diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 50263b7ff7..3018ebf687 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -65,6 +65,7 @@ /nixos/doc/manual/development/writing-modules.xml @nbp /nixos/doc/manual/man-nixos-option.xml @nbp /nixos/modules/installer/tools/nixos-option.sh @nbp +/nixos/modules/system @dasJ # NixOS integration test driver /nixos/lib/test-driver @tfc diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml index 81c5694f43..9032b3d7d9 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml @@ -28,6 +28,10 @@ jobs: pairs: - from: master into: haskell-updates + - from: release-21.05 + into: staging-next-21.05 + - from: staging-next-21.05 + into: staging-21.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - uses: actions/checkout@v2 diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml index 68fde857f8..daa9b6d3c8 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml @@ -30,10 +30,6 @@ jobs: into: staging-next - from: staging-next into: staging - - from: release-21.05 - into: staging-next-21.05 - - from: staging-next-21.05 - into: staging-21.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - uses: actions/checkout@v2 diff --git a/third_party/nixpkgs/doc/builders/packages/etc-files.section.md b/third_party/nixpkgs/doc/builders/packages/etc-files.section.md new file mode 100644 index 0000000000..2405a54634 --- /dev/null +++ b/third_party/nixpkgs/doc/builders/packages/etc-files.section.md @@ -0,0 +1,18 @@ +# /etc files {#etc} + +Certain calls in glibc require access to runtime files found in /etc such as `/etc/protocols` or `/etc/services` -- [getprotobyname](https://linux.die.net/man/3/getprotobyname) is one such function. + +On non-NixOS distributions these files are typically provided by packages (i.e. [netbase](https://packages.debian.org/sid/netbase)) if not already pre-installed in your distribution. This can cause non-reproducibility for code if they rely on these files being present. + +If [iana-etc](https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.iana-etc.x86_64-linux) is part of your _buildInputs_ then it will set the environment varaibles `NIX_ETC_PROTOCOLS` and `NIX_ETC_SERVICES` to the corresponding files in the package through a _setup-hook_. + + +```bash +> nix-shell -p iana-etc + +[nix-shell:~]$ env | grep NIX_ETC +NIX_ETC_SERVICES=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/etc/services +NIX_ETC_PROTOCOLS=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/etc/protocols +``` + +Nixpkg's version of [glibc](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/glibc/default.nix) has been patched to check for the existence of these environment variables. If the environment variable are *not set*, then it will attempt to find the files at the default location within _/etc_. diff --git a/third_party/nixpkgs/doc/builders/packages/index.xml b/third_party/nixpkgs/doc/builders/packages/index.xml index f5b05b0bbc..206e1e49f1 100644 --- a/third_party/nixpkgs/doc/builders/packages/index.xml +++ b/third_party/nixpkgs/doc/builders/packages/index.xml @@ -17,6 +17,7 @@ + diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md index 85c8626bd9..7a8e7741a3 100644 --- a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md +++ b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md @@ -181,6 +181,21 @@ rev = "${version}"; ``` +- Filling lists condionally _should_ be done with `lib.optional(s)` instead of using `if cond then [ ... ] else null` or `if cond then [ ... ] else [ ]`. + + ```nix + buildInputs = lib.optional stdenv.isDarwin iconv; + ``` + + instead of + + ```nix + buildInputs = if stdenv.isDarwin then [ iconv ] else null; + ``` + + As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild. + If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`. + - Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first. ## Package naming {#sec-package-naming} diff --git a/third_party/nixpkgs/flake.nix b/third_party/nixpkgs/flake.nix index ececd26c15..1e20fcd40e 100644 --- a/third_party/nixpkgs/flake.nix +++ b/third_party/nixpkgs/flake.nix @@ -11,15 +11,7 @@ lib = import ./lib; - systems = [ - "x86_64-linux" - "i686-linux" - "x86_64-darwin" - "aarch64-linux" - "armv6l-linux" - "armv7l-linux" - "aarch64-darwin" - ]; + systems = lib.systems.supported.hydra; forAllSystems = f: lib.genAttrs systems (system: f system); diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index cabc1549c0..5a85c54211 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -123,8 +123,8 @@ let inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' - scrubOptionValue literalExample showOption showFiles - unknownModule mkOption; + scrubOptionValue literalExpression literalExample literalDocBook + showOption showFiles unknownModule mkOption; inherit (self.types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; inherit (self.asserts) diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix index 119a67fb7d..b316418131 100644 --- a/third_party/nixpkgs/lib/options.nix +++ b/third_party/nixpkgs/lib/options.nix @@ -54,7 +54,7 @@ rec { Example: mkOption { } // => { _type = "option"; } - mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; } + mkOption { default = "foo"; } // => { _type = "option"; default = "foo"; } */ mkOption = { @@ -212,11 +212,25 @@ rec { else x; - /* For use in the `example` option attribute. It causes the given - text to be included verbatim in documentation. This is necessary - for example values that are not simple values, e.g., functions. + /* For use in the `defaultText` and `example` option attributes. Causes the + given string to be rendered verbatim in the documentation as Nix code. This + is necessary for complex values, e.g. functions, or values that depend on + other values or packages. */ - literalExample = text: { _type = "literalExample"; inherit text; }; + literalExpression = text: + if ! isString text then throw "literalExpression expects a string." + else { _type = "literalExpression"; inherit text; }; + + literalExample = lib.warn "literalExample is deprecated, use literalExpression instead, or use literalDocBook for a non-Nix description." literalExpression; + + + /* For use in the `defaultText` and `example` option attributes. Causes the + given DocBook text to be inserted verbatim in the documentation, for when + a `literalExpression` would be too hard to read. + */ + literalDocBook = text: + if ! isString text then throw "literalDocBook expects a string." + else { _type = "literalDocBook"; inherit text; }; # Helper functions. diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix index ef609859ab..529eeb6514 100644 --- a/third_party/nixpkgs/lib/systems/default.nix +++ b/third_party/nixpkgs/lib/systems/default.nix @@ -8,6 +8,7 @@ rec { platforms = import ./platforms.nix { inherit lib; }; examples = import ./examples.nix { inherit lib; }; architectures = import ./architectures.nix { inherit lib; }; + supported = import ./supported.nix { inherit lib; }; # Elaborate a `localSystem` or `crossSystem` so that it contains everything # necessary. diff --git a/third_party/nixpkgs/lib/systems/supported.nix b/third_party/nixpkgs/lib/systems/supported.nix new file mode 100644 index 0000000000..60bf307413 --- /dev/null +++ b/third_party/nixpkgs/lib/systems/supported.nix @@ -0,0 +1,24 @@ +# Supported systems according to RFC0046's definition. +# +# https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md +{ lib }: +rec { + # List of systems that are built by Hydra. + hydra = tier1 ++ tier2 ++ tier3; + + tier1 = [ + "x86_64-linux" + ]; + + tier2 = [ + "aarch64-linux" + "x86_64-darwin" + ]; + + tier3 = [ + "armv6l-linux" + "armv7l-linux" + "i686-linux" + "mipsel-linux" + ]; +} diff --git a/third_party/nixpkgs/lib/tests/modules.sh b/third_party/nixpkgs/lib/tests/modules.sh index 2e57c2f8e2..b51db91f6b 100755 --- a/third_party/nixpkgs/lib/tests/modules.sh +++ b/third_party/nixpkgs/lib/tests/modules.sh @@ -254,8 +254,10 @@ checkConfigOutput / config.value.path ./types-anything/equal-atoms.nix checkConfigOutput null config.value.null ./types-anything/equal-atoms.nix checkConfigOutput 0.1 config.value.float ./types-anything/equal-atoms.nix # Functions can't be merged together -checkConfigError "The option .* has conflicting definition values" config.value.multiple-lambdas ./types-anything/functions.nix +checkConfigError "The option .value.multiple-lambdas.. has conflicting option types" config.applied.multiple-lambdas ./types-anything/functions.nix checkConfigOutput '' config.value.single-lambda ./types-anything/functions.nix +checkConfigOutput 'null' config.applied.merging-lambdas.x ./types-anything/functions.nix +checkConfigOutput 'null' config.applied.merging-lambdas.y ./types-anything/functions.nix # Check that all mk* modifiers are applied checkConfigError 'attribute .* not found' config.value.mkiffalse ./types-anything/mk-mods.nix checkConfigOutput '{ }' config.value.mkiftrue ./types-anything/mk-mods.nix diff --git a/third_party/nixpkgs/lib/tests/modules/types-anything/functions.nix b/third_party/nixpkgs/lib/tests/modules/types-anything/functions.nix index 0795189139..21edd4aff9 100644 --- a/third_party/nixpkgs/lib/tests/modules/types-anything/functions.nix +++ b/third_party/nixpkgs/lib/tests/modules/types-anything/functions.nix @@ -1,16 +1,22 @@ -{ lib, ... }: { +{ lib, config, ... }: { options.value = lib.mkOption { type = lib.types.anything; }; + options.applied = lib.mkOption { + default = lib.mapAttrs (name: fun: fun null) config.value; + }; + config = lib.mkMerge [ { value.single-lambda = x: x; - value.multiple-lambdas = x: x; + value.multiple-lambdas = x: { inherit x; }; + value.merging-lambdas = x: { inherit x; }; } { - value.multiple-lambdas = x: x; + value.multiple-lambdas = x: [ x ]; + value.merging-lambdas = y: { inherit y; }; } ]; diff --git a/third_party/nixpkgs/lib/types.nix b/third_party/nixpkgs/lib/types.nix index a0be2ff3a4..c2532065d7 100644 --- a/third_party/nixpkgs/lib/types.nix +++ b/third_party/nixpkgs/lib/types.nix @@ -192,6 +192,12 @@ rec { else (listOf anything).merge; # This is the type of packages, only accept a single definition stringCoercibleSet = mergeOneOption; + lambda = loc: defs: arg: anything.merge + (loc ++ [ "" ]) + (map (def: { + file = def.file; + value = def.value arg; + }) defs); # Otherwise fall back to only allowing all equal definitions }.${commonType} or mergeEqualOption; in mergeFunction loc defs; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 07d76c8f34..e34f9e823e 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -3119,6 +3119,12 @@ githubId = 50854; name = "edef"; }; + edlimerkaj = { + name = "Edli Merkaj"; + email = "edli.merkaj@identinet.io"; + github = "edlimerkaj"; + githubId = 71988351; + }; edibopp = { email = "eduard.bopp@aepsil0n.de"; github = "edibopp"; @@ -8914,6 +8920,12 @@ githubId = 11365056; name = "Kevin Liu"; }; + pnmadelaine = { + name = "Paul-Nicolas Madelaine"; + email = "pnm@pnm.tf"; + github = "pnmadelaine"; + githubId = 21977014; + }; pnotequalnp = { email = "kevin@pnotequalnp.com"; github = "pnotequalnp"; @@ -10288,6 +10300,12 @@ fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; }]; }; + simarra = { + name = "simarra"; + email = "loic.martel@protonmail.com"; + github = "simarra"; + githubId = 14372987; + }; simonchatts = { email = "code@chatts.net"; github = "simonchatts"; diff --git a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md index 819c23684c..be56529992 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md @@ -38,9 +38,19 @@ The function `mkOption` accepts the following arguments. of the module will have to define the value of the option, otherwise an error will be thrown. +`defaultText` + +: A textual representation of the default value to be rendered verbatim in + the manual. Useful if the default value is a complex expression or depends + on other values or packages. + Use `lib.literalExpression` for a Nix expression, `lib.literalDocBook` for + a plain English description in DocBook format. + `example` : An example value that will be shown in the NixOS manual. + You can use `lib.literalExpression` and `lib.literalDocBook` in the same way + as in `defaultText`. `description` diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml index 85a59a543d..2845e37659 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -57,13 +57,31 @@ options = { + + + defaultText + + + + A textual representation of the default value to be rendered + verbatim in the manual. Useful if the default value is a + complex expression or depends on other values or packages. Use + lib.literalExpression for a Nix expression, + lib.literalDocBook for a plain English + description in DocBook format. + + + example - An example value that will be shown in the NixOS manual. + An example value that will be shown in the NixOS manual. You + can use lib.literalExpression and + lib.literalDocBook in the same way as in + defaultText. diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl b/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl index 18d19fddac..da4cd164bf 100644 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -54,7 +54,7 @@ Default: - + @@ -62,14 +62,7 @@ Example: - - - - - - - - + @@ -107,20 +100,37 @@ - + - - -'' -'' + + - + + + + + + + + + '' + + '' + + + + + + + + + null @@ -129,10 +139,10 @@ - '''' + '''' - "" + "" @@ -163,7 +173,7 @@ - + diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix b/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix index e5aca9fe20..fcb369e87f 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -27,7 +27,7 @@ in { }; contents = mkOption { - example = literalExample '' + example = literalExpression '' [ { source = pkgs.memtest86 + "/memtest.bin"; target = "boot/memtest.bin"; } diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix index f87e61e3ef..04952898cb 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix @@ -61,7 +61,7 @@ in fonts = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ pkgs.dejavu_fonts ]"; + example = literalExpression "[ pkgs.dejavu_fonts ]"; description = "List of primary font paths."; }; diff --git a/third_party/nixpkgs/nixos/modules/config/i18n.nix b/third_party/nixpkgs/nixos/modules/config/i18n.nix index 991b449d80..545d4a3dca 100644 --- a/third_party/nixpkgs/nixos/modules/config/i18n.nix +++ b/third_party/nixpkgs/nixos/modules/config/i18n.nix @@ -14,7 +14,7 @@ with lib; allLocales = any (x: x == "all") config.i18n.supportedLocales; locales = config.i18n.supportedLocales; }; - example = literalExample "pkgs.glibcLocales"; + example = literalExpression "pkgs.glibcLocales"; description = '' Customized pkg.glibcLocales package. diff --git a/third_party/nixpkgs/nixos/modules/config/krb5/default.nix b/third_party/nixpkgs/nixos/modules/config/krb5/default.nix index 6db2a7e403..911c5b629a 100644 --- a/third_party/nixpkgs/nixos/modules/config/krb5/default.nix +++ b/third_party/nixpkgs/nixos/modules/config/krb5/default.nix @@ -83,8 +83,8 @@ in { kerberos = mkOption { type = types.package; default = pkgs.krb5Full; - defaultText = "pkgs.krb5Full"; - example = literalExample "pkgs.heimdal"; + defaultText = literalExpression "pkgs.krb5Full"; + example = literalExpression "pkgs.heimdal"; description = '' The Kerberos implementation that will be present in environment.systemPackages after enabling this @@ -96,7 +96,7 @@ in { type = with types; either attrs lines; default = {}; apply = attrs: filterEmbeddedMetadata attrs; - example = literalExample '' + example = literalExpression '' { default_realm = "ATHENA.MIT.EDU"; }; @@ -109,7 +109,7 @@ in { realms = mkOption { type = with types; either attrs lines; default = {}; - example = literalExample '' + example = literalExpression '' { "ATHENA.MIT.EDU" = { admin_server = "athena.mit.edu"; @@ -127,7 +127,7 @@ in { domain_realm = mkOption { type = with types; either attrs lines; default = {}; - example = literalExample '' + example = literalExpression '' { "example.com" = "EXAMPLE.COM"; ".example.com" = "EXAMPLE.COM"; @@ -142,7 +142,7 @@ in { capaths = mkOption { type = with types; either attrs lines; default = {}; - example = literalExample '' + example = literalExpression '' { "ATHENA.MIT.EDU" = { "EXAMPLE.COM" = "."; @@ -161,7 +161,7 @@ in { appdefaults = mkOption { type = with types; either attrs lines; default = {}; - example = literalExample '' + example = literalExpression '' { pam = { debug = false; @@ -182,7 +182,7 @@ in { plugins = mkOption { type = with types; either attrs lines; default = {}; - example = literalExample '' + example = literalExpression '' { ccselect = { disable = "k5identity"; diff --git a/third_party/nixpkgs/nixos/modules/config/networking.nix b/third_party/nixpkgs/nixos/modules/config/networking.nix index 8c4eec510e..11307e3312 100644 --- a/third_party/nixpkgs/nixos/modules/config/networking.nix +++ b/third_party/nixpkgs/nixos/modules/config/networking.nix @@ -21,7 +21,7 @@ in networking.hosts = lib.mkOption { type = types.attrsOf (types.listOf types.str); - example = literalExample '' + example = literalExpression '' { "127.0.0.1" = [ "foo.bar.baz" ]; "192.168.0.2" = [ "fileserver.local" "nameserver.local" ]; @@ -34,8 +34,8 @@ in networking.hostFiles = lib.mkOption { type = types.listOf types.path; - defaultText = lib.literalExample "Hosts from `networking.hosts` and `networking.extraHosts`"; - example = lib.literalExample ''[ "''${pkgs.my-blocklist-package}/share/my-blocklist/hosts" ]''; + defaultText = literalDocBook "Hosts from and "; + example = literalExpression ''[ "''${pkgs.my-blocklist-package}/share/my-blocklist/hosts" ]''; description = '' Files that should be concatenated together to form /etc/hosts. ''; diff --git a/third_party/nixpkgs/nixos/modules/config/power-management.nix b/third_party/nixpkgs/nixos/modules/config/power-management.nix index cc0ff732ff..710842e150 100644 --- a/third_party/nixpkgs/nixos/modules/config/power-management.nix +++ b/third_party/nixpkgs/nixos/modules/config/power-management.nix @@ -35,7 +35,7 @@ in powerUpCommands = mkOption { type = types.lines; default = ""; - example = literalExample '' + example = literalExpression '' "''${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda" ''; description = @@ -49,7 +49,7 @@ in powerDownCommands = mkOption { type = types.lines; default = ""; - example = literalExample '' + example = literalExpression '' "''${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda" ''; description = diff --git a/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix b/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix index 3f7ae109e8..01555d28b7 100644 --- a/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix +++ b/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix @@ -149,8 +149,8 @@ in { default = if config.services.jack.jackd.enable then pkgs.pulseaudioFull else pkgs.pulseaudio; - defaultText = "pkgs.pulseaudio"; - example = literalExample "pkgs.pulseaudioFull"; + defaultText = literalExpression "pkgs.pulseaudio"; + example = literalExpression "pkgs.pulseaudioFull"; description = '' The PulseAudio derivation to use. This can be used to enable features (such as JACK support, Bluetooth) via the @@ -161,7 +161,7 @@ in { extraModules = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.pulseaudio-modules-bt ]"; + example = literalExpression "[ pkgs.pulseaudio-modules-bt ]"; description = '' Extra pulseaudio modules to use. This is intended for out-of-tree pulseaudio modules like extra bluetooth codecs. @@ -184,7 +184,7 @@ in { type = types.attrsOf types.unspecified; default = {}; description = "Config of the pulse daemon. See man pulse-daemon.conf."; - example = literalExample ''{ realtime-scheduling = "yes"; }''; + example = literalExpression ''{ realtime-scheduling = "yes"; }''; }; }; @@ -204,7 +204,7 @@ in { allowedIpRanges = mkOption { type = types.listOf types.str; default = []; - example = literalExample ''[ "127.0.0.1" "192.168.1.0/24" ]''; + example = literalExpression ''[ "127.0.0.1" "192.168.1.0/24" ]''; description = '' A list of IP subnets that are allowed to stream to the server. ''; diff --git a/third_party/nixpkgs/nixos/modules/config/shells-environment.nix b/third_party/nixpkgs/nixos/modules/config/shells-environment.nix index 34e558d860..ae3f618e27 100644 --- a/third_party/nixpkgs/nixos/modules/config/shells-environment.nix +++ b/third_party/nixpkgs/nixos/modules/config/shells-environment.nix @@ -136,10 +136,8 @@ in environment.binsh = mkOption { default = "${config.system.build.binsh}/bin/sh"; - defaultText = "\${config.system.build.binsh}/bin/sh"; - example = literalExample '' - "''${pkgs.dash}/bin/dash" - ''; + defaultText = literalExpression ''"''${config.system.build.binsh}/bin/sh"''; + example = literalExpression ''"''${pkgs.dash}/bin/dash"''; type = types.path; visible = false; description = '' @@ -152,7 +150,7 @@ in environment.shells = mkOption { default = []; - example = literalExample "[ pkgs.bashInteractive pkgs.zsh ]"; + example = literalExpression "[ pkgs.bashInteractive pkgs.zsh ]"; description = '' A list of permissible login shells for user accounts. No need to mention /bin/sh diff --git a/third_party/nixpkgs/nixos/modules/config/sysctl.nix b/third_party/nixpkgs/nixos/modules/config/sysctl.nix index e59c7a32c2..db1f5284f5 100644 --- a/third_party/nixpkgs/nixos/modules/config/sysctl.nix +++ b/third_party/nixpkgs/nixos/modules/config/sysctl.nix @@ -22,7 +22,7 @@ in boot.kernel.sysctl = mkOption { default = {}; - example = literalExample '' + example = literalExpression '' { "net.ipv4.tcp_syncookies" = false; "vm.swappiness" = 60; } ''; type = types.attrsOf sysctlOption; diff --git a/third_party/nixpkgs/nixos/modules/config/system-path.nix b/third_party/nixpkgs/nixos/modules/config/system-path.nix index 1292c3008c..6ff4ec2921 100644 --- a/third_party/nixpkgs/nixos/modules/config/system-path.nix +++ b/third_party/nixpkgs/nixos/modules/config/system-path.nix @@ -58,7 +58,7 @@ in systemPackages = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.firefox pkgs.thunderbird ]"; + example = literalExpression "[ pkgs.firefox pkgs.thunderbird ]"; description = '' The set of packages that appear in /run/current-system/sw. These packages are @@ -73,9 +73,9 @@ in defaultPackages = mkOption { type = types.listOf types.package; default = defaultPackages; - example = literalExample "[]"; + example = []; description = '' - Set of default packages that aren't strictly neccessary + Set of default packages that aren't strictly necessary for a running system, entries can be removed for a more minimal NixOS installation. diff --git a/third_party/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix b/third_party/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix index abc12a627d..055c3b2364 100644 --- a/third_party/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix +++ b/third_party/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix @@ -19,7 +19,7 @@ in { environment.unixODBCDrivers = mkOption { type = types.listOf types.package; default = []; - example = literalExample "with pkgs.unixODBCDrivers; [ sqlite psql ]"; + example = literalExpression "with pkgs.unixODBCDrivers; [ sqlite psql ]"; description = '' Specifies Unix ODBC drivers to be registered in /etc/odbcinst.ini. You may also want to diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index 8e2db9107a..629905e609 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -165,8 +165,8 @@ let shell = mkOption { type = types.nullOr (types.either types.shellPackage (passwdEntry types.path)); default = pkgs.shadow; - defaultText = "pkgs.shadow"; - example = literalExample "pkgs.bashInteractive"; + defaultText = literalExpression "pkgs.shadow"; + example = literalExpression "pkgs.bashInteractive"; description = '' The path to the user's shell. Can use shell derivations, like pkgs.bashInteractive. Don’t @@ -291,7 +291,7 @@ let packages = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.firefox pkgs.thunderbird ]"; + example = literalExpression "[ pkgs.firefox pkgs.thunderbird ]"; description = '' The set of packages that should be made available to the user. This is in contrast to , diff --git a/third_party/nixpkgs/nixos/modules/config/xdg/portals/wlr.nix b/third_party/nixpkgs/nixos/modules/config/xdg/portals/wlr.nix index 55baab0026..aba1d8dbc0 100644 --- a/third_party/nixpkgs/nixos/modules/config/xdg/portals/wlr.nix +++ b/third_party/nixpkgs/nixos/modules/config/xdg/portals/wlr.nix @@ -37,7 +37,7 @@ in default = { }; # Example taken from the manpage - example = literalExample '' + example = literalExpression '' { screencast = { output_name = "HDMI-A-1"; diff --git a/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix b/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix index 6932be1c54..b2bbd77c9d 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix @@ -27,7 +27,7 @@ in package = mkOption { type = types.package; default = pkgs.ckb-next; - defaultText = "pkgs.ckb-next"; + defaultText = literalExpression "pkgs.ckb-next"; description = '' The package implementing the Corsair keyboard/mouse driver. ''; diff --git a/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix b/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix index 4aa1d6369d..be67116ad5 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix @@ -21,7 +21,7 @@ let each .dtb file matching "compatible" of the overlay. ''; default = null; - example = literalExample "./dts/overlays.dts"; + example = literalExpression "./dts/overlays.dts"; }; dtsText = mkOption { @@ -31,7 +31,7 @@ let Literal DTS contents, overlay is applied to each .dtb file matching "compatible" of the overlay. ''; - example = literalExample '' + example = '' /dts-v1/; /plugin/; / { @@ -125,8 +125,8 @@ in kernelPackage = mkOption { default = config.boot.kernelPackages.kernel; - defaultText = "config.boot.kernelPackages.kernel"; - example = literalExample "pkgs.linux_latest"; + defaultText = literalExpression "config.boot.kernelPackages.kernel"; + example = literalExpression "pkgs.linux_latest"; type = types.path; description = '' Kernel package containing the base device-tree (.dtb) to boot. Uses @@ -156,7 +156,7 @@ in overlays = mkOption { default = []; - example = literalExample '' + example = literalExpression '' [ { name = "pps"; dtsFile = ./dts/pps.dts; } { name = "spi"; diff --git a/third_party/nixpkgs/nixos/modules/hardware/digitalbitbox.nix b/third_party/nixpkgs/nixos/modules/hardware/digitalbitbox.nix index 0888cfbef2..097448a74f 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/digitalbitbox.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/digitalbitbox.nix @@ -19,7 +19,7 @@ in package = mkOption { type = types.package; default = pkgs.digitalbitbox; - defaultText = "pkgs.digitalbitbox"; + defaultText = literalExpression "pkgs.digitalbitbox"; description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/opengl.nix b/third_party/nixpkgs/nixos/modules/hardware/opengl.nix index a50b5d32c3..0d8aaf7345 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/opengl.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/opengl.nix @@ -89,7 +89,7 @@ in extraPackages = mkOption { type = types.listOf types.package; default = []; - example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; + example = literalExpression "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; description = '' Additional packages to add to OpenGL drivers. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. @@ -99,7 +99,7 @@ in extraPackages32 = mkOption { type = types.listOf types.package; default = []; - example = literalExample "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; + example = literalExpression "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; description = '' Additional packages to add to 32-bit OpenGL drivers on 64-bit systems. Used when is diff --git a/third_party/nixpkgs/nixos/modules/hardware/opentabletdriver.nix b/third_party/nixpkgs/nixos/modules/hardware/opentabletdriver.nix index 295e23e616..caba934ebe 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/opentabletdriver.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/opentabletdriver.nix @@ -29,7 +29,7 @@ in package = mkOption { type = types.package; default = pkgs.opentabletdriver; - defaultText = "pkgs.opentabletdriver"; + defaultText = literalExpression "pkgs.opentabletdriver"; description = '' OpenTabletDriver derivation to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/hardware/printers.nix b/third_party/nixpkgs/nixos/modules/hardware/printers.nix index c587076dcd..7bab4f7038 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/printers.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/printers.nix @@ -72,10 +72,10 @@ in { }; deviceUri = mkOption { type = types.str; - example = [ + example = literalExpression '' "ipp://printserver.local/printers/BrotherHL_Workroom" "usb://HP/DESKJET%20940C?serial=CN16E6C364BH" - ]; + ''; description = '' How to reach the printer. lpinfo -v shows a list of supported device URIs and schemes. @@ -83,8 +83,8 @@ in { }; model = mkOption { type = types.str; - example = literalExample '' - gutenprint.''${lib.versions.majorMinor (lib.getVersion pkgs.gutenprint)}://brother-hl-5140/expert + example = literalExpression '' + "gutenprint.''${lib.versions.majorMinor (lib.getVersion pkgs.gutenprint)}://brother-hl-5140/expert" ''; description = '' Location of the ppd driver file for the printer. diff --git a/third_party/nixpkgs/nixos/modules/hardware/sata.nix b/third_party/nixpkgs/nixos/modules/hardware/sata.nix index 541897527a..81592997d6 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/sata.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/sata.nix @@ -39,7 +39,7 @@ in enable = mkEnableOption "SATA drive timeouts"; deciSeconds = mkOption { - example = "70"; + example = 70; type = types.int; description = '' Set SCT Error Recovery Control timeout in deciseconds for use in RAID configurations. diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index cf87ca5377..b9eb7f69ef 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -165,11 +165,11 @@ in hardware.nvidia.package = lib.mkOption { type = lib.types.package; default = config.boot.kernelPackages.nvidiaPackages.stable; - defaultText = "config.boot.kernelPackages.nvidiaPackages.stable"; + defaultText = literalExpression "config.boot.kernelPackages.nvidiaPackages.stable"; description = '' The NVIDIA X11 derivation to use. ''; - example = "config.boot.kernelPackages.nvidiaPackages.legacy_340"; + example = literalExpression "config.boot.kernelPackages.nvidiaPackages.legacy_340"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/uvcvideo/default.nix b/third_party/nixpkgs/nixos/modules/hardware/video/uvcvideo/default.nix index cf6aa052ab..338062cf69 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/uvcvideo/default.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/uvcvideo/default.nix @@ -33,7 +33,7 @@ in packages = mkOption { type = types.listOf types.path; - example = literalExample "[ pkgs.tiscamera ]"; + example = literalExpression "[ pkgs.tiscamera ]"; description = '' List of packages containing uvcvideo dynamic controls rules. All files found in diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix index 440f13b415..57960cc365 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix @@ -17,7 +17,7 @@ in engines = mkOption { type = with types; listOf fcitxEngine; default = []; - example = literalExample "with pkgs.fcitx-engines; [ mozc hangul ]"; + example = literalExpression "with pkgs.fcitx-engines; [ mozc hangul ]"; description = let enginesDrv = filterAttrs (const isDerivation) pkgs.fcitx-engines; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix index eecbe32fea..414aabbbaa 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix @@ -12,7 +12,7 @@ in { addons = mkOption { type = with types; listOf package; default = []; - example = with pkgs; [ fcitx5-rime ]; + example = literalExpression "with pkgs; [ fcitx5-rime ]"; description = '' Enabled Fcitx5 addons. ''; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix index 1aaa5a952b..92f8c64338 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix @@ -36,7 +36,7 @@ in engines = mkOption { type = with types; listOf ibusEngine; default = []; - example = literalExample "with pkgs.ibus-engines; [ mozc hangul ]"; + example = literalExpression "with pkgs.ibus-engines; [ mozc hangul ]"; description = let enginesDrv = filterAttrs (const isDerivation) pkgs.ibus-engines; @@ -48,7 +48,7 @@ in panel = mkOption { type = with types; nullOr path; default = null; - example = literalExample "''${pkgs.plasma5Packages.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; + example = literalExpression ''"''${pkgs.plasma5Packages.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"''; description = "Replace the IBus panel with another panel."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix index 2a73cb3f46..e462cae243 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix @@ -10,7 +10,7 @@ in config = mkOption { type = yamlFormat.type; default = { }; - example = literalExample '' + example = literalExpression '' { daemon = { modules = ["Xim" "Indicator"]; diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix index 78cbf14bba..4812cacaba 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix @@ -528,7 +528,7 @@ in }; isoImage.contents = mkOption { - example = literalExample '' + example = literalExpression '' [ { source = pkgs.memtest86 + "/memtest.bin"; target = "boot/memtest.bin"; } @@ -541,7 +541,7 @@ in }; isoImage.storeContents = mkOption { - example = literalExample "[ pkgs.stdenv ]"; + example = literalExpression "[ pkgs.stdenv ]"; description = '' This option lists additional derivations to be included in the Nix store in the generated ISO image. diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball.nix index 58098c4553..362c555cc5 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball.nix @@ -15,7 +15,7 @@ in { options = { tarball.contents = mkOption { - example = literalExample '' + example = literalExpression '' [ { source = pkgs.memtest86 + "/memtest.bin"; target = "boot/memtest.bin"; } @@ -28,7 +28,7 @@ in }; tarball.storeContents = mkOption { - example = literalExample "[ pkgs.stdenv ]"; + example = literalExpression "[ pkgs.stdenv ]"; description = '' This option lists additional derivations to be included in the Nix store in the generated ISO image. diff --git a/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix b/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix index 28b6c39b29..145f71b5d0 100644 --- a/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix +++ b/third_party/nixpkgs/nixos/modules/installer/netboot/netboot.nix @@ -9,7 +9,7 @@ with lib; options = { netboot.storeContents = mkOption { - example = literalExample "[ pkgs.stdenv ]"; + example = literalExpression "[ pkgs.stdenv ]"; description = '' This option lists additional derivations to be included in the Nix store in the generated netboot image. 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 2a10a77300..a964cf2d6f 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 @@ -49,7 +49,7 @@ in storePaths = mkOption { type = with types; listOf package; - example = literalExample "[ pkgs.stdenv ]"; + example = literalExpression "[ pkgs.stdenv ]"; description = '' Derivations to be included in the Nix store in the generated SD image. ''; @@ -107,7 +107,7 @@ in }; populateFirmwareCommands = mkOption { - example = literalExample "'' cp \${pkgs.myBootLoader}/u-boot.bin firmware/ ''"; + example = literalExpression "'' cp \${pkgs.myBootLoader}/u-boot.bin firmware/ ''"; description = '' Shell commands to populate the ./firmware directory. All files in that directory are copied to the @@ -116,7 +116,7 @@ in }; populateRootCommands = mkOption { - example = literalExample "''\${config.boot.loader.generic-extlinux-compatible.populateCmd} -c \${config.system.build.toplevel} -d ./files/boot''"; + example = literalExpression "''\${config.boot.loader.generic-extlinux-compatible.populateCmd} -c \${config.system.build.toplevel} -d ./files/boot''"; description = '' Shell commands to populate the ./files directory. All files in that directory are copied to the @@ -126,7 +126,7 @@ in }; postBuildCommands = mkOption { - example = literalExample "'' dd if=\${pkgs.myBootLoader}/SPL of=$img bs=1024 seek=1 conv=notrunc ''"; + example = literalExpression "'' dd if=\${pkgs.myBootLoader}/SPL of=$img bs=1024 seek=1 conv=notrunc ''"; default = ""; description = '' Shell commands to run after the image is built. diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation.nix b/third_party/nixpkgs/nixos/modules/misc/documentation.nix index ec6b2ad3b8..c3ded4f1ea 100644 --- a/third_party/nixpkgs/nixos/modules/misc/documentation.nix +++ b/third_party/nixpkgs/nixos/modules/misc/documentation.nix @@ -133,7 +133,7 @@ in extraOutputsToInstall = ["man"]; ignoreCollisions = true; }; - defaultText = "all man pages in config.environment.systemPackages"; + defaultText = literalDocBook "all man pages in "; description = '' The manual pages to generate caches for if is enabled. Must be a path to a directory with man pages under @@ -211,7 +211,7 @@ in Which extra NixOS module paths the generated NixOS's documentation should strip from options. ''; - example = literalExample '' + example = literalExpression '' # e.g. with options from modules in ''${pkgs.customModules}/nix: [ pkgs.customModules ] ''; diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index e760a18f50..b77ef42a16 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -48,7 +48,7 @@ in #disk = 6; # unused #vsftpd = 7; # dynamically allocated ass of 2021-09-14 ftp = 8; - bitlbee = 9; + # bitlbee = 9; # removed 2021-10-05 #139765 #avahi = 10; # removed 2019-05-22 nagios = 11; atd = 12; @@ -368,7 +368,7 @@ in disk = 6; #vsftpd = 7; # dynamically allocated as of 2021-09-14 ftp = 8; - bitlbee = 9; + # bitlbee = 9; # removed 2021-10-05 #139765 #avahi = 10; # removed 2019-05-22 #nagios = 11; # unused atd = 12; diff --git a/third_party/nixpkgs/nixos/modules/misc/locate.nix b/third_party/nixpkgs/nixos/modules/misc/locate.nix index 5d2f9a21bc..2f2986c2fe 100644 --- a/third_party/nixpkgs/nixos/modules/misc/locate.nix +++ b/third_party/nixpkgs/nixos/modules/misc/locate.nix @@ -25,8 +25,8 @@ in { locate = mkOption { type = package; default = pkgs.findutils; - defaultText = "pkgs.findutils"; - example = "pkgs.mlocate"; + defaultText = literalExpression "pkgs.findutils"; + example = literalExpression "pkgs.mlocate"; description = '' The locate implementation to use ''; diff --git a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix index a2ac5c5852..08bc439855 100644 --- a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix +++ b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix @@ -67,13 +67,13 @@ in options.nixpkgs = { pkgs = mkOption { - defaultText = literalExample - ''import "''${nixos}/.." { - inherit (cfg) config overlays localSystem crossSystem; - } - ''; + defaultText = literalExpression '' + import "''${nixos}/.." { + inherit (cfg) config overlays localSystem crossSystem; + } + ''; type = pkgsType; - example = literalExample "import {}"; + example = literalExpression "import {}"; description = '' If set, the pkgs argument to all NixOS modules is the value of this option, extended with nixpkgs.overlays, if @@ -109,7 +109,7 @@ in config = mkOption { default = {}; - example = literalExample + example = literalExpression '' { allowBroken = true; allowUnfree = true; } ''; @@ -125,7 +125,7 @@ in overlays = mkOption { default = []; - example = literalExample + example = literalExpression '' [ (self: super: { @@ -158,7 +158,7 @@ in # Make sure that the final value has all fields for sake of other modules # referring to this. TODO make `lib.systems` itself use the module system. apply = lib.systems.elaborate; - defaultText = literalExample + defaultText = literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' Specifies the platform on which NixOS should be built. When diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index d24f98efb7..36e2131f2d 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -154,6 +154,7 @@ ./programs/gnupg.nix ./programs/gphoto2.nix ./programs/hamster.nix + ./programs/htop.nix ./programs/iftop.nix ./programs/iotop.nix ./programs/java.nix @@ -984,6 +985,7 @@ ./services/web-apps/jirafeau.nix ./services/web-apps/jitsi-meet.nix ./services/web-apps/keycloak.nix + ./services/web-apps/lemmy.nix ./services/web-apps/limesurvey.nix ./services/web-apps/mastodon.nix ./services/web-apps/mattermost.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/atop.nix b/third_party/nixpkgs/nixos/modules/programs/atop.nix index 918c228b3f..ad75ab2766 100644 --- a/third_party/nixpkgs/nixos/modules/programs/atop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/atop.nix @@ -19,7 +19,7 @@ in package = mkOption { type = types.package; default = pkgs.atop; - defaultText = "pkgs.atop"; + defaultText = literalExpression "pkgs.atop"; description = '' Which package to use for Atop. ''; @@ -37,7 +37,7 @@ in package = mkOption { type = types.package; default = config.boot.kernelPackages.netatop; - defaultText = "config.boot.kernelPackages.netatop"; + defaultText = literalExpression "config.boot.kernelPackages.netatop"; description = '' Which package to use for netatop. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix b/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix index 4e8abdeecf..0f5d087e8d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix +++ b/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix @@ -14,7 +14,7 @@ in package = mkOption { type = types.package; default = pkgs.captive-browser; - defaultText = "pkgs.captive-browser"; + defaultText = literalExpression "pkgs.captive-browser"; description = "Which package to use for captive-browser"; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/ccache.nix b/third_party/nixpkgs/nixos/modules/programs/ccache.nix index 35a4373f61..0f7fd0a368 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ccache.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ccache.nix @@ -28,7 +28,7 @@ in { # "nix-ccache --show-stats" and "nix-ccache --clear" security.wrappers.nix-ccache = { - owner = "nobody"; + owner = "root"; group = "nixbld"; setuid = false; setgid = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/chromium.nix b/third_party/nixpkgs/nixos/modules/programs/chromium.nix index b727f850a9..602253a321 100644 --- a/third_party/nixpkgs/nixos/modules/programs/chromium.nix +++ b/third_party/nixpkgs/nixos/modules/programs/chromium.nix @@ -33,7 +33,7 @@ in for additional details. ''; default = []; - example = literalExample '' + example = literalExpression '' [ "chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet "mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot @@ -75,7 +75,7 @@ in Make sure the selected policy is supported on Linux and your browser version. ''; default = {}; - example = literalExample '' + example = literalExpression '' { "BrowserSignin" = 0; "SyncDisabled" = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.pl b/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.pl index 6e275bcc8b..220d057b7f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.pl +++ b/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.pl @@ -25,14 +25,7 @@ if (!defined $res || scalar @$res == 0) { print STDERR "$program: command not found\n"; } elsif (scalar @$res == 1) { my $package = @$res[0]->{package}; - if ($ENV{"NIX_AUTO_INSTALL"} // "") { - print STDERR <runtime. diff --git a/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix b/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix index bca68b0064..f76555289f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix +++ b/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix @@ -10,6 +10,7 @@ in { package = mkOption { type = types.package; default = pkgs.noisetorch; + defaultText = literalExpression "pkgs.noisetorch"; description = '' The noisetorch package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/npm.nix b/third_party/nixpkgs/nixos/modules/programs/npm.nix index f101a44587..d79c6c7340 100644 --- a/third_party/nixpkgs/nixos/modules/programs/npm.nix +++ b/third_party/nixpkgs/nixos/modules/programs/npm.nix @@ -14,10 +14,11 @@ in enable = mkEnableOption "npm global config"; package = mkOption { - type = types.path; + type = types.package; description = "The npm package version / flavor to use"; default = pkgs.nodePackages.npm; - example = literalExample "pkgs.nodePackages_13_x.npm"; + defaultText = literalExpression "pkgs.nodePackages.npm"; + example = literalExpression "pkgs.nodePackages_13_x.npm"; }; npmrc = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix index 7743f79c1c..3f44e23a93 100644 --- a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix +++ b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix @@ -120,7 +120,7 @@ in { Proxies to be used by proxychains. ''; - example = literalExample '' + example = literalExpression '' { myproxy = { type = "socks4"; host = "127.0.0.1"; diff --git a/third_party/nixpkgs/nixos/modules/programs/shadow.nix b/third_party/nixpkgs/nixos/modules/programs/shadow.nix index e021f18417..963cd8853d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/shadow.nix +++ b/third_party/nixpkgs/nixos/modules/programs/shadow.nix @@ -66,7 +66,7 @@ in This must not be a store path, since the path is used outside the store (in particular in /etc/passwd). ''; - example = literalExample "pkgs.zsh"; + example = literalExpression "pkgs.zsh"; type = types.either types.path types.shellPackage; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/spacefm.nix b/third_party/nixpkgs/nixos/modules/programs/spacefm.nix index 6d03608402..822fca3ece 100644 --- a/third_party/nixpkgs/nixos/modules/programs/spacefm.nix +++ b/third_party/nixpkgs/nixos/modules/programs/spacefm.nix @@ -29,11 +29,13 @@ in terminal_su = "${pkgs.sudo}/bin/sudo"; graphical_su = "${pkgs.gksu}/bin/gksu"; }; - example = literalExample ''{ - tmp_dir = "/tmp"; - terminal_su = "''${pkgs.sudo}/bin/sudo"; - graphical_su = "''${pkgs.gksu}/bin/gksu"; - }''; + defaultText = literalExpression '' + { + tmp_dir = "/tmp"; + terminal_su = "''${pkgs.sudo}/bin/sudo"; + graphical_su = "''${pkgs.gksu}/bin/gksu"; + } + ''; description = '' The system-wide spacefm configuration. Parameters to be written to /etc/spacefm/spacefm.conf. diff --git a/third_party/nixpkgs/nixos/modules/programs/ssh.nix b/third_party/nixpkgs/nixos/modules/programs/ssh.nix index 795f1a9f7b..5da15b68cf 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ssh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ssh.nix @@ -36,6 +36,7 @@ in askPassword = mkOption { type = types.str; default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; + defaultText = literalExpression ''"''${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"''; description = "Program used by SSH to ask for passwords."; }; @@ -113,7 +114,7 @@ in agentPKCS11Whitelist = mkOption { type = types.nullOr types.str; default = null; - example = "\${pkgs.opensc}/lib/opensc-pkcs11.so"; + example = literalExpression ''"''${pkgs.opensc}/lib/opensc-pkcs11.so"''; description = '' A pattern-list of acceptable paths for PKCS#11 shared libraries that may be used with the -s option to ssh-add. @@ -123,7 +124,7 @@ in package = mkOption { type = types.package; default = pkgs.openssh; - defaultText = "pkgs.openssh"; + defaultText = literalExpression "pkgs.openssh"; description = '' The package used for the openssh client and daemon. ''; @@ -180,7 +181,7 @@ in description = '' The set of system-wide known SSH hosts. ''; - example = literalExample '' + example = literalExpression '' { myhost = { hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/ssmtp.nix b/third_party/nixpkgs/nixos/modules/programs/ssmtp.nix index e28a14538e..b454bf3522 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ssmtp.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ssmtp.nix @@ -54,7 +54,7 @@ in ssmtp5 configuration. Refer to for details on supported values. ''; - example = literalExample '' + example = literalExpression '' { Debug = true; FromLineOverride = false; diff --git a/third_party/nixpkgs/nixos/modules/programs/sway.nix b/third_party/nixpkgs/nixos/modules/programs/sway.nix index d5819a08e8..caf329c253 100644 --- a/third_party/nixpkgs/nixos/modules/programs/sway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/sway.nix @@ -92,10 +92,10 @@ in { default = with pkgs; [ swaylock swayidle alacritty dmenu ]; - defaultText = literalExample '' + defaultText = literalExpression '' with pkgs; [ swaylock swayidle alacritty dmenu ]; ''; - example = literalExample '' + example = literalExpression '' with pkgs; [ i3status i3status-rust termite rofi light diff --git a/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix b/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix index 7ac4086d5f..65d4db7834 100644 --- a/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix +++ b/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix @@ -5,7 +5,7 @@ let inherit (builtins) length map; inherit (lib.attrsets) attrNames filterAttrs hasAttr mapAttrs mapAttrsToList optionalAttrs; inherit (lib.modules) mkDefault mkIf; - inherit (lib.options) literalExample mkEnableOption mkOption; + inherit (lib.options) literalExpression mkEnableOption mkOption; inherit (lib.strings) concatStringsSep optionalString toLower; inherit (lib.types) addCheck attrsOf lines nullOr package path port str strMatching submodule; @@ -123,7 +123,7 @@ let }; options.text = mkOption { type = lines; - example = literalExample + example = literalExpression ''lib.modules.mkAfter "compression no"''; description = '' Additional text lines for the server stanza. @@ -218,8 +218,8 @@ let package = mkOption { type = package; default = pkgs.tsm-client; - defaultText = "pkgs.tsm-client"; - example = literalExample "pkgs.tsm-client-withGui"; + defaultText = literalExpression "pkgs.tsm-client"; + example = literalExpression "pkgs.tsm-client-withGui"; description = '' The TSM client derivation to be added to the system environment. diff --git a/third_party/nixpkgs/nixos/modules/programs/vim.nix b/third_party/nixpkgs/nixos/modules/programs/vim.nix index 9f46dff2a2..1695bc9947 100644 --- a/third_party/nixpkgs/nixos/modules/programs/vim.nix +++ b/third_party/nixpkgs/nixos/modules/programs/vim.nix @@ -18,8 +18,8 @@ in { package = mkOption { type = types.package; default = pkgs.vim; - defaultText = "pkgs.vim"; - example = "pkgs.vimHugeX"; + defaultText = literalExpression "pkgs.vim"; + example = literalExpression "pkgs.vimHugeX"; description = '' vim package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/wireshark.nix b/third_party/nixpkgs/nixos/modules/programs/wireshark.nix index 819f15b98a..f7b0727cb2 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wireshark.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wireshark.nix @@ -19,7 +19,7 @@ in { package = mkOption { type = types.package; default = pkgs.wireshark-cli; - defaultText = "pkgs.wireshark-cli"; + defaultText = literalExpression "pkgs.wireshark-cli"; description = '' Which Wireshark package to install in the global environment. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/xonsh.nix b/third_party/nixpkgs/nixos/modules/programs/xonsh.nix index c06fd1655c..6e40db51cd 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xonsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xonsh.nix @@ -27,7 +27,8 @@ in package = mkOption { type = types.package; default = pkgs.xonsh; - example = literalExample "pkgs.xonsh.override { configFile = \"/path/to/xonshrc\"; }"; + defaultText = literalExpression "pkgs.xonsh"; + example = literalExpression "pkgs.xonsh.override { configFile = \"/path/to/xonshrc\"; }"; description = '' xonsh package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix b/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix index ceb7259b3d..aba76133e5 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix @@ -11,7 +11,8 @@ in lockerCommand = mkOption { default = "${pkgs.i3lock}/bin/i3lock"; - example = literalExample "\${pkgs.i3lock-fancy}/bin/i3lock-fancy"; + defaultText = literalExpression ''"''${pkgs.i3lock}/bin/i3lock"''; + example = literalExpression ''"''${pkgs.i3lock-fancy}/bin/i3lock-fancy"''; type = types.separatedString " "; description = "Locker to be used with xsslock"; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/xwayland.nix b/third_party/nixpkgs/nixos/modules/programs/xwayland.nix index cb3c9c5b15..3a8080fa4c 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xwayland.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xwayland.nix @@ -16,9 +16,8 @@ in type = types.str; default = optionalString config.fonts.fontDir.enable "/run/current-system/sw/share/X11/fonts"; - defaultText = literalExample '' - optionalString config.fonts.fontDir.enable - "/run/current-system/sw/share/X11/fonts"; + defaultText = literalExpression '' + optionalString config.fonts.fontDir.enable "/run/current-system/sw/share/X11/fonts" ''; description = '' Default font path. Setting this option causes Xwayland to be rebuilt. @@ -30,10 +29,10 @@ in default = pkgs.xwayland.override (oldArgs: { inherit (cfg) defaultFontPath; }); - defaultText = literalExample '' + defaultText = literalExpression '' pkgs.xwayland.override (oldArgs: { inherit (config.programs.xwayland) defaultFontPath; - }); + }) ''; description = "The Xwayland package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/yabar.nix b/third_party/nixpkgs/nixos/modules/programs/yabar.nix index 5de9331ac5..a8fac41e89 100644 --- a/third_party/nixpkgs/nixos/modules/programs/yabar.nix +++ b/third_party/nixpkgs/nixos/modules/programs/yabar.nix @@ -45,7 +45,8 @@ in package = mkOption { default = pkgs.yabar-unstable; - example = literalExample "pkgs.yabar"; + defaultText = literalExpression "pkgs.yabar-unstable"; + example = literalExpression "pkgs.yabar"; type = types.package; # `yabar-stable` segfaults under certain conditions. diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix index f24842a479..9d7622bd32 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -48,7 +48,7 @@ in package = mkOption { default = pkgs.oh-my-zsh; - defaultText = "pkgs.oh-my-zsh"; + defaultText = literalExpression "pkgs.oh-my-zsh"; description = '' Package to install for `oh-my-zsh` usage. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autoenv.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autoenv.nix index 630114bcda..62f497a45d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autoenv.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autoenv.nix @@ -10,7 +10,7 @@ in { enable = mkEnableOption "zsh-autoenv"; package = mkOption { default = pkgs.zsh-autoenv; - defaultText = "pkgs.zsh-autoenv"; + defaultText = literalExpression "pkgs.zsh-autoenv"; description = '' Package to install for `zsh-autoenv` usage. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix index 037888fdc5..a8fcfff95e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix @@ -40,7 +40,7 @@ in type = with types; attrsOf str; default = {}; description = "Attribute set with additional configuration values"; - example = literalExample '' + example = literalExpression '' { "ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" = "20"; } diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix index 927a904369..1eb53ccae5 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -42,7 +42,7 @@ in default = {}; type = types.attrsOf types.str; - example = literalExample '' + example = literalExpression '' { "rm -rf *" = "fg=white,bold,bg=red"; } @@ -59,7 +59,7 @@ in default = {}; type = types.attrsOf types.str; - example = literalExample '' + example = literalExpression '' { "alias" = "fg=magenta,bold"; } diff --git a/third_party/nixpkgs/nixos/modules/security/acme.nix b/third_party/nixpkgs/nixos/modules/security/acme.nix index bcbd17d8e1..f522b7c412 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme.nix @@ -486,7 +486,7 @@ let extraDomainNames = mkOption { type = types.listOf types.str; default = []; - example = literalExample '' + example = literalExpression '' [ "example.org" "mydomain.org" @@ -656,7 +656,7 @@ in { to those units if they rely on the certificates being present, or trigger restarts of the service if certificates get renewed. ''; - example = literalExample '' + example = literalExpression '' { "example.com" = { webroot = "/var/lib/acme/acme-challenge/"; diff --git a/third_party/nixpkgs/nixos/modules/security/ca.nix b/third_party/nixpkgs/nixos/modules/security/ca.nix index 7df86e7142..83c15f90f9 100644 --- a/third_party/nixpkgs/nixos/modules/security/ca.nix +++ b/third_party/nixpkgs/nixos/modules/security/ca.nix @@ -24,7 +24,7 @@ in security.pki.certificateFiles = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ \"\${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt\" ]"; + example = literalExpression ''[ "''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]''; description = '' A list of files containing trusted root certificates in PEM format. These are concatenated to form @@ -37,7 +37,7 @@ in security.pki.certificates = mkOption { type = types.listOf types.str; default = []; - example = literalExample '' + example = literalExpression '' [ ''' NixOS.org ========= diff --git a/third_party/nixpkgs/nixos/modules/security/dhparams.nix b/third_party/nixpkgs/nixos/modules/security/dhparams.nix index 62a499ea62..012be2887d 100644 --- a/third_party/nixpkgs/nixos/modules/security/dhparams.nix +++ b/third_party/nixpkgs/nixos/modules/security/dhparams.nix @@ -53,7 +53,7 @@ in { coerce = bits: { inherit bits; }; in attrsOf (coercedTo int coerce (submodule paramsSubmodule)); default = {}; - example = lib.literalExample "{ nginx.bits = 3072; }"; + example = lib.literalExpression "{ nginx.bits = 3072; }"; description = '' Diffie-Hellman parameters to generate. diff --git a/third_party/nixpkgs/nixos/modules/security/doas.nix b/third_party/nixpkgs/nixos/modules/security/doas.nix index 35f618b03e..9a3daf4f50 100644 --- a/third_party/nixpkgs/nixos/modules/security/doas.nix +++ b/third_party/nixpkgs/nixos/modules/security/doas.nix @@ -77,7 +77,7 @@ in You can use mkBefore and/or mkAfter to ensure this is the case when configuration options are merged. ''; - example = literalExample '' + example = literalExpression '' [ # Allow execution of any command by any user in group doas, requiring # a password and keeping any previously-defined environment variables. diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 8b1f653d4e..4c18fa8cc6 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -586,7 +586,7 @@ in }; security.pam.services = mkOption { - default = []; + default = {}; type = with types; attrsOf (submodule pamOpts); description = '' diff --git a/third_party/nixpkgs/nixos/modules/security/pam_mount.nix b/third_party/nixpkgs/nixos/modules/security/pam_mount.nix index e25ace38f5..462b7f89e2 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam_mount.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam_mount.nix @@ -33,7 +33,7 @@ in additionalSearchPaths = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.bindfs ]"; + example = literalExpression "[ pkgs.bindfs ]"; description = '' Additional programs to include in the search path of pam_mount. Useful for example if you want to use some FUSE filesystems like bindfs. @@ -43,7 +43,7 @@ in fuseMountOptions = mkOption { type = types.listOf types.str; default = []; - example = literalExample '' + example = literalExpression '' [ "nodev" "nosuid" "force-user=%(USER)" "gid=%(USERGID)" "perms=0700" "chmod-deny" "chown-deny" "chgrp-deny" ] ''; description = '' diff --git a/third_party/nixpkgs/nixos/modules/security/sudo.nix b/third_party/nixpkgs/nixos/modules/security/sudo.nix index 2e73f8f4f3..99e578f8ad 100644 --- a/third_party/nixpkgs/nixos/modules/security/sudo.nix +++ b/third_party/nixpkgs/nixos/modules/security/sudo.nix @@ -45,7 +45,7 @@ in security.sudo.package = mkOption { type = types.package; default = pkgs.sudo; - defaultText = "pkgs.sudo"; + defaultText = literalExpression "pkgs.sudo"; description = '' Which package to use for `sudo`. ''; @@ -91,7 +91,7 @@ in this is the case when configuration options are merged. ''; default = []; - example = literalExample '' + example = literalExpression '' [ # Allow execution of any command by all users in group sudo, # requiring a password. diff --git a/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix b/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix index 0a09a755e9..d859c45c74 100644 --- a/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix +++ b/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix @@ -62,8 +62,8 @@ in { options.confinement.binSh = lib.mkOption { type = types.nullOr types.path; default = toplevelConfig.environment.binsh; - defaultText = "config.environment.binsh"; - example = lib.literalExample "\${pkgs.dash}/bin/dash"; + defaultText = lib.literalExpression "config.environment.binsh"; + example = lib.literalExpression ''"''${pkgs.dash}/bin/dash"''; description = '' The program to make available as /bin/sh inside the chroot. If this is set to null, no diff --git a/third_party/nixpkgs/nixos/modules/security/tpm2.nix b/third_party/nixpkgs/nixos/modules/security/tpm2.nix index d37425166f..be85fd246e 100644 --- a/third_party/nixpkgs/nixos/modules/security/tpm2.nix +++ b/third_party/nixpkgs/nixos/modules/security/tpm2.nix @@ -26,8 +26,7 @@ in { ''; type = lib.types.nullOr lib.types.str; default = if cfg.abrmd.enable then "tss" else "root"; - defaultText = ''"tss" when using the userspace resource manager,'' + - ''"root" otherwise''; + defaultText = lib.literalExpression ''if config.security.tpm2.abrmd.enable then "tss" else "root"''; }; tssGroup = lib.mkOption { @@ -57,7 +56,7 @@ in { description = "tpm2-abrmd package to use"; type = lib.types.package; default = pkgs.tpm2-abrmd; - defaultText = "pkgs.tpm2-abrmd"; + defaultText = lib.literalExpression "pkgs.tpm2-abrmd"; }; }; @@ -71,7 +70,7 @@ in { description = "tpm2-pkcs11 package to use"; type = lib.types.package; default = pkgs.tpm2-pkcs11; - defaultText = "pkgs.tpm2-pkcs11"; + defaultText = lib.literalExpression "pkgs.tpm2-pkcs11"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix index 2697ab0bde..a47de7e04f 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix @@ -152,7 +152,7 @@ in security.wrappers = lib.mkOption { type = lib.types.attrsOf wrapperType; default = {}; - example = lib.literalExample + example = lib.literalExpression '' { # a setuid root program diff --git a/third_party/nixpkgs/nixos/modules/services/admin/meshcentral.nix b/third_party/nixpkgs/nixos/modules/services/admin/meshcentral.nix index ae7b6edda7..92762d2037 100644 --- a/third_party/nixpkgs/nixos/modules/services/admin/meshcentral.nix +++ b/third_party/nixpkgs/nixos/modules/services/admin/meshcentral.nix @@ -10,7 +10,7 @@ in with lib; { description = "MeshCentral package to use. Replacing this may be necessary to add dependencies for extra functionality."; type = types.package; default = pkgs.meshcentral; - defaultText = "pkgs.meshcentral"; + defaultText = literalExpression "pkgs.meshcentral"; }; settings = mkOption { description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/admin/oxidized.nix b/third_party/nixpkgs/nixos/modules/services/admin/oxidized.nix index 94b44630ba..49ea3ced76 100644 --- a/third_party/nixpkgs/nixos/modules/services/admin/oxidized.nix +++ b/third_party/nixpkgs/nixos/modules/services/admin/oxidized.nix @@ -33,7 +33,7 @@ in configFile = mkOption { type = types.path; - example = literalExample '' + example = literalExpression '' pkgs.writeText "oxidized-config.yml" ''' --- debug: true @@ -69,7 +69,7 @@ in routerDB = mkOption { type = types.path; - example = literalExample '' + example = literalExpression '' pkgs.writeText "oxidized-router.db" ''' hostname-sw1:powerconnect:username1:password2 hostname-sw2:procurve:username2:password2 diff --git a/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix b/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix index 178b2f6e14..47669b05aa 100644 --- a/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix @@ -33,6 +33,7 @@ in { }; configurationDir = mkOption { default = "${activemq}/conf"; + defaultText = literalExpression ''"''${pkgs.activemq}/conf"''; type = types.str; description = '' The base directory for ActiveMQ's configuration. @@ -64,7 +65,7 @@ in { javaProperties = mkOption { type = types.attrs; default = { }; - example = literalExample '' + example = literalExpression '' { "java.net.preferIPv4Stack" = "true"; } diff --git a/third_party/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix b/third_party/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix index dabd80312d..3255942fe4 100644 --- a/third_party/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix +++ b/third_party/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix @@ -29,7 +29,7 @@ in package = mkOption { default = pkgs.rabbitmq-server; type = types.package; - defaultText = "pkgs.rabbitmq-server"; + defaultText = literalExpression "pkgs.rabbitmq-server"; description = '' Which rabbitmq package to use. ''; @@ -82,7 +82,7 @@ in configItems = mkOption { default = { }; type = types.attrsOf types.str; - example = literalExample '' + example = literalExpression '' { "auth_backends.1.authn" = "rabbit_auth_backend_ldap"; "auth_backends.1.authz" = "rabbit_auth_backend_internal"; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/botamusique.nix b/third_party/nixpkgs/nixos/modules/services/audio/botamusique.nix index 14614d2dd1..f4fa0ead4f 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/botamusique.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/botamusique.nix @@ -17,6 +17,7 @@ in package = mkOption { type = types.package; default = pkgs.botamusique; + defaultText = literalExpression "pkgs.botamusique"; description = "The botamusique package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix index d0a95b87ee..84fc9957b8 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix @@ -25,8 +25,8 @@ in { internal = true; type = types.package; default = pkgs.jack2; - defaultText = "pkgs.jack2"; - example = literalExample "pkgs.jack1"; + defaultText = literalExpression "pkgs.jack2"; + example = literalExpression "pkgs.jack1"; description = '' The JACK package to use. ''; @@ -37,7 +37,7 @@ in { default = [ "-dalsa" ]; - example = literalExample '' + example = literalExpression '' [ "-dalsa" "--device" "hw:1" ]; ''; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/audio/liquidsoap.nix b/third_party/nixpkgs/nixos/modules/services/audio/liquidsoap.nix index 3a047d10a6..ffeefc0f98 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/liquidsoap.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/liquidsoap.nix @@ -39,9 +39,9 @@ in default = {}; example = { - myStream1 = literalExample "\"/etc/liquidsoap/myStream1.liq\""; - myStream2 = literalExample "./myStream2.liq"; - myStream3 = literalExample "\"out(playlist(\\\"/srv/music/\\\"))\""; + myStream1 = "/etc/liquidsoap/myStream1.liq"; + myStream2 = literalExpression "./myStream2.liq"; + myStream3 = "out(playlist(\"/srv/music/\"))"; }; type = types.attrsOf (types.either types.path types.str); diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mopidy.nix b/third_party/nixpkgs/nixos/modules/services/audio/mopidy.nix index 6fd7eae5b8..9937feadae 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/mopidy.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/mopidy.nix @@ -39,7 +39,7 @@ in { extensionPackages = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.mopidy-spotify ]"; + example = literalExpression "[ pkgs.mopidy-spotify ]"; description = '' Mopidy extensions that should be loaded by the service. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix index e33e860d88..560264e249 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix @@ -74,7 +74,7 @@ in { musicDirectory = mkOption { type = with types; either path (strMatching "(http|https|nfs|smb)://.+"); default = "${cfg.dataDir}/music"; - defaultText = "\${dataDir}/music"; + defaultText = literalExpression ''"''${dataDir}/music"''; description = '' The directory or NFS/SMB network share where MPD reads music from. If left as the default value this directory will automatically be created before @@ -86,7 +86,7 @@ in { playlistDirectory = mkOption { type = types.path; default = "${cfg.dataDir}/playlists"; - defaultText = "\${dataDir}/playlists"; + defaultText = literalExpression ''"''${dataDir}/playlists"''; description = '' The directory where MPD stores playlists. If left as the default value this directory will automatically be created before the MPD server starts, @@ -155,7 +155,7 @@ in { dbFile = mkOption { type = types.nullOr types.str; default = "${cfg.dataDir}/tag_cache"; - defaultText = "\${dataDir}/tag_cache"; + defaultText = literalExpression ''"''${dataDir}/tag_cache"''; description = '' The path to MPD's database. If set to null the parameter is omitted from the configuration. diff --git a/third_party/nixpkgs/nixos/modules/services/audio/slimserver.nix b/third_party/nixpkgs/nixos/modules/services/audio/slimserver.nix index 2163291969..ecd2652849 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/slimserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/slimserver.nix @@ -22,7 +22,7 @@ in { package = mkOption { type = types.package; default = pkgs.slimserver; - defaultText = "pkgs.slimserver"; + defaultText = literalExpression "pkgs.slimserver"; description = "Slimserver package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix index f96b5f3e19..d3e97719f3 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix @@ -206,7 +206,7 @@ in { For type meta, a list of stream names in the form /one/two/.... Don't forget the leading slash. For type alsa, use an empty string. ''; - example = literalExample '' + example = literalExpression '' "/path/to/pipe" "/path/to/librespot" "192.168.1.2:4444" @@ -226,7 +226,7 @@ in { description = '' Key-value pairs that convey additional parameters about a stream. ''; - example = literalExample '' + example = literalExpression '' # for type == "pipe": { mode = "create"; @@ -254,7 +254,7 @@ in { description = '' The definition for an input source. ''; - example = literalExample '' + example = literalExpression '' { mpd = { type = "pipe"; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix b/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix index 551bd941fe..36c5527027 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix @@ -26,7 +26,6 @@ in { type = types.str; default = "localhost"; description = "The host where MPD is listening."; - example = "localhost"; }; port = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix index 4fcaf9eb93..fd2764a40a 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix @@ -2,7 +2,7 @@ let - inherit (lib) concatMapStringsSep concatStringsSep isInt isList literalExample; + inherit (lib) concatMapStringsSep concatStringsSep isInt isList literalExpression; inherit (lib) mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkOption optional types; cfg = config.services.automysqlbackup; @@ -48,7 +48,7 @@ in ''${pkgs.automysqlbackup}/etc/automysqlbackup.conf for details on supported values. ''; - example = literalExample '' + example = literalExpression '' { db_names = [ "nextcloud" "matomo" ]; table_exclude = [ "nextcloud.oc_users" "nextcloud.oc_whats_new" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix index c4174286fc..5461dbaf0b 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix @@ -203,7 +203,7 @@ in { See also the chapter about BorgBackup in the NixOS manual. ''; default = { }; - example = literalExample '' + example = literalExpression '' { # for a local backup rootBackup = { paths = "/"; @@ -260,7 +260,7 @@ in { archiveBaseName = mkOption { type = types.strMatching "[^/{}]+"; default = "${globalConfig.networking.hostName}-${name}"; - defaultText = "\${config.networking.hostName}-"; + defaultText = literalExpression ''"''${config.networking.hostName}-"''; description = '' How to name the created archives. A timestamp, whose format is determined by , will be appended. The full @@ -326,10 +326,7 @@ in { you to specify a or a . ''; - example = '' - encryption.mode = "repokey-blake2" ; - encryption.passphrase = "mySecretPassphrase" ; - ''; + example = "repokey-blake2"; }; encryption.passCommand = mkOption { @@ -437,7 +434,7 @@ in { for the available options. ''; default = { }; - example = literalExample '' + example = literalExpression '' { within = "1d"; # Keep all archives from the last day daily = 7; @@ -455,7 +452,7 @@ in { Use "" to consider all archives. ''; default = config.archiveBaseName; - defaultText = "\${archiveBaseName}"; + defaultText = literalExpression "archiveBaseName"; }; environment = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix b/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix index a8ff71f609..0c00b93440 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix @@ -57,7 +57,7 @@ in description = "Extra packages for btrbk, like compression utilities for stream_compress"; type = lib.types.listOf lib.types.package; default = [ ]; - example = lib.literalExample "[ pkgs.xz ]"; + example = lib.literalExpression "[ pkgs.xz ]"; }; niceness = lib.mkOption { description = "Niceness for local instances of btrbk. Also applies to remote ones connecting via ssh when positive."; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix index bcc135005e..562458eb45 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix @@ -85,7 +85,7 @@ in { backupAll = mkOption { default = cfg.databases == []; - defaultText = "services.postgresqlBackup.databases == []"; + defaultText = literalExpression "services.postgresqlBackup.databases == []"; type = lib.types.bool; description = '' Backup all databases using pg_dumpall. diff --git a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix index 3d9869d534..32643adfda 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix @@ -7,7 +7,7 @@ let options = { postgresqlPackage = mkOption { type = types.package; - example = literalExample "pkgs.postgresql_11"; + example = literalExpression "pkgs.postgresql_11"; description = '' PostgreSQL package to use. ''; @@ -15,7 +15,7 @@ let directory = mkOption { type = types.path; - example = literalExample "/mnt/pg_wal/main/"; + example = literalExpression "/mnt/pg_wal/main/"; description = '' Directory to write the output to. ''; @@ -88,7 +88,7 @@ let extraArgs = mkOption { type = with types; listOf str; default = [ ]; - example = literalExample '' + example = literalExpression '' [ "--no-sync" ] @@ -101,7 +101,7 @@ let environment = mkOption { type = with types; attrsOf str; default = { }; - example = literalExample '' + example = literalExpression '' { PGPASSFILE = "/private/passfile"; PGSSLMODE = "require"; @@ -121,7 +121,7 @@ in { receivers = mkOption { type = with types; attrsOf (submodule receiverSubmodule); default = { }; - example = literalExample '' + example = literalExpression '' { main = { postgresqlPackage = pkgs.postgresql_11; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix index d1b775f150..86744637f8 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix @@ -59,7 +59,7 @@ in package = mkOption { default = pkgs.restic-rest-server; - defaultText = "pkgs.restic-rest-server"; + defaultText = literalExpression "pkgs.restic-rest-server"; type = types.package; description = "Restic REST server package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix index 6e44a99aae..4df10f5ee0 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix @@ -286,7 +286,7 @@ in }; })); default = { }; - example = literalExample '' + example = literalExpression '' { "pool/test".target = "root@target:pool/test"; } diff --git a/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix b/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix index 3cf21c1baa..9cce868366 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix @@ -214,7 +214,7 @@ in maxbwRateUp = mkOption { type = types.nullOr types.int; default = null; - example = literalExample "25 * 1000"; + example = literalExpression "25 * 1000"; description = '' Upload bandwidth rate limit in bytes. ''; @@ -223,7 +223,7 @@ in maxbwRateDown = mkOption { type = types.nullOr types.int; default = null; - example = literalExample "50 * 1000"; + example = literalExpression "50 * 1000"; description = '' Download bandwidth rate limit in bytes. ''; @@ -256,7 +256,7 @@ in default = {}; - example = literalExample '' + example = literalExpression '' { nixos = { directories = [ "/home" "/root/ssl" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix b/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix index 1fccc7cd60..09e60177c3 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix @@ -166,8 +166,8 @@ let . ''; default = null; - example = literalExample '' - ''${pkgs.mariadb}/bin/mysql -e "set autocommit=0;flush tables with read lock;\\! ''${pkgs.coreutils}/bin/sleep 600" & ''${pkgs.coreutils}/bin/echo $! > /tmp/mariadblock.pid ; sleep 10 + example = literalExpression '' + '''''${pkgs.mariadb}/bin/mysql -e "set autocommit=0;flush tables with read lock;\\! ''${pkgs.coreutils}/bin/sleep 600" & ''${pkgs.coreutils}/bin/echo $! > /tmp/mariadblock.pid ; sleep 10''' ''; }; @@ -178,8 +178,8 @@ let e.g. for database unlocking. See also . ''; default = null; - example = literalExample '' - ''${pkgs.coreutils}/bin/kill `''${pkgs.coreutils}/bin/cat /tmp/mariadblock.pid`;''${pkgs.coreutils}/bin/rm /tmp/mariadblock.pid + example = literalExpression '' + "''${pkgs.coreutils}/bin/kill `''${pkgs.coreutils}/bin/cat /tmp/mariadblock.pid`;''${pkgs.coreutils}/bin/rm /tmp/mariadblock.pid" ''; }; @@ -223,7 +223,7 @@ let type = attrsOf (destType config); description = "Additional destinations."; default = {}; - example = literalExample '' + example = literalExpression '' { local = { dataset = "btank/backup"; @@ -331,7 +331,7 @@ in type = attrsOf srcType; description = "Znapzend configuration."; default = {}; - example = literalExample '' + example = literalExpression '' { "tank/home" = { # Make snapshots of tank/home every hour, keep those for 1 day, diff --git a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix index 6c2df95886..bf2cf1edd4 100644 --- a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix +++ b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix @@ -108,6 +108,7 @@ let package = mkOption { default = pkgs.go-ethereum.geth; + defaultText = literalExpression "pkgs.go-ethereum.geth"; type = types.package; description = "Package to use as Go Ethereum node."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix index 41ac46e538..a165f619dc 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix @@ -8,7 +8,7 @@ with lib; coreSite = mkOption { default = {}; type = types.attrsOf types.anything; - example = literalExample '' + example = literalExpression '' { "fs.defaultFS" = "hdfs://localhost"; } @@ -19,7 +19,7 @@ with lib; hdfsSite = mkOption { default = {}; type = types.attrsOf types.anything; - example = literalExample '' + example = literalExpression '' { "dfs.nameservices" = "namenode1"; } @@ -30,7 +30,7 @@ with lib; mapredSite = mkOption { default = {}; type = types.attrsOf types.anything; - example = literalExample '' + example = literalExpression '' { "mapreduce.map.cpu.vcores" = "1"; } @@ -41,7 +41,7 @@ with lib; yarnSite = mkOption { default = {}; type = types.attrsOf types.anything; - example = literalExample '' + example = literalExpression '' { "yarn.resourcemanager.ha.id" = "resourcemanager1"; } @@ -52,8 +52,7 @@ with lib; package = mkOption { type = types.package; default = pkgs.hadoop; - defaultText = "pkgs.hadoop"; - example = literalExample "pkgs.hadoop"; + defaultText = literalExpression "pkgs.hadoop"; description = ""; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix index e5c5144169..50b6780bbe 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix @@ -12,8 +12,7 @@ in package = mkOption { type = types.package; default = pkgs.k3s; - defaultText = "pkgs.k3s"; - example = literalExample "pkgs.k3s"; + defaultText = literalExpression "pkgs.k3s"; description = "Package that should be used for k3s"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix index 821f1aa546..3d988dc247 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -27,7 +27,7 @@ in ''; default = { }; type = attrsOf attrs; - example = literalExample '' + example = literalExpression '' { "my-service" = { "apiVersion" = "v1"; @@ -46,7 +46,7 @@ in description = "Kubernetes addons (any kind of Kubernetes resource can be an addon)."; default = { }; type = attrsOf (either attrs (listOf attrs)); - example = literalExample '' + example = literalExpression '' { "my-service" = { "apiVersion" = "v1"; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix index 8f937a1323..34943fddd3 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -83,21 +83,24 @@ in { reload loadbalance }''; - defaultText = '' - .:${toString ports.dns} { - errors - health :${toString ports.health} - kubernetes ''${config.services.kubernetes.addons.dns.clusterDomain} in-addr.arpa ip6.arpa { - pods insecure - fallthrough in-addr.arpa ip6.arpa + defaultText = literalExpression '' + ''' + .:${toString ports.dns} { + errors + health :${toString ports.health} + kubernetes ''${config.services.kubernetes.addons.dns.clusterDomain} in-addr.arpa ip6.arpa { + pods insecure + fallthrough in-addr.arpa ip6.arpa + } + prometheus :${toString ports.metrics} + forward . /etc/resolv.conf + cache 30 + loop + reload + loadbalance } - prometheus :${toString ports.metrics} - forward . /etc/resolv.conf - cache 30 - loop - reload - loadbalance - }''; + ''' + ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix index 08b2141818..433adf4d48 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix @@ -126,7 +126,7 @@ in { description = "Kubernetes package to use."; type = types.package; default = pkgs.kubernetes; - defaultText = "pkgs.kubernetes"; + defaultText = literalExpression "pkgs.kubernetes"; }; kubeconfig = mkKubeConfigOptions "Default kubeconfig"; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index 51b2b5f6eb..3a2a0ed363 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -96,7 +96,7 @@ in description = "Kubernetes CNI configuration."; type = listOf attrs; default = []; - example = literalExample '' + example = literalExpression '' [{ "cniVersion": "0.3.1", "name": "mynet", diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/spark/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/spark/default.nix index bbfe0489f1..e6b44e130a 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/spark/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/spark/default.nix @@ -70,7 +70,7 @@ with lib; type = types.path; description = "Spark configuration directory. Spark will use the configuration files (spark-defaults.conf, spark-env.sh, log4j.properties, etc) from this directory."; default = "${cfg.package}/lib/${cfg.package.untarDir}/conf"; - defaultText = literalExample "\${cfg.package}/lib/\${cfg.package.untarDir}/conf"; + defaultText = literalExpression ''"''${package}/lib/''${package.untarDir}/conf"''; }; logDir = mkOption { type = types.path; @@ -81,8 +81,8 @@ with lib; type = types.package; description = "Spark package."; default = pkgs.spark; - defaultText = "pkgs.spark"; - example = literalExample ''pkgs.spark.overrideAttrs (super: rec { + defaultText = literalExpression "pkgs.spark"; + example = literalExpression ''pkgs.spark.overrideAttrs (super: rec { pname = "spark"; version = "2.4.4"; diff --git a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix index 7becf62407..52249455fd 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix @@ -30,7 +30,7 @@ in package = mkOption { type = types.package; default = pkgs.boinc; - defaultText = "pkgs.boinc"; + defaultText = literalExpression "pkgs.boinc"; description = '' Which BOINC package to use. ''; @@ -60,7 +60,7 @@ in extraEnvPackages = mkOption { type = types.listOf types.package; default = []; - example = "[ pkgs.virtualbox ]"; + example = literalExpression "[ pkgs.virtualbox ]"; description = '' Additional packages to make available in the environment in which BOINC will run. Common choices are: diff --git a/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix b/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix index fbef6a04b1..aa9d0a5218 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix @@ -23,7 +23,7 @@ in package = mkOption { type = types.package; default = pkgs.fahclient; - defaultText = "pkgs.fahclient"; + defaultText = literalExpression "pkgs.fahclient"; description = '' Which Folding@home client to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix index a3dee94e2d..0c96f32313 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix @@ -132,8 +132,8 @@ in package = mkOption { type = types.package; default = pkgs.slurm.override { enableX11 = ! cfg.enableSrunX11; }; - defaultText = "pkgs.slurm"; - example = literalExample "pkgs.slurm-full"; + defaultText = literalExpression "pkgs.slurm"; + example = literalExpression "pkgs.slurm-full"; description = '' The package to use for slurm binaries. ''; @@ -172,7 +172,7 @@ in nodeName = mkOption { type = types.listOf types.str; default = []; - example = literalExample ''[ "linux[1-32] CPUs=1 State=UNKNOWN" ];''; + example = literalExpression ''[ "linux[1-32] CPUs=1 State=UNKNOWN" ];''; description = '' Name that SLURM uses to refer to a node (or base partition for BlueGene systems). Typically this would be the string that "/bin/hostname -s" @@ -183,7 +183,7 @@ in partitionName = mkOption { type = types.listOf types.str; default = []; - example = literalExample ''[ "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP" ];''; + example = literalExpression ''[ "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP" ];''; description = '' Name by which the partition may be referenced. Note that now you have to write the partition's parameters after the name. diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix index f668e69e5d..2dc61c21ac 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -93,6 +93,7 @@ in { type = types.path; description = "Optionally pass master.cfg path. Other options in this configuration will be ignored."; default = defaultMasterCfg; + defaultText = literalDocBook ''generated configuration file''; example = "/etc/nixos/buildbot/master.cfg"; }; @@ -210,14 +211,14 @@ in { package = mkOption { type = types.package; default = pkgs.python3Packages.buildbot-full; - defaultText = "pkgs.python3Packages.buildbot-full"; + defaultText = literalExpression "pkgs.python3Packages.buildbot-full"; description = "Package to use for buildbot."; - example = literalExample "pkgs.python3Packages.buildbot"; + example = literalExpression "pkgs.python3Packages.buildbot"; }; packages = mkOption { default = [ pkgs.git ]; - example = literalExample "[ pkgs.git ]"; + defaultText = literalExpression "[ pkgs.git ]"; type = types.listOf types.package; description = "Packages to add to PATH for the buildbot process."; }; @@ -225,9 +226,9 @@ in { pythonPackages = mkOption { type = types.functionTo (types.listOf types.package); default = pythonPackages: with pythonPackages; [ ]; - defaultText = "pythonPackages: with pythonPackages; [ ]"; + defaultText = literalExpression "pythonPackages: with pythonPackages; [ ]"; description = "Packages to add the to the PYTHONPATH of the buildbot process."; - example = literalExample "pythonPackages: with pythonPackages; [ requests ]"; + example = literalExpression "pythonPackages: with pythonPackages; [ requests ]"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix index 708b3e1cc1..dd4f4a4a74 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -128,14 +128,14 @@ in { package = mkOption { type = types.package; default = pkgs.python3Packages.buildbot-worker; - defaultText = "pkgs.python3Packages.buildbot-worker"; + defaultText = literalExpression "pkgs.python3Packages.buildbot-worker"; description = "Package to use for buildbot worker."; - example = literalExample "pkgs.python2Packages.buildbot-worker"; + example = literalExpression "pkgs.python2Packages.buildbot-worker"; }; packages = mkOption { default = with pkgs; [ git ]; - example = literalExample "[ pkgs.git ]"; + defaultText = literalExpression "[ pkgs.git ]"; type = types.listOf types.package; description = "Packages to add to PATH for the buildbot process."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix index b8982d757d..1872567c9f 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -39,7 +39,7 @@ let package = mkOption { default = pkgs.buildkite-agent; - defaultText = "pkgs.buildkite-agent"; + defaultText = literalExpression "pkgs.buildkite-agent"; description = "Which buildkite-agent derivation to use"; type = types.package; }; @@ -52,7 +52,7 @@ let runtimePackages = mkOption { default = [ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]; - defaultText = "[ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]"; + defaultText = literalExpression "[ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]"; description = "Add programs to the buildkite-agent environment"; type = types.listOf types.package; }; @@ -168,7 +168,7 @@ let hooksPath = mkOption { type = types.path; default = hooksDir config; - defaultText = "generated from services.buildkite-agents..hooks"; + defaultText = literalDocBook "generated from "; description = '' Path to the directory storing the hooks. Consider using @@ -179,6 +179,7 @@ let shell = mkOption { type = types.str; default = "${pkgs.bash}/bin/bash -e -c"; + defaultText = literalExpression ''"''${pkgs.bash}/bin/bash -e -c"''; description = '' Command that buildkite-agent 3 will execute when it spawns a shell. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix index f951c15532..943c1e4598 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix @@ -77,7 +77,7 @@ in Changing this option triggers a new runner registration. ''; - example = literalExample ''[ "nixos" ]''; + example = literalExpression ''[ "nixos" ]''; default = [ ]; }; @@ -105,6 +105,7 @@ in Which github-runner derivation to use. ''; default = pkgs.github-runner; + defaultText = literalExpression "pkgs.github-runner"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix index 15c37c2bc7..d4b8541c6a 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -136,7 +136,7 @@ in checkInterval = mkOption { type = types.int; default = 0; - example = literalExample "with lib; (length (attrNames config.services.gitlab-runner.services)) * 3"; + example = literalExpression "with lib; (length (attrNames config.services.gitlab-runner.services)) * 3"; description = '' Defines the interval length, in seconds, between new jobs check. The default value is 3; @@ -147,7 +147,7 @@ in concurrent = mkOption { type = types.int; default = 1; - example = literalExample "config.nix.maxJobs"; + example = literalExpression "config.nix.maxJobs"; description = '' Limits how many jobs globally can be run concurrently. The most upper limit of jobs using all defined runners. @@ -203,7 +203,7 @@ in }; }; default = { }; - example = literalExample '' + example = literalExpression '' { listenAddress = "0.0.0.0:8093"; } @@ -234,8 +234,8 @@ in package = mkOption { type = types.package; default = pkgs.gitlab-runner; - defaultText = "pkgs.gitlab-runner"; - example = literalExample "pkgs.gitlab-runner_1_11"; + defaultText = literalExpression "pkgs.gitlab-runner"; + example = literalExpression "pkgs.gitlab-runner_1_11"; description = "Gitlab Runner package to use."; }; extraPackages = mkOption { @@ -248,7 +248,7 @@ in services = mkOption { description = "GitLab Runner services."; default = { }; - example = literalExample '' + example = literalExpression '' { # runner for building in docker via host's nix-daemon # nix store will be readable in runner, might be insecure diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 8cae08bf1f..acc3fb1248 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -37,7 +37,7 @@ in { packages = mkOption { default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]; - defaultText = "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]"; + defaultText = literalExpression "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = '' Packages to add to PATH for the Go.CD agent process. diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix index 4c829664a0..646bf13ac6 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -69,7 +69,7 @@ in { packages = mkOption { default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]; - defaultText = "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]"; + defaultText = literalExpression "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = '' Packages to add to PATH for the Go.CD server's process. diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix index 5d0c3f7b4a..4070a3425c 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix @@ -35,7 +35,7 @@ in { package = mkOption { type = types.package; default = pkgs.haskellPackages.hail; - defaultText = "pkgs.haskellPackages.hail"; + defaultText = literalExpression "pkgs.haskellPackages.hail"; description = "Hail package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix index 70d85a97f3..d53d68bdcf 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -10,7 +10,8 @@ Platform-specific code is in the respective default.nix files. let inherit (lib) filterAttrs - literalExample + literalDocBook + literalExpression mkIf mkOption mkRemovedOptionModule @@ -60,7 +61,7 @@ let ''; type = types.path; default = config.baseDirectory + "/work"; - defaultText = literalExample ''baseDirectory + "/work"''; + defaultText = literalExpression ''baseDirectory + "/work"''; }; staticSecretsDirectory = mkOption { description = '' @@ -68,7 +69,7 @@ let ''; type = types.path; default = config.baseDirectory + "/secrets"; - defaultText = literalExample ''baseDirectory + "/secrets"''; + defaultText = literalExpression ''baseDirectory + "/secrets"''; }; clusterJoinTokenPath = mkOption { description = '' @@ -76,7 +77,7 @@ let ''; type = types.path; default = config.staticSecretsDirectory + "/cluster-join-token.key"; - defaultText = literalExample ''staticSecretsDirectory + "/cluster-join-token.key"''; + defaultText = literalExpression ''staticSecretsDirectory + "/cluster-join-token.key"''; # internal: It's a bit too detailed to show by default in the docs, # but useful to define explicitly to allow reuse by other modules. internal = true; @@ -87,7 +88,7 @@ let ''; type = types.path; default = config.staticSecretsDirectory + "/binary-caches.json"; - defaultText = literalExample ''staticSecretsDirectory + "/binary-caches.json"''; + defaultText = literalExpression ''staticSecretsDirectory + "/binary-caches.json"''; # internal: It's a bit too detailed to show by default in the docs, # but useful to define explicitly to allow reuse by other modules. internal = true; @@ -158,7 +159,7 @@ in ''; type = types.package; default = pkgs.hercules-ci-agent; - defaultText = literalExample "pkgs.hercules-ci-agent"; + defaultText = literalExpression "pkgs.hercules-ci-agent"; }; settings = mkOption { description = '' @@ -180,7 +181,7 @@ in tomlFile = mkOption { type = types.path; internal = true; - defaultText = "generated hercules-ci-agent.toml"; + defaultText = literalDocBook "generated hercules-ci-agent.toml"; description = '' The fully assembled config file. ''; 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 0103cd723d..d6cde77c0a 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 @@ -100,7 +100,7 @@ in package = mkOption { type = types.package; default = pkgs.hydra-unstable; - defaultText = "pkgs.hydra-unstable"; + defaultText = literalExpression "pkgs.hydra-unstable"; description = "The Hydra package."; }; @@ -155,7 +155,7 @@ in smtpHost = mkOption { type = types.nullOr types.str; default = null; - example = ["localhost"]; + example = "localhost"; description = '' Hostname of the SMTP server to use to send email. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix index 98ef1e2c69..d37dcb5519 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -81,14 +81,14 @@ in { package = mkOption { default = pkgs.jenkins; - defaultText = "pkgs.jenkins"; + defaultText = literalExpression "pkgs.jenkins"; type = types.package; description = "Jenkins package to use."; }; packages = mkOption { default = [ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]; - defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]"; + defaultText = literalExpression "[ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = '' Packages to add to PATH for the jenkins process. @@ -120,7 +120,7 @@ in { null. You can generate this set with a tool such as jenkinsPlugins2nix. ''; - example = literalExample '' + example = literalExpression '' import path/to/jenkinsPlugins2nix-generated-plugins.nix { inherit (pkgs) fetchurl stdenv; } ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix index 536d394b3f..3ca1542c18 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix @@ -74,7 +74,7 @@ in { jsonJobs = mkOption { default = [ ]; type = types.listOf types.str; - example = literalExample '' + example = literalExpression '' [ ''' [ { "job": @@ -94,7 +94,7 @@ in { nixJobs = mkOption { default = [ ]; type = types.listOf types.attrs; - example = literalExample '' + example = literalExpression '' [ { job = { name = "jenkins-job-test-3"; builders = [ diff --git a/third_party/nixpkgs/nixos/modules/services/databases/aerospike.nix b/third_party/nixpkgs/nixos/modules/services/databases/aerospike.nix index 4b905f9052..8109762aea 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/aerospike.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/aerospike.nix @@ -43,7 +43,7 @@ in package = mkOption { default = pkgs.aerospike; - defaultText = "pkgs.aerospike"; + defaultText = literalExpression "pkgs.aerospike"; type = types.package; description = "Which Aerospike derivation to use"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix b/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix index 820be5085d..b36cac35e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix @@ -4,7 +4,8 @@ let inherit (lib) concatStringsSep flip - literalExample + literalDocBook + literalExpression optionalAttrs optionals recursiveUpdate @@ -136,8 +137,8 @@ in package = mkOption { type = types.package; default = pkgs.cassandra; - defaultText = "pkgs.cassandra"; - example = literalExample "pkgs.cassandra_3_11"; + defaultText = literalExpression "pkgs.cassandra"; + example = literalExpression "pkgs.cassandra_3_11"; description = '' The Apache Cassandra package to use. ''; @@ -276,7 +277,7 @@ in extraEnvSh = mkOption { type = types.lines; default = ""; - example = "CLASSPATH=$CLASSPATH:\${extraJar}"; + example = literalExpression ''"CLASSPATH=$CLASSPATH:''${extraJar}"''; description = '' Extra shell lines to be appended onto cassandra-env.sh. ''; @@ -436,6 +437,7 @@ in if versionAtLeast cfg.package.version "3.11" then pkgs.writeText "jmx-roles-file" defaultJmxRolesFile else null; + defaultText = literalDocBook ''generated configuration file if version is at least 3.11, otherwise null''; example = "/var/lib/cassandra/jmx.password"; description = '' Specify your own jmx roles file. diff --git a/third_party/nixpkgs/nixos/modules/services/databases/cockroachdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/cockroachdb.nix index 35fb46d69d..eb061af926 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/cockroachdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/cockroachdb.nix @@ -150,7 +150,7 @@ in package = mkOption { type = types.package; default = pkgs.cockroachdb; - defaultText = "pkgs.cockroachdb"; + defaultText = literalExpression "pkgs.cockroachdb"; description = '' The CockroachDB derivation to use for running the service. diff --git a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix index 6cc29cd717..16dd64f237 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix @@ -44,8 +44,7 @@ in { package = mkOption { type = types.package; default = pkgs.couchdb; - defaultText = "pkgs.couchdb"; - example = literalExample "pkgs.couchdb"; + defaultText = literalExpression "pkgs.couchdb"; description = '' CouchDB package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix b/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix index 0815487d4a..4e3130bea2 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix @@ -44,11 +44,9 @@ in package = mkOption { default = pkgs.firebird; - defaultText = "pkgs.firebird"; + defaultText = literalExpression "pkgs.firebird"; type = types.package; - example = '' - package = pkgs.firebird_3; - ''; + example = literalExpression "pkgs.firebird_3"; description = '' Which Firebird package to be installed: pkgs.firebird_3 For SuperServer use override: pkgs.firebird_3.override { superServer = true; }; @@ -56,7 +54,7 @@ in }; port = mkOption { - default = "3050"; + default = 3050; type = types.port; description = '' Port Firebird uses. diff --git a/third_party/nixpkgs/nixos/modules/services/databases/hbase.nix b/third_party/nixpkgs/nixos/modules/services/databases/hbase.nix index 2d1a47bbaa..9132b7ed35 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/hbase.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/hbase.nix @@ -44,8 +44,7 @@ in { package = mkOption { type = types.package; default = pkgs.hbase; - defaultText = "pkgs.hbase"; - example = literalExample "pkgs.hbase"; + defaultText = literalExpression "pkgs.hbase"; description = '' HBase package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix index 3b8c00929b..c7c9871cfe 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix @@ -121,7 +121,7 @@ in package = mkOption { default = pkgs.influxdb; - defaultText = "pkgs.influxdb"; + defaultText = literalExpression "pkgs.influxdb"; description = "Which influxdb derivation to use"; type = types.package; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix b/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix index df7bac4261..01b9c49348 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix @@ -11,7 +11,7 @@ in enable = mkEnableOption "the influxdb2 server"; package = mkOption { default = pkgs.influxdb2; - defaultText = "pkgs.influxdb2"; + defaultText = literalExpression "pkgs.influxdb2"; description = "influxdb2 derivation to use."; type = types.package; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/monetdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/monetdb.nix index 5c66fc7b2e..52a2ef041f 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/monetdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/monetdb.nix @@ -17,7 +17,7 @@ in { package = mkOption { type = types.package; default = pkgs.monetdb; - defaultText = "pkgs.monetdb"; + defaultText = literalExpression "pkgs.monetdb"; description = "MonetDB package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix b/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix index 5121e0415d..fccf85d482 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix @@ -33,7 +33,7 @@ in package = mkOption { default = pkgs.mongodb; - defaultText = "pkgs.mongodb"; + defaultText = literalExpression "pkgs.mongodb"; type = types.package; description = " Which MongoDB derivation to use. diff --git a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix index b801b5cce6..a9d9a6d805 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix @@ -34,7 +34,7 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.mariadb"; + example = literalExpression "pkgs.mariadb"; description = " Which MySQL derivation to use. MariaDB packages are supported too. "; @@ -43,7 +43,7 @@ in bind = mkOption { type = types.nullOr types.str; default = null; - example = literalExample "0.0.0.0"; + example = "0.0.0.0"; description = "Address to bind to. The default is to bind to all addresses."; }; @@ -74,12 +74,12 @@ in configFile = mkOption { type = types.path; default = settingsFile; - defaultText = "settingsFile"; + defaultText = literalExpression "settingsFile"; description = '' Override the configuration file used by MySQL. By default, NixOS generates one automatically from . ''; - example = literalExample '' + example = literalExpression '' pkgs.writeText "my.cnf" ''' [mysqld] datadir = /var/lib/mysql @@ -109,7 +109,7 @@ in ''; - example = literalExample '' + example = literalExpression '' { mysqld = { key_buffer_size = "6G"; @@ -167,7 +167,7 @@ in of MySQL. The schema attribute is optional: If not specified, an empty database is created. ''; example = [ - { name = "foodatabase"; schema = literalExample "./foodatabase.sql"; } + { name = "foodatabase"; schema = literalExpression "./foodatabase.sql"; } { name = "bardatabase"; } ]; }; @@ -217,7 +217,7 @@ in GRANT syntax. The attributes are used as GRANT ''${attrName} ON ''${attrValue}. ''; - example = literalExample '' + example = literalExpression '' { "database.*" = "ALL PRIVILEGES"; "*.*" = "SELECT, LOCK TABLES"; @@ -235,7 +235,7 @@ in option is changed. This means that users created and permissions assigned once through this option or otherwise have to be removed manually. ''; - example = literalExample '' + example = literalExpression '' [ { name = "nextcloud"; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix b/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix index 2a30923538..f37e5ad169 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix @@ -179,7 +179,7 @@ in { package = mkOption { type = types.package; default = pkgs.neo4j; - defaultText = "pkgs.neo4j"; + defaultText = literalExpression "pkgs.neo4j"; description = '' Neo4j package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix b/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix index f0efc659cf..2c1e25d430 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix @@ -34,7 +34,7 @@ let in types.attrsOf (types.submodule { options = hiddenOptions; }); default = {}; description = "Child entries of the current entry, with recursively the same structure."; - example = lib.literalExample '' + example = lib.literalExpression '' { "cn=schema" = { # The attribute used in the DN must be defined @@ -127,6 +127,7 @@ in { package = mkOption { type = types.package; default = pkgs.openldap; + defaultText = literalExpression "pkgs.openldap"; description = '' OpenLDAP package to use. @@ -158,14 +159,14 @@ in { settings = mkOption { type = ldapAttrsType; description = "Configuration for OpenLDAP, in OLC format"; - example = lib.literalExample '' + example = lib.literalExpression '' { attrs.olcLogLevel = [ "stats" ]; children = { "cn=schema".includes = [ - "\${pkgs.openldap}/etc/schema/core.ldif" - "\${pkgs.openldap}/etc/schema/cosine.ldif" - "\${pkgs.openldap}/etc/schema/inetorgperson.ldif" + "''${pkgs.openldap}/etc/schema/core.ldif" + "''${pkgs.openldap}/etc/schema/cosine.ldif" + "''${pkgs.openldap}/etc/schema/inetorgperson.ldif" ]; "olcDatabase={-1}frontend" = { attrs = { @@ -225,7 +226,7 @@ in { rebuilt on each server startup, so this will slow down server startup, especially with large databases. ''; - example = lib.literalExample '' + example = lib.literalExpression '' { "dc=example,dc=org" = ''' dn= dn: dc=example,dc=org diff --git a/third_party/nixpkgs/nixos/modules/services/databases/opentsdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/opentsdb.nix index c4bd71f3d6..e873b2f701 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/opentsdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/opentsdb.nix @@ -26,8 +26,7 @@ in { package = mkOption { type = types.package; default = pkgs.opentsdb; - defaultText = "pkgs.opentsdb"; - example = literalExample "pkgs.opentsdb"; + defaultText = literalExpression "pkgs.opentsdb"; description = '' OpenTSDB package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix b/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix index 8508e76b5c..f30f71866a 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix @@ -49,7 +49,7 @@ in { package = mkOption { type = types.package; default = pkgs.pgmanage; - defaultText = "pkgs.pgmanage"; + defaultText = literalExpression "pkgs.pgmanage"; description = '' The pgmanage package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix index fd4a195787..d49cb4c51a 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -44,7 +44,7 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.postgresql_11"; + example = literalExpression "pkgs.postgresql_11"; description = '' PostgreSQL package to use. ''; @@ -66,7 +66,7 @@ in dataDir = mkOption { type = types.path; - defaultText = "/var/lib/postgresql/\${config.services.postgresql.package.psqlSchema}"; + defaultText = literalExpression ''"/var/lib/postgresql/''${config.services.postgresql.package.psqlSchema}"''; example = "/var/lib/postgresql/11"; description = '' The data directory for PostgreSQL. If left as the default value @@ -161,7 +161,7 @@ in GRANT syntax. The attributes are used as GRANT ''${attrValue} ON ''${attrName}. ''; - example = literalExample '' + example = literalExpression '' { "DATABASE \"nextcloud\"" = "ALL PRIVILEGES"; "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; @@ -179,7 +179,7 @@ in option is changed. This means that users created and permissions assigned once through this option or otherwise have to be removed manually. ''; - example = literalExample '' + example = literalExpression '' [ { name = "nextcloud"; @@ -221,7 +221,7 @@ in extraPlugins = mkOption { type = types.listOf types.path; default = []; - example = literalExample "with pkgs.postgresql_11.pkgs; [ postgis pg_repack ]"; + example = literalExpression "with pkgs.postgresql_11.pkgs; [ postgis pg_repack ]"; description = '' List of PostgreSQL plugins. PostgreSQL version for each plugin should match version for services.postgresql.package value. @@ -241,7 +241,7 @@ in escaped with two single quotes as described by the upstream documentation linked above. ''; - example = literalExample '' + example = literalExpression '' { log_connections = true; log_statement = "all"; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix index 1b9358c81a..578d9d9ec8 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix @@ -47,7 +47,7 @@ in { package = mkOption { type = types.package; default = pkgs.redis; - defaultText = "pkgs.redis"; + defaultText = literalExpression "pkgs.redis"; description = "Which Redis derivation to use."; }; @@ -133,7 +133,6 @@ in { type = with types; listOf (listOf int); default = [ [900 1] [300 10] [60 10000] ]; description = "The schedule in which data is persisted to disk, represented as a list of lists where the first element represent the amount of seconds and the second the number of changes."; - example = [ [900 1] [300 10] [60 10000] ]; }; slaveOf = mkOption { @@ -217,7 +216,7 @@ in { for details on supported values. ''; - example = literalExample '' + example = literalExpression '' { loadmodule = [ "/path/to/my_module.so" "/path/to/other_module.so" ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/databases/riak.nix b/third_party/nixpkgs/nixos/modules/services/databases/riak.nix index 657eeea87b..cc4237d038 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/riak.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/riak.nix @@ -21,8 +21,7 @@ in package = mkOption { type = types.package; default = pkgs.riak; - defaultText = "pkgs.riak"; - example = literalExample "pkgs.riak"; + defaultText = literalExpression "pkgs.riak"; description = '' Riak package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix b/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix index 9e2c79e61a..0513dcff17 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix @@ -6,7 +6,7 @@ let cfg = config.services.victoriametrics; in package = mkOption { type = types.package; default = pkgs.victoriametrics; - defaultText = "pkgs.victoriametrics"; + defaultText = literalExpression "pkgs.victoriametrics"; description = '' The VictoriaMetrics distribution to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix b/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix index cb5c948ecf..60a34dd656 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix @@ -21,7 +21,6 @@ let isAllowed = mkOption { type = types.bool; - default = null; description = '' Whether the application will be allowed access to location information. ''; @@ -29,7 +28,6 @@ let isSystem = mkOption { type = types.bool; - default = null; description = '' Whether the application is a system component or not. ''; @@ -162,7 +160,7 @@ in appConfig = mkOption { type = types.attrsOf appConfigModule; default = {}; - example = literalExample '' + example = literalExpression '' "com.github.app" = { isAllowed = true; isSystem = true; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix index ef5ad797c2..bd2242d981 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix @@ -39,7 +39,7 @@ with lib; plugins = mkOption { type = types.listOf types.package; default = [ ]; - example = literalExample "[ pkgs.evolution-ews ]"; + example = literalExpression "[ pkgs.evolution-ews ]"; description = "Plugins for Evolution."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix index 966a4d3866..b6a27279bd 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix @@ -35,6 +35,7 @@ in package = mkOption { type = types.package; default = pkgs.gnome.gvfs; + defaultText = literalExpression "pkgs.gnome.gvfs"; description = "Which GVfs package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 17a2d49bb1..4ae6aab29c 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -37,14 +37,14 @@ in { enable = mkOption { type = types.bool; default = config.services.pipewire.enable; - defaultText = "config.services.pipewire.enable"; + defaultText = literalExpression "config.services.pipewire.enable"; description = "Example pipewire session manager"; }; package = mkOption { type = types.package; default = pkgs.pipewire.mediaSession; - example = literalExample "pkgs.pipewire.mediaSession"; + defaultText = literalExpression "pkgs.pipewire.mediaSession"; description = '' The pipewire-media-session derivation to use. ''; 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 bc75aa2717..604645b2b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -51,8 +51,7 @@ in { package = mkOption { type = types.package; default = pkgs.pipewire; - defaultText = "pkgs.pipewire"; - example = literalExample "pkgs.pipewire"; + defaultText = literalExpression "pkgs.pipewire"; description = '' The pipewire derivation to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/development/distccd.nix b/third_party/nixpkgs/nixos/modules/services/development/distccd.nix index 8790ea08d0..9f6d5c813c 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/distccd.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/distccd.nix @@ -69,7 +69,7 @@ in package = mkOption { type = types.package; default = pkgs.distcc; - example = "pkgs.distcc"; + defaultText = literalExpression "pkgs.distcc"; description = '' The distcc package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/development/hoogle.nix b/third_party/nixpkgs/nixos/modules/services/development/hoogle.nix index a6693013b7..7c635f7a5b 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/hoogle.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/hoogle.nix @@ -27,8 +27,8 @@ in { packages = mkOption { type = types.functionTo (types.listOf types.package); default = hp: []; - defaultText = "hp: []"; - example = "hp: with hp; [ text lens ]"; + defaultText = literalExpression "hp: []"; + example = literalExpression "hp: with hp; [ text lens ]"; description = '' The Haskell packages to generate documentation for. @@ -41,7 +41,7 @@ in { haskellPackages = mkOption { description = "Which haskell package set to use."; default = pkgs.haskellPackages; - defaultText = "pkgs.haskellPackages"; + defaultText = literalExpression "pkgs.haskellPackages"; }; home = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix b/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix index 21b84b3bcd..bebb3c3f13 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/jupyter/default.nix @@ -40,6 +40,7 @@ in { # want to pass in JUPYTER_PATH but use .environment instead, # saving a rebuild. default = pkgs.python3.pkgs.notebook; + defaultText = literalExpression "pkgs.python3.pkgs.notebook"; description = '' Jupyter package to use. ''; @@ -105,10 +106,7 @@ in { "open('/path/secret_file', 'r', encoding='utf8').read().strip()" It will be interpreted at the end of the notebookConfig. ''; - example = [ - "'sha1:1b961dc713fb:88483270a63e57d18d43cf337e629539de1436ba'" - "open('/path/secret_file', 'r', encoding='utf8').read().strip()" - ]; + example = "'sha1:1b961dc713fb:88483270a63e57d18d43cf337e629539de1436ba'"; }; notebookConfig = mkOption { @@ -125,7 +123,7 @@ in { }))); default = null; - example = literalExample '' + example = literalExpression '' { python3 = let env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ diff --git a/third_party/nixpkgs/nixos/modules/services/development/jupyter/kernel-options.nix b/third_party/nixpkgs/nixos/modules/services/development/jupyter/kernel-options.nix index 0354763744..348a8b44b3 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/jupyter/kernel-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/jupyter/kernel-options.nix @@ -9,10 +9,10 @@ with lib; displayName = mkOption { type = types.str; default = ""; - example = [ + example = literalExpression '' "Python 3" "Python 3 for Data Science" - ]; + ''; description = '' Name that will be shown to the user. ''; @@ -43,7 +43,7 @@ with lib; logo32 = mkOption { type = types.nullOr types.path; default = null; - example = "{env.sitePackages}/ipykernel/resources/logo-32x32.png"; + example = literalExpression ''"''${env.sitePackages}/ipykernel/resources/logo-32x32.png"''; description = '' Path to 32x32 logo png. ''; @@ -51,7 +51,7 @@ with lib; logo64 = mkOption { type = types.nullOr types.path; default = null; - example = "{env.sitePackages}/ipykernel/resources/logo-64x64.png"; + example = literalExpression ''"''${env.sitePackages}/ipykernel/resources/logo-64x64.png"''; description = '' Path to 64x64 logo png. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix b/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix index a1df4468cf..fa6b3be960 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/jupyterhub/default.nix @@ -66,18 +66,24 @@ in { defaults for configuration but you can override anything since this is a python file. ''; - example = literalExample '' - c.SystemdSpawner.mem_limit = '8G' - c.SystemdSpawner.cpu_limit = 2.0 + example = '' + c.SystemdSpawner.mem_limit = '8G' + c.SystemdSpawner.cpu_limit = 2.0 ''; }; jupyterhubEnv = mkOption { type = types.package; - default = (pkgs.python3.withPackages (p: with p; [ + default = pkgs.python3.withPackages (p: with p; [ jupyterhub jupyterhub-systemdspawner - ])); + ]); + defaultText = literalExpression '' + pkgs.python3.withPackages (p: with p; [ + jupyterhub + jupyterhub-systemdspawner + ]) + ''; description = '' Python environment to run jupyterhub @@ -90,10 +96,16 @@ in { jupyterlabEnv = mkOption { type = types.package; - default = (pkgs.python3.withPackages (p: with p; [ + default = pkgs.python3.withPackages (p: with p; [ jupyterhub jupyterlab - ])); + ]); + defaultText = literalExpression '' + pkgs.python3.withPackages (p: with p; [ + jupyterhub + jupyterlab + ]) + ''; description = '' Python environment to run jupyterlab @@ -111,7 +123,7 @@ in { }))); default = null; - example = literalExample '' + example = literalExpression '' { python3 = let env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ diff --git a/third_party/nixpkgs/nixos/modules/services/development/lorri.nix b/third_party/nixpkgs/nixos/modules/services/development/lorri.nix index fc576e4c18..bda63518bf 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/lorri.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/lorri.nix @@ -21,8 +21,7 @@ in { description = '' The lorri package to use. ''; - defaultText = lib.literalExample "pkgs.lorri"; - example = lib.literalExample "pkgs.lorri"; + defaultText = lib.literalExpression "pkgs.lorri"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix b/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix index d4f5dc267d..895961707d 100644 --- a/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix +++ b/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix @@ -13,13 +13,13 @@ in package = mkOption { type = types.package; default = pkgs.greetd.greetd; - defaultText = "pkgs.greetd.greetd"; + defaultText = literalExpression "pkgs.greetd.greetd"; description = "The greetd package that should be used."; }; settings = mkOption { type = settingsFormat.type; - example = literalExample '' + example = literalExpression '' { default_session = { command = "''${pkgs.greetd.greetd}/bin/agreety --cmd sway"; @@ -43,7 +43,7 @@ in restart = mkOption { type = types.bool; default = !(cfg.settings ? initial_session); - defaultText = "!(config.services.greetd.settings ? initial_session)"; + defaultText = literalExpression "!(config.services.greetd.settings ? initial_session)"; description = '' Wether to restart greetd when it terminates (e.g. on failure). This is usually desirable so a user can always log in, but should be disabled when using 'settings.initial_session' (autologin), diff --git a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix index 00d9eaad9e..e2bbd27f6e 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix +++ b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix @@ -66,7 +66,7 @@ in package = mkOption { type = types.package; default = pkgs.emacs; - defaultText = "pkgs.emacs"; + defaultText = literalExpression "pkgs.emacs"; description = '' emacs derivation to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/editors/infinoted.nix b/third_party/nixpkgs/nixos/modules/services/editors/infinoted.nix index 3eb0753194..16fe52a232 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/infinoted.nix +++ b/third_party/nixpkgs/nixos/modules/services/editors/infinoted.nix @@ -11,7 +11,7 @@ in { package = mkOption { type = types.package; default = pkgs.libinfinity; - defaultText = "pkgs.libinfinity"; + defaultText = literalExpression "pkgs.libinfinity"; description = '' Package providing infinoted ''; diff --git a/third_party/nixpkgs/nixos/modules/services/games/crossfire-server.nix b/third_party/nixpkgs/nixos/modules/services/games/crossfire-server.nix index 974aea0cd6..a33025e0c3 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/crossfire-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/crossfire-server.nix @@ -18,7 +18,7 @@ in { package = mkOption { type = types.package; default = pkgs.crossfire-server; - defaultText = "pkgs.crossfire-server"; + defaultText = literalExpression "pkgs.crossfire-server"; description = '' The package to use for the Crossfire server (and map/arch data, if you don't change dataDir). @@ -28,7 +28,7 @@ in { dataDir = mkOption { type = types.str; default = "${cfg.package}/share/crossfire"; - defaultText = "\${config.services.crossfire.package}/share/crossfire"; + defaultText = literalExpression ''"''${config.services.crossfire.package}/share/crossfire"''; description = '' Where to load readonly data from -- maps, archetypes, treasure tables, and the like. If you plan to edit the data on the live server (rather @@ -72,30 +72,32 @@ in { overwrite the example files that come with the server, rather than being appended to them as the other configuration files are. ''; - example = literalExample '' - dm_file = ''' - admin:secret_password:localhost - jane:xyzzy:* - '''; - ban_file = ''' - # Bob is a jerk - bob@* - # So is everyone on 192.168.86.255/24 - *@192.168.86. - '''; - metaserver2 = ''' - metaserver2_notification on - localhostname crossfire.example.net - '''; - motd = "Welcome to CrossFire!"; - news = "No news yet."; - rules = "Don't be a jerk."; - settings = ''' - # be nicer to newbies and harsher to experienced players - balanced_stat_loss true - # don't let players pick up and use admin-created items - real_wiz false - '''; + example = literalExpression '' + { + dm_file = ''' + admin:secret_password:localhost + jane:xyzzy:* + '''; + ban_file = ''' + # Bob is a jerk + bob@* + # So is everyone on 192.168.86.255/24 + *@192.168.86. + '''; + metaserver2 = ''' + metaserver2_notification on + localhostname crossfire.example.net + '''; + motd = "Welcome to CrossFire!"; + news = "No news yet."; + rules = "Don't be a jerk."; + settings = ''' + # be nicer to newbies and harsher to experienced players + balanced_stat_loss true + # don't let players pick up and use admin-created items + real_wiz false + '''; + } ''; default = {}; }; diff --git a/third_party/nixpkgs/nixos/modules/services/games/deliantra-server.nix b/third_party/nixpkgs/nixos/modules/services/games/deliantra-server.nix index 36bf604176..b7011f4c35 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/deliantra-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/deliantra-server.nix @@ -18,7 +18,7 @@ in { package = mkOption { type = types.package; default = pkgs.deliantra-server; - defaultText = "pkgs.deliantra-server"; + defaultText = literalExpression "pkgs.deliantra-server"; description = '' The package to use for the Deliantra server (and map/arch data, if you don't change dataDir). @@ -28,7 +28,7 @@ in { dataDir = mkOption { type = types.str; default = "${pkgs.deliantra-data}"; - defaultText = "\${pkgs.deliantra-data}"; + defaultText = literalExpression ''"''${pkgs.deliantra-data}"''; description = '' Where to store readonly data (maps, archetypes, sprites, etc). Note that if you plan to use the live map editor (rather than editing @@ -69,22 +69,24 @@ in { The example here is not comprehensive. See the files in /etc/deliantra-server after enabling this module for full documentation. ''; - example = literalExample '' - dm_file = ''' - admin:secret_password:localhost - jane:xyzzy:* - '''; - motd = "Welcome to Deliantra!"; - settings = ''' - # Settings for game mechanics. - stat_loss_on_death true - armor_max_enchant 7 - '''; - config = ''' - # Settings for the server daemon. - hiscore_url https://deliantra.example.net/scores/ - max_map_reset 86400 - '''; + example = literalExpression '' + { + dm_file = ''' + admin:secret_password:localhost + jane:xyzzy:* + '''; + motd = "Welcome to Deliantra!"; + settings = ''' + # Settings for game mechanics. + stat_loss_on_death true + armor_max_enchant 7 + '''; + config = ''' + # Settings for the server daemon. + hiscore_url https://deliantra.example.net/scores/ + max_map_reset 86400 + '''; + } ''; default = { motd = ""; diff --git a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix index 3cb1427579..0e8860a028 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix @@ -86,7 +86,7 @@ in configFile = mkOption { type = types.path; default = configFile; - defaultText = "configFile"; + defaultText = literalExpression "configFile"; description = '' The server's configuration file. @@ -162,8 +162,8 @@ in package = mkOption { type = types.package; default = pkgs.factorio-headless; - defaultText = "pkgs.factorio-headless"; - example = "pkgs.factorio-headless-experimental"; + defaultText = literalExpression "pkgs.factorio-headless"; + example = literalExpression "pkgs.factorio-headless-experimental"; description = '' Factorio version to use. This defaults to the stable channel. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix b/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix index 458e57fef8..ddbe9508a4 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix @@ -109,7 +109,7 @@ in { You can use to get a Minecraft UUID for a username. ''; - example = literalExample '' + example = literalExpression '' { username1 = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"; username2 = "yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy"; @@ -120,7 +120,7 @@ in { serverProperties = mkOption { type = with types; attrsOf (oneOf [ bool int str ]); default = {}; - example = literalExample '' + example = literalExpression '' { server-port = 43000; difficulty = 3; @@ -144,8 +144,8 @@ in { package = mkOption { type = types.package; default = pkgs.minecraft-server; - defaultText = "pkgs.minecraft-server"; - example = literalExample "pkgs.minecraft-server_1_12_2"; + defaultText = literalExpression "pkgs.minecraft-server"; + example = literalExpression "pkgs.minecraft-server_1_12_2"; description = "Version of minecraft-server to run."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix b/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix index 3e619fe32e..883ef08300 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix @@ -61,7 +61,7 @@ in options = { event = mkOption { type = types.str; - example = [ "button/power.*" "button/lid.*" "ac_adapter.*" "button/mute.*" "button/volumedown.*" "cd/play.*" "cd/next.*" ]; + example = literalExpression ''"button/power.*" "button/lid.*" "ac_adapter.*" "button/mute.*" "button/volumedown.*" "cd/play.*" "cd/next.*"''; description = "Event type."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/actkbd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/actkbd.nix index f7770f85da..b499de97b2 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/actkbd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/actkbd.nix @@ -74,7 +74,7 @@ in bindings = mkOption { type = types.listOf (types.submodule bindingCfg); default = []; - example = lib.literalExample '' + example = lib.literalExpression '' [ { keys = [ 113 ]; events = [ "key" ]; command = "''${pkgs.alsa-utils}/bin/amixer -q set Master toggle"; } ] ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix b/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix index 08ad90126b..7f75ac272d 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix @@ -6,7 +6,7 @@ let inherit (lib) mkDefault mkEnableOption mkIf mkOption mkRenamedOptionModule mkRemovedOptionModule - concatStringsSep escapeShellArgs + concatStringsSep escapeShellArgs literalExpression optional optionals optionalAttrs recursiveUpdate types; cfgFmt = pkgs.formats.ini { }; @@ -53,8 +53,8 @@ in package = mkOption { type = types.package; default = pkgs.bluez; - defaultText = "pkgs.bluez"; - example = "pkgs.bluezFull"; + defaultText = literalExpression "pkgs.bluez"; + example = literalExpression "pkgs.bluezFull"; description = '' Which BlueZ package to use. diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/freefall.nix b/third_party/nixpkgs/nixos/modules/services/hardware/freefall.nix index 83f1e8c84f..3f7b159244 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/freefall.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/freefall.nix @@ -21,7 +21,7 @@ in { package = mkOption { type = types.package; default = pkgs.freefall; - defaultText = "pkgs.freefall"; + defaultText = literalExpression "pkgs.freefall"; description = '' freefall derivation to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix index 51eca19dca..e0506416ff 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix @@ -80,7 +80,7 @@ in { extraTrustedKeys = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ /etc/nixos/fwupd/myfirmware.pem ]"; + example = literalExpression "[ /etc/nixos/fwupd/myfirmware.pem ]"; description = '' Installing a public key allows firmware signed with a matching private key to be recognized as trusted, which may require less authentication to install than for untrusted files. By default trusted firmware can be upgraded (but not downgraded) without the user or administrator password. Only very few keys are installed by default. ''; @@ -98,6 +98,7 @@ in { package = mkOption { type = types.package; default = pkgs.fwupd; + defaultText = literalExpression "pkgs.fwupd"; description = '' Which fwupd package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/interception-tools.nix b/third_party/nixpkgs/nixos/modules/services/hardware/interception-tools.nix index fadcb19a01..e69c05841e 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/interception-tools.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/interception-tools.nix @@ -15,6 +15,7 @@ in { plugins = mkOption { type = types.listOf types.package; default = [ pkgs.interception-tools-plugins.caps2esc ]; + defaultText = literalExpression "[ pkgs.interception-tools-plugins.caps2esc ]"; description = '' A list of interception tools plugins that will be made available to use inside the udevmon configuration. diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/pcscd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/pcscd.nix index 4fc1e351f5..b1a5c680a0 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/pcscd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/pcscd.nix @@ -21,8 +21,8 @@ in plugins = mkOption { type = types.listOf types.package; default = [ pkgs.ccid ]; - defaultText = "[ pkgs.ccid ]"; - example = literalExample "[ pkgs.pcsc-cyberjack ]"; + defaultText = literalExpression "[ pkgs.ccid ]"; + example = literalExpression "[ pkgs.pcsc-cyberjack ]"; description = "Plugin packages to be used for PCSC-Lite."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix b/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix index ccf726bd18..caf232e234 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix @@ -73,7 +73,7 @@ in The example contains the package for HP scanners. ''; - example = literalExample "[ pkgs.hplipWithPlugin ]"; + example = literalExpression "[ pkgs.hplipWithPlugin ]"; }; hardware.sane.disabledDefaultBackends = mkOption { @@ -115,6 +115,7 @@ in hardware.sane.drivers.scanSnap.package = mkOption { type = types.package; default = pkgs.sane-drivers.epjitsu; + defaultText = literalExpression "pkgs.sane-drivers.epjitsu"; description = '' Epjitsu driver package to use. Useful if you want to extract the driver files yourself. diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix index a6afa01dd8..8f99981084 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix @@ -20,7 +20,7 @@ let the name of attribute will be used. ''; - example = literalExample "office1"; + example = "office1"; }; model = mkOption { @@ -29,7 +29,7 @@ let The model of the network device. ''; - example = literalExample "MFC-7860DW"; + example = "MFC-7860DW"; }; ip = mkOption { @@ -40,7 +40,7 @@ let provide a nodename. ''; - example = literalExample "192.168.1.2"; + example = "192.168.1.2"; }; nodename = mkOption { @@ -51,7 +51,7 @@ let provide an ip. ''; - example = literalExample "BRW0080927AFBCE"; + example = "BRW0080927AFBCE"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix b/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix index 89b5ff0e02..2e4ad8cc3b 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix @@ -20,7 +20,7 @@ let the name of attribute will be used. ''; - example = literalExample "office1"; + example = "office1"; }; model = mkOption { @@ -29,7 +29,7 @@ let The model of the network device. ''; - example = literalExample "ADS-1200"; + example = "ADS-1200"; }; ip = mkOption { @@ -40,7 +40,7 @@ let provide a nodename. ''; - example = literalExample "192.168.1.2"; + example = "192.168.1.2"; }; nodename = mkOption { @@ -51,7 +51,7 @@ let provide an ip. ''; - example = literalExample "BRW0080927AFBCE"; + example = "BRW0080927AFBCE"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix index aa936ac09d..3b495d00df 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix @@ -27,7 +27,7 @@ in { package = mkOption { type = types.package; default = pkgs.thermald; - defaultText = "pkgs.thermald"; + defaultText = literalExpression "pkgs.thermald"; description = "Which thermald package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix b/third_party/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix index f9f5234bdc..4e979c4d8f 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix @@ -69,7 +69,7 @@ in bindings = mkOption { type = types.listOf (types.submodule bindingCfg); default = []; - example = lib.literalExample '' + example = lib.literalExpression '' [ { keys = ["PLAYPAUSE"]; cmd = "''${pkgs.mpc_cli}/bin/mpc -q toggle"; } ] ''; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix b/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix index 9c2f78a755..212c0227c0 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix @@ -50,7 +50,7 @@ in package = mkOption { type = types.package; default = pkgs.undervolt; - defaultText = "pkgs.undervolt"; + defaultText = literalExpression "pkgs.undervolt"; description = '' undervolt derivation to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix b/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix index 449810b531..92c060147b 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix @@ -30,8 +30,7 @@ in package = mkOption { type = types.package; default = pkgs.upower; - defaultText = "pkgs.upower"; - example = lib.literalExample "pkgs.upower"; + defaultText = literalExpression "pkgs.upower"; description = '' Which upower package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/vdr.nix b/third_party/nixpkgs/nixos/modules/services/hardware/vdr.nix index 8a6cde51b0..5ec222b805 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/vdr.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/vdr.nix @@ -17,8 +17,8 @@ in { package = mkOption { type = types.package; default = pkgs.vdr; - defaultText = "pkgs.vdr"; - example = literalExample "pkgs.wrapVdr.override { plugins = with pkgs.vdrPlugins; [ hello ]; }"; + defaultText = literalExpression "pkgs.vdr"; + example = literalExpression "pkgs.wrapVdr.override { plugins = with pkgs.vdrPlugins; [ hello ]; }"; description = "Package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/SystemdJournal2Gelf.nix b/third_party/nixpkgs/nixos/modules/services/logging/SystemdJournal2Gelf.nix index f26aef7262..f28ecab8ac 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/SystemdJournal2Gelf.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/SystemdJournal2Gelf.nix @@ -36,6 +36,7 @@ in package = mkOption { type = types.package; default = pkgs.systemd-journal2gelf; + defaultText = literalExpression "pkgs.systemd-journal2gelf"; description = '' SystemdJournal2Gelf package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/awstats.nix b/third_party/nixpkgs/nixos/modules/services/logging/awstats.nix index 896f52302f..df0124380f 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/awstats.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/awstats.nix @@ -51,7 +51,7 @@ let hostAliases = mkOption { type = types.listOf types.str; default = []; - example = "[ \"www.example.org\" ]"; + example = [ "www.example.org" ]; description = '' List of aliases the site has. ''; @@ -60,12 +60,12 @@ let extraConfig = mkOption { type = types.attrsOf types.str; default = {}; - example = literalExample '' + example = literalExpression '' { "ValidHTTPCodes" = "404"; } ''; - description = "Extra configuration to be appendend to awstats.\${name}.conf."; + description = "Extra configuration to be appended to awstats.\${name}.conf."; }; webService = { @@ -106,7 +106,7 @@ in configs = mkOption { type = types.attrsOf (types.submodule configOpts); default = {}; - example = literalExample '' + example = literalExpression '' { "mysite" = { domain = "example.com"; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/fluentd.nix b/third_party/nixpkgs/nixos/modules/services/logging/fluentd.nix index 95825705d9..dd19617a13 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/fluentd.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/fluentd.nix @@ -27,7 +27,7 @@ in { package = mkOption { type = types.path; default = pkgs.fluentd; - defaultText = "pkgs.fluentd"; + defaultText = literalExpression "pkgs.fluentd"; description = "The fluentd package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix b/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix index 5e20a10f24..e6a23233ba 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix @@ -38,14 +38,13 @@ in package = mkOption { type = types.package; default = pkgs.graylog; - defaultText = "pkgs.graylog"; + defaultText = literalExpression "pkgs.graylog"; description = "Graylog package to use."; }; user = mkOption { type = types.str; default = "graylog"; - example = literalExample "graylog"; description = "User account under which graylog runs"; }; @@ -90,7 +89,7 @@ in elasticsearchHosts = mkOption { type = types.listOf types.str; - example = literalExample ''[ "http://node1:9200" "http://user:password@node2:19200" ]''; + example = literalExpression ''[ "http://node1:9200" "http://user:password@node2:19200" ]''; description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/journalbeat.nix b/third_party/nixpkgs/nixos/modules/services/logging/journalbeat.nix index 89f53b1b24..2d98598c1b 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/journalbeat.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/journalbeat.nix @@ -27,8 +27,8 @@ in package = mkOption { type = types.package; default = pkgs.journalbeat; - defaultText = "pkgs.journalbeat"; - example = literalExample "pkgs.journalbeat7"; + defaultText = literalExpression "pkgs.journalbeat"; + example = literalExpression "pkgs.journalbeat7"; description = '' The journalbeat package to use ''; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logcheck.nix b/third_party/nixpkgs/nixos/modules/services/logging/logcheck.nix index 348ed8adf9..c8738b734f 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logcheck.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logcheck.nix @@ -172,7 +172,7 @@ in extraRulesDirs = mkOption { default = []; - example = "/etc/logcheck"; + example = [ "/etc/logcheck" ]; type = types.listOf types.path; description = '' Directories with extra rules. diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix index 7d6102b825..624b6cfb12 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix @@ -111,7 +111,7 @@ in can be controlled by the priority option using the same semantics as `lib.mkOrder`. Smaller values have a greater priority. ''; - example = literalExample '' + example = literalExpression '' { httpd = { path = "/var/log/httpd/*.log"; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix b/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix index 7a2f568161..044d533023 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix @@ -53,15 +53,14 @@ in package = mkOption { type = types.package; default = pkgs.logstash; - defaultText = "pkgs.logstash"; - example = literalExample "pkgs.logstash"; + defaultText = literalExpression "pkgs.logstash"; description = "Logstash package to use."; }; plugins = mkOption { type = types.listOf types.path; default = [ ]; - example = literalExample "[ pkgs.logstash-contrib ]"; + example = literalExpression "[ pkgs.logstash-contrib ]"; description = "The paths to find other logstash plugins in."; }; @@ -102,12 +101,14 @@ in type = types.lines; default = "generator { }"; description = "Logstash input configuration."; - example = '' - # Read from journal - pipe { - command => "''${pkgs.systemd}/bin/journalctl -f -o json" - type => "syslog" codec => json {} - } + example = literalExpression '' + ''' + # Read from journal + pipe { + command => "''${pkgs.systemd}/bin/journalctl -f -o json" + type => "syslog" codec => json {} + } + ''' ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/syslog-ng.nix b/third_party/nixpkgs/nixos/modules/services/logging/syslog-ng.nix index 3505531168..0a57bf20bd 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/syslog-ng.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/syslog-ng.nix @@ -43,7 +43,7 @@ in { package = mkOption { type = types.package; default = pkgs.syslogng; - defaultText = "pkgs.syslogng"; + defaultText = literalExpression "pkgs.syslogng"; description = '' The package providing syslog-ng binaries. ''; @@ -51,7 +51,7 @@ in { extraModulePaths = mkOption { type = types.listOf types.str; default = []; - example = literalExample '' + example = literalExpression '' [ "''${pkgs.syslogng_incubator}/lib/syslog-ng" ] ''; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/mail/davmail.nix b/third_party/nixpkgs/nixos/modules/services/mail/davmail.nix index 374a3dd75c..e9f31e6fb3 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/davmail.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/davmail.nix @@ -42,7 +42,7 @@ in and for details on supported values. ''; - example = literalExample '' + example = literalExpression '' { davmail.allowRemote = true; davmail.imapPort = 55555; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix index f3500f46e3..223f3bef77 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix @@ -289,7 +289,7 @@ in modules = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.dovecot_pigeonhole ]"; + example = literalExpression "[ pkgs.dovecot_pigeonhole ]"; description = '' Symlinks the contents of lib/dovecot of every given package into /etc/dovecot/modules. This will make the given modules available @@ -339,7 +339,7 @@ in (list: listToAttrs (map (entry: { name = entry.name; value = removeAttrs entry ["name"]; }) list)) (attrsOf (submodule mailboxes)); default = {}; - example = literalExample '' + example = literalExpression '' { Spam = { specialUse = "Junk"; auto = "create"; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/mail/exim.nix b/third_party/nixpkgs/nixos/modules/services/mail/exim.nix index 25b533578c..7356db2b6a 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/exim.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/exim.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkIf mkOption singleton types; + inherit (lib) literalExpression mkIf mkOption singleton types; inherit (pkgs) coreutils; cfg = config.services.exim; in @@ -60,7 +60,7 @@ in package = mkOption { type = types.package; default = pkgs.exim; - defaultText = "pkgs.exim"; + defaultText = literalExpression "pkgs.exim"; description = '' The Exim derivation to use. This can be used to enable features such as LDAP or PAM support. diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix index 831175d562..0c9b38b44b 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix @@ -87,8 +87,8 @@ in { package = mkOption { type = types.package; default = pkgs.mailman; - defaultText = "pkgs.mailman"; - example = literalExample "pkgs.mailman.override { archivers = []; }"; + defaultText = literalExpression "pkgs.mailman"; + example = literalExpression "pkgs.mailman.override { archivers = []; }"; description = "Mailman package to use"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/offlineimap.nix b/third_party/nixpkgs/nixos/modules/services/mail/offlineimap.nix index 294e3806f9..4514775811 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/offlineimap.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/offlineimap.nix @@ -25,14 +25,14 @@ in { package = mkOption { type = types.package; default = pkgs.offlineimap; - defaultText = "pkgs.offlineimap"; + defaultText = literalExpression "pkgs.offlineimap"; description = "Offlineimap derivation to use."; }; path = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ pkgs.pass pkgs.bash pkgs.notmuch ]"; + example = literalExpression "[ pkgs.pass pkgs.bash pkgs.notmuch ]"; description = "List of derivations to put in Offlineimap's path."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/opensmtpd.nix b/third_party/nixpkgs/nixos/modules/services/mail/opensmtpd.nix index ef7d53e7d9..e7632be280 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/opensmtpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/opensmtpd.nix @@ -34,7 +34,7 @@ in { package = mkOption { type = types.package; default = pkgs.opensmtpd; - defaultText = "pkgs.opensmtpd"; + defaultText = literalExpression "pkgs.opensmtpd"; description = "The OpenSMTPD package to use."; }; @@ -103,7 +103,7 @@ in { }; security.wrappers.smtpctl = { - owner = "nobody"; + owner = "root"; group = "smtpq"; setuid = false; setgid = true; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix index da18fae4ca..6fc09682e0 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix @@ -505,6 +505,7 @@ in tlsTrustedAuthorities = mkOption { type = types.str; default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + defaultText = literalExpression ''"''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"''; description = '' File containing trusted certification authorities (CA) to verify certificates of mailservers contacted for mail delivery. This basically sets smtp_tls_CAfile and enables opportunistic tls. Defaults to NixOS trusted certification authorities. ''; @@ -673,7 +674,7 @@ in services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail { program = "sendmail"; source = "${pkgs.postfix}/bin/sendmail"; - owner = "nobody"; + owner = "root"; group = setgidGroup; setuid = false; setgid = true; @@ -682,7 +683,7 @@ in security.wrappers.mailq = { program = "mailq"; source = "${pkgs.postfix}/bin/mailq"; - owner = "nobody"; + owner = "root"; group = setgidGroup; setuid = false; setgid = true; @@ -691,7 +692,7 @@ in security.wrappers.postqueue = { program = "postqueue"; source = "${pkgs.postfix}/bin/postqueue"; - owner = "nobody"; + owner = "root"; group = setgidGroup; setuid = false; setgid = true; @@ -700,7 +701,7 @@ in security.wrappers.postdrop = { program = "postdrop"; source = "${pkgs.postfix}/bin/postdrop"; - owner = "nobody"; + owner = "root"; group = setgidGroup; setuid = false; setgid = true; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix index f9b6300047..bf5abc7ba5 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix @@ -32,8 +32,9 @@ in package = mkOption { type = types.package; default = pkgs.roundcube; + defaultText = literalExpression "pkgs.roundcube"; - example = literalExample '' + example = literalExpression '' roundcube.withPlugins (plugins: [ plugins.persistent_login ]) ''; @@ -89,7 +90,7 @@ in dicts = mkOption { type = types.listOf types.package; default = []; - example = literalExample "with pkgs.aspellDicts; [ en fr de ]"; + example = literalExpression "with pkgs.aspellDicts; [ en fr de ]"; description = '' List of aspell dictionnaries for spell checking. If empty, spell checking is disabled. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix b/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix index c78f464235..50208cbeb0 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix @@ -240,7 +240,7 @@ in description = '' Local configuration files, written into /etc/rspamd/local.d/{name}. ''; - example = literalExample '' + example = literalExpression '' { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf"; "arc.conf".text = "allow_envfrom_empty = true;"; } @@ -253,7 +253,7 @@ in description = '' Overridden configuration files, written into /etc/rspamd/override.d/{name}. ''; - example = literalExample '' + example = literalExpression '' { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf"; "arc.conf".text = "allow_envfrom_empty = true;"; } @@ -278,7 +278,7 @@ in normal = {}; controller = {}; }; - example = literalExample '' + example = literalExpression '' { normal = { includes = [ "$CONFDIR/worker-normal.inc" ]; @@ -338,10 +338,6 @@ in smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"]; non_smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"]; }; - example = { - smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"]; - non_smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"]; - }; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix b/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix index 491b6dba9a..f3578bef96 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix @@ -153,7 +153,7 @@ in Email domains handled by this instance. There have to be MX records for keys of this attribute set. ''; - example = literalExample '' + example = literalExpression '' { "lists.example.org" = { webHost = "lists.example.org"; @@ -200,7 +200,7 @@ in name = mkOption { type = str; default = if cfg.database.type == "SQLite" then "${dataDir}/sympa.sqlite" else "sympa"; - defaultText = ''if database.type == "SQLite" then "${dataDir}/sympa.sqlite" else "sympa"''; + defaultText = literalExpression ''if database.type == "SQLite" then "${dataDir}/sympa.sqlite" else "sympa"''; description = '' Database name. When using SQLite this must be an absolute path to the database file. @@ -279,7 +279,7 @@ in settings = mkOption { type = attrsOf (oneOf [ str int bool ]); default = {}; - example = literalExample '' + example = literalExpression '' { default_home = "lists"; viewlogs_page_size = 50; @@ -314,7 +314,7 @@ in config.source = mkIf (config.text != null) (mkDefault (pkgs.writeText "sympa-${baseNameOf name}" config.text)); })); default = {}; - example = literalExample '' + example = literalExpression '' { "list_data/lists.example.org/help" = { text = "subject This list provides help to users"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/airsonic.nix b/third_party/nixpkgs/nixos/modules/services/misc/airsonic.nix index c1ce515750..533a3d367a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/airsonic.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/airsonic.nix @@ -74,7 +74,7 @@ in { transcoders = mkOption { type = types.listOf types.path; default = [ "${pkgs.ffmpeg.bin}/bin/ffmpeg" ]; - defaultText= [ "\${pkgs.ffmpeg.bin}/bin/ffmpeg" ]; + defaultText = literalExpression ''[ "''${pkgs.ffmpeg.bin}/bin/ffmpeg" ]''; description = '' List of paths to transcoder executables that should be accessible from Airsonic. Symlinks will be created to each executable inside @@ -85,7 +85,7 @@ in { jre = mkOption { type = types.package; default = pkgs.jre8; - defaultText = literalExample "pkgs.jre8"; + defaultText = literalExpression "pkgs.jre8"; description = '' JRE package to use. @@ -97,7 +97,7 @@ in { war = mkOption { type = types.path; default = "${pkgs.airsonic}/webapps/airsonic.war"; - defaultText = "\${pkgs.airsonic}/webapps/airsonic.war"; + defaultText = literalExpression ''"''${pkgs.airsonic}/webapps/airsonic.war"''; description = "Airsonic war file to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ankisyncd.nix b/third_party/nixpkgs/nixos/modules/services/misc/ankisyncd.nix index 5fc19649d3..69e471f4f5 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ankisyncd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ankisyncd.nix @@ -33,7 +33,7 @@ in package = mkOption { type = types.package; default = pkgs.ankisyncd; - defaultText = literalExample "pkgs.ankisyncd"; + defaultText = literalExpression "pkgs.ankisyncd"; description = "The package to use for the ankisyncd command."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix b/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix index 8bc307311a..d1856fff4a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix @@ -102,14 +102,14 @@ in { package = mkOption { description = "The kafka package to use"; default = pkgs.apacheKafka; - defaultText = "pkgs.apacheKafka"; + defaultText = literalExpression "pkgs.apacheKafka"; type = types.package; }; jre = mkOption { description = "The JRE with which to run Kafka"; default = cfg.package.passthru.jre; - defaultText = "pkgs.apacheKafka.passthru.jre"; + defaultText = literalExpression "pkgs.apacheKafka.passthru.jre"; type = types.package; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix b/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix index 541f0d2db1..5fce990afe 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix @@ -29,7 +29,7 @@ in autoMaster = mkOption { type = types.str; - example = literalExample '' + example = literalExpression '' let mapConf = pkgs.writeText "auto" ''' kernel -ro,soft,intr ftp.kernel.org:/pub/linux diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bees.nix b/third_party/nixpkgs/nixos/modules/services/misc/bees.nix index 6b8cae8464..cb97a86b85 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/bees.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/bees.nix @@ -61,7 +61,7 @@ let description = '' Extra command-line options passed to the daemon. See upstream bees documentation. ''; - example = literalExample '' + example = literalExpression '' [ "--thread-count" "4" ] ''; }; @@ -75,7 +75,7 @@ in type = with types; attrsOf (submodule fsOptions); description = "BTRFS filesystems to run block-level deduplication on."; default = { }; - example = literalExample '' + example = literalExpression '' { root = { spec = "LABEL=root"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix b/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix index 5afc1546ef..60f7553072 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix @@ -35,7 +35,7 @@ in package = mkOption { default = pkgs.cgminer; - defaultText = "pkgs.cgminer"; + defaultText = literalExpression "pkgs.cgminer"; description = "Which cgminer derivation to use."; type = types.package; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/clipcat.nix b/third_party/nixpkgs/nixos/modules/services/misc/clipcat.nix index 128bb9a89d..8b749aa728 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/clipcat.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/clipcat.nix @@ -12,7 +12,7 @@ in { package = mkOption { type = types.package; default = pkgs.clipcat; - defaultText = "pkgs.clipcat"; + defaultText = literalExpression "pkgs.clipcat"; description = "clipcat derivation to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/clipmenu.nix b/third_party/nixpkgs/nixos/modules/services/misc/clipmenu.nix index 3ba050044c..ef95985f8d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/clipmenu.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/clipmenu.nix @@ -12,7 +12,7 @@ in { package = mkOption { type = types.package; default = pkgs.clipmenu; - defaultText = "pkgs.clipmenu"; + defaultText = literalExpression "pkgs.clipmenu"; description = "clipmenu derivation to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/confd.nix b/third_party/nixpkgs/nixos/modules/services/misc/confd.nix index c1ebdb3dde..6c66786524 100755 --- a/third_party/nixpkgs/nixos/modules/services/misc/confd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/confd.nix @@ -64,7 +64,7 @@ in { package = mkOption { description = "Confd package to use."; default = pkgs.confd; - defaultText = "pkgs.confd"; + defaultText = literalExpression "pkgs.confd"; type = types.package; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/dictd.nix b/third_party/nixpkgs/nixos/modules/services/misc/dictd.nix index 6e796a3a1f..96e2a4e7c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/dictd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/dictd.nix @@ -25,8 +25,8 @@ in DBs = mkOption { type = types.listOf types.package; default = with pkgs.dictdDBs; [ wiktionary wordnet ]; - defaultText = "with pkgs.dictdDBs; [ wiktionary wordnet ]"; - example = literalExample "[ pkgs.dictdDBs.nld2eng ]"; + defaultText = literalExpression "with pkgs.dictdDBs; [ wiktionary wordnet ]"; + example = literalExpression "[ pkgs.dictdDBs.nld2eng ]"; description = "List of databases to make available."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix index 24a259bb4d..07c0613336 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix @@ -31,7 +31,7 @@ in type = types.path; description = "The Disnix package"; default = pkgs.disnix; - defaultText = "pkgs.disnix"; + defaultText = literalExpression "pkgs.disnix"; }; enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH"; @@ -39,7 +39,6 @@ in profiles = mkOption { type = types.listOf types.str; default = [ "default" ]; - example = [ "default" ]; description = "Names of the Disnix profiles to expose in the system's PATH"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/dwm-status.nix b/third_party/nixpkgs/nixos/modules/services/misc/dwm-status.nix index b98a42e6a6..5f591b3c5d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/dwm-status.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/dwm-status.nix @@ -27,8 +27,8 @@ in package = mkOption { type = types.package; default = pkgs.dwm-status; - defaultText = "pkgs.dwm-status"; - example = "pkgs.dwm-status.override { enableAlsaUtils = false; }"; + defaultText = literalExpression "pkgs.dwm-status"; + example = literalExpression "pkgs.dwm-status.override { enableAlsaUtils = false; }"; description = '' Which dwm-status package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/etcd.nix b/third_party/nixpkgs/nixos/modules/services/misc/etcd.nix index 2b667fab6b..c4ea091a03 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/etcd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/etcd.nix @@ -123,7 +123,7 @@ in { ''; type = types.attrsOf types.str; default = {}; - example = literalExample '' + example = literalExpression '' { "CORS" = "*"; "NAME" = "default-name"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix b/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix index b6bd6e9fd3..dd84ac37b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix @@ -97,13 +97,13 @@ in static_root = mkOption { type = types.str; default = "${cfg.dataDir}/static"; - defaultText = "\${config.services.etebase-server.dataDir}/static"; + defaultText = literalExpression ''"''${config.services.etebase-server.dataDir}/static"''; description = "The directory for static files."; }; media_root = mkOption { type = types.str; default = "${cfg.dataDir}/media"; - defaultText = "\${config.services.etebase-server.dataDir}/media"; + defaultText = literalExpression ''"''${config.services.etebase-server.dataDir}/media"''; description = "The media directory."; }; }; @@ -126,7 +126,7 @@ in name = mkOption { type = types.str; default = "${cfg.dataDir}/db.sqlite3"; - defaultText = "\${config.services.etebase-server.dataDir}/db.sqlite3"; + defaultText = literalExpression ''"''${config.services.etebase-server.dataDir}/db.sqlite3"''; description = "The database name."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/felix.nix b/third_party/nixpkgs/nixos/modules/services/misc/felix.nix index 8d438bb9eb..0283de128a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/felix.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/felix.nix @@ -22,7 +22,7 @@ in bundles = mkOption { type = types.listOf types.package; default = [ pkgs.felix_remoteshell ]; - defaultText = "[ pkgs.felix_remoteshell ]"; + defaultText = literalExpression "[ pkgs.felix_remoteshell ]"; description = "List of bundles that should be activated on startup"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix b/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix index b42f36e866..472b0b73ff 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix @@ -32,8 +32,8 @@ in { configTemplate = mkOption { type = types.path; default = "${config.services.freeswitch.package}/share/freeswitch/conf/vanilla"; - defaultText = literalExample "\${config.services.freeswitch.package}/share/freeswitch/conf/vanilla"; - example = literalExample "\${config.services.freeswitch.package}/share/freeswitch/conf/minimal"; + defaultText = literalExpression ''"''${config.services.freeswitch.package}/share/freeswitch/conf/vanilla"''; + example = literalExpression ''"''${config.services.freeswitch.package}/share/freeswitch/conf/minimal"''; description = '' Configuration template to use. See available templates in FreeSWITCH repository. @@ -43,7 +43,7 @@ in { configDir = mkOption { type = with types; attrsOf path; default = { }; - example = literalExample '' + example = literalExpression '' { "freeswitch.xml" = ./freeswitch.xml; "dialplan/default.xml" = pkgs.writeText "dialplan-default.xml" ''' @@ -61,8 +61,7 @@ in { package = mkOption { type = types.package; default = pkgs.freeswitch; - defaultText = literalExample "pkgs.freeswitch"; - example = literalExample "pkgs.freeswitch"; + defaultText = literalExpression "pkgs.freeswitch"; description = '' FreeSWITCH package. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix index 753cb870e7..c0f7661c56 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix @@ -32,7 +32,7 @@ in package = mkOption { default = pkgs.gitea; type = types.package; - defaultText = "pkgs.gitea"; + defaultText = literalExpression "pkgs.gitea"; description = "gitea derivation to use"; }; @@ -122,7 +122,7 @@ in socket = mkOption { type = types.nullOr types.path; default = if (cfg.database.createDatabase && usePostgresql) then "/run/postgresql" else if (cfg.database.createDatabase && useMysql) then "/run/mysqld/mysqld.sock" else null; - defaultText = "null"; + defaultText = literalExpression "null"; example = "/run/mysqld/mysqld.sock"; description = "Path to the unix socket file to use for authentication."; }; @@ -255,8 +255,9 @@ in }; staticRootPath = mkOption { - type = types.str; - default = "${gitea.data}"; + type = types.either types.str types.path; + default = gitea.data; + defaultText = literalExpression "package.data"; example = "/var/lib/gitea/data"; description = "Upper level of template and static files path."; }; @@ -287,7 +288,7 @@ in Gitea configuration. Refer to for details on supported values. ''; - example = literalExample '' + example = literalExpression '' { "cron.sync_external_users" = { RUN_AT_START = true; @@ -348,7 +349,7 @@ in server = mkMerge [ { DOMAIN = cfg.domain; - STATIC_ROOT_PATH = cfg.staticRootPath; + STATIC_ROOT_PATH = toString cfg.staticRootPath; LFS_JWT_SECRET = "#lfsjwtsecret#"; ROOT_URL = cfg.rootUrl; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitit.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitit.nix index f09565283f..ceb186c0f0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitit.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitit.nix @@ -36,15 +36,15 @@ let haskellPackages = mkOption { default = pkgs.haskellPackages; - defaultText = "pkgs.haskellPackages"; - example = literalExample "pkgs.haskell.packages.ghc784"; + defaultText = literalExpression "pkgs.haskellPackages"; + example = literalExpression "pkgs.haskell.packages.ghc784"; description = "haskellPackages used to build gitit and plugins."; }; extraPackages = mkOption { type = types.functionTo (types.listOf types.package); default = self: []; - example = literalExample '' + example = literalExpression '' haskellPackages: [ haskellPackages.wreq ] @@ -665,9 +665,9 @@ in wantedBy = [ "multi-user.target" ]; path = with pkgs; [ curl ] ++ optional cfg.pdfExport texlive.combined.scheme-basic - ++ optional (cfg.repositoryType == "darcs") darcs - ++ optional (cfg.repositoryType == "mercurial") mercurial - ++ optional (cfg.repositoryType == "git") git; + ++ optional (cfg.repositoryType == "darcs") darcs + ++ optional (cfg.repositoryType == "mercurial") mercurial + ++ optional (cfg.repositoryType == "git") git; preStart = let gm = "gitit@${config.networking.hostName}"; @@ -684,35 +684,35 @@ in fi done cd ${repositoryPath} - ${ - if repositoryType == "darcs" then - '' - if [ ! -d _darcs ] - then - ${pkgs.darcs}/bin/darcs initialize - echo "${gm}" > _darcs/prefs/email - '' - else if repositoryType == "mercurial" then - '' - if [ ! -d .hg ] - then - ${pkgs.mercurial}/bin/hg init - cat >> .hg/hgrc < _darcs/prefs/email + '' + else if repositoryType == "mercurial" then + '' + if [ ! -d .hg ] + then + ${pkgs.mercurial}/bin/hg init + cat >> .hg/hgrc <~/.gitolite.rc. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/greenclip.nix b/third_party/nixpkgs/nixos/modules/services/misc/greenclip.nix index 9152a782d7..32e8d746cb 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/greenclip.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/greenclip.nix @@ -12,7 +12,7 @@ in { package = mkOption { type = types.package; default = pkgs.haskellPackages.greenclip; - defaultText = "pkgs.haskellPackages.greenclip"; + defaultText = literalExpression "pkgs.haskellPackages.greenclip"; description = "greenclip derivation to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix index 800bea4ff5..8279d075ba 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix @@ -112,7 +112,7 @@ in { emptyValue.value = {}; }; in valueType; - example = literalExample '' + example = literalExpression '' { homeassistant = { name = "Home"; @@ -152,7 +152,7 @@ in { default = null; type = with types; nullOr attrs; # from https://www.home-assistant.io/lovelace/yaml-mode/ - example = literalExample '' + example = literalExpression '' { title = "My Awesome Home"; views = [ { @@ -188,13 +188,13 @@ in { default = pkgs.home-assistant.overrideAttrs (oldAttrs: { doInstallCheck = false; }); - defaultText = literalExample '' + defaultText = literalExpression '' pkgs.home-assistant.overrideAttrs (oldAttrs: { doInstallCheck = false; }) ''; type = types.package; - example = literalExample '' + example = literalExpression '' pkgs.home-assistant.override { extraPackages = ps: with ps; [ colorlog ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ihaskell.nix b/third_party/nixpkgs/nixos/modules/services/misc/ihaskell.nix index c7332b8780..9978e8a465 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ihaskell.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ihaskell.nix @@ -6,7 +6,7 @@ let cfg = config.services.ihaskell; ihaskell = pkgs.ihaskell.override { - packages = self: cfg.extraPackages self; + packages = cfg.extraPackages; }; in @@ -22,8 +22,9 @@ in extraPackages = mkOption { type = types.functionTo (types.listOf types.package); - default = self: []; - example = literalExample '' + default = haskellPackages: []; + defaultText = literalExpression "haskellPackages: []"; + example = literalExpression '' haskellPackages: [ haskellPackages.wreq haskellPackages.lens diff --git a/third_party/nixpkgs/nixos/modules/services/misc/jackett.nix b/third_party/nixpkgs/nixos/modules/services/misc/jackett.nix index f2dc6635df..c2144d4a9a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/jackett.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/jackett.nix @@ -38,7 +38,7 @@ in package = mkOption { type = types.package; default = pkgs.jackett; - defaultText = "pkgs.jackett"; + defaultText = literalExpression "pkgs.jackett"; description = "Jackett package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix index 6d64acc029..b9d54f27ed 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix @@ -19,7 +19,7 @@ in package = mkOption { type = types.package; default = pkgs.jellyfin; - example = literalExample "pkgs.jellyfin"; + defaultText = literalExpression "pkgs.jellyfin"; description = '' Jellyfin package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix b/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix index e6b9dd234a..7b3780b5cc 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix @@ -19,6 +19,7 @@ in package = mkOption { type = types.package; default = pkgs.klipper; + defaultText = literalExpression "pkgs.klipper"; description = "The Klipper package."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/lidarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/lidarr.nix index 8ff1adadcf..20153c7e61 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/lidarr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/lidarr.nix @@ -19,7 +19,7 @@ in package = mkOption { type = types.package; default = pkgs.lidarr; - defaultText = "pkgs.lidarr"; + defaultText = literalExpression "pkgs.lidarr"; description = "The Lidarr package to use"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-discord.nix b/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-discord.nix index 71d1227f4f..c448614eca 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-discord.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-discord.nix @@ -31,7 +31,7 @@ in { botToken = ""; }; }; - example = literalExample '' + example = literalExpression '' { bridge = { domain = "public-domain.tld"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix b/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix index e150a1aaaa..437bd05fdc 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix @@ -125,7 +125,7 @@ in { package = mkOption { type = types.package; default = pkgs.matrix-synapse; - defaultText = "pkgs.matrix-synapse"; + defaultText = literalExpression "pkgs.matrix-synapse"; description = '' Overridable attribute of the matrix synapse server package to use. ''; @@ -133,7 +133,7 @@ in { plugins = mkOption { type = types.listOf types.package; default = [ ]; - example = literalExample '' + example = literalExpression '' with config.services.matrix-synapse.package.plugins; [ matrix-synapse-ldap3 matrix-synapse-pam diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix b/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix index 717cf7936e..59d0b68240 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix @@ -60,7 +60,7 @@ in { }; }; }; - example = literalExample '' + example = literalExpression '' { homeserver = { address = "http://localhost:8008"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix b/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix index e22d1ed61f..d80b6fafc2 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix @@ -13,7 +13,7 @@ in { package = mkOption { type = types.package; default = pkgs.mbpfan; - defaultText = "pkgs.mbpfan"; + defaultText = literalExpression "pkgs.mbpfan"; description = '' The package used for the mbpfan daemon. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix b/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix index a19b73889c..383090575b 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix @@ -216,10 +216,11 @@ in { package = mkOption { type = types.package; - example = literalExample "pkgs.mediatomb"; + example = literalExpression "pkgs.mediatomb"; default = pkgs.gerbera; + defaultText = literalExpression "pkgs.gerbera"; description = '' - Underlying package to be used with the module (default: pkgs.gerbera). + Underlying package to be used with the module. ''; }; @@ -325,7 +326,7 @@ in { mediaDirectories = mkOption { type = with types; listOf (submodule mediaDirectory); - default = {}; + default = []; description = '' Declare media directories to index. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix b/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix index 11116f7c34..c34803f972 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix @@ -45,7 +45,7 @@ in { lineDateFormat = "MMM-D HH:mm:ss.SSS"; }; }; - example = literalExample '' + example = literalExpression '' { bridge = { bindAddress = "localhost"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix b/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix index 301af76c33..0c562343d8 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix @@ -79,7 +79,7 @@ in staticDir = mkOption { type = types.path; default = "${pkgs.nitter}/share/nitter/public"; - defaultText = "\${pkgs.nitter}/share/nitter/public"; + defaultText = literalExpression ''"''${pkgs.nitter}/share/nitter/public"''; description = "Path to the static files directory."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index 70b27b7d3d..789d0355b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -85,7 +85,7 @@ in package = mkOption { type = types.package; default = pkgs.nix; - defaultText = "pkgs.nix"; + defaultText = literalExpression "pkgs.nix"; description = '' This option specifies the Nix package instance to use throughout the system. ''; @@ -460,7 +460,7 @@ in flake = mkOption { type = types.nullOr types.attrs; default = null; - example = literalExample "nixpkgs"; + example = literalExpression "nixpkgs"; description = '' The flake input to which is to be rewritten. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nzbhydra2.nix b/third_party/nixpkgs/nixos/modules/services/misc/nzbhydra2.nix index c396b4b8f6..500c40f117 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nzbhydra2.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nzbhydra2.nix @@ -25,7 +25,7 @@ in { package = mkOption { type = types.package; default = pkgs.nzbhydra2; - defaultText = "pkgs.nzbhydra2"; + defaultText = literalExpression "pkgs.nzbhydra2"; description = "NZBHydra2 package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix index 7129ac6952..cd846d3f26 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix @@ -68,8 +68,8 @@ in plugins = mkOption { type = types.functionTo (types.listOf types.package); default = plugins: []; - defaultText = "plugins: []"; - example = literalExample "plugins: with plugins; [ themeify stlviewer ]"; + defaultText = literalExpression "plugins: []"; + example = literalExpression "plugins: with plugins; [ themeify stlviewer ]"; description = "Additional plugins to be used. Available plugins are passed through the plugins input."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/paperless-ng.nix b/third_party/nixpkgs/nixos/modules/services/misc/paperless-ng.nix index 4b7087e17f..db8082f072 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/paperless-ng.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/paperless-ng.nix @@ -107,14 +107,14 @@ in mediaDir = mkOption { type = types.str; default = "${cfg.dataDir}/media"; - defaultText = "\${dataDir}/consume"; + defaultText = literalExpression ''"''${dataDir}/media"''; description = "Directory to store the Paperless documents."; }; consumptionDir = mkOption { type = types.str; default = "${cfg.dataDir}/consume"; - defaultText = "\${dataDir}/consume"; + defaultText = literalExpression ''"''${dataDir}/consume"''; description = "Directory from which new documents are imported."; }; @@ -167,7 +167,7 @@ in See the documentation for available options. ''; - example = literalExample '' + example = literalExpression '' { PAPERLESS_OCR_LANGUAGE = "deu+eng"; } @@ -183,7 +183,7 @@ in package = mkOption { type = types.package; default = pkgs.paperless-ng; - defaultText = "pkgs.paperless-ng"; + defaultText = literalExpression "pkgs.paperless-ng"; description = "The Paperless package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/plex.nix b/third_party/nixpkgs/nixos/modules/services/misc/plex.nix index 7efadf1b9b..5f99ee866a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/plex.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/plex.nix @@ -68,7 +68,7 @@ in package = mkOption { type = types.package; default = pkgs.plex; - defaultText = "pkgs.plex"; + defaultText = literalExpression "pkgs.plex"; description = '' The Plex package to use. Plex subscribers may wish to use their own package here, pointing to subscriber-only server versions. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix index 66c8e558fb..696b8d1a25 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix @@ -2,7 +2,7 @@ let inherit (lib) mkBefore mkDefault mkEnableOption mkIf mkOption mkRemovedOptionModule types; - inherit (lib) concatStringsSep literalExample mapAttrsToList; + inherit (lib) concatStringsSep literalExpression mapAttrsToList; inherit (lib) optional optionalAttrs optionalString; cfg = config.services.redmine; @@ -54,8 +54,9 @@ in package = mkOption { type = types.package; default = pkgs.redmine; + defaultText = literalExpression "pkgs.redmine"; description = "Which Redmine package to use."; - example = "pkgs.redmine.override { ruby = pkgs.ruby_2_7; }"; + example = literalExpression "pkgs.redmine.override { ruby = pkgs.ruby_2_7; }"; }; user = mkOption { @@ -90,7 +91,7 @@ in for details. ''; - example = literalExample '' + example = literalExpression '' { email_delivery = { delivery_method = "smtp"; @@ -112,7 +113,7 @@ in See for details. ''; - example = literalExample '' + example = '' config.logger.level = Logger::DEBUG ''; }; @@ -121,7 +122,7 @@ in type = types.attrsOf types.path; default = {}; description = "Set of themes."; - example = literalExample '' + example = literalExpression '' { dkuk-redmine_alex_skin = builtins.fetchurl { url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip"; @@ -135,7 +136,7 @@ in type = types.attrsOf types.path; default = {}; description = "Set of plugins."; - example = literalExample '' + example = literalExpression '' { redmine_env_auth = builtins.fetchurl { url = "https://github.com/Intera/redmine_env_auth/archive/0.6.zip"; @@ -162,7 +163,7 @@ in port = mkOption { type = types.int; default = if cfg.database.type == "postgresql" then 5432 else 3306; - defaultText = "3306"; + defaultText = literalExpression "3306"; description = "Database host port."; }; @@ -194,7 +195,7 @@ in if mysqlLocal then "/run/mysqld/mysqld.sock" else if pgsqlLocal then "/run/postgresql" else null; - defaultText = "/run/mysqld/mysqld.sock"; + defaultText = literalExpression "/run/mysqld/mysqld.sock"; example = "/run/mysqld/mysqld.sock"; description = "Path to the unix socket file to use for authentication."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/rippled.nix b/third_party/nixpkgs/nixos/modules/services/misc/rippled.nix index 8cdfe0875d..9c66df2fce 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/rippled.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/rippled.nix @@ -210,7 +210,7 @@ in description = "Which rippled package to use."; type = types.package; default = pkgs.rippled; - defaultText = "pkgs.rippled"; + defaultText = literalExpression "pkgs.rippled"; }; ports = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix b/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix index a32dbfa310..f560f838e4 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix @@ -24,7 +24,8 @@ in package = mkOption { type = types.package; default = pkgs.sickbeard; - example = literalExample "pkgs.sickrage"; + defaultText = literalExpression "pkgs.sickbeard"; + example = literalExpression "pkgs.sickrage"; description ='' Enable pkgs.sickrage or pkgs.sickgear as an alternative to SickBeard diff --git a/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix b/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix index 7ab5e14733..3c3f6c4d64 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix @@ -51,16 +51,18 @@ in configs = mkOption { default = { }; - example = literalExample { - home = { - subvolume = "/home"; - extraConfig = '' - ALLOW_USERS="alice" - TIMELINE_CREATE=yes - TIMELINE_CLEANUP=yes - ''; - }; - }; + example = literalExpression '' + { + home = { + subvolume = "/home"; + extraConfig = ''' + ALLOW_USERS="alice" + TIMELINE_CREATE=yes + TIMELINE_CLEANUP=yes + '''; + }; + } + ''; description = '' Subvolume configuration diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/builds.nix b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/builds.nix index e446f08284..f806e8c51b 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/builds.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/builds.nix @@ -54,7 +54,7 @@ in images = mkOption { type = types.attrsOf (types.attrsOf (types.attrsOf types.package)); default = { }; - example = lib.literalExample ''(let + example = lib.literalExpression ''(let # Pinning unstable to allow usage with flakes and limit rebuilds. pkgs_unstable = builtins.fetchGit { url = "https://github.com/NixOS/nixpkgs"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/git.nix b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/git.nix index 99b9aec061..2653d77876 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/git.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/git.nix @@ -49,7 +49,8 @@ in package = mkOption { type = types.package; default = pkgs.git; - example = literalExample "pkgs.gitFull"; + defaultText = literalExpression "pkgs.git"; + example = literalExpression "pkgs.gitFull"; description = '' Git package for git.sr.ht. This can help silence collisions. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix b/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix index c29d03d199..4ae596ade1 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix @@ -23,7 +23,7 @@ in { type = types.path; description = "The SSM agent package to use"; default = pkgs.ssm-agent.override { overrideEtc = false; }; - defaultText = "pkgs.ssm-agent.override { overrideEtc = false; }"; + defaultText = literalExpression "pkgs.ssm-agent.override { overrideEtc = false; }"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/subsonic.nix b/third_party/nixpkgs/nixos/modules/services/misc/subsonic.nix index e17a98a5e1..340683ae6f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/subsonic.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/subsonic.nix @@ -93,6 +93,7 @@ let cfg = config.services.subsonic; in { transcoders = mkOption { type = types.listOf types.path; default = [ "${pkgs.ffmpeg.bin}/bin/ffmpeg" ]; + defaultText = literalExpression ''[ "''${pkgs.ffmpeg.bin}/bin/ffmpeg" ]''; description = '' List of paths to transcoder executables that should be accessible from Subsonic. Symlinks will be created to each executable inside diff --git a/third_party/nixpkgs/nixos/modules/services/misc/tautulli.nix b/third_party/nixpkgs/nixos/modules/services/misc/tautulli.nix index aded33629f..9a972b2912 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/tautulli.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/tautulli.nix @@ -47,7 +47,7 @@ in package = mkOption { type = types.package; default = pkgs.tautulli; - defaultText = "pkgs.tautulli"; + defaultText = literalExpression "pkgs.tautulli"; description = '' The Tautulli package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/tp-auto-kbbl.nix b/third_party/nixpkgs/nixos/modules/services/misc/tp-auto-kbbl.nix index 3ddece88e5..59018f7f81 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/tp-auto-kbbl.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/tp-auto-kbbl.nix @@ -14,7 +14,7 @@ in { package = mkOption { type = types.package; default = pkgs.tp-auto-kbbl; - defaultText = literalExample "pkgs.tp-auto-kbbl"; + defaultText = literalExpression "pkgs.tp-auto-kbbl"; description = "Package providing tp-auto-kbbl."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/uhub.nix b/third_party/nixpkgs/nixos/modules/services/misc/uhub.nix index da2613e6db..0d0a8c2a4c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/uhub.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/uhub.nix @@ -50,7 +50,7 @@ in { options = { plugin = mkOption { type = path; - example = literalExample + example = literalExpression "$${pkgs.uhub}/plugins/mod_auth_sqlite.so"; description = "Path to plugin file."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix b/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix index 9ac2b0ea49..7a4c4dca2a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix @@ -21,11 +21,10 @@ in }; binary = mkOption { type = types.path; - description = "Binary to execute (by default \${weechat}/bin/weechat)."; - example = literalExample '' - ''${pkgs.weechat}/bin/weechat-headless - ''; + description = "Binary to execute."; default = "${pkgs.weechat}/bin/weechat"; + defaultText = literalExpression ''"''${pkgs.weechat}/bin/weechat"''; + example = literalExpression ''"''${pkgs.weechat}/bin/weechat-headless"''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix b/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix index a87878c31e..9256e9ae01 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix @@ -29,7 +29,7 @@ in configFiles = mkOption { type = types.attrsOf types.str; default = {}; - example = literalExample '' + example = literalExpression '' { "config.txt" = ''' "verbose_level" : 4, diff --git a/third_party/nixpkgs/nixos/modules/services/misc/zigbee2mqtt.nix b/third_party/nixpkgs/nixos/modules/services/misc/zigbee2mqtt.nix index 4458da1346..b378d9f362 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/zigbee2mqtt.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/zigbee2mqtt.nix @@ -25,7 +25,7 @@ in default = pkgs.zigbee2mqtt.override { dataDir = cfg.dataDir; }; - defaultText = literalExample '' + defaultText = literalExpression '' pkgs.zigbee2mqtt { dataDir = services.zigbee2mqtt.dataDir } @@ -42,7 +42,7 @@ in settings = mkOption { type = format.type; default = {}; - example = literalExample '' + example = literalExpression '' { homeassistant = config.services.home-assistant.enable; permit_join = true; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix b/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix index 0e5880983e..3809a93a61 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix @@ -110,7 +110,7 @@ in { package = mkOption { description = "The zookeeper package to use"; default = pkgs.zookeeper; - defaultText = "pkgs.zookeeper"; + defaultText = literalExpression "pkgs.zookeeper"; type = types.package; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix index 7c6eff713c..a73d94001f 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix @@ -32,7 +32,6 @@ in bind = mkOption { type = types.str; default = "0.0.0.0"; - example = literalExample "0.0.0.0"; description = "Address to bind to. The default is to bind to all addresses"; }; @@ -46,20 +45,17 @@ in type = types.str; description = "URL of the MongoDB or PostgreSQL database to connect to"; default = "mongodb://localhost"; - example = "mongodb://localhost"; }; databaseName = mkOption { type = types.str; description = "Name of the database instance to connect to"; default = "monitoring"; - example = "monitoring"; }; corsOrigins = mkOption { type = types.listOf types.str; description = "List of URLs that can access the API for Cross-Origin Resource Sharing (CORS)"; - example = [ "http://localhost" "http://localhost:5000" ]; default = [ "http://localhost" "http://localhost:5000" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix index b41a3c7b50..94eead220a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix @@ -18,8 +18,7 @@ in { package = mkOption { type = types.package; default = pkgs.haskellPackages.arbtt; - defaultText = "pkgs.haskellPackages.arbtt"; - example = literalExample "pkgs.haskellPackages.arbtt"; + defaultText = literalExpression "pkgs.haskellPackages.arbtt"; description = '' The package to use for the arbtt binaries. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/bosun.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/bosun.nix index 04e9da1c81..4b278b9c20 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/bosun.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/bosun.nix @@ -33,8 +33,7 @@ in { package = mkOption { type = types.package; default = pkgs.bosun; - defaultText = "pkgs.bosun"; - example = literalExample "pkgs.bosun"; + defaultText = literalExpression "pkgs.bosun"; description = '' bosun binary to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/collectd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/collectd.nix index ef3663c62e..ad0cf4735a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/collectd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/collectd.nix @@ -45,7 +45,7 @@ in { package = mkOption { default = pkgs.collectd; - defaultText = "pkgs.collectd"; + defaultText = literalExpression "pkgs.collectd"; description = '' Which collectd package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix index ea9eca1809..6d9d1ef973 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix @@ -59,7 +59,7 @@ in { package = mkOption { default = pkgs.datadog-agent; - defaultText = "pkgs.datadog-agent"; + defaultText = literalExpression "pkgs.datadog-agent"; description = '' Which DataDog v7 agent package to use. Note that the provided package is expected to have an overridable `pythonPackages`-attribute @@ -135,9 +135,11 @@ in { package set must be provided. ''; - example = { - ntp = (pythonPackages: [ pythonPackages.ntplib ]); - }; + example = literalExpression '' + { + ntp = pythonPackages: [ pythonPackages.ntplib ]; + } + ''; }; extraConfig = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-reporter.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-reporter.nix index 893c15d568..e40d78f538 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-reporter.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-reporter.nix @@ -41,8 +41,9 @@ in { templateDir = mkOption { description = "Optional template directory to use custom tex templates"; - default = "${pkgs.grafana_reporter}"; - type = types.str; + default = pkgs.grafana_reporter; + defaultText = literalExpression "pkgs.grafana_reporter"; + type = types.either types.str types.path; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix index d46e38e82a..9b21dc78b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix @@ -330,13 +330,14 @@ in { staticRootPath = mkOption { description = "Root path for static assets."; default = "${cfg.package}/share/grafana/public"; + defaultText = literalExpression ''"''${package}/share/grafana/public"''; type = types.str; }; package = mkOption { description = "Package to use."; default = pkgs.grafana; - defaultText = "pkgs.grafana"; + defaultText = literalExpression "pkgs.grafana"; type = types.package; }; @@ -344,7 +345,7 @@ in { type = with types; nullOr (listOf path); default = null; description = "If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot be manually installed."; - example = literalExample "with pkgs.grafanaPlugins; [ grafana-piechart-panel ]"; + example = literalExpression "with pkgs.grafanaPlugins; [ grafana-piechart-panel ]"; # Make sure each plugin is added only once; otherwise building # the link farm fails, since the same path is added multiple # times. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/graphite.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/graphite.nix index 502afce523..4690a252c9 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/graphite.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/graphite.nix @@ -132,7 +132,7 @@ in { finders = mkOption { description = "List of finder plugins to load."; default = []; - example = literalExample "[ pkgs.python3Packages.influxgraph ]"; + example = literalExpression "[ pkgs.python3Packages.influxgraph ]"; type = types.listOf types.package; }; @@ -160,7 +160,7 @@ in { package = mkOption { description = "Package to use for graphite api."; default = pkgs.python3Packages.graphite_api; - defaultText = "pkgs.python3Packages.graphite_api"; + defaultText = literalExpression "pkgs.python3Packages.graphite_api"; type = types.package; }; @@ -335,7 +335,7 @@ in { ''; type = types.attrsOf types.str; - example = literalExample '' + example = literalExpression '' { GRAPHITE_USERNAME = "user"; GRAPHITE_PASSWORD = "pass"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/heapster.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/heapster.nix index 1bf7203d68..44f53e1890 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/heapster.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/heapster.nix @@ -33,7 +33,7 @@ in { package = mkOption { description = "Package to use by heapster"; default = pkgs.heapster; - defaultText = "pkgs.heapster"; + defaultText = literalExpression "pkgs.heapster"; type = types.package; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/incron.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/incron.nix index 255e1d9e30..2681c35d6a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/incron.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/incron.nix @@ -56,7 +56,7 @@ in extraPackages = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.rsync ]"; + example = literalExpression "[ pkgs.rsync ]"; description = "Extra packages available to the system incrontab."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/kapacitor.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/kapacitor.nix index 9b4ff3c561..a79c647bec 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/kapacitor.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/kapacitor.nix @@ -61,7 +61,6 @@ in dataDir = mkOption { type = types.path; - example = "/var/lib/kapacitor"; default = "/var/lib/kapacitor"; description = "Location where Kapacitor stores its state"; }; @@ -75,7 +74,7 @@ in bind = mkOption { type = types.str; default = ""; - example = literalExample "0.0.0.0"; + example = "0.0.0.0"; description = "Address to bind to. The default is to bind to all addresses"; }; @@ -101,7 +100,6 @@ in type = types.str; description = "Specifies how often to snapshot the task state (in InfluxDB time units)"; default = "1m0s"; - example = "1m0s"; }; loadDirectory = mkOption { @@ -136,7 +134,6 @@ in url = mkOption { description = "The URL to the Alerta REST API"; default = "http://localhost:5000"; - example = "http://localhost:5000"; type = types.str; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix index 51cabaa274..ebac70c30c 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - inherit (lib) escapeShellArgs literalExample mkEnableOption mkIf mkOption types; + inherit (lib) escapeShellArgs mkEnableOption mkIf mkOption types; cfg = config.services.loki; @@ -57,7 +57,7 @@ in { extraFlags = mkOption { type = types.listOf types.str; default = []; - example = literalExample [ "--server.http-listen-port=3101" ]; + example = [ "--server.http-listen-port=3101" ]; description = '' Specify a list of additional command line flags, which get escaped and are then passed to Loki. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix index 7046de9d40..aeb6247abd 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix @@ -19,7 +19,6 @@ in { apiKeyFile = mkOption { type = types.path; - default = ""; example = "/run/keys/mackerel-api-key"; description = '' Path to file containing the Mackerel API key. The file should contain a diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/metricbeat.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/metricbeat.nix index b285559eaa..e75039daa1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/metricbeat.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/metricbeat.nix @@ -3,7 +3,7 @@ let inherit (lib) attrValues - literalExample + literalExpression mkEnableOption mkIf mkOption @@ -24,8 +24,8 @@ in package = mkOption { type = types.package; default = pkgs.metricbeat; - defaultText = literalExample "pkgs.metricbeat"; - example = literalExample "pkgs.metricbeat7"; + defaultText = literalExpression "pkgs.metricbeat"; + example = literalExpression "pkgs.metricbeat7"; description = '' The metricbeat package to use ''; @@ -51,7 +51,6 @@ in module = mkOption { type = types.str; default = name; - defaultText = literalExample ''''; description = '' The name of the module. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix index 1ebf7ee6a7..4fddb1e37e 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix @@ -189,7 +189,7 @@ in /bin, /usr/bin, /sbin, and /usr/sbin. ''; - example = literalExample '' + example = literalExpression '' { zfs_usage_bigpool = /src/munin-contrib/plugins/zfs/zfs_usage_; zfs_usage_smallpool = /src/munin-contrib/plugins/zfs/zfs_usage_; @@ -220,7 +220,7 @@ in /bin, /usr/bin, /sbin, and /usr/sbin. ''; - example = literalExample '' + example = literalExpression '' [ /src/munin-contrib/plugins/zfs /src/munin-contrib/plugins/ssh @@ -285,9 +285,11 @@ in host for cron to succeed. See ''; - example = '' - [''${config.networking.hostName}] - address localhost + example = literalExpression '' + ''' + [''${config.networking.hostName}] + address localhost + ''' ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix index 280a9a001b..83020d52fc 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix @@ -97,13 +97,13 @@ in network that you want Nagios to monitor. "; type = types.listOf types.path; - example = literalExample "[ ./objects.cfg ]"; + example = literalExpression "[ ./objects.cfg ]"; }; plugins = mkOption { type = types.listOf types.package; default = with pkgs; [ monitoring-plugins ssmtp mailutils ]; - defaultText = "[pkgs.monitoring-plugins pkgs.ssmtp pkgs.mailutils]"; + defaultText = literalExpression "[pkgs.monitoring-plugins pkgs.ssmtp pkgs.mailutils]"; description = " Packages to be added to the Nagios PATH. Typically used to add plugins, but can be anything. @@ -137,7 +137,7 @@ in cgiConfigFile = mkOption { type = types.package; default = nagiosCGICfgFile; - defaultText = "nagiosCGICfgFile"; + defaultText = literalExpression "nagiosCGICfgFile"; description = " Derivation for the configuration file of Nagios CGI scripts that can be used in web servers for running the Nagios web interface. @@ -155,7 +155,7 @@ in virtualHost = mkOption { type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); - example = literalExample '' + example = literalExpression '' { hostName = "example.org"; adminAddr = "webmaster@example.org"; enableSSL = true; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix index 3ea84ca815..00bdd9fcda 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -45,7 +45,7 @@ in { package = mkOption { type = types.package; default = pkgs.netdata; - defaultText = "pkgs.netdata"; + defaultText = literalExpression "pkgs.netdata"; description = "Netdata package to use."; }; @@ -84,8 +84,8 @@ in { extraPackages = mkOption { type = types.functionTo (types.listOf types.package); default = ps: []; - defaultText = "ps: []"; - example = literalExample '' + defaultText = literalExpression "ps: []"; + example = literalExpression '' ps: [ ps.psycopg2 ps.docker @@ -102,7 +102,7 @@ in { extraPluginPaths = mkOption { type = types.listOf types.path; default = [ ]; - example = literalExample '' + example = literalExpression '' [ "/path/to/plugins.d" ] ''; description = '' @@ -121,7 +121,7 @@ in { type = types.attrsOf types.attrs; default = {}; description = "netdata.conf configuration as nix attributes. cannot be combined with configText."; - example = literalExample '' + example = literalExpression '' global = { "debug log" = "syslog"; "access log" = "syslog"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix index e6a72dea02..eeee04b440 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix @@ -39,7 +39,7 @@ in hostname = lib.mkOption { type = lib.types.str; default = config.networking.fqdn; - defaultText = "config.networking.fqdn"; + defaultText = lib.literalExpression "config.networking.fqdn"; example = "monitoring.example.com"; description = '' The hostname to use when configuring Postfix. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix index 1b02ebf370..1f396634ae 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -45,7 +45,7 @@ in { package = mkOption { type = types.package; default = pkgs.prometheus-alertmanager; - defaultText = "pkgs.alertmanager"; + defaultText = literalExpression "pkgs.alertmanager"; description = '' Package that should be used for alertmanager. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index 1161d18ab1..d2b37cf688 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -692,7 +692,7 @@ in { package = mkOption { type = types.package; default = pkgs.prometheus; - defaultText = "pkgs.prometheus"; + defaultText = literalExpression "pkgs.prometheus"; description = '' The prometheus package that should be used. ''; @@ -833,7 +833,7 @@ in { alertmanagers = mkOption { type = types.listOf types.attrs; - example = literalExample '' + example = literalExpression '' [ { scheme = "https"; path_prefix = "/alertmanager"; 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 83de9a3f5e..99dfea6daa 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, options, ... }: let - inherit (lib) concatStrings foldl foldl' genAttrs literalExample maintainers + inherit (lib) concatStrings foldl foldl' genAttrs literalExpression maintainers mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption optional types mkOptionDefault flip attrNames; @@ -109,7 +109,7 @@ let firewallFilter = mkOption { type = types.nullOr types.str; default = null; - example = literalExample '' + example = literalExpression '' "-i eth0 -p tcp -m tcp --dport ${toString port}" ''; description = '' @@ -204,7 +204,7 @@ in }; description = "Prometheus exporter configuration"; default = {}; - example = literalExample '' + example = literalExpression '' { node = { enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix index 7557480ac0..e9be39608f 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix @@ -36,7 +36,7 @@ in queues = mkOption { type = with types; nullOr (listOf str); default = null; - example = literalExample ''[ "my-queue1" "my-queue2" ]''; + example = literalExpression ''[ "my-queue1" "my-queue2" ]''; description = '' Which specific queues to process. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix index 6a35f46308..b85e5461f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix @@ -9,7 +9,7 @@ in { extraOpts = { brokers = mkOption { type = types.listOf types.str; - example = literalExample ''[ "kafka.example.org:19092" ]''; + example = literalExpression ''[ "kafka.example.org:19092" ]''; description = "List of Kafka brokers to connect to."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix index 9677281f87..0571325c5d 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @@ -13,7 +13,7 @@ in { extraOpts = { controlSocketPaths = mkOption { type = types.listOf types.str; - example = literalExample '' + example = literalExpression '' [ "/run/kea/kea-dhcp4.socket" "/run/kea/kea-dhcp6.socket" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix index 46c28fe0a5..2acaac293b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix @@ -10,7 +10,7 @@ in { knotLibraryPath = mkOption { type = types.str; default = "${pkgs.knot-dns.out}/lib/libknot.so"; - defaultText = "\${pkgs.knot-dns}/lib/libknot.so"; + defaultText = literalExpression ''"''${pkgs.knot-dns.out}/lib/libknot.so"''; description = '' Path to the library of knot-dns. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix index 7e196149fb..956bd96aa4 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix @@ -100,7 +100,7 @@ let servers = mkOption { type = types.listOf (types.submodule serverOptions); default = []; - example = literalExample '' + example = literalExpression '' [ { name = "testserver"; server = "smtp.domain.tld"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix index 62c2cc5684..8f9536b702 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix @@ -15,7 +15,7 @@ in Path to a mikrotik exporter configuration file. Mutually exclusive with option. ''; - example = literalExample "./mikrotik.yml"; + example = literalExpression "./mikrotik.yml"; }; configuration = mkOption { @@ -28,7 +28,7 @@ in See for the description of the configuration file format. ''; - example = literalExample '' + example = literalExpression '' { devices = [ { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix index adc2abe0b9..ed594460d9 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -11,7 +11,7 @@ in enabledCollectors = mkOption { type = types.listOf types.str; default = []; - example = ''[ "systemd" ]''; + example = [ "systemd" ]; description = '' Collectors to enable. The collectors listed here are enabled in addition to the default ones. ''; @@ -19,7 +19,7 @@ in disabledCollectors = mkOption { type = types.listOf types.str; default = []; - example = ''[ "timex" ]''; + example = [ "timex" ]; description = '' Collectors to disable which are enabled by default. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix index 21c2e5eab4..4bc27ebc32 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix @@ -42,8 +42,8 @@ in }; piholePort = mkOption { type = types.port; - default = "80"; - example = "443"; + default = 80; + example = 443; description = '' The port pihole webinterface is reachable on ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix index e3b3d18367..1e9c402fb5 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix @@ -11,14 +11,12 @@ in extraOpts = { settings.process_names = mkOption { type = types.listOf types.anything; - default = {}; - example = literalExample '' - { - process_names = [ - # Remove nix store path from process name - { name = "{{.Matches.Wrapped}} {{ .Matches.Args }}"; cmdline = [ "^/nix/store[^ ]*/(?P[^ /]*) (?P.*)" ]; } - ]; - } + default = []; + example = literalExpression '' + [ + # Remove nix store path from process name + { name = "{{.Matches.Wrapped}} {{ .Matches.Args }}"; cmdline = [ "^/nix/store[^ ]*/(?P[^ /]*) (?P.*)" ]; } + ] ''; description = '' All settings expressed as an Nix attrset. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix index 994670a376..ed985751e4 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix @@ -62,8 +62,8 @@ in default = { host = config.networking.hostName; }; - defaultText = "{ host = config.networking.hostName; }"; - example = literalExample '' + defaultText = literalExpression "{ host = config.networking.hostName; }"; + example = literalExpression '' { host = config.networking.hostName; custom_label = "some_value"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix index 104ab859f2..a805a0ad33 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix @@ -30,7 +30,7 @@ in }; }; }); - example = literalExample '' + example = literalExpression '' { scripts = [ { name = "sleep"; script = "sleep 5"; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index 01276366e9..de42663e67 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -14,7 +14,7 @@ in description = '' Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option. ''; - example = "./snmp.yml"; + example = literalExpression "./snmp.yml"; }; configuration = mkOption { @@ -23,16 +23,14 @@ in description = '' Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option. ''; - example = '' - { - "default" = { - "version" = 2; - "auth" = { - "community" = "public"; - }; + example = { + "default" = { + "version" = 2; + "auth" = { + "community" = "public"; }; }; - ''; + }; }; logFormat = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix index f8fcc3eb97..01b9937624 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix @@ -26,7 +26,7 @@ in { package = mkOption { type = types.package; default = pkgs.prometheus-pushgateway; - defaultText = "pkgs.prometheus-pushgateway"; + defaultText = literalExpression "pkgs.prometheus-pushgateway"; description = '' Package that should be used for the prometheus pushgateway. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix index ef535585e9..6a6fe110f9 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix @@ -43,8 +43,7 @@ in { package = mkOption { type = types.package; default = pkgs.scollector; - defaultText = "pkgs.scollector"; - example = literalExample "pkgs.scollector"; + defaultText = literalExpression "pkgs.scollector"; description = '' scollector binary to use. ''; @@ -78,7 +77,7 @@ in { collectors = mkOption { type = with types; attrsOf (listOf path); default = {}; - example = literalExample "{ \"0\" = [ \"\${postgresStats}/bin/collect-stats\" ]; }"; + example = literalExpression ''{ "0" = [ "''${postgresStats}/bin/collect-stats" ]; }''; description = '' An attribute set mapping the frequency of collection to a list of binaries that should be executed at that frequency. You can use "0" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix index 4046260c16..13aae58d0f 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix @@ -15,7 +15,7 @@ in { package = mkOption { default = pkgs.telegraf; - defaultText = "pkgs.telegraf"; + defaultText = literalExpression "pkgs.telegraf"; description = "Which telegraf derivation to use"; type = types.package; }; @@ -23,7 +23,7 @@ in { environmentFiles = mkOption { type = types.listOf types.path; default = []; - example = "/run/keys/telegraf.env"; + example = [ "/run/keys/telegraf.env" ]; description = '' File to load as environment file. Environment variables from this file will be interpolated into the config file using envsubst with this diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix index 96addf392b..da626788d8 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix @@ -120,7 +120,7 @@ let type = with types; nullOr str; default = if cfg.tracing.config == null then null else toString (toYAML "tracing.yaml" cfg.tracing.config); - defaultText = '' + defaultText = literalExpression '' if config.services.thanos..tracing.config == null then null else toString (toYAML "tracing.yaml" config.services.thanos..tracing.config); ''; @@ -185,7 +185,7 @@ let type = with types; nullOr str; default = if cfg.objstore.config == null then null else toString (toYAML "objstore.yaml" cfg.objstore.config); - defaultText = '' + defaultText = literalExpression '' if config.services.thanos..objstore.config == null then null else toString (toYAML "objstore.yaml" config.services.thanos..objstore.config); ''; @@ -227,7 +227,7 @@ let option = mkOption { type = types.str; default = "/var/lib/${config.services.prometheus.stateDir}/data"; - defaultText = "/var/lib/\${config.services.prometheus.stateDir}/data"; + defaultText = literalExpression ''"/var/lib/''${config.services.prometheus.stateDir}/data"''; description = '' Data directory of TSDB. ''; @@ -656,7 +656,7 @@ in { package = mkOption { type = types.package; default = pkgs.thanos; - defaultText = "pkgs.thanos"; + defaultText = literalExpression "pkgs.thanos"; description = '' The thanos package that should be used. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix index 208f5e4875..81a7b408bc 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix @@ -87,7 +87,7 @@ in { pass = mkOption { type = types.path; default = pkgs.writeText "unifi-poller-influxdb-default.password" "unifipoller"; - defaultText = "unifi-poller-influxdb-default.password"; + defaultText = literalExpression "unifi-poller-influxdb-default.password"; description = '' Path of a file containing the password for influxdb. This file needs to be readable by the unifi-poller user. @@ -130,7 +130,7 @@ in { pass = mkOption { type = types.path; default = pkgs.writeText "unifi-poller-unifi-default.password" "unifi"; - defaultText = "unifi-poller-unifi-default.password"; + defaultText = literalExpression "unifi-poller-unifi-default.password"; description = '' Path of a file containing the password for the unifi service user. This file needs to be readable by the unifi-poller user. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix index 7eb6449e38..c48b973f1e 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix @@ -4,7 +4,7 @@ let cfg = config.services.zabbixAgent; inherit (lib) mkDefault mkEnableOption mkIf mkMerge mkOption; - inherit (lib) attrValues concatMapStringsSep literalExample optionalString types; + inherit (lib) attrValues concatMapStringsSep literalExpression optionalString types; inherit (lib.generators) toKeyValue; user = "zabbix-agent"; @@ -34,15 +34,15 @@ in package = mkOption { type = types.package; default = pkgs.zabbix.agent; - defaultText = "pkgs.zabbix.agent"; + defaultText = literalExpression "pkgs.zabbix.agent"; description = "The Zabbix package to use."; }; extraPackages = mkOption { type = types.listOf types.package; default = with pkgs; [ nettools ]; - defaultText = "[ nettools ]"; - example = "[ nettools mysql ]"; + defaultText = literalExpression "with pkgs; [ nettools ]"; + example = literalExpression "with pkgs; [ nettools mysql ]"; description = '' Packages to be added to the Zabbix PATH. Typically used to add executables for scripts, but can be anything. @@ -53,7 +53,7 @@ in type = types.attrsOf types.package; description = "A set of modules to load."; default = {}; - example = literalExample '' + example = literalExpression '' { "dummy.so" = pkgs.stdenv.mkDerivation { name = "zabbix-dummy-module-''${cfg.package.version}"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix index 8c7a2970e9..b5009f47f1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -6,7 +6,7 @@ let mysql = config.services.mysql; inherit (lib) mkAfter mkDefault mkEnableOption mkIf mkMerge mkOption; - inherit (lib) attrValues concatMapStringsSep getName literalExample optional optionalAttrs optionalString types; + inherit (lib) attrValues concatMapStringsSep getName literalExpression optional optionalAttrs optionalString types; inherit (lib.generators) toKeyValue; user = "zabbix"; @@ -52,14 +52,14 @@ in if cfg.database.type == "mysql" then pkgs.zabbix.proxy-mysql else if cfg.database.type == "pgsql" then pkgs.zabbix.proxy-pgsql else pkgs.zabbix.proxy-sqlite; - defaultText = "pkgs.zabbix.proxy-pgsql"; + defaultText = literalExpression "pkgs.zabbix.proxy-pgsql"; description = "The Zabbix package to use."; }; extraPackages = mkOption { type = types.listOf types.package; default = with pkgs; [ nettools nmap traceroute ]; - defaultText = "[ nettools nmap traceroute ]"; + defaultText = literalExpression "[ nettools nmap traceroute ]"; description = '' Packages to be added to the Zabbix PATH. Typically used to add executables for scripts, but can be anything. @@ -70,7 +70,7 @@ in type = types.attrsOf types.package; description = "A set of modules to load."; default = {}; - example = literalExample '' + example = literalExpression '' { "dummy.so" = pkgs.stdenv.mkDerivation { name = "zabbix-dummy-module-''${cfg.package.version}"; @@ -109,7 +109,7 @@ in name = mkOption { type = types.str; default = if cfg.database.type == "sqlite" then "${stateDir}/zabbix.db" else "zabbix"; - defaultText = "zabbix"; + defaultText = literalExpression "zabbix"; description = "Database name."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix index c8658634ec..9b0fd9dbff 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix @@ -6,7 +6,7 @@ let mysql = config.services.mysql; inherit (lib) mkAfter mkDefault mkEnableOption mkIf mkMerge mkOption; - inherit (lib) attrValues concatMapStringsSep getName literalExample optional optionalAttrs optionalString types; + inherit (lib) attrValues concatMapStringsSep getName literalExpression optional optionalAttrs optionalString types; inherit (lib.generators) toKeyValue; user = "zabbix"; @@ -44,14 +44,14 @@ in package = mkOption { type = types.package; default = if cfg.database.type == "mysql" then pkgs.zabbix.server-mysql else pkgs.zabbix.server-pgsql; - defaultText = "pkgs.zabbix.server-pgsql"; + defaultText = literalExpression "pkgs.zabbix.server-pgsql"; description = "The Zabbix package to use."; }; extraPackages = mkOption { type = types.listOf types.package; default = with pkgs; [ nettools nmap traceroute ]; - defaultText = "[ nettools nmap traceroute ]"; + defaultText = literalExpression "[ nettools nmap traceroute ]"; description = '' Packages to be added to the Zabbix PATH. Typically used to add executables for scripts, but can be anything. @@ -62,7 +62,7 @@ in type = types.attrsOf types.package; description = "A set of modules to load."; default = {}; - example = literalExample '' + example = literalExpression '' { "dummy.so" = pkgs.stdenv.mkDerivation { name = "zabbix-dummy-module-''${cfg.package.version}"; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix index d833062c47..e313589134 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix @@ -97,6 +97,7 @@ in mgrModulePath = mkOption { type = types.path; default = "${pkgs.ceph.lib}/lib/ceph/mgr"; + defaultText = literalExpression ''"''${pkgs.ceph.lib}/lib/ceph/mgr"''; description = '' Path at which to find ceph-mgr modules. ''; @@ -181,6 +182,7 @@ in rgwMimeTypesFile = mkOption { type = with types; nullOr path; default = "${pkgs.mime-types}/etc/mime.types"; + defaultText = literalExpression ''"''${pkgs.mime-types}/etc/mime.types"''; description = '' Path to mime types used by radosgw. ''; @@ -190,11 +192,9 @@ in extraConfig = mkOption { type = with types; attrsOf str; default = {}; - example = '' - { - "ms bind ipv6" = "true"; - }; - ''; + example = { + "ms bind ipv6" = "true"; + }; description = '' Extra configuration to add to the global section. Use for setting values that are common for all daemons in the cluster. ''; @@ -205,9 +205,7 @@ in daemons = mkOption { type = with types; listOf str; default = []; - example = '' - [ "name1" "name2" ]; - ''; + example = [ "name1" "name2" ]; description = '' A list of names for manager daemons that should have a service created. The names correspond to the id part in ceph i.e. [ "name1" ] would result in mgr.name1 @@ -227,9 +225,7 @@ in daemons = mkOption { type = with types; listOf str; default = []; - example = '' - [ "name1" "name2" ]; - ''; + example = [ "name1" "name2" ]; description = '' A list of monitor daemons that should have a service created. The names correspond to the id part in ceph i.e. [ "name1" ] would result in mon.name1 @@ -249,9 +245,7 @@ in daemons = mkOption { type = with types; listOf str; default = []; - example = '' - [ "name1" "name2" ]; - ''; + example = [ "name1" "name2" ]; description = '' A list of OSD daemons that should have a service created. The names correspond to the id part in ceph i.e. [ "name1" ] would result in osd.name1 @@ -279,9 +273,7 @@ in daemons = mkOption { type = with types; listOf str; default = []; - example = '' - [ "name1" "name2" ]; - ''; + example = [ "name1" "name2" ]; description = '' A list of metadata service daemons that should have a service created. The names correspond to the id part in ceph i.e. [ "name1" ] would result in mds.name1 @@ -301,9 +293,7 @@ in daemons = mkOption { type = with types; listOf str; default = []; - example = '' - [ "name1" "name2" ]; - ''; + example = [ "name1" "name2" ]; description = '' A list of rados gateway daemons that should have a service created. The names correspond to the id part in ceph i.e. [ "name1" ] would result in client.name1, radosgw daemons @@ -318,7 +308,7 @@ in extraConfig = mkOption { type = with types; attrsOf (attrsOf str); default = {}; - example = '' + example = literalExpression '' { # This would create a section for a radosgw daemon named node0 and related # configuration for it diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/glusterfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/glusterfs.nix index d70092999f..bc8be05ca8 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/glusterfs.nix @@ -113,19 +113,16 @@ in type = types.nullOr (types.submodule { options = { tlsKeyPath = mkOption { - default = null; type = types.str; description = "Path to the private key used for TLS."; }; tlsPem = mkOption { - default = null; type = types.path; description = "Path to the certificate used for TLS."; }; caCert = mkOption { - default = null; type = types.path; description = "Path certificate authority used to sign the cluster certificates."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix index faa515835b..36b72ca48b 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix @@ -57,7 +57,7 @@ in package = mkOption { type = types.package; default = pkgs.ipfs; - defaultText = "pkgs.ipfs"; + defaultText = literalExpression "pkgs.ipfs"; description = "Which IPFS package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix index f1806c5af0..51eb920d77 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix @@ -13,7 +13,7 @@ in package = mkOption { description = "Package to use."; default = pkgs.litestream; - defaultText = "pkgs.litestream"; + defaultText = literalExpression "pkgs.litestream"; type = types.package; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/client.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/client.nix index 03884cb729..c8cc5052c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/client.nix @@ -4,7 +4,7 @@ with import ./lib.nix { inherit config lib pkgs; }; let - inherit (lib) getBin mkOption mkIf optionalString singleton types; + inherit (lib) getBin literalExpression mkOption mkIf optionalString singleton types; cfg = config.services.openafsClient; @@ -57,11 +57,10 @@ in CellServDB. See CellServDB(5) man page for syntax. Ignored when afsdb is set to true. ''; - example = '' - [ { ip = "1.2.3.4"; dnsname = "first.afsdb.server.dns.fqdn.org"; } - { ip = "2.3.4.5"; dnsname = "second.afsdb.server.dns.fqdn.org"; } - ] - ''; + example = [ + { ip = "1.2.3.4"; dnsname = "first.afsdb.server.dns.fqdn.org"; } + { ip = "2.3.4.5"; dnsname = "second.afsdb.server.dns.fqdn.org"; } + ]; }; cache = { @@ -149,13 +148,13 @@ in packages = { module = mkOption { default = config.boot.kernelPackages.openafs; - defaultText = "config.boot.kernelPackages.openafs"; + defaultText = literalExpression "config.boot.kernelPackages.openafs"; type = types.package; description = "OpenAFS kernel module package. MUST match the userland package!"; }; programs = mkOption { default = getBin pkgs.openafs; - defaultText = "getBin pkgs.openafs"; + defaultText = literalExpression "getBin pkgs.openafs"; type = types.package; description = "OpenAFS programs package. MUST match the kernel module package!"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix index 4fce650b01..c1bf83be77 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix @@ -4,7 +4,7 @@ with import ./lib.nix { inherit config lib pkgs; }; let - inherit (lib) concatStringsSep mkIf mkOption optionalString types; + inherit (lib) concatStringsSep literalExpression mkIf mkOption optionalString types; bosConfig = pkgs.writeText "BosConfig" ('' restrictmode 1 @@ -81,7 +81,7 @@ in { package = mkOption { default = pkgs.openafs.server or pkgs.openafs; - defaultText = "pkgs.openafs.server or pkgs.openafs"; + defaultText = literalExpression "pkgs.openafs.server or pkgs.openafs"; type = types.package; description = "OpenAFS package for the server binaries"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/client.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/client.nix index b69d9e713c..36ea5af216 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/client.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/client.nix @@ -47,7 +47,6 @@ in { target = mkOption { type = types.str; - default = null; example = "tcp://server:3334/orangefs"; description = "Target URL"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix index 8c55ccf5ff..621c2fe8f7 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix @@ -118,12 +118,10 @@ in { servers = mkOption { type = with types; attrsOf types.str; default = {}; - example = '' - { - node1="tcp://node1:3334"; - node2="tcp://node2:3334"; - } - ''; + example = { + node1 = "tcp://node1:3334"; + node2 = "tcp://node2:3334"; + }; description = "URLs for storage server including port. The attribute names define the server alias."; }; @@ -132,8 +130,7 @@ in { These options will create the <FileSystem> sections of config file. ''; default = { orangefs = {}; }; - defaultText = literalExample "{ orangefs = {}; }"; - example = literalExample '' + example = literalExpression '' { fs1 = { id = 101; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix index 78ea245cb3..3fedaeb495 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix @@ -117,8 +117,8 @@ in package = mkOption { type = types.package; default = pkgs.samba; - defaultText = "pkgs.samba"; - example = literalExample "pkgs.samba4Full"; + defaultText = literalExpression "pkgs.samba"; + example = literalExpression "pkgs.samba4Full"; description = '' Defines which package should be used for the samba server. ''; @@ -176,7 +176,7 @@ in See man smb.conf for options. ''; type = types.attrsOf (types.attrsOf types.unspecified); - example = literalExample '' + example = literalExpression '' { public = { path = "/srv/public"; "read only" = true; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/tahoe.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/tahoe.nix index 7d75eb2861..5426463dff 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/tahoe.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/tahoe.nix @@ -34,9 +34,8 @@ in }; package = mkOption { default = pkgs.tahoelafs; - defaultText = "pkgs.tahoelafs"; + defaultText = literalExpression "pkgs.tahoelafs"; type = types.package; - example = literalExample "pkgs.tahoelafs"; description = '' The package to use for the Tahoe LAFS daemon. ''; @@ -179,9 +178,8 @@ in }; package = mkOption { default = pkgs.tahoelafs; - defaultText = "pkgs.tahoelafs"; + defaultText = literalExpression "pkgs.tahoelafs"; type = types.package; - example = literalExample "pkgs.tahoelafs"; description = '' The package to use for the Tahoe LAFS daemon. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix index 6cc8a05ee0..fc07231157 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -142,7 +142,7 @@ in ''; }; syncMode = mkOption { - type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "ASYNC" ]; + type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "FSYNC" ]; default = "FSYNC"; example = "FDATASYNC"; description = '' @@ -268,7 +268,7 @@ in }; syncMode = mkOption { default = "FSYNC"; - type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "ASYNC" ]; + type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "FSYNC" ]; example = "FDATASYNC"; description = '' The sync mode influences how operations are committed to the disk diff --git a/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix index 37a48657c1..326a8671fc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix @@ -205,7 +205,7 @@ in { }; }); default = [ ]; - example = literalExample '' + example = literalExpression '' [ { rule = "allow"; @@ -244,7 +244,7 @@ in { }; }); default = [ ]; - example = literalExample '' + example = literalExpression '' [ { type = "proxy"; @@ -290,17 +290,6 @@ in { "::1" "fc00::/7" ]; - example = [ - "0.0.0.0/8" - "127.0.0.0/8" - "10.0.0.0/8" - "100.64.0.0/10" - "172.16.0.0/12" - "192.168.0.0/16" - "::" - "::1" - "fc00::/7" - ]; description = '' What IP ranges to deny access when denyPrivate is set tu true. ''; @@ -322,19 +311,17 @@ in { nscache = mkOption { type = types.int; default = 65535; - example = 65535; description = "Set name cache size for IPv4."; }; nscache6 = mkOption { type = types.int; default = 65535; - example = 65535; description = "Set name cache size for IPv6."; }; nsrecord = mkOption { type = types.attrsOf types.str; default = { }; - example = literalExample '' + example = literalExpression '' { "files.local" = "192.168.1.12"; "site.local" = "192.168.1.43"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix b/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix index 03a2544b9a..af091d55c0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix @@ -115,7 +115,7 @@ in confFiles = mkOption { default = {}; type = types.attrsOf types.str; - example = literalExample + example = literalExpression '' { "extensions.conf" = ''' @@ -200,7 +200,7 @@ in package = mkOption { type = types.package; default = pkgs.asterisk; - defaultText = "pkgs.asterisk"; + defaultText = literalExpression "pkgs.asterisk"; description = "The Asterisk package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/atftpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/atftpd.nix index e7fd48c99a..da5e305201 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/atftpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/atftpd.nix @@ -28,7 +28,7 @@ in extraOptions = mkOption { default = []; type = types.listOf types.str; - example = literalExample '' + example = literalExpression '' [ "--bind-address 192.168.9.1" "--verbose=7" ] diff --git a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix index 020a817f25..50c4ffdedc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix @@ -54,7 +54,7 @@ in hostName = mkOption { type = types.str; default = config.networking.hostName; - defaultText = literalExample "config.networking.hostName"; + defaultText = literalExpression "config.networking.hostName"; description = '' Host name advertised on the LAN. If not set, avahi will use the value of . @@ -87,7 +87,7 @@ in ipv6 = mkOption { type = types.bool; default = config.networking.enableIPv6; - defaultText = "config.networking.enableIPv6"; + defaultText = literalExpression "config.networking.enableIPv6"; description = "Whether to use IPv6."; }; @@ -134,7 +134,7 @@ in extraServiceFiles = mkOption { type = with types; attrsOf (either str path); default = {}; - example = literalExample '' + example = literalExpression '' { ssh = "''${pkgs.avahi}/etc/avahi/services/ssh.service"; smb = ''' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bee.nix b/third_party/nixpkgs/nixos/modules/services/networking/bee.nix index 8a77ce23ab..d6efade063 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bee.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bee.nix @@ -20,8 +20,8 @@ in { package = mkOption { type = types.package; default = pkgs.bee; - defaultText = "pkgs.bee"; - example = "pkgs.bee-unstable"; + defaultText = literalExpression "pkgs.bee"; + example = literalExpression "pkgs.bee-unstable"; description = "The package providing the bee binary for the service."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix b/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix index 66ddca93d8..3f46b95eaf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix @@ -107,6 +107,7 @@ in options.policy_directory = mkOption { type = types.path; default = "${pkgs.biboumi}/etc/biboumi"; + defaultText = literalExpression ''"''${pkgs.biboumi}/etc/biboumi"''; description = '' A directory that should contain the policy files, used to customize Botan’s behaviour diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bind.nix b/third_party/nixpkgs/nixos/modules/services/networking/bind.nix index 0c23fb7e40..f2b2e4c4d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bind.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bind.nix @@ -110,7 +110,7 @@ in package = mkOption { type = types.package; default = pkgs.bind; - defaultText = "pkgs.bind"; + defaultText = literalExpression "pkgs.bind"; description = "The BIND package to use."; }; @@ -209,7 +209,7 @@ in configFile = mkOption { type = types.path; default = confFile; - defaultText = "confFile"; + defaultText = literalExpression "confFile"; description = " Overridable config file to use for named. By default, that generated by nixos. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix b/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix index bc9aa53f49..80033d9586 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix @@ -40,7 +40,7 @@ let package = mkOption { type = types.package; default = pkgs.bitcoind; - defaultText = "pkgs.bitcoind"; + defaultText = literalExpression "pkgs.bitcoind"; description = "The package providing bitcoin binaries."; }; @@ -88,7 +88,7 @@ let }; users = mkOption { default = {}; - example = literalExample '' + example = literalExpression '' { alice.passwordHMAC = "f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae"; bob.passwordHMAC = "b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bitlbee.nix b/third_party/nixpkgs/nixos/modules/services/networking/bitlbee.nix index 59ad9e5468..8bf04e3a1a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bitlbee.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bitlbee.nix @@ -16,7 +16,6 @@ let '' [settings] RunMode = Daemon - User = bitlbee ConfigDir = ${cfg.configDir} DaemonInterface = ${cfg.interface} DaemonPort = ${toString cfg.portNumber} @@ -109,7 +108,7 @@ in plugins = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.bitlbee-facebook ]"; + example = literalExpression "[ pkgs.bitlbee-facebook ]"; description = '' The list of bitlbee plugins to install. ''; @@ -118,7 +117,7 @@ in libpurple_plugins = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.purple-matrix ]"; + example = literalExpression "[ pkgs.purple-matrix ]"; description = '' The list of libpurple plugins to install. ''; @@ -166,24 +165,17 @@ in config = mkMerge [ (mkIf config.services.bitlbee.enable { - users.users.bitlbee = { - uid = bitlbeeUid; - description = "BitlBee user"; - home = "/var/lib/bitlbee"; - createHome = true; - }; - - users.groups.bitlbee = { - gid = config.ids.gids.bitlbee; - }; - systemd.services.bitlbee = { environment.PURPLE_PLUGIN_PATH = purple_plugin_path; description = "BitlBee IRC to other chat networks gateway"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.User = "bitlbee"; - serviceConfig.ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}"; + + serviceConfig = { + DynamicUser = true; + StateDirectory = "bitlbee"; + ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}"; + }; }; environment.systemPackages = [ bitlbeePkg ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix b/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix index ca323e495e..eeea521c8d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix @@ -15,6 +15,7 @@ let package = mkOption { type = types.package; default = pkgs.blockbook; + defaultText = literalExpression "pkgs.blockbook"; description = "Which blockbook package to use."; }; @@ -50,7 +51,6 @@ let coinName = mkOption { type = types.str; default = "Bitcoin"; - example = "Bitcoin"; description = '' See for current of coins supported in master (Note: may differ from release). @@ -60,7 +60,8 @@ let cssDir = mkOption { type = types.path; default = "${config.package}/share/css/"; - example = "${config.dataDir}/static/css/"; + defaultText = literalExpression ''"''${package}/share/css/"''; + example = literalExpression ''"''${dataDir}/static/css/"''; description = '' Location of the dir with main.css CSS file. By default, the one shipped with the package is used. @@ -82,21 +83,18 @@ let internal = mkOption { type = types.nullOr types.str; default = ":9030"; - example = ":9030"; description = "Internal http server binding [address]:port."; }; messageQueueBinding = mkOption { type = types.str; default = "tcp://127.0.0.1:38330"; - example = "tcp://127.0.0.1:38330"; description = "Message Queue Binding address:port."; }; public = mkOption { type = types.nullOr types.str; default = ":9130"; - example = ":9130"; description = "Public http server binding [address]:port."; }; @@ -116,14 +114,12 @@ let user = mkOption { type = types.str; default = "rpc"; - example = "rpc"; description = "Username for JSON-RPC connections."; }; password = mkOption { type = types.str; default = "rpc"; - example = "rpc"; description = '' RPC password for JSON-RPC connections. Warning: this is stored in cleartext in the Nix store!!! @@ -150,14 +146,15 @@ let templateDir = mkOption { type = types.path; default = "${config.package}/share/templates/"; - example = "${config.dataDir}/templates/static/"; + defaultText = literalExpression ''"''${package}/share/templates/"''; + example = literalExpression ''"''${dataDir}/templates/static/"''; description = "Location of the HTML templates. By default, ones shipped with the package are used."; }; extraConfig = mkOption { type = types.attrs; default = {}; - example = literalExample '' { + example = literalExpression '' { "alternative_estimate_fee" = "whatthefee-disabled"; "alternative_estimate_fee_params" = "{\"url\": \"https://whatthefee.io/data.json\", \"periodSeconds\": 60}"; "fiat_rates" = "coingecko"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix index ca95d00c2f..0d97d379e9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix @@ -150,7 +150,7 @@ in connectTo = mkOption { type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); default = { }; - example = literalExample '' + example = literalExpression '' { "192.168.1.1:27313" = { hostname = "homer.hype"; @@ -197,7 +197,7 @@ in connectTo = mkOption { type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); default = { }; - example = literalExample '' + example = literalExpression '' { "01:02:03:04:05:06" = { hostname = "homer.hype"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/connman.nix b/third_party/nixpkgs/nixos/modules/services/networking/connman.nix index 608672c644..8886e7a30f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/connman.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/connman.nix @@ -77,10 +77,11 @@ in { }; package = mkOption { - type = types.path; + type = types.package; description = "The connman package / build flavor"; default = connman; - example = literalExample "pkgs.connmanFull"; + defaultText = literalExpression "pkgs.connman"; + example = literalExpression "pkgs.connmanFull"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/consul.nix b/third_party/nixpkgs/nixos/modules/services/networking/consul.nix index 476ca738dd..792b2e7f5d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/consul.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/consul.nix @@ -34,7 +34,7 @@ in package = mkOption { type = types.package; default = pkgs.consul; - defaultText = "pkgs.consul"; + defaultText = literalExpression "pkgs.consul"; description = '' The package used for the Consul agent and CLI. ''; @@ -121,7 +121,7 @@ in package = mkOption { description = "Package to use for consul-alerts."; default = pkgs.consul-alerts; - defaultText = "pkgs.consul-alerts"; + defaultText = literalExpression "pkgs.consul-alerts"; type = types.package; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix b/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix index afb2b547a4..88615d8e61 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix @@ -22,7 +22,7 @@ in { package = mkOption { default = pkgs.coredns; - defaultText = "pkgs.coredns"; + defaultText = literalExpression "pkgs.coredns"; type = types.package; description = "Coredns package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix b/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix index e76ba9a2d0..9d79d5d768 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix @@ -14,7 +14,7 @@ in { settings = mkOption { type = settingsFormat.type; - example = literalExample '' + example = literalExpression '' { interfaces = [ # eth0 is an upstream interface monitoring for IPv6 router advertisements. @@ -44,13 +44,13 @@ in { configFile = mkOption { type = types.path; - example = literalExample "\"\${pkgs.corerad}/etc/corerad/corerad.toml\""; + example = literalExpression ''"''${pkgs.corerad}/etc/corerad/corerad.toml"''; description = "Path to CoreRAD TOML configuration file."; }; package = mkOption { default = pkgs.corerad; - defaultText = literalExample "pkgs.corerad"; + defaultText = literalExpression "pkgs.corerad"; type = types.package; description = "CoreRAD package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix b/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix index 12098ec6d3..610754e9bd 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix @@ -68,7 +68,7 @@ in { alt-listening-port = mkOption { type = types.int; default = cfg.listening-port + 1; - defaultText = "listening-port + 1"; + defaultText = literalExpression "listening-port + 1"; description = '' Alternative listening port for UDP and TCP listeners; default (or zero) value means "listening port plus one". @@ -83,7 +83,7 @@ in { alt-tls-listening-port = mkOption { type = types.int; default = cfg.tls-listening-port + 1; - defaultText = "tls-listening-port + 1"; + defaultText = literalExpression "tls-listening-port + 1"; description = '' Alternative listening port for TLS and DTLS protocols. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscache.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscache.nix index d06032daec..7452210de4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscache.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscache.nix @@ -61,7 +61,7 @@ in { Table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts). If entry for @ is not specified predefined list of root servers is used. ''; - example = literalExample '' + example = literalExpression '' { "@" = ["8.8.8.8" "8.8.4.4"]; "example.com" = ["192.168.100.100"]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix index 72965c267a..dc6a019e9b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -13,7 +13,7 @@ in Attrset that is converted and passed as TOML config file. For available params, see: ''; - example = literalExample '' + example = literalExpression '' { sources.public-resolvers = { urls = [ "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md" ]; @@ -29,7 +29,7 @@ in upstreamDefaults = mkOption { description = '' - Whether to base the config declared in services.dnscrypt-proxy2.settings on the upstream example config () + Whether to base the config declared in on the upstream example config () Disable this if you want to declare your dnscrypt config from scratch. ''; @@ -56,7 +56,7 @@ in ''} ${pkgs.remarshal}/bin/json2toml < config.json > $out ''; - defaultText = literalExample "TOML file generated from services.dnscrypt-proxy2.settings"; + defaultText = literalDocBook "TOML file generated from "; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/doh-proxy-rust.nix b/third_party/nixpkgs/nixos/modules/services/networking/doh-proxy-rust.nix index 0e55bc3866..efd492e23f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/doh-proxy-rust.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/doh-proxy-rust.nix @@ -15,7 +15,7 @@ in { flags = mkOption { type = types.listOf types.str; default = []; - example = literalExample [ "--server-address=9.9.9.9:53" ]; + example = [ "--server-address=9.9.9.9:53" ]; description = '' A list of command-line flags to pass to doh-proxy. For details on the available options, see . diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ejabberd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ejabberd.nix index a5af25b983..daf8d5c424 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ejabberd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ejabberd.nix @@ -32,7 +32,7 @@ in { package = mkOption { type = types.package; default = pkgs.ejabberd; - defaultText = "pkgs.ejabberd"; + defaultText = literalExpression "pkgs.ejabberd"; description = "ejabberd server package to use"; }; @@ -76,7 +76,7 @@ in { type = types.listOf types.path; default = []; description = "Configuration dumps that should be loaded on the first startup"; - example = literalExample "[ ./myejabberd.dump ]"; + example = literalExpression "[ ./myejabberd.dump ]"; }; imagemagick = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix b/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix index 3899d164f1..75d78476e5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix @@ -20,6 +20,7 @@ in package = mkOption { type = types.package; default = pkgs.erlang; + defaultText = literalExpression "pkgs.erlang"; description = '' The Erlang package to use to get epmd binary. That way you can re-use an Erlang runtime that is already installed for other purposes. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ferm.nix b/third_party/nixpkgs/nixos/modules/services/networking/ferm.nix index 07338ccf4d..8e03f30efc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ferm.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ferm.nix @@ -30,14 +30,14 @@ in { config = mkOption { description = "Verbatim ferm.conf configuration."; default = ""; - defaultText = "empty firewall, allows any traffic"; + defaultText = literalDocBook "empty firewall, allows any traffic"; type = types.lines; }; package = mkOption { description = "The ferm package."; type = types.package; default = pkgs.ferm; - defaultText = "pkgs.ferm"; + defaultText = literalExpression "pkgs.ferm"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix b/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix index f982621e23..b5b46fe604 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix @@ -325,8 +325,8 @@ in package = mkOption { type = types.package; default = pkgs.iptables; - defaultText = "pkgs.iptables"; - example = literalExample "pkgs.iptables-nftables-compat"; + defaultText = literalExpression "pkgs.iptables"; + example = literalExpression "pkgs.iptables-nftables-compat"; description = '' The iptables package to use for running the firewall service." @@ -500,7 +500,7 @@ in extraPackages = mkOption { type = types.listOf types.package; default = [ ]; - example = literalExample "[ pkgs.ipset ]"; + example = literalExpression "[ pkgs.ipset ]"; description = '' Additional packages to be included in the environment of the system diff --git a/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix b/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix index 2d67a2a2ad..b15339870e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix @@ -20,7 +20,7 @@ in { description = "Package to use for flannel"; type = types.package; default = pkgs.flannel; - defaultText = "pkgs.flannel"; + defaultText = literalExpression "pkgs.flannel"; }; publicIp = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix b/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix index 58a51df6cc..7a62d378e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix @@ -5,7 +5,7 @@ let concatMap concatStringsSep escapeShellArg - literalExample + literalExpression mapAttrs' mkDefault mkEnableOption @@ -219,7 +219,7 @@ in description = "The ghostunnel package to use."; type = types.package; default = pkgs.ghostunnel; - defaultText = literalExample ''pkgs.ghostunnel''; + defaultText = literalExpression "pkgs.ghostunnel"; }; services.ghostunnel.servers = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix index 367a42687e..976fdf2b96 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix @@ -21,7 +21,7 @@ in as described at ''; default = null; - example = literalExample "\${pkgs.openconnect}/libexec/openconnect/hipreport.sh"; + example = literalExpression ''"''${pkgs.openconnect}/libexec/openconnect/hipreport.sh"''; type = types.nullOr types.path; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix b/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix index cf3d1841a9..5c41967d27 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix @@ -115,9 +115,9 @@ in package = mkOption { type = types.package; default = pkgs.gnunet; - defaultText = "pkgs.gnunet"; + defaultText = literalExpression "pkgs.gnunet"; description = "Overridable attribute of the gnunet package to use."; - example = literalExample "pkgs.gnunet_git"; + example = literalExpression "pkgs.gnunet_git"; }; extraOptions = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/gobgpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/gobgpd.nix index d3b03471f4..29ef9a5cf1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/gobgpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/gobgpd.nix @@ -18,7 +18,7 @@ in { for details on supported values. ''; - example = literalExample '' + example = literalExpression '' { global = { config = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hans.nix b/third_party/nixpkgs/nixos/modules/services/networking/hans.nix index 84147db00f..2639b4b680 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hans.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hans.nix @@ -27,7 +27,7 @@ in where name is the name of the corresponding attribute name. ''; - example = literalExample '' + example = literalExpression '' { foo = { server = "192.0.2.1"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix b/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix index 74960e69b9..8e59c68054 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix @@ -2,7 +2,7 @@ let - inherit (lib.options) literalExample mkEnableOption mkOption; + inherit (lib.options) literalExpression mkEnableOption mkOption; inherit (lib.types) bool enum ints lines attrsOf nullOr path str submodule; inherit (lib.modules) mkDefault mkIf mkMerge; @@ -197,7 +197,7 @@ in sendmailPath = mkOption { type = path; - example = literalExample "''${pkgs.postfix}/bin/sendmail"; + example = literalExpression ''"''${pkgs.postfix}/bin/sendmail"''; # '' ; # fix vim description = '' Path to sendmail program. @@ -344,7 +344,7 @@ in faxqclean.doneqMinutes = mkOption { type = ints.positive; default = 15; - example = literalExample "24*60"; + example = literalExpression "24*60"; description = '' Set the job age threshold (in minutes) that controls how long @@ -354,7 +354,7 @@ in faxqclean.docqMinutes = mkOption { type = ints.positive; default = 60; - example = literalExample "24*60"; + example = literalExpression "24*60"; description = '' Set the document age threshold (in minutes) that controls how long diff --git a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix index fba0d81700..17828ca44f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix @@ -481,7 +481,7 @@ in exploratory.inbound = i2cpOpts "exploratory"; exploratory.outbound = i2cpOpts "exploratory"; - ntcp2.enable = mkEnableTrueOption "NTCP2."; + ntcp2.enable = mkEnableTrueOption "NTCP2"; ntcp2.published = mkEnableOption "NTCP2 publication"; ntcp2.port = mkOption { type = types.int; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix index 2975696f9c..8593c94e34 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix @@ -101,7 +101,7 @@ in { package = mkOption { default = pkgs.icecream; - defaultText = "pkgs.icecream"; + defaultText = literalExpression "pkgs.icecream"; type = types.package; description = "Icecream package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix b/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix index 4ccbf27015..14fbc966b9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix @@ -56,7 +56,7 @@ in { package = mkOption { default = pkgs.icecream; - defaultText = "pkgs.icecream"; + defaultText = literalExpression "pkgs.icecream"; type = types.package; description = "Icecream package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix b/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix index 8cb2b406ee..81c367ec8f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix @@ -17,8 +17,8 @@ in { package = lib.mkOption { type = lib.types.package; default = pkgs.inspircd; - defaultText = lib.literalExample "pkgs.inspircd"; - example = lib.literalExample "pkgs.inspircdMinimal"; + defaultText = lib.literalExpression "pkgs.inspircd"; + example = lib.literalExpression "pkgs.inspircdMinimal"; description = '' The InspIRCd package to use. This is mainly useful to specify an overridden version of the diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iodine.nix b/third_party/nixpkgs/nixos/modules/services/networking/iodine.nix index f67e2d9a5e..e241afe326 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/iodine.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/iodine.nix @@ -36,7 +36,7 @@ in where name is the name of the corresponding attribute name. ''; - example = literalExample '' + example = literalExpression '' { foo = { server = "tunnel.mdomain.com"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix b/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix index 1f5636e4e3..f659f3f3e8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -64,7 +64,7 @@ in rsaKey = mkOption { default = null; - example = literalExample "/root/certificates/irc.key"; + example = literalExpression "/root/certificates/irc.key"; type = types.nullOr types.path; description = " IRCD server RSA key. @@ -73,7 +73,7 @@ in certificate = mkOption { default = null; - example = literalExample "/root/certificates/irc.pem"; + example = literalExpression "/root/certificates/irc.pem"; type = types.nullOr types.path; description = " IRCD server SSL certificate. There are some limitations - read manual. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix index cbc919a2f7..051c9c7bff 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix @@ -23,7 +23,7 @@ in type = package; description = "openiscsi package to use"; default = pkgs.openiscsi; - defaultText = "pkgs.openiscsi"; + defaultText = literalExpression "pkgs.openiscsi"; }; extraConfig = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/jicofo.nix b/third_party/nixpkgs/nixos/modules/services/networking/jicofo.nix index 160a5fea91..647119b903 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/jicofo.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/jicofo.nix @@ -70,7 +70,7 @@ in config = mkOption { type = attrsOf str; default = { }; - example = literalExample '' + example = literalExpression '' { "org.jitsi.jicofo.auth.URL" = "XMPP:jitsi-meet.example.com"; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix b/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix index 80f35d56e2..dd06ad98a9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix @@ -56,7 +56,7 @@ in config = mkOption { type = attrs; default = { }; - example = literalExample '' + example = literalExpression '' { videobridge = { ice.udp.port = 5000; @@ -82,7 +82,7 @@ in See for more information. ''; default = { }; - example = literalExample '' + example = literalExpression '' { "localhost" = { hostName = "localhost"; @@ -199,7 +199,7 @@ in Needed for monitoring jitsi. ''; default = []; - example = literalExample "[ \"colibri\" \"rest\" ]"; + example = literalExpression "[ \"colibri\" \"rest\" ]"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix b/third_party/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix index 85b9bc3377..e96dde5fa8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix @@ -102,9 +102,7 @@ with lib; inherit lib; })); default = []; - example = literalExample '' - TODO: Example - ''; + # TODO: example description = "Declarative vhost config"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-script-options.nix b/third_party/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-script-options.nix index a3f794c40a..df7a89cff8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-script-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/keepalived/vrrp-script-options.nix @@ -7,7 +7,7 @@ with lib.types; script = mkOption { type = str; - example = "\${pkgs.curl} -f http://localhost:80"; + example = literalExpression ''"''${pkgs.curl} -f http://localhost:80"''; description = "(Path of) Script command to execute followed by args, i.e. cmd [args]..."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/knot.nix b/third_party/nixpkgs/nixos/modules/services/networking/knot.nix index 12ff89fe84..67eadbd767 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/knot.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/knot.nix @@ -71,7 +71,7 @@ in { package = mkOption { type = types.package; default = pkgs.knot-dns; - defaultText = "pkgs.knot-dns"; + defaultText = literalExpression "pkgs.knot-dns"; description = '' Which Knot DNS package to use ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix index 6882a315f6..3a36ac7e66 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix @@ -62,8 +62,8 @@ in { knot-resolver package to use. "; default = pkgs.knot-resolver; - defaultText = "pkgs.knot-resolver"; - example = literalExample "pkgs.knot-resolver.override { extraFeatures = true; }"; + defaultText = literalExpression "pkgs.knot-resolver"; + example = literalExpression "pkgs.knot-resolver.override { extraFeatures = true; }"; }; extraConfig = mkOption { type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/lambdabot.nix b/third_party/nixpkgs/nixos/modules/services/networking/lambdabot.nix index b7c8bd008f..3005e58245 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/lambdabot.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/lambdabot.nix @@ -27,7 +27,7 @@ in package = mkOption { type = types.package; default = pkgs.lambdabot; - defaultText = "pkgs.lambdabot"; + defaultText = literalExpression "pkgs.lambdabot"; description = "Used lambdabot package"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix index 1f0423ac3d..429167aed9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix @@ -66,7 +66,7 @@ in connections = mkOption { type = types.attrsOf types.lines; default = {}; - example = literalExample '' + example = literalExpression '' { myconnection = ''' auto=add left=%defaultroute @@ -85,7 +85,7 @@ in policies = mkOption { type = types.attrsOf types.lines; default = {}; - example = literalExample '' + example = literalExpression '' { private-or-clear = ''' # Attempt opportunistic IPsec for the entire Internet 0.0.0.0/0 diff --git a/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix b/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix index c580ba47da..c860f63efa 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix @@ -39,7 +39,7 @@ in services.minidlna.friendlyName = mkOption { type = types.str; default = "${config.networking.hostName} MiniDLNA"; - defaultText = "$HOSTNAME MiniDLNA"; + defaultText = literalExpression ''"''${config.networking.hostName} MiniDLNA"''; example = "rpi3"; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/miredo.nix b/third_party/nixpkgs/nixos/modules/services/networking/miredo.nix index 2c8393fb5b..b7f657efb7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/miredo.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/miredo.nix @@ -25,7 +25,7 @@ in package = mkOption { type = types.package; default = pkgs.miredo; - defaultText = "pkgs.miredo"; + defaultText = literalExpression "pkgs.miredo"; description = '' The package to use for the miredo daemon's binary. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/morty.nix b/third_party/nixpkgs/nixos/modules/services/networking/morty.nix index c627feb527..dff2f482ca 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/morty.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/morty.nix @@ -23,7 +23,6 @@ in type = types.bool; default = true; description = "Allow IPv6 HTTP requests?"; - defaultText = "Allow IPv6 HTTP requests."; }; key = mkOption { @@ -33,21 +32,20 @@ in HMAC url validation key (hexadecimal encoded). Leave blank to disable. Without validation key, anyone can submit proxy requests. Leave blank to disable. + Generate with printf %s somevalue | openssl dgst -sha1 -hmac somekey ''; - defaultText = "No HMAC url validation. Generate with echo -n somevalue | openssl dgst -sha1 -hmac somekey"; }; timeout = mkOption { type = types.int; default = 2; description = "Request timeout in seconds."; - defaultText = "A resource now gets 2 seconds to respond."; }; package = mkOption { type = types.package; default = pkgs.morty; - defaultText = "pkgs.morty"; + defaultText = literalExpression "pkgs.morty"; description = "morty package to use."; }; @@ -61,7 +59,6 @@ in type = types.str; default = "127.0.0.1"; description = "The address on which the service listens"; - defaultText = "127.0.0.1 (localhost)"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix index 8e814ffd0b..b0fbfc1940 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix @@ -56,7 +56,6 @@ in port = mkOption { default = 1883; - example = 1883; type = types.int; description = '' Port on which to listen without SSL. @@ -95,7 +94,6 @@ in port = mkOption { default = 8883; - example = 8883; type = types.int; description = '' Port on which to listen with SSL. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix index f8bb878ec6..bbbe1e181b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix @@ -112,7 +112,7 @@ in package = mkOption { type = types.package; default = pkgs.murmur; - defaultText = "pkgs.murmur"; + defaultText = literalExpression "pkgs.murmur"; description = "Overridable attribute of the murmur package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix b/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix index f29d190c62..803f0689d1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix @@ -42,7 +42,7 @@ in { package = mkOption { type = types.package; default = pkgs.ma1sd; - defaultText = "pkgs.ma1sd"; + defaultText = literalExpression "pkgs.ma1sd"; description = "The mxisd/ma1sd package to use"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nat.nix b/third_party/nixpkgs/nixos/modules/services/networking/nat.nix index 45eb500fe8..2e58cd699b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nat.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nat.nix @@ -247,7 +247,7 @@ in loopbackIPs = mkOption { type = types.listOf types.str; default = []; - example = literalExample ''[ "55.1.2.3" ]''; + example = literalExpression ''[ "55.1.2.3" ]''; description = "Public IPs for NAT reflection; for connections to `loopbackip:sourcePort' from the host itself and from other hosts behind NAT"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nats.nix b/third_party/nixpkgs/nixos/modules/services/networking/nats.nix index eb0c65bc65..3e86a4f07b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nats.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nats.nix @@ -43,7 +43,6 @@ in { port = mkOption { default = 4222; - example = 4222; type = types.port; description = '' Port on which to listen. @@ -67,7 +66,7 @@ in { settings = mkOption { default = { }; type = format.type; - example = literalExample '' + example = literalExpression '' { jetstream = { max_mem = "1G"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix index c5ea5d9505..af17fc0814 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix @@ -164,7 +164,7 @@ in settings = mkOption { type = configType; default = { }; - example = literalExample '' + example = literalExpression '' { # enable webserver ncdns.httplistenaddr = ":8202"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix index 77e979a8a4..6046ac860c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix @@ -142,7 +142,7 @@ in { messages, and respond to them according to a set of rules. ''; default = {}; - example = literalExample '' + example = literalExpression '' { eth0.rules."1111::/64" = {}; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix b/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix index e7ebfe1b4d..de4439415c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix @@ -30,7 +30,7 @@ in package = mkOption { type = types.package; default = pkgs.nebula; - defaultText = "pkgs.nebula"; + defaultText = literalExpression "pkgs.nebula"; description = "Nebula derivation to use."; }; @@ -59,9 +59,7 @@ in The static host map defines a set of hosts with fixed IP addresses on the internet (or any network). A host can have multiple fixed IP addresses defined here, and nebula will try each when establishing a tunnel. ''; - example = literalExample '' - { "192.168.100.1" = [ "100.64.22.11:4242" ]; } - ''; + example = { "192.168.100.1" = [ "100.64.22.11:4242" ]; }; }; isLighthouse = mkOption { @@ -77,7 +75,7 @@ in List of IPs of lighthouse hosts this node should report to and query from. This should be empty on lighthouse nodes. The IPs should be the lighthouse's Nebula IPs, not their external IPs. ''; - example = ''[ "192.168.100.1" ]''; + example = [ "192.168.100.1" ]; }; listen.host = mkOption { @@ -110,14 +108,14 @@ in type = types.listOf types.attrs; default = []; description = "Firewall rules for outbound traffic."; - example = ''[ { port = "any"; proto = "any"; host = "any"; } ]''; + example = [ { port = "any"; proto = "any"; host = "any"; } ]; }; firewall.inbound = mkOption { type = types.listOf types.attrs; default = []; description = "Firewall rules for inbound traffic."; - example = ''[ { port = "any"; proto = "any"; host = "any"; } ]''; + example = [ { port = "any"; proto = "any"; host = "any"; } ]; }; settings = mkOption { @@ -128,7 +126,7 @@ in for details on supported values. ''; - example = literalExample '' + example = literalExpression '' { lighthouse.dns = { host = "0.0.0.0"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index ba13f575c3..2a826e0f08 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -353,7 +353,7 @@ in { }; }); default = []; - example = literalExample '' + example = literalExpression '' [ { source = pkgs.writeText "upHook" ''' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix index 72f37c3225..eb74d373b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix @@ -32,6 +32,7 @@ in }; networking.nftables.ruleset = mkOption { type = types.lines; + default = ""; example = '' # Check out https://wiki.nftables.org/ for better documentation. # Table for both IPv4 and IPv6. @@ -86,6 +87,7 @@ in name = "nftables-rules"; text = cfg.ruleset; }; + defaultText = literalDocBook ''a file with the contents of ''; description = '' The ruleset file to be used with nftables. Should be in a format that diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ngircd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ngircd.nix index 1b631de3b0..c0b9c98fb4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ngircd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ngircd.nix @@ -34,7 +34,7 @@ in { type = types.package; default = pkgs.ngircd; - defaultText = "pkgs.ngircd"; + defaultText = literalExpression "pkgs.ngircd"; }; }; }; 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 2bb1263b7f..5e33d872ea 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nixops-dns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nixops-dns.nix @@ -34,7 +34,6 @@ in For example "ops" will resolve "vm.ops". ''; - example = "ops"; default = "ops"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix index 0083990cff..a5973cd593 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix @@ -159,7 +159,6 @@ in options = { username = mkOption { type = types.str; - default = null; description = '' Username ''; @@ -167,7 +166,6 @@ in passwordHash = mkOption { type = types.str; - default = null; example = "$6$GtzE7FrpE$wwuVgFYU.TZH4Rz.Snjxk9XGua89IeVwPQ/fEUD8eujr40q5Y021yhn0aNcsQ2Ifw.BLclyzvzgegopgKcneL0"; description = '' SHA-512 password hash (can be generated by @@ -189,15 +187,17 @@ in ''; default = {}; - example = literalExample '' - "user1" = { - passwordHash = "$6$1l0t5Kn2Dk$appzivc./9l/kjq57eg5UCsBKlcfyCr0zNWYNerKoPsI1d7eAwiT0SVsOVx/CTgaBNT/u4fi2vN.iGlPfv1ek0"; - maxConnections = 5; - }; - "anotheruser" = { - passwordHash = "$6$6lwEsWB.TmsS$W7m1riUx4QrA8pKJz8hvff0dnF1NwtZXgdjmGqA1Dx2MDPj07tI9GNcb0SWlMglE.2/hBgynDdAd/XqqtRqVQ0"; - maxConnections = 7; - }; + example = literalExpression '' + { + "user1" = { + passwordHash = "$6$1l0t5Kn2Dk$appzivc./9l/kjq57eg5UCsBKlcfyCr0zNWYNerKoPsI1d7eAwiT0SVsOVx/CTgaBNT/u4fi2vN.iGlPfv1ek0"; + maxConnections = 5; + }; + "anotheruser" = { + passwordHash = "$6$6lwEsWB.TmsS$W7m1riUx4QrA8pKJz8hvff0dnF1NwtZXgdjmGqA1Dx2MDPj07tI9GNcb0SWlMglE.2/hBgynDdAd/XqqtRqVQ0"; + maxConnections = 7; + }; + } ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix b/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix index 48689f1195..3bd15bd5c8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix @@ -13,7 +13,7 @@ in package = mkOption { type = types.package; default = pkgs.nomad; - defaultText = "pkgs.nomad"; + defaultText = literalExpression "pkgs.nomad"; description = '' The package used for the Nomad agent and CLI. ''; @@ -25,7 +25,7 @@ in description = '' Extra packages to add to PATH for the Nomad agent process. ''; - example = literalExample '' + example = literalExpression '' with pkgs; [ cni-plugins ] ''; }; @@ -55,7 +55,7 @@ in description = '' Additional settings paths used to configure nomad. These can be files or directories. ''; - example = literalExample '' + example = literalExpression '' [ "/etc/nomad-mutable.json" "/run/keys/nomad-with-secrets.json" "/etc/nomad/config.d" ] ''; }; @@ -81,7 +81,7 @@ in the DynamicUser feature of systemd which directly manages and operates on StateDirectory. ''; - example = literalExample '' + example = literalExpression '' { # A minimal config example: server = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix index 2ac0a8c792..893995165b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix @@ -260,7 +260,6 @@ let data = mkOption { type = types.lines; default = ""; - example = ""; description = '' The actual zone data. This is the content of your zone file. Use imports or pkgs.lib.readFile if you don't want this data in your config file. @@ -397,7 +396,6 @@ let requestXFR = mkOption { type = types.listOf types.str; default = []; - example = []; description = '' Format: [AXFR|UDP] <ip-address> <key-name | NOKEY> ''; @@ -726,7 +724,7 @@ in }; }); default = {}; - example = literalExample '' + example = literalExpression '' { "tsig.example.org" = { algorithm = "hmac-md5"; keyFile = "/path/to/my/key"; @@ -861,7 +859,7 @@ in zones = mkOption { type = types.attrsOf zoneOptions; default = {}; - example = literalExample '' + example = literalExpression '' { "serverGroup1" = { provideXFR = [ "10.1.2.3 NOKEY" ]; children = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix index ed61c178c6..d414936a2c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix @@ -44,7 +44,7 @@ in package = mkOption { type = types.package; default = pkgs.chrony; - defaultText = "pkgs.chrony"; + defaultText = literalExpression "pkgs.chrony"; description = '' Which chrony package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix index 1dffbd78bb..ce4802ce02 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix @@ -97,7 +97,7 @@ in extraFlags = mkOption { type = types.listOf types.str; description = "Extra flags passed to the ntpd command."; - example = literalExample ''[ "--interface=eth0" ]''; + example = literalExpression ''[ "--interface=eth0" ]''; default = []; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ofono.nix b/third_party/nixpkgs/nixos/modules/services/networking/ofono.nix index 40ef9433de..460b06443c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ofono.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ofono.nix @@ -24,7 +24,7 @@ in plugins = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.modem-manager-gui ]"; + example = literalExpression "[ pkgs.modem-manager-gui ]"; description = '' The list of plugins to install. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix b/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix index c52f920bae..0256a6a411 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix @@ -35,8 +35,7 @@ in { package = lib.mkOption { type = lib.types.package; default = pkgs.onedrive; - defaultText = "pkgs.onedrive"; - example = lib.literalExample "pkgs.onedrive"; + defaultText = lib.literalExpression "pkgs.onedrive"; description = '' OneDrive package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix index b4c2c944b6..cf3f79fc57 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix @@ -84,7 +84,7 @@ in services.openvpn.servers = mkOption { default = {}; - example = literalExample '' + example = literalExpression '' { server = { config = ''' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ostinato.nix b/third_party/nixpkgs/nixos/modules/services/networking/ostinato.nix index 5e8cce5b89..4da11984b9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ostinato.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ostinato.nix @@ -65,7 +65,7 @@ in include = mkOption { type = types.listOf types.str; default = []; - example = ''[ "eth*" "lo*" ]''; + example = [ "eth*" "lo*" ]; description = '' For a port to pass the filter and appear on the port list managed by drone, it be allowed by this include list. @@ -74,7 +74,7 @@ in exclude = mkOption { type = types.listOf types.str; default = []; - example = ''[ "usbmon*" "eth0" ]''; + example = [ "usbmon*" "eth0" ]; description = '' A list of ports does not appear on the port list managed by drone. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix b/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix index a326eccfd6..0579d314a9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix @@ -127,7 +127,7 @@ in { settings = mkOption { type = configType; default = { }; - example = literalExample '' + example = literalExpression '' { loglevel = 8; log-common-errors = true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix index 93ab29b71e..2f32faf387 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix @@ -9,6 +9,7 @@ in { package = mkOption { type = types.package; default = pkgs.pleroma; + defaultText = literalExpression "pkgs.pleroma"; description = "Pleroma package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix b/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix index 37f44f07ac..d1ed25b023 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix @@ -16,7 +16,7 @@ in package = mkOption { default = pkgs.ppp; - defaultText = "pkgs.ppp"; + defaultText = literalExpression "pkgs.ppp"; type = types.package; description = "pppd package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix index df818baa46..7bc964d5f3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix @@ -164,7 +164,7 @@ in }; }; default = {}; - example = literalExample '' + example = literalExpression '' { # Listen on IPv6 only listen-address = "[::]:8118"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix index e7a7aa700b..42596ccfef 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix @@ -500,8 +500,8 @@ in type = types.package; description = "Prosody package to use"; default = pkgs.prosody; - defaultText = "pkgs.prosody"; - example = literalExample '' + defaultText = literalExpression "pkgs.prosody"; + example = literalExpression '' pkgs.prosody.override { withExtraLibs = [ pkgs.luaPackages.lpty ]; withCommunityModules = [ "auth_external" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/quassel.nix b/third_party/nixpkgs/nixos/modules/services/networking/quassel.nix index bfbd3b46ab..22940ef7a1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/quassel.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/quassel.nix @@ -37,11 +37,10 @@ in package = mkOption { type = types.package; default = pkgs.quasselDaemon; - defaultText = "pkgs.quasselDaemon"; + defaultText = literalExpression "pkgs.quasselDaemon"; description = '' The package of the quassel daemon. ''; - example = literalExample "pkgs.quasselDaemon"; }; interfaces = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/quorum.nix b/third_party/nixpkgs/nixos/modules/services/networking/quorum.nix index 2f612c9db6..50148dc314 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/quorum.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/quorum.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - inherit (lib) mkEnableOption mkIf mkOption literalExample types optionalString; + inherit (lib) mkEnableOption mkIf mkOption literalExpression types optionalString; cfg = config.services.quorum; dataDir = "/var/lib/quorum"; @@ -130,7 +130,7 @@ in { genesis = mkOption { type = types.nullOr types.attrs; default = null; - example = literalExample '' { + example = literalExpression '' { alloc = { a47385db68718bdcbddc2d2bb7c54018066ec111 = { balance = "1000000000000000000000000000"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix b/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix index 368259b5b0..c121008d52 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix @@ -33,7 +33,7 @@ in { # warnings about incompatible configuration and storage formats. type = with types; nullOr package // { inherit (package) description; }; default = null; - defaultText = "pkgs.radicale"; + defaultText = literalExpression "pkgs.radicale"; }; config = mkOption { @@ -55,7 +55,7 @@ in { . This option is mutually exclusive with . ''; - example = literalExample '' + example = literalExpression '' server = { hosts = [ "0.0.0.0:5232" "[::]:5232" ]; }; @@ -80,7 +80,7 @@ in { to approriate values. ''; default = { }; - example = literalExample '' + example = literalExpression '' root = { user = ".+"; collection = ""; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/searx.nix b/third_party/nixpkgs/nixos/modules/services/networking/searx.nix index 04f7d7e31f..9fb06af744 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/searx.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/searx.nix @@ -68,7 +68,7 @@ in settings = mkOption { type = types.attrsOf settingType; default = { }; - example = literalExample '' + example = literalExpression '' { server.port = 8080; server.bind_address = "0.0.0.0"; server.secret_key = "@SEARX_SECRET_KEY@"; @@ -116,7 +116,7 @@ in package = mkOption { type = types.package; default = pkgs.searx; - defaultText = "pkgs.searx"; + defaultText = literalExpression "pkgs.searx"; description = "searx package to use."; }; @@ -138,7 +138,7 @@ in uwsgiConfig = mkOption { type = options.services.uwsgi.instance.type; default = { http = ":8080"; }; - example = literalExample '' + example = literalExpression '' { disable-logging = true; http = ":8080"; # serve via HTTP... diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix b/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix index d2541f9a6d..7bea269a9e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix @@ -98,7 +98,7 @@ in plugin = mkOption { type = types.nullOr types.str; default = null; - example = "\${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"; + example = literalExpression ''"''${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"''; description = '' SIP003 plugin for shadowsocks ''; @@ -116,11 +116,9 @@ in extraConfig = mkOption { type = types.attrs; default = {}; - example = '' - { - nameserver = "8.8.8.8"; - } - ''; + example = { + nameserver = "8.8.8.8"; + }; description = '' Additional configuration for shadowsocks that is not covered by the provided options. The provided attrset will be serialized to JSON and diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shellhub-agent.nix b/third_party/nixpkgs/nixos/modules/services/networking/shellhub-agent.nix index 4ce4b8250b..a45ef14854 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shellhub-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shellhub-agent.nix @@ -23,7 +23,7 @@ in { package = mkOption { type = types.package; default = pkgs.shellhub-agent; - defaultText = "pkgs.shellhub-agent"; + defaultText = literalExpression "pkgs.shellhub-agent"; description = '' Which ShellHub Agent package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix b/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix index 16383be253..ac732d4b12 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix @@ -22,7 +22,7 @@ in { package = lib.mkOption { type = types.package; default = pkgs.shorewall; - defaultText = "pkgs.shorewall"; + defaultText = lib.literalExpression "pkgs.shorewall"; description = "The shorewall package to use."; }; configs = lib.mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix b/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix index e081aedc6c..4235c74a3f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix @@ -22,7 +22,7 @@ in { package = lib.mkOption { type = types.package; default = pkgs.shorewall; - defaultText = "pkgs.shorewall"; + defaultText = lib.literalExpression "pkgs.shorewall"; description = "The shorewall package to use."; }; configs = lib.mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/skydns.nix b/third_party/nixpkgs/nixos/modules/services/networking/skydns.nix index ea466de932..c4e959b57b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/skydns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/skydns.nix @@ -56,7 +56,7 @@ in { package = mkOption { default = pkgs.skydns; - defaultText = "pkgs.skydns"; + defaultText = literalExpression "pkgs.skydns"; type = types.package; description = "Skydns package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/smartdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/smartdns.nix index f84c727f03..7f9df42ce9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/smartdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/smartdns.nix @@ -32,7 +32,7 @@ in { type = let atom = oneOf [ str int bool ]; in attrsOf (coercedTo atom toList (listOf atom)); - example = literalExample '' + example = literalExpression '' { bind = ":5353 -no-rule -group example"; cache-size = 4096; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix index 0f123fd187..021368488a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix @@ -60,7 +60,7 @@ in to = root@localhost from = smokeping@localhost ''; - example = literalExample '' + example = '' to = alertee@address.somewhere from = smokealert@company.xy @@ -75,7 +75,7 @@ in cgiUrl = mkOption { type = types.str; default = "http://${cfg.hostName}:${toString cfg.port}/smokeping.cgi"; - defaultText = "http://\${hostName}:\${toString port}/smokeping.cgi"; + defaultText = literalExpression ''"http://''${hostName}:''${toString port}/smokeping.cgi"''; example = "https://somewhere.example.com/smokeping.cgi"; description = "URL to the smokeping cgi."; }; @@ -100,7 +100,7 @@ in MIN 0.5 144 720 ''; - example = literalExample '' + example = '' # near constant pings. step = 30 pings = 20 @@ -125,14 +125,14 @@ in hostName = mkOption { type = types.str; default = config.networking.fqdn; - defaultText = "\${config.networking.fqdn}"; + defaultText = literalExpression "config.networking.fqdn"; example = "somewhere.example.com"; description = "DNS name for the urls generated in the cgi."; }; imgUrl = mkOption { type = types.str; default = "http://${cfg.hostName}:${toString cfg.port}/cache"; - defaultText = "http://\${hostName}:\${toString port}/cache"; + defaultText = literalExpression ''"http://''${hostName}:''${toString port}/cache"''; example = "https://somewhere.example.com/cache"; description = "Base url for images generated in the cgi."; }; @@ -157,20 +157,19 @@ in ownerEmail = mkOption { type = types.str; default = "no-reply@${cfg.hostName}"; - defaultText = "no-reply@\${hostName}"; + defaultText = literalExpression ''"no-reply@''${hostName}"''; example = "no-reply@yourdomain.com"; description = "Email contact for owner"; }; package = mkOption { type = types.package; default = pkgs.smokeping; - defaultText = "pkgs.smokeping"; + defaultText = literalExpression "pkgs.smokeping"; description = "Specify a custom smokeping package"; }; port = mkOption { type = types.int; default = 8081; - example = 8081; description = "TCP port to use for the web server."; }; presentationConfig = mkOption { @@ -217,6 +216,7 @@ in presentationTemplate = mkOption { type = types.str; default = "${pkgs.smokeping}/etc/basepage.html.dist"; + defaultText = literalExpression ''"''${pkgs.smokeping}/etc/basepage.html.dist"''; description = "Default page layout for the web UI."; }; probeConfig = mkOption { @@ -236,6 +236,7 @@ in smokeMailTemplate = mkOption { type = types.str; default = "${cfg.package}/etc/smokemail.dist"; + defaultText = literalExpression ''"''${package}/etc/smokemail.dist"''; description = "Specify the smokemail template for alerts."; }; targetConfig = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/sniproxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/sniproxy.nix index 0345c12d3a..28c201f056 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/sniproxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/sniproxy.nix @@ -34,7 +34,7 @@ in type = types.lines; default = ""; description = "sniproxy.conf configuration excluding the daemon username and pid file."; - example = literalExample '' + example = '' error_log { filename /var/log/sniproxy/error.log } @@ -47,7 +47,7 @@ in table { example.com 192.0.2.10 example.net 192.0.2.20 - } + } ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/softether.nix b/third_party/nixpkgs/nixos/modules/services/networking/softether.nix index 2dc73d81b2..5405f56871 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/softether.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/softether.nix @@ -21,7 +21,7 @@ in package = mkOption { type = types.package; default = pkgs.softether; - defaultText = "pkgs.softether"; + defaultText = literalExpression "pkgs.softether"; description = '' softether derivation to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/spacecookie.nix b/third_party/nixpkgs/nixos/modules/services/networking/spacecookie.nix index e0bef9e962..400f3e26cc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/spacecookie.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/spacecookie.nix @@ -30,8 +30,8 @@ in { package = mkOption { type = types.package; default = pkgs.spacecookie; - defaultText = literalExample "pkgs.spacecookie"; - example = literalExample "pkgs.haskellPackages.spacecookie"; + defaultText = literalExpression "pkgs.spacecookie"; + example = literalExpression "pkgs.haskellPackages.spacecookie"; description = '' The spacecookie derivation to use. This can be used to override the used package or to use another version. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix b/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix index e60d9abf42..3c229ecfc7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix @@ -138,7 +138,7 @@ in default = {}; - example = literalExample '' + example = literalExpression '' { pipe1 = { keyfile = "/var/lib/spiped/pipe1.key"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix index 6e619f2254..9287943fcd 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -13,7 +13,7 @@ in { package = mkOption { type = types.package; default = pkgs.strongswan; - defaultText = "pkgs.strongswan"; + defaultText = literalExpression "pkgs.strongswan"; description = '' The strongswan derivation to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix b/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix index 401f7be402..e3a97207be 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix @@ -4,7 +4,7 @@ let inherit (builtins) toFile; inherit (lib) concatMapStringsSep concatStringsSep mapAttrsToList - mkIf mkEnableOption mkOption types literalExample; + mkIf mkEnableOption mkOption types literalExpression; cfg = config.services.strongswan; @@ -79,7 +79,7 @@ in connections = mkOption { type = types.attrsOf (types.attrsOf types.str); default = {}; - example = literalExample '' + example = literalExpression '' { "%default" = { keyexchange = "ikev2"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix b/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix index fe1616f411..70d0a7d3c1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix @@ -69,6 +69,7 @@ let CAFile = mkOption { type = types.nullOr types.path; default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + defaultText = literalExpression ''"''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"''; description = "Path to a file containing certificates to validate against."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix index 4f4b5cef37..eb24130e51 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix @@ -73,7 +73,7 @@ in path = mkOption { type = types.nullOr types.path; default = null; - example = literalExample "/etc/wpa_supplicant.conf"; + example = literalExpression "/etc/wpa_supplicant.conf"; description = '' External wpa_supplicant.conf configuration file. The configuration options defined declaratively within networking.supplicant have @@ -170,7 +170,7 @@ in default = { }; - example = literalExample '' + example = literalExpression '' { "wlan0 wlan1" = { configFile.path = "/etc/wpa_supplicant.conf"; userControlled.group = "network"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/supybot.nix b/third_party/nixpkgs/nixos/modules/services/networking/supybot.nix index 332c3ced06..94b79c7e24 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/supybot.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/supybot.nix @@ -24,7 +24,7 @@ in default = if versionAtLeast config.system.stateVersion "20.09" then "/var/lib/supybot" else "/home/supybot"; - defaultText = "/var/lib/supybot"; + defaultText = literalExpression "/var/lib/supybot"; description = "The root directory, logs and plugins are stored here"; }; @@ -49,7 +49,7 @@ in Please note that you still need to add the plugins to the config file (or with !load) using their attribute name. ''; - example = literalExample '' + example = literalExpression '' let plugins = pkgs.fetchzip { url = "https://github.com/ProgVal/Supybot-plugins/archive/57c2450c.zip"; @@ -66,12 +66,13 @@ in extraPackages = mkOption { type = types.functionTo (types.listOf types.package); default = p: []; + defaultText = literalExpression "p: []"; description = '' Extra Python packages available to supybot plugins. The value must be a function which receives the attrset defined in python3Packages as the sole argument. ''; - example = literalExample "p: [ p.lxml p.requests ]"; + example = literalExpression "p: [ p.lxml p.requests ]"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix index ebe4d89a0e..8c44687a38 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix @@ -182,7 +182,7 @@ in { will be reverted on restart if overrideDevices is enabled. ''; - example = literalExample '' + example = literalExpression '' { "/home/user/sync" = { id = "syncme"; @@ -243,7 +243,7 @@ in { There are 4 different types of versioning with different parameters. See . ''; - example = literalExample '' + example = literalExpression '' [ { versioning = { @@ -430,8 +430,8 @@ in { description = '' The path where the settings and keys will exist. ''; - default = cfg.dataDir + (optionalString cond "/.config/syncthing"); - defaultText = literalExample "dataDir${optionalString cond " + \"/.config/syncthing\""}"; + default = cfg.dataDir + optionalString cond "/.config/syncthing"; + defaultText = literalExpression "dataDir${optionalString cond " + \"/.config/syncthing\""}"; }; extraFlags = mkOption { @@ -461,7 +461,7 @@ in { package = mkOption { type = types.package; default = pkgs.syncthing; - defaultText = literalExample "pkgs.syncthing"; + defaultText = literalExpression "pkgs.syncthing"; description = '' The Syncthing package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix index 3f88ff53df..3f41646bf0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix @@ -24,7 +24,7 @@ in { package = mkOption { type = types.package; default = pkgs.tailscale; - defaultText = "pkgs.tailscale"; + defaultText = literalExpression "pkgs.tailscale"; description = "The package to use for tailscale"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix b/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix index 0716975f59..c7830289dc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix @@ -18,7 +18,7 @@ in { config = mkOption { type = types.attrs; # from https://github.com/TediCross/TediCross/blob/master/example.settings.yaml - example = literalExample '' + example = literalExpression '' { telegram = { useFirstNameInsteadOfUsername = false; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix b/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix index a1b0670348..b944916391 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix @@ -32,7 +32,7 @@ in { extraConfig = mkOption { default = {}; type = types.attrs; - example = literalExample ''{ + example = literalExpression ''{ reverseProxy = true; defaults = { name = "Your Network"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix b/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix index 22caf9f4ec..1d77503d68 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix @@ -226,7 +226,7 @@ in hostSettings = mkOption { default = { }; - example = literalExample '' + example = literalExpression '' { host1 = { addresses = [ @@ -282,7 +282,7 @@ in package = mkOption { type = types.package; default = pkgs.tinc_pre; - defaultText = "pkgs.tinc_pre"; + defaultText = literalExpression "pkgs.tinc_pre"; description = '' The package to use for the tinc daemon's binary. ''; @@ -302,7 +302,7 @@ in settings = mkOption { default = { }; type = types.submodule { freeformType = tincConfType; }; - example = literalExample '' + example = literalExpression '' { Interface = "custom.interface"; DirectOnly = true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/toxvpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/toxvpn.nix index 1765ef3ea2..18cf7672d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/toxvpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/toxvpn.nix @@ -22,7 +22,7 @@ with lib; auto_add_peers = mkOption { type = types.listOf types.str; default = []; - example = ''[ "toxid1" "toxid2" ]''; + example = [ "toxid1" "toxid2" ]; description = "peers to automatically connect to on startup"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/trickster.nix b/third_party/nixpkgs/nixos/modules/services/networking/trickster.nix index 49c945adb8..e48bba8fa5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/trickster.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/trickster.nix @@ -20,7 +20,7 @@ in package = mkOption { type = types.package; default = pkgs.trickster; - defaultText = "pkgs.trickster"; + defaultText = literalExpression "pkgs.trickster"; description = '' Package that should be used for trickster. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ucarp.nix b/third_party/nixpkgs/nixos/modules/services/networking/ucarp.nix index 9b19a19687..189e4f99ce 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ucarp.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ucarp.nix @@ -91,10 +91,10 @@ in { Command to run after become master, the interface name, virtual address and optional extra parameters are passed as arguments. ''; - example = '' + example = literalExpression '' pkgs.writeScript "upscript" ''' #!/bin/sh - $\{pkgs.iproute2\}/bin/ip addr add "$2"/24 dev "$1" + ''${pkgs.iproute2}/bin/ip addr add "$2"/24 dev "$1" '''; ''; }; @@ -105,10 +105,10 @@ in { Command to run after become backup, the interface name, virtual address and optional extra parameters are passed as arguments. ''; - example = '' + example = literalExpression '' pkgs.writeScript "downscript" ''' #!/bin/sh - $\{pkgs.iproute2\}/bin/ip addr del "$2"/24 dev "$1" + ''${pkgs.iproute2}/bin/ip addr del "$2"/24 dev "$1" '''; ''; }; @@ -152,7 +152,7 @@ in { upstream updates for a long time and can be considered as unmaintained. ''; default = pkgs.ucarp; - defaultText = "pkgs.ucarp"; + defaultText = literalExpression "pkgs.ucarp"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix index 6d7178047e..f6e9634909 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix @@ -45,7 +45,7 @@ in { package = mkOption { type = types.package; default = pkgs.unbound-with-systemd; - defaultText = "pkgs.unbound-with-systemd"; + defaultText = literalExpression "pkgs.unbound-with-systemd"; description = "The unbound package to use"; }; @@ -128,7 +128,7 @@ in { }; }; }; - example = literalExample '' + example = literalExpression '' { server = { interface = [ "127.0.0.1" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix index 73170ebfc9..708ea28a94 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix @@ -44,7 +44,7 @@ in services.unifi.jrePackage = mkOption { type = types.package; default = pkgs.jre8; - defaultText = "pkgs.jre8"; + defaultText = literalExpression "pkgs.jre8"; description = '' The JRE package to use. Check the release notes to ensure it is supported. ''; @@ -53,7 +53,7 @@ in services.unifi.unifiPackage = mkOption { type = types.package; default = pkgs.unifiLTS; - defaultText = "pkgs.unifiLTS"; + defaultText = literalExpression "pkgs.unifiLTS"; description = '' The unifi package to use. ''; @@ -62,7 +62,7 @@ in services.unifi.mongodbPackage = mkOption { type = types.package; default = pkgs.mongodb; - defaultText = "pkgs.mongodb"; + defaultText = literalExpression "pkgs.mongodb"; description = '' The mongodb package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix index 5489f74bf0..710c2d9ca1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix @@ -159,7 +159,7 @@ in userlistFile = mkOption { type = types.path; default = pkgs.writeText "userlist" (concatMapStrings (x: "${x}\n") cfg.userlist); - defaultText = "pkgs.writeText \"userlist\" (concatMapStrings (x: \"\${x}\n\") cfg.userlist)"; + defaultText = literalExpression ''pkgs.writeText "userlist" (concatMapStrings (x: "''${x}\n") cfg.userlist)''; description = '' Newline separated list of names to be allowed/denied if is true. Meaning see . diff --git a/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix b/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix index 27cb47be12..f7e014e03e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix @@ -21,7 +21,7 @@ let cfg = config.services.networking.websockify; in { sslKey = mkOption { description = "Path to the SSL key."; default = cfg.sslCert; - defaultText = "config.services.networking.websockify.sslCert"; + defaultText = literalExpression "config.services.networking.websockify.sslCert"; type = types.path; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix b/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix index 3b76de5854..414775fc35 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix @@ -56,9 +56,7 @@ let }; preUp = mkOption { - example = literalExample '' - ${pkgs.iproute2}/bin/ip netns add foo - ''; + example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns add foo"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; description = '' @@ -67,9 +65,7 @@ let }; preDown = mkOption { - example = literalExample '' - ${pkgs.iproute2}/bin/ip netns del foo - ''; + example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns del foo"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; description = '' @@ -78,9 +74,7 @@ let }; postUp = mkOption { - example = literalExample '' - ${pkgs.iproute2}/bin/ip netns add foo - ''; + example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns add foo"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; description = '' @@ -89,9 +83,7 @@ let }; postDown = mkOption { - example = literalExample '' - ${pkgs.iproute2}/bin/ip netns del foo - ''; + example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns del foo"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix index 2b51770a5a..55b84935b6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix @@ -62,9 +62,7 @@ let }; preSetup = mkOption { - example = literalExample '' - ${pkgs.iproute2}/bin/ip netns add foo - ''; + example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns add foo"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; description = '' @@ -73,8 +71,8 @@ let }; postSetup = mkOption { - example = literalExample '' - printf "nameserver 10.200.100.1" | ${pkgs.openresolv}/bin/resolvconf -a wg0 -m 0 + example = literalExpression '' + '''printf "nameserver 10.200.100.1" | ''${pkgs.openresolv}/bin/resolvconf -a wg0 -m 0''' ''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; @@ -82,7 +80,7 @@ let }; postShutdown = mkOption { - example = literalExample "${pkgs.openresolv}/bin/resolvconf -d wg0"; + example = literalExpression ''"''${pkgs.openresolv}/bin/resolvconf -d wg0"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; description = "Commands called after shutting down the interface."; 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 904a3db493..4aa350d21a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -328,7 +328,7 @@ in { description = '' Set this to true if the SSID of the network is hidden. ''; - example = literalExample '' + example = literalExpression '' { echelon = { hidden = true; psk = "abcdefgh"; @@ -377,7 +377,7 @@ in { /etc/wpa_supplicant.conf as the configuration file. ''; default = {}; - example = literalExample '' + example = literalExpression '' { echelon = { # SSID with no spaces or special characters psk = "abcdefgh"; # (password will be written to /nix/store!) }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/x2goserver.nix b/third_party/nixpkgs/nixos/modules/services/networking/x2goserver.nix index 554e51f9d4..d4adf6c565 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/x2goserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/x2goserver.nix @@ -42,7 +42,6 @@ in { nxagentDefaultOptions = mkOption { type = types.listOf types.str; default = [ "-extension GLX" "-nolisten tcp" ]; - example = [ "-extension GLX" "-nolisten tcp" ]; description = '' List of default nx agent options. ''; @@ -55,12 +54,14 @@ in { x2goserver.conf ini configuration as nix attributes. See `x2goserver.conf(5)` for details ''; - example = literalExample '' - superenicer = { - "enable" = "yes"; - "idle-nice-level" = 19; - }; - telekinesis = { "enable" = "no"; }; + example = literalExpression '' + { + superenicer = { + "enable" = "yes"; + "idle-nice-level" = 19; + }; + telekinesis = { "enable" = "no"; }; + } ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix b/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix index 3c40bb956f..4bd45a76e6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix @@ -14,7 +14,7 @@ in package = mkOption { type = types.package; default = pkgs.xandikos; - defaultText = "pkgs.xandikos"; + defaultText = literalExpression "pkgs.xandikos"; description = "The Xandikos package to use."; }; @@ -45,7 +45,7 @@ in extraOptions = mkOption { default = []; type = types.listOf types.str; - example = literalExample '' + example = literalExpression '' [ "--autocreate" "--defaults" "--current-user-principal user" diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix index 9be7c3233e..c4f828f3c5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix @@ -47,7 +47,7 @@ in package = mkOption { type = types.package; default = pkgs.xrdp; - defaultText = "pkgs.xrdp"; + defaultText = literalExpression "pkgs.xrdp"; description = '' The package to use for the xrdp daemon's binary. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix index 47a7152f6f..99c18ae691 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix @@ -99,7 +99,7 @@ in { package = mkOption { type = package; default = pkgs.yggdrasil; - defaultText = "pkgs.yggdrasil"; + defaultText = literalExpression "pkgs.yggdrasil"; description = "Yggdrasil package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/zeronet.nix b/third_party/nixpkgs/nixos/modules/services/networking/zeronet.nix index a34b2d8715..3370390a4c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/zeronet.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/zeronet.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - inherit (lib) generators literalExample mkEnableOption mkIf mkOption recursiveUpdate types; + inherit (lib) generators literalExpression mkEnableOption mkIf mkOption recursiveUpdate types; cfg = config.services.zeronet; dataDir = "/var/lib/zeronet"; configFile = pkgs.writeText "zeronet.conf" (generators.toINI {} (recursiveUpdate defaultSettings cfg.settings)); @@ -22,7 +22,7 @@ in with lib; { settings = mkOption { type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); default = {}; - example = literalExample "global.tor = enable;"; + example = literalExpression "{ global.tor = enable; }"; description = '' zeronet.conf configuration. Refer to @@ -34,7 +34,6 @@ in with lib; { port = mkOption { type = types.port; default = 43110; - example = 43110; description = "Optional zeronet web UI port."; }; @@ -43,7 +42,6 @@ in with lib; { # read-only config file and crashes type = types.port; default = 12261; - example = 12261; description = "Zeronet fileserver port."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix b/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix index cf39ed065a..3bc7d3ac0d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix @@ -19,7 +19,6 @@ in options.services.zerotierone.port = mkOption { default = 9993; - example = 9993; type = types.int; description = '' Network port used by ZeroTier. @@ -28,7 +27,7 @@ in options.services.zerotierone.package = mkOption { default = pkgs.zerotierone; - defaultText = "pkgs.zerotierone"; + defaultText = literalExpression "pkgs.zerotierone"; type = types.package; description = '' ZeroTier One package to use. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix b/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix index b872b99976..a98f92d2d7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix @@ -125,7 +125,7 @@ in config = mkOption { type = semanticTypes.zncConf; default = {}; - example = literalExample '' + example = literalExpression '' { LoadModule = [ "webadmin" "adminlog" ]; User.paul = { @@ -180,7 +180,7 @@ in configFile = mkOption { type = types.path; - example = "~/.znc/configs/znc.conf"; + example = literalExpression "~/.znc/configs/znc.conf"; description = '' Configuration file for ZNC. It is recommended to use the option instead. @@ -195,7 +195,7 @@ in modulePackages = mkOption { type = types.listOf types.package; default = [ ]; - example = literalExample "[ pkgs.zncModules.fish pkgs.zncModules.push ]"; + example = literalExpression "[ pkgs.zncModules.fish pkgs.zncModules.push ]"; description = '' A list of global znc module packages to add to znc. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix b/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix index be9dc78c86..0db051126e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix @@ -44,7 +44,7 @@ let modules = mkOption { type = types.listOf types.str; default = [ "simple_away" ]; - example = literalExample ''[ "simple_away" "sasl" ]''; + example = literalExpression ''[ "simple_away" "sasl" ]''; description = '' ZNC network modules to load. ''; @@ -148,7 +148,7 @@ in description = '' IRC networks to connect the user to. ''; - example = literalExample '' + example = literalExpression '' { "libera" = { server = "irc.libera.chat"; @@ -170,7 +170,7 @@ in }; passBlock = mkOption { - example = literalExample '' + example = '' <Pass password> Method = sha256 Hash = e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93 diff --git a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix index d2b36d9e75..53091d8e2a 100644 --- a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix @@ -270,7 +270,7 @@ in drivers = mkOption { type = types.listOf types.path; default = []; - example = literalExample "with pkgs; [ gutenprint hplip splix ]"; + example = literalExpression "with pkgs; [ gutenprint hplip splix ]"; description = '' CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript and Samba are added unconditionally. If this list contains diff --git a/third_party/nixpkgs/nixos/modules/services/scheduling/cron.nix b/third_party/nixpkgs/nixos/modules/services/scheduling/cron.nix index c28956b3bf..1fac54003c 100644 --- a/third_party/nixpkgs/nixos/modules/services/scheduling/cron.nix +++ b/third_party/nixpkgs/nixos/modules/services/scheduling/cron.nix @@ -52,7 +52,7 @@ in systemCronJobs = mkOption { type = types.listOf types.str; default = []; - example = literalExample '' + example = literalExpression '' [ "* * * * * test ls -l / > /tmp/cronout 2>&1" "* * * * * eelco echo Hello World > /home/eelco/cronout" ] diff --git a/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix b/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix index 40ebe29c9a..6df147be0c 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix @@ -53,7 +53,7 @@ in package = mkOption { description = "Elasticsearch package to use."; default = pkgs.elasticsearch; - defaultText = "pkgs.elasticsearch"; + defaultText = literalExpression "pkgs.elasticsearch"; type = types.package; }; @@ -140,7 +140,7 @@ in description = "Extra elasticsearch plugins"; default = [ ]; type = types.listOf types.package; - example = lib.literalExample "[ pkgs.elasticsearchPlugins.discovery-ec2 ]"; + example = lib.literalExpression "[ pkgs.elasticsearchPlugins.discovery-ec2 ]"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/search/hound.nix b/third_party/nixpkgs/nixos/modules/services/search/hound.nix index 7a44489efe..ef62175b0a 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/hound.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/hound.nix @@ -50,7 +50,7 @@ in { package = mkOption { default = pkgs.hound; - defaultText = "pkgs.hound"; + defaultText = literalExpression "pkgs.hound"; type = types.package; description = '' Package for running hound. @@ -63,16 +63,18 @@ in { The full configuration of the Hound daemon. Note the dbpath should be an absolute path to a writable location on disk. ''; - example = '' - { - "max-concurrent-indexers" : 2, - "dbpath" : "''${services.hound.home}/data", - "repos" : { - "nixpkgs": { - "url" : "https://www.github.com/NixOS/nixpkgs.git" - } - } - } + example = literalExpression '' + ''' + { + "max-concurrent-indexers" : 2, + "dbpath" : "''${services.hound.home}/data", + "repos" : { + "nixpkgs": { + "url" : "https://www.github.com/NixOS/nixpkgs.git" + } + } + } + ''' ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/search/kibana.nix b/third_party/nixpkgs/nixos/modules/services/search/kibana.nix index b3093abfa5..381f5156ce 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/kibana.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/kibana.nix @@ -149,8 +149,7 @@ in { package = mkOption { description = "Kibana package to use"; default = pkgs.kibana; - defaultText = "pkgs.kibana"; - example = "pkgs.kibana"; + defaultText = literalExpression "pkgs.kibana"; type = types.package; }; diff --git a/third_party/nixpkgs/nixos/modules/services/search/solr.nix b/third_party/nixpkgs/nixos/modules/services/search/solr.nix index a8615a20a1..ea76bfc929 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/solr.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/solr.nix @@ -16,7 +16,7 @@ in package = mkOption { type = types.package; default = pkgs.solr; - defaultText = "pkgs.solr"; + defaultText = literalExpression "pkgs.solr"; description = "Which Solr package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/certmgr.nix b/third_party/nixpkgs/nixos/modules/services/security/certmgr.nix index 94c0ba1411..d302a4e000 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/certmgr.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/certmgr.nix @@ -40,7 +40,7 @@ in package = mkOption { type = types.package; default = pkgs.certmgr; - defaultText = "pkgs.certmgr"; + defaultText = literalExpression "pkgs.certmgr"; description = "Which certmgr package to use in the service."; }; @@ -76,7 +76,7 @@ in specs = mkOption { default = {}; - example = literalExample '' + example = literalExpression '' { exampleCert = let diff --git a/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix b/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix index ee6d5d91fe..e5bed0a998 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix @@ -27,13 +27,13 @@ in { }; ca = mkOption { - defaultText = "\${cfg.dataDir}/ca.pem"; + defaultText = literalExpression ''"''${cfg.dataDir}/ca.pem"''; type = types.str; description = "CA used to sign the new certificate -- accepts '[file:]fname' or 'env:varname'."; }; caKey = mkOption { - defaultText = "file:\${cfg.dataDir}/ca-key.pem"; + defaultText = literalExpression ''"file:''${cfg.dataDir}/ca-key.pem"''; type = types.str; description = "CA private key -- accepts '[file:]fname' or 'env:varname'."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix index 499d346675..67e1026dce 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix @@ -55,22 +55,24 @@ in package = mkOption { default = pkgs.fail2ban; + defaultText = literalExpression "pkgs.fail2ban"; type = types.package; - example = "pkgs.fail2ban_0_11"; + example = literalExpression "pkgs.fail2ban_0_11"; description = "The fail2ban package to use for running the fail2ban service."; }; packageFirewall = mkOption { default = pkgs.iptables; + defaultText = literalExpression "pkgs.iptables"; type = types.package; - example = "pkgs.nftables"; + example = literalExpression "pkgs.nftables"; description = "The firewall package used by fail2ban service."; }; extraPackages = mkOption { default = []; type = types.listOf types.package; - example = lib.literalExample "[ pkgs.ipset ]"; + example = lib.literalExpression "[ pkgs.ipset ]"; description = '' Extra packages to be made available to the fail2ban service. The example contains the packages needed by the `iptables-ipset-proto6` action. @@ -202,7 +204,7 @@ in jails = mkOption { default = { }; - example = literalExample '' + example = literalExpression '' { apache-nohome-iptables = ''' # Block an IP address if it accesses a non-existent # home directory more than 5 times in 10 minutes, diff --git a/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix b/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix index fe0fba5b45..87c3f1f6f9 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix @@ -23,7 +23,7 @@ in package = mkOption { type = types.package; default = fprintdPkg; - defaultText = "if cfg.tod.enable then pkgs.fprintd-tod else pkgs.fprintd"; + defaultText = literalExpression "if config.services.fprintd.tod.enable then pkgs.fprintd-tod else pkgs.fprintd"; description = '' fprintd package to use. ''; @@ -35,7 +35,7 @@ in driver = mkOption { type = types.package; - example = literalExample "pkgs.libfprint-2-tod1-goodix"; + example = literalExpression "pkgs.libfprint-2-tod1-goodix"; description = '' Touch OEM Drivers (TOD) package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/haka.nix b/third_party/nixpkgs/nixos/modules/services/security/haka.nix index 618e689924..2cfc05f303 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/haka.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/haka.nix @@ -59,7 +59,7 @@ in package = mkOption { default = pkgs.haka; - defaultText = "pkgs.haka"; + defaultText = literalExpression "pkgs.haka"; type = types.package; description = " Which Haka derivation to use. diff --git a/third_party/nixpkgs/nixos/modules/services/security/hockeypuck.nix b/third_party/nixpkgs/nixos/modules/services/security/hockeypuck.nix index 2e98624bb2..d0e152934f 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/hockeypuck.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/hockeypuck.nix @@ -18,7 +18,7 @@ in { settings = lib.mkOption { type = settingsFormat.type; default = { }; - example = lib.literalExample '' + example = lib.literalExpression '' { hockeypuck = { loglevel = "INFO"; diff --git a/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix b/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix index 50d250fc4d..b4de1d36ed 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix @@ -13,7 +13,7 @@ in { package = mkOption { type = types.package; default = pkgs.nginx-sso; - defaultText = "pkgs.nginx-sso"; + defaultText = literalExpression "pkgs.nginx-sso"; description = '' The nginx-sso package that should be used. ''; @@ -22,7 +22,7 @@ in { configuration = mkOption { type = types.attrsOf types.unspecified; default = {}; - example = literalExample '' + example = literalExpression '' { listen = { addr = "127.0.0.1"; port = 8080; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix index e85fd4b75d..4d35624241 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix @@ -91,7 +91,7 @@ in package = mkOption { type = types.package; default = pkgs.oauth2-proxy; - defaultText = "pkgs.oauth2-proxy"; + defaultText = literalExpression "pkgs.oauth2-proxy"; description = '' The package that provides oauth2-proxy. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix index 5f894d0fa6..e78c4383e4 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix @@ -169,7 +169,6 @@ in configFile = mkOption { type = types.path; - default = ""; description = '' Path to PrivacyIDEA LDAP Proxy configuration (proxy.ini). ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix b/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix index 5908f727d5..fea2a855e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix @@ -14,7 +14,7 @@ in { configFile = mkOption { type = types.path; - example = "${pkgs.shibboleth-sp}/etc/shibboleth/shibboleth2.xml"; + example = literalExpression ''"''${pkgs.shibboleth-sp}/etc/shibboleth/shibboleth2.xml"''; description = "Path to shibboleth config file"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/sks.nix b/third_party/nixpkgs/nixos/modules/services/security/sks.nix index a91060dc65..f491159756 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/sks.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/sks.nix @@ -23,7 +23,7 @@ in { package = mkOption { default = pkgs.sks; - defaultText = "pkgs.sks"; + defaultText = literalExpression "pkgs.sks"; type = types.package; description = "Which SKS derivation to use."; }; @@ -74,7 +74,7 @@ in { webroot = mkOption { type = types.nullOr types.path; default = "${sksPkg.webSamples}/OpenPKG"; - defaultText = "\${pkgs.sks.webSamples}/OpenPKG"; + defaultText = literalExpression ''"''${package.webSamples}/OpenPKG"''; description = '' Source directory (will be symlinked, if not null) for the files the built-in webserver should serve. SKS (''${pkgs.sks.webSamples}) diff --git a/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix b/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix index 64eee11f58..2eccc30e40 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix @@ -13,6 +13,7 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.step-ca; + defaultText = lib.literalExpression "pkgs.step-ca"; description = "Which step-ca package to use."; }; address = lib.mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/security/tor.nix b/third_party/nixpkgs/nixos/modules/services/security/tor.nix index 1e1f443905..c94b248d5f 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/tor.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/tor.nix @@ -232,8 +232,7 @@ in package = mkOption { type = types.package; default = pkgs.tor; - defaultText = "pkgs.tor"; - example = literalExample "pkgs.tor"; + defaultText = literalExpression "pkgs.tor"; description = "Tor package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix b/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix index 4cdb3a041b..201b37f17b 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix @@ -44,7 +44,7 @@ in package = mkOption { type = types.package; default = pkgs.usbguard; - defaultText = "pkgs.usbguard"; + defaultText = literalExpression "pkgs.usbguard"; description = '' The usbguard package to use. If you do not need the Qt GUI, use pkgs.usbguard-nox to save disk space. diff --git a/third_party/nixpkgs/nixos/modules/services/security/vault.nix b/third_party/nixpkgs/nixos/modules/services/security/vault.nix index 5a20f6413b..b0ade62d97 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vault.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vault.nix @@ -42,7 +42,7 @@ in package = mkOption { type = types.package; default = pkgs.vault; - defaultText = "pkgs.vault"; + defaultText = literalExpression "pkgs.vault"; description = "This option specifies the vault package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix index d28ea61e66..5b951bc85e 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix @@ -60,7 +60,7 @@ in { config = mkOption { type = attrsOf (nullOr (oneOf [ bool int str ])); default = {}; - example = literalExample '' + example = literalExpression '' { domain = "https://bw.domain.tld:8443"; signupsAllowed = true; @@ -106,14 +106,14 @@ in { package = mkOption { type = package; default = pkgs.vaultwarden; - defaultText = "pkgs.vaultwarden"; + defaultText = literalExpression "pkgs.vaultwarden"; description = "Vaultwarden package to use."; }; webVaultPackage = mkOption { type = package; default = pkgs.vaultwarden-vault; - defaultText = "pkgs.vaultwarden-vault"; + defaultText = literalExpression "pkgs.vaultwarden-vault"; description = "Web vault package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix b/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix index 2972c64a36..8a2f98d041 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix @@ -33,7 +33,7 @@ in package = mkOption { type = types.package; default = pkgs.yubikey-agent; - defaultText = "pkgs.yubikey-agent"; + defaultText = literalExpression "pkgs.yubikey-agent"; description = '' The package used for the yubikey-agent daemon. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix b/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix index e29bdbe264..452efc7364 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix @@ -106,6 +106,7 @@ in path = optional ecfg.enableNotifications pkgs.dbus; serviceConfig = { StandardOutput = "null"; + StandardError = "journal"; ExecStart = '' ${pkgs.earlyoom}/bin/earlyoom \ -m ${toString ecfg.freeMemThreshold} \ diff --git a/third_party/nixpkgs/nixos/modules/services/system/saslauthd.nix b/third_party/nixpkgs/nixos/modules/services/system/saslauthd.nix index 8fcf4fb91f..466b0ca60a 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/saslauthd.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/saslauthd.nix @@ -20,7 +20,7 @@ in package = mkOption { default = pkgs.cyrus_sasl.bin; - defaultText = "pkgs.cyrus_sasl.bin"; + defaultText = literalExpression "pkgs.cyrus_sasl.bin"; type = types.package; description = "Cyrus SASL package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix b/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix index 151a1dd638..cb0da9e83b 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix @@ -50,7 +50,7 @@ in { config = mkOption { type = types.attrs; default = {}; - example = literalExample '' + example = literalExpression '' { download_location = "/srv/torrents/"; max_upload_speed = "1000.0"; @@ -149,7 +149,7 @@ in { package = mkOption { type = types.package; - example = literalExample "pkgs.deluge-2_x"; + example = literalExpression "pkgs.deluge-2_x"; description = '' Deluge package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix b/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix index 6ac85f8fa1..e500e02d86 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix @@ -39,7 +39,7 @@ in { systemScheduler = mkOption { default = true; - example = "false"; + example = false; type = types.bool; description = "When true, execute the runs via the flexget-runner.timer. If false, you have to specify the settings yourself in the YML file."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix b/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix index ada6f9b1e3..3dd7b1ece7 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix @@ -111,7 +111,7 @@ in { web.credentials = mkOption { type = types.attrsOf types.str; default = {}; - example = lib.literalExample '' + example = lib.literalExpression '' { myuser = "$2y$12$YE01LZ8jrbQbx6c0s2hdZO71dSjn2p/O9XsYJpz.5968yCysUgiaG"; } diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/opentracker.nix b/third_party/nixpkgs/nixos/modules/services/torrent/opentracker.nix index 74f443381d..d76d61dfe8 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/opentracker.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/opentracker.nix @@ -13,7 +13,7 @@ in { opentracker package to use ''; default = pkgs.opentracker; - defaultText = "pkgs.opentracker"; + defaultText = literalExpression "pkgs.opentracker"; }; extraOptions = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix b/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix index be57c03b17..dd7df623c7 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix @@ -45,7 +45,7 @@ in { package = mkOption { type = types.package; default = pkgs.rtorrent; - defaultText = "pkgs.rtorrent"; + defaultText = literalExpression "pkgs.rtorrent"; description = '' The rtorrent package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix b/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix index eb966c37ce..8c5b6e5e0c 100644 --- a/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix +++ b/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix @@ -42,6 +42,7 @@ in loginProgram = mkOption { type = types.path; default = "${pkgs.shadow}/bin/login"; + defaultText = literalExpression ''"''${pkgs.shadow}/bin/login"''; description = '' Path to the login binary executed by agetty. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix b/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix index b13393c898..e34b6e0510 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix @@ -126,6 +126,7 @@ in passwordFile = mkOption { type = types.path; default = pkgs.writeText "epgstation-password" defaultPassword; + defaultText = literalDocBook ''a file containing ${defaultPassword}''; example = "/run/keys/epgstation-password"; description = '' A file containing the password for . @@ -145,6 +146,7 @@ in passwordFile = mkOption { type = types.path; default = pkgs.writeText "epgstation-db-password" defaultPassword; + defaultText = literalDocBook ''a file containing ${defaultPassword}''; example = "/run/keys/epgstation-db-password"; description = '' A file containing the password for the database named @@ -189,14 +191,33 @@ in type = with types; listOf attrs; description = "Encoding presets for recorded videos."; default = [ - { name = "H264"; + { + name = "H264"; cmd = "${pkgs.epgstation}/libexec/enc.sh main"; suffix = ".mp4"; - default = true; } - { name = "H264-sub"; + default = true; + } + { + name = "H264-sub"; cmd = "${pkgs.epgstation}/libexec/enc.sh sub"; - suffix = "-sub.mp4"; } + suffix = "-sub.mp4"; + } ]; + defaultText = literalExpression '' + [ + { + name = "H264"; + cmd = "''${pkgs.epgstation}/libexec/enc.sh main"; + suffix = ".mp4"; + default = true; + } + { + name = "H264-sub"; + cmd = "''${pkgs.epgstation}/libexec/enc.sh sub"; + suffix = "-sub.mp4"; + } + ] + ''; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix b/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix index 1a99d1c976..16efb56cfd 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix @@ -72,7 +72,7 @@ in serverSettings = mkOption { type = settingsFmt.type; default = {}; - example = literalExample '' + example = literalExpression '' { highWaterMark = 25165824; overflowTimeLimit = 30000; @@ -89,7 +89,7 @@ in tunerSettings = mkOption { type = with types; nullOr settingsFmt.type; default = null; - example = literalExample '' + example = literalExpression '' [ { name = "tuner-name"; @@ -110,7 +110,7 @@ in channelSettings = mkOption { type = with types; nullOr settingsFmt.type; default = null; - example = literalExample '' + example = literalExpression '' [ { name = "channel"; diff --git a/third_party/nixpkgs/nixos/modules/services/video/replay-sorcery.nix b/third_party/nixpkgs/nixos/modules/services/video/replay-sorcery.nix index 7ce5be8a5a..abe7202a4a 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/replay-sorcery.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/replay-sorcery.nix @@ -26,7 +26,7 @@ in type = attrsOf (oneOf [ str int ]); default = {}; description = "System-wide configuration for ReplaySorcery (/etc/replay-sorcery.conf)."; - example = literalExample '' + example = literalExpression '' { videoInput = "hwaccel"; # requires `services.replay-sorcery.enableSysAdminCapability = true` videoFramerate = 60; diff --git a/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix b/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix index d4c0268ed6..17971b23db 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix @@ -104,7 +104,7 @@ in jrePackage = mkOption { type = types.package; default = pkgs.jre8; - defaultText = "pkgs.jre8"; + defaultText = literalExpression "pkgs.jre8"; description = '' The JRE package to use. Check the release notes to ensure it is supported. ''; @@ -113,7 +113,7 @@ in unifiVideoPackage = mkOption { type = types.package; default = pkgs.unifi-video; - defaultText = "pkgs.unifi-video"; + defaultText = literalExpression "pkgs.unifi-video"; description = '' The unifi-video package to use. ''; @@ -122,7 +122,7 @@ in mongodbPackage = mkOption { type = types.package; default = pkgs.mongodb-4_0; - defaultText = "pkgs.mongodb"; + defaultText = literalExpression "pkgs.mongodb"; description = '' The mongodb package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix index bd97a674eb..273693a3b2 100644 --- a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix +++ b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix @@ -18,7 +18,7 @@ in { options.services.cage.extraArguments = mkOption { type = types.listOf types.str; default = []; - defaultText = "[]"; + defaultText = literalExpression "[]"; description = "Additional command line arguments to pass to Cage."; example = ["-d"]; }; @@ -26,6 +26,7 @@ in { options.services.cage.program = mkOption { type = types.path; default = "${pkgs.xterm}/bin/xterm"; + defaultText = literalExpression ''"''${pkgs.xterm}/bin/xterm"''; description = '' Program to run in cage. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix index 59185fdbd3..2d809c17ff 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -128,14 +128,14 @@ in package = mkOption { type = types.package; default = pkgs.atlassian-confluence; - defaultText = "pkgs.atlassian-confluence"; + defaultText = literalExpression "pkgs.atlassian-confluence"; description = "Atlassian Confluence package to use."; }; jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; - defaultText = "pkgs.oraclejre8"; + defaultText = literalExpression "pkgs.oraclejre8"; description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix index ceab656b15..a8b2482d5a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -96,14 +96,14 @@ in package = mkOption { type = types.package; default = pkgs.atlassian-crowd; - defaultText = "pkgs.atlassian-crowd"; + defaultText = literalExpression "pkgs.atlassian-crowd"; description = "Atlassian Crowd package to use."; }; jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; - defaultText = "pkgs.oraclejre8"; + defaultText = literalExpression "pkgs.oraclejre8"; description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix index ce04982e8a..d7a26838d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix @@ -134,14 +134,14 @@ in package = mkOption { type = types.package; default = pkgs.atlassian-jira; - defaultText = "pkgs.atlassian-jira"; + defaultText = literalExpression "pkgs.atlassian-jira"; description = "Atlassian JIRA package to use."; }; jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; - defaultText = "pkgs.oraclejre8"; + defaultText = literalExpression "pkgs.oraclejre8"; description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix index 34a31af9c9..74eeb2faa4 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix @@ -91,7 +91,7 @@ in { user = mkOption { type = types.str; default = user; - defaultText = "\${user}"; + defaultText = literalExpression "user"; description = "Database username."; }; passwordFile = mkOption { @@ -187,14 +187,16 @@ in { (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {} ); default = {}; - example = { - serverAliases = [ - "bookstack.\${config.networking.domain}" - ]; - # To enable encryption and let let's encrypt take care of certificate - forceSSL = true; - enableACME = true; - }; + example = literalExpression '' + { + serverAliases = [ + "bookstack.''${config.networking.domain}" + ]; + # To enable encryption and let let's encrypt take care of certificate + forceSSL = true; + enableACME = true; + } + ''; description = '' With this option, you can customize the nginx virtualHost settings. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/cryptpad.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/cryptpad.nix index 69a89107d3..e6772de768 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/cryptpad.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/cryptpad.nix @@ -11,7 +11,7 @@ in package = mkOption { default = pkgs.cryptpad; - defaultText = "pkgs.cryptpad"; + defaultText = literalExpression "pkgs.cryptpad"; type = types.package; description = " Cryptpad package to use. @@ -21,7 +21,7 @@ in configFile = mkOption { type = types.path; default = "${cfg.package}/lib/node_modules/cryptpad/config/config.example.js"; - defaultText = "\${cfg.package}/lib/node_modules/cryptpad/config/config.example.js"; + defaultText = literalExpression ''"''${package}/lib/node_modules/cryptpad/config/config.example.js"''; description = '' Path to the JavaScript configuration file. diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix index 2b5999706d..f08dd65bdb 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix @@ -23,7 +23,7 @@ in settings = mkOption { type = settingsFormat.type; default = {}; - example = literalExample '' + example = literalExpression '' { # External url issuer = "http://127.0.0.1:5556/dex"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix index b28e3cf0de..c4fb7e2b31 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix @@ -33,7 +33,7 @@ in apply = p: p.override { plugins = lib.unique (p.enabledPlugins ++ cfg.plugins); }; - defaultText = "pkgs.discourse"; + defaultText = lib.literalExpression "pkgs.discourse"; description = '' The discourse package to use. ''; @@ -45,7 +45,7 @@ in config.networking.fqdn else config.networking.hostName; - defaultText = "config.networking.fqdn"; + defaultText = lib.literalExpression "config.networking.fqdn"; example = "discourse.example.com"; description = '' The hostname to serve Discourse on. @@ -99,7 +99,10 @@ in enableACME = lib.mkOption { type = lib.types.bool; default = cfg.sslCertificate == null && cfg.sslCertificateKey == null; - defaultText = "true, unless services.discourse.sslCertificate and services.discourse.sslCertificateKey are set."; + defaultText = lib.literalDocBook '' + true, unless + and are set. + ''; description = '' Whether an ACME certificate should be used to secure connections to the server. @@ -109,7 +112,7 @@ in backendSettings = lib.mkOption { type = with lib.types; attrsOf (nullOr (oneOf [ str int bool float ])); default = {}; - example = lib.literalExample '' + example = lib.literalExpression '' { max_reqs_per_ip_per_minute = 300; max_reqs_per_ip_per_10_seconds = 60; @@ -134,7 +137,7 @@ in siteSettings = lib.mkOption { type = json.type; default = {}; - example = lib.literalExample '' + example = lib.literalExpression '' { required = { title = "My Cats"; @@ -334,10 +337,8 @@ in notificationEmailAddress = lib.mkOption { type = lib.types.str; default = "${if cfg.mail.incoming.enable then "notifications" else "noreply"}@${cfg.hostname}"; - defaultText = '' - "notifications@`config.services.discourse.hostname`" if - config.services.discourse.mail.incoming.enable is "true", - otherwise "noreply`config.services.discourse.hostname`" + defaultText = lib.literalExpression '' + "''${if config.services.discourse.mail.incoming.enable then "notifications" else "noreply"}@''${config.services.discourse.hostname}" ''; description = '' The from: email address used when @@ -448,7 +449,7 @@ in replyEmailAddress = lib.mkOption { type = lib.types.str; default = "%{reply_key}@${cfg.hostname}"; - defaultText = "%{reply_key}@`config.services.discourse.hostname`"; + defaultText = lib.literalExpression ''"%{reply_key}@''${config.services.discourse.hostname}"''; description = '' Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or @@ -459,7 +460,7 @@ in mailReceiverPackage = lib.mkOption { type = lib.types.package; default = pkgs.discourse-mail-receiver; - defaultText = "pkgs.discourse-mail-receiver"; + defaultText = lib.literalExpression "pkgs.discourse-mail-receiver"; description = '' The discourse-mail-receiver package to use. ''; @@ -484,7 +485,7 @@ in plugins = lib.mkOption { type = lib.types.listOf lib.types.package; default = []; - example = lib.literalExample '' + example = lib.literalExpression '' with config.services.discourse.package.plugins; [ discourse-canned-replies discourse-github diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/documize.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/documize.nix index a5f48e744f..7f2ed82ee3 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/documize.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/documize.nix @@ -26,6 +26,7 @@ in { package = mkOption { type = types.package; default = pkgs.documize-community; + defaultText = literalExpression "pkgs.documize-community"; description = '' Which package to use for documize. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix index 964fef23ad..bc5b1a8be5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix @@ -2,7 +2,7 @@ let inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types maintainers recursiveUpdate; - inherit (lib) any attrValues concatMapStrings concatMapStringsSep flatten literalExample; + inherit (lib) any attrValues concatMapStrings concatMapStringsSep flatten literalExpression; inherit (lib) filterAttrs mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString; cfg = migrateOldAttrs config.services.dokuwiki; @@ -69,6 +69,7 @@ let package = mkOption { type = types.package; default = pkgs.dokuwiki; + defaultText = literalExpression "pkgs.dokuwiki"; description = "Which DokuWiki package to use."; }; @@ -167,24 +168,24 @@ let List of path(s) to respective plugin(s) which are copied from the 'plugin' directory. These plugins need to be packaged before use, see example. ''; - example = '' - # Let's package the icalevents plugin - plugin-icalevents = pkgs.stdenv.mkDerivation { - name = "icalevents"; - # Download the plugin from the dokuwiki site - src = pkgs.fetchurl { - url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip"; - sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; + example = literalExpression '' + let + # Let's package the icalevents plugin + plugin-icalevents = pkgs.stdenv.mkDerivation { + name = "icalevents"; + # Download the plugin from the dokuwiki site + src = pkgs.fetchurl { + url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip"; + sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; + }; + sourceRoot = "."; + # We need unzip to build this package + buildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; }; - sourceRoot = "."; - # We need unzip to build this package - buildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - # And then pass this theme to the plugin list like this: - plugins = [ plugin-icalevents ]; + in [ plugin-icalevents ] ''; }; @@ -195,23 +196,23 @@ let List of path(s) to respective template(s) which are copied from the 'tpl' directory. These templates need to be packaged before use, see example. ''; - example = '' - # Let's package the bootstrap3 theme - template-bootstrap3 = pkgs.stdenv.mkDerivation { - name = "bootstrap3"; - # Download the theme from the dokuwiki site - src = pkgs.fetchurl { - url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip"; - sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; + example = literalExpression '' + let + # Let's package the bootstrap3 theme + template-bootstrap3 = pkgs.stdenv.mkDerivation { + name = "bootstrap3"; + # Download the theme from the dokuwiki site + src = pkgs.fetchurl { + url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip"; + sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; + }; + # We need unzip to build this package + buildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; }; - # We need unzip to build this package - buildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - # And then pass this theme to the template list like this: - templates = [ template-bootstrap3 ]; + in [ template-bootstrap3 ] ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix index b87fecae65..06c3c6dfc3 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, utils, ... }: let - inherit (lib) mkDefault mkEnableOption mkIf mkOption types literalExample; + inherit (lib) mkDefault mkEnableOption mkIf mkOption types literalExpression; cfg = config.services.engelsystem; in { options = { @@ -24,9 +24,9 @@ in { package = mkOption { type = types.package; - example = literalExample "pkgs.engelsystem"; description = "Engelsystem package used for the service."; default = pkgs.engelsystem; + defaultText = literalExpression "pkgs.engelsystem"; }; createDatabase = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/fluidd.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/fluidd.nix index c632b8ff71..6ac1acc9d0 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/fluidd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/fluidd.nix @@ -12,7 +12,7 @@ in type = types.package; description = "Fluidd package to be used in the module"; default = pkgs.fluidd; - defaultText = "pkgs.fluidd"; + defaultText = literalExpression "pkgs.fluidd"; }; hostName = mkOption { @@ -25,9 +25,11 @@ in type = types.submodule (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }); default = { }; - example = { - serverAliases = [ "fluidd.\${config.networking.domain}" ]; - }; + example = literalExpression '' + { + serverAliases = [ "fluidd.''${config.networking.domain}" ]; + } + ''; description = "Extra configuration for the nginx virtual host of fluidd."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix index dd63857a55..db9dfeb474 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix @@ -80,6 +80,7 @@ in staticDir = mkOption { type = types.str; default = "${cfg.package.static}/static"; + defaultText = literalExpression ''"''${package.static}/static"''; example = "/var/lib/galene/static"; description = "Web server directory."; }; @@ -107,7 +108,7 @@ in package = mkOption { default = pkgs.galene; - defaultText = "pkgs.galene"; + defaultText = literalExpression "pkgs.galene"; type = types.package; description = '' Package for running Galene. diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix index 864587aea5..9ee9dbf1aa 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix @@ -64,13 +64,14 @@ in package = mkOption { type = types.package; default = pkgs.gerrit; + defaultText = literalExpression "pkgs.gerrit"; description = "Gerrit package to use"; }; jvmPackage = mkOption { type = types.package; default = pkgs.jre_headless; - defaultText = "pkgs.jre_headless"; + defaultText = literalExpression "pkgs.jre_headless"; description = "Java Runtime Environment package to use"; }; 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 d940f3d3da..b434f16e9b 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix @@ -73,7 +73,7 @@ in port = mkOption { type = types.int; default = 3000; - example = "80"; + example = 80; description = '' Port to listen on. ''; @@ -135,7 +135,7 @@ in csp = mkOption { type = types.nullOr types.attrs; default = null; - example = literalExample '' + example = literalExpression '' { enable = true; directives = { @@ -222,7 +222,7 @@ in db = mkOption { type = types.attrs; default = {}; - example = literalExample '' + example = literalExpression '' { dialect = "sqlite"; storage = "/var/lib/${name}/db.${name}.sqlite"; @@ -313,7 +313,7 @@ in errorPath = mkOption { type = types.nullOr types.str; default = null; - defaultText = "./public/views/error.ejs"; + defaultText = literalExpression "./public/views/error.ejs"; description = '' Path to the error template file. (Non-canonical paths are relative to HedgeDoc's base directory) @@ -322,7 +322,7 @@ in prettyPath = mkOption { type = types.nullOr types.str; default = null; - defaultText = "./public/views/pretty.ejs"; + defaultText = literalExpression "./public/views/pretty.ejs"; description = '' Path to the pretty template file. (Non-canonical paths are relative to HedgeDoc's base directory) @@ -331,7 +331,7 @@ in slidePath = mkOption { type = types.nullOr types.str; default = null; - defaultText = "./public/views/slide.hbs"; + defaultText = literalExpression "./public/views/slide.hbs"; description = '' Path to the slide template file. (Non-canonical paths are relative to HedgeDoc's base directory) @@ -340,7 +340,7 @@ in uploadsPath = mkOption { type = types.str; default = "${cfg.workDir}/uploads"; - defaultText = "/var/lib/${name}/uploads"; + defaultText = literalExpression "/var/lib/${name}/uploads"; description = '' Path under which uploaded files are saved. ''; @@ -925,6 +925,7 @@ in package = mkOption { type = types.package; default = pkgs.hedgedoc; + defaultText = literalExpression "pkgs.hedgedoc"; description = '' Package that provides HedgeDoc. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix index a69767194c..9c66589dff 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix @@ -20,7 +20,7 @@ in { port = mkOption { type = types.port; default = 5000; - example = "80"; + example = 80; description = '' Port to listen on. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index f8f0854f1b..b9761061aa 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -59,7 +59,7 @@ in { modulePackages = mkOption { type = attrsOf package; default = {}; - example = literalExample '' + example = literalExpression '' { "snow" = icingaweb2Modules.theme-snow; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/isso.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/isso.nix index d05a99a3ee..4c01781a6a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/isso.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/isso.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkEnableOption mkIf mkOption types literalExample; + inherit (lib) mkEnableOption mkIf mkOption types literalExpression; cfg = config.services.isso; @@ -31,7 +31,7 @@ in { freeformType = settingsFormat.type; }; - example = literalExample '' + example = literalExpression '' { general = { host = "http://localhost"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix index 4f181257ef..83cf224f7d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/jirafeau.nix @@ -84,18 +84,19 @@ in type = types.submodule (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }); default = {}; - example = { - serverAliases = [ "wiki.\${config.networking.domain}" ]; - }; + example = literalExpression '' + { + serverAliases = [ "wiki.''${config.networking.domain}" ]; + } + ''; description = "Extra configuration for the nginx virtual host of Jirafeau."; }; package = mkOption { type = types.package; default = pkgs.jirafeau; - defaultText = "pkgs.jirafeau"; + defaultText = literalExpression "pkgs.jirafeau"; description = "Jirafeau package to use"; - example = "pkgs.jirafeau"; }; poolConfig = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix index 997604754e..a32e1e9011 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix @@ -54,7 +54,7 @@ in config = mkOption { type = attrs; default = { }; - example = literalExample '' + example = literalExpression '' { enableWelcomePage = false; defaultLang = "fi"; @@ -81,7 +81,7 @@ in interfaceConfig = mkOption { type = attrs; default = { }; - example = literalExample '' + example = literalExpression '' { SHOW_JITSI_WATERMARK = false; SHOW_WATERMARK_FOR_GUESTS = false; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix index b1bea222c7..df8c711410 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix @@ -210,6 +210,7 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.keycloak; + defaultText = lib.literalExpression "pkgs.keycloak"; description = '' Keycloak package to use. ''; @@ -228,7 +229,7 @@ in extraConfig = lib.mkOption { type = lib.types.attrs; default = { }; - example = lib.literalExample '' + example = lib.literalExpression '' { "subsystem=keycloak-server" = { "spi=hostname" = { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.md b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.md new file mode 100644 index 0000000000..e6599cd843 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.md @@ -0,0 +1,34 @@ +# Lemmy {#module-services-lemmy} + +Lemmy is a federated alternative to reddit in rust. + +## Quickstart {#module-services-lemmy-quickstart} + +the minimum to start lemmy is + +```nix +services.lemmy = { + enable = true; + settings = { + hostname = "lemmy.union.rocks"; + database.createLocally = true; + }; + jwtSecretPath = "/run/secrets/lemmyJwt"; + caddy.enable = true; +} +``` + +(note that you can use something like agenix to get your secret jwt to the specified path) + +this will start the backend on port 8536 and the frontend on port 1234. +It will expose your instance with a caddy reverse proxy to the hostname you've provided. +Postgres will be initialized on that same instance automatically. + +## Usage {#module-services-lemmy-usage} + +On first connection you will be asked to define an admin user. + +## Missing {#module-services-lemmy-missing} + +- Exposing with nginx is not implemented yet. +- This has been tested using a local database with a unix socket connection. Using different database settings will likely require modifications diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix new file mode 100644 index 0000000000..ae7d0d02c8 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix @@ -0,0 +1,238 @@ +{ lib, pkgs, config, ... }: +with lib; +let + cfg = config.services.lemmy; + settingsFormat = pkgs.formats.json { }; +in +{ + meta.maintainers = with maintainers; [ happysalada ]; + # Don't edit the docbook xml directly, edit the md and generate it: + # `pandoc lemmy.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > lemmy.xml` + meta.doc = ./lemmy.xml; + + options.services.lemmy = { + + enable = mkEnableOption "lemmy a federated alternative to reddit in rust"; + + jwtSecretPath = mkOption { + type = types.path; + description = "Path to read the jwt secret from."; + }; + + ui = { + port = mkOption { + type = types.port; + default = 1234; + description = "Port where lemmy-ui should listen for incoming requests."; + }; + }; + + caddy.enable = mkEnableOption "exposing lemmy with the caddy reverse proxy"; + + settings = mkOption { + default = { }; + description = "Lemmy configuration"; + + type = types.submodule { + freeformType = settingsFormat.type; + + options.hostname = mkOption { + type = types.str; + default = null; + description = "The domain name of your instance (eg 'lemmy.ml')."; + }; + + options.port = mkOption { + type = types.port; + default = 8536; + description = "Port where lemmy should listen for incoming requests."; + }; + + options.federation = { + enabled = mkEnableOption "activitypub federation"; + }; + + options.captcha = { + enabled = mkOption { + type = types.bool; + default = true; + description = "Enable Captcha."; + }; + difficulty = mkOption { + type = types.enum [ "easy" "medium" "hard" ]; + default = "medium"; + description = "The difficultly of the captcha to solve."; + }; + }; + + options.database.createLocally = mkEnableOption "creation of database on the instance"; + + }; + }; + + }; + + config = + let + localPostgres = (cfg.settings.database.host == "localhost" || cfg.settings.database.host == "/run/postgresql"); + in + lib.mkIf cfg.enable { + services.lemmy.settings = (mapAttrs (name: mkDefault) + { + bind = "127.0.0.1"; + tls_enabled = true; + pictrs_url = with config.services.pict-rs; "http://${address}:${toString port}"; + actor_name_max_length = 20; + + rate_limit.message = 180; + rate_limit.message_per_second = 60; + rate_limit.post = 6; + rate_limit.post_per_second = 600; + rate_limit.register = 3; + rate_limit.register_per_second = 3600; + rate_limit.image = 6; + rate_limit.image_per_second = 3600; + } // { + database = mapAttrs (name: mkDefault) { + user = "lemmy"; + host = "/run/postgresql"; + port = 5432; + database = "lemmy"; + pool_size = 5; + }; + }); + + services.postgresql = mkIf localPostgres { + enable = mkDefault true; + }; + + services.pict-rs.enable = true; + + services.caddy = mkIf cfg.caddy.enable { + enable = mkDefault true; + virtualHosts."${cfg.settings.hostname}" = { + extraConfig = '' + handle_path /static/* { + root * ${pkgs.lemmy-ui}/dist + file_server + } + @for_backend { + path /api/* /pictrs/* feeds/* nodeinfo/* + } + handle @for_backend { + reverse_proxy 127.0.0.1:${toString cfg.settings.port} + } + @post { + method POST + } + handle @post { + reverse_proxy 127.0.0.1:${toString cfg.settings.port} + } + @jsonld { + header Accept "application/activity+json" + header Accept "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"" + } + handle @jsonld { + reverse_proxy 127.0.0.1:${toString cfg.settings.port} + } + handle { + reverse_proxy 127.0.0.1:${toString cfg.ui.port} + } + ''; + }; + }; + + assertions = [{ + assertion = cfg.settings.database.createLocally -> localPostgres; + message = "if you want to create the database locally, you need to use a local database"; + }]; + + systemd.services.lemmy = { + description = "Lemmy server"; + + environment = { + LEMMY_CONFIG_LOCATION = "/run/lemmy/config.hjson"; + + # Verify how this is used, and don't put the password in the nix store + LEMMY_DATABASE_URL = with cfg.settings.database;"postgres:///${database}?host=${host}"; + }; + + documentation = [ + "https://join-lemmy.org/docs/en/administration/from_scratch.html" + "https://join-lemmy.org/docs" + ]; + + wantedBy = [ "multi-user.target" ]; + + after = [ "pict-rs.service " ] ++ lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ]; + + requires = lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ]; + + # script is needed here since loadcredential is not accessible on ExecPreStart + script = '' + ${pkgs.coreutils}/bin/install -m 600 ${settingsFormat.generate "config.hjson" cfg.settings} /run/lemmy/config.hjson + jwtSecret="$(< $CREDENTIALS_DIRECTORY/jwt_secret )" + ${pkgs.jq}/bin/jq ".jwt_secret = \"$jwtSecret\"" /run/lemmy/config.hjson | ${pkgs.moreutils}/bin/sponge /run/lemmy/config.hjson + ${pkgs.lemmy-server}/bin/lemmy_server + ''; + + serviceConfig = { + DynamicUser = true; + RuntimeDirectory = "lemmy"; + LoadCredential = "jwt_secret:${cfg.jwtSecretPath}"; + }; + }; + + systemd.services.lemmy-ui = { + description = "Lemmy ui"; + + environment = { + LEMMY_UI_HOST = "127.0.0.1:${toString cfg.ui.port}"; + LEMMY_INTERNAL_HOST = "127.0.0.1:${toString cfg.settings.port}"; + LEMMY_EXTERNAL_HOST = cfg.settings.hostname; + LEMMY_HTTPS = "false"; + }; + + documentation = [ + "https://join-lemmy.org/docs/en/administration/from_scratch.html" + "https://join-lemmy.org/docs" + ]; + + wantedBy = [ "multi-user.target" ]; + + after = [ "lemmy.service" ]; + + requires = [ "lemmy.service" ]; + + serviceConfig = { + DynamicUser = true; + WorkingDirectory = "${pkgs.lemmy-ui}"; + ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.lemmy-ui}/dist/js/server.js"; + }; + }; + + systemd.services.lemmy-postgresql = mkIf cfg.settings.database.createLocally { + description = "Lemmy postgresql db"; + after = [ "postgresql.service" ]; + bindsTo = [ "postgresql.service" ]; + requiredBy = [ "lemmy.service" ]; + partOf = [ "lemmy.service" ]; + script = with cfg.settings.database; '' + PSQL() { + ${config.services.postgresql.package}/bin/psql --port=${toString cfg.settings.database.port} "$@" + } + # check if the database already exists + if ! PSQL -lqt | ${pkgs.coreutils}/bin/cut -d \| -f 1 | ${pkgs.gnugrep}/bin/grep -qw ${database} ; then + PSQL -tAc "CREATE ROLE ${user} WITH LOGIN;" + PSQL -tAc "CREATE DATABASE ${database} WITH OWNER ${user};" + fi + ''; + serviceConfig = { + User = config.services.postgresql.superUser; + Type = "oneshot"; + RemainAfterExit = true; + }; + }; + }; + +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.xml new file mode 100644 index 0000000000..0be9fb8aef --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.xml @@ -0,0 +1,56 @@ + + Lemmy + + Lemmy is a federated alternative to reddit in rust. + +
+ Quickstart + + the minimum to start lemmy is + + +services.lemmy = { + enable = true; + settings = { + hostname = "lemmy.union.rocks"; + database.createLocally = true; + }; + jwtSecretPath = "/run/secrets/lemmyJwt"; + caddy.enable = true; +} + + + (note that you can use something like agenix to get your secret + jwt to the specified path) + + + this will start the backend on port 8536 and the frontend on port + 1234. It will expose your instance with a caddy reverse proxy to + the hostname you’ve provided. Postgres will be initialized on that + same instance automatically. + +
+
+ Usage + + On first connection you will be asked to define an admin user. + +
+
+ Missing + + + + Exposing with nginx is not implemented yet. + + + + + This has been tested using a local database with a unix socket + connection. Using different database settings will likely + require modifications + + + +
+ diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix index 56265e8095..5ccd742a30 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix @@ -3,7 +3,7 @@ let inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption; - inherit (lib) literalExample mapAttrs optional optionalString types; + inherit (lib) literalExpression mapAttrs optional optionalString types; cfg = config.services.limesurvey; fpm = config.services.phpfpm.pools.limesurvey; @@ -51,7 +51,7 @@ in port = mkOption { type = types.int; default = if cfg.database.type == "pgsql" then 5442 else 3306; - defaultText = "3306"; + defaultText = literalExpression "3306"; description = "Database host port."; }; @@ -84,14 +84,14 @@ in else if pgsqlLocal then "/run/postgresql" else null ; - defaultText = "/run/mysqld/mysqld.sock"; + defaultText = literalExpression "/run/mysqld/mysqld.sock"; description = "Path to the unix socket file to use for authentication."; }; createLocally = mkOption { type = types.bool; default = cfg.database.type == "mysql"; - defaultText = "true"; + defaultText = literalExpression "true"; description = '' Create the database and database user locally. This currently only applies if database type "mysql" is selected. @@ -101,7 +101,7 @@ in virtualHost = mkOption { type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); - example = literalExample '' + example = literalExpression '' { hostName = "survey.example.org"; adminAddr = "webmaster@example.org"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix index 5bda7d5a5d..d3790d8b17 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix @@ -399,7 +399,7 @@ in { package = lib.mkOption { type = lib.types.package; default = pkgs.mastodon; - defaultText = "pkgs.mastodon"; + defaultText = lib.literalExpression "pkgs.mastodon"; description = "Mastodon package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.nix index 79a0354e22..b0d281cfb6 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.nix @@ -48,7 +48,7 @@ in { as they don't get backported if they are not security-relevant. ''; default = pkgs.matomo; - defaultText = "pkgs.matomo"; + defaultText = literalExpression "pkgs.matomo"; }; webServerUser = mkOption { @@ -100,13 +100,15 @@ in { ) ); default = null; - example = { - serverAliases = [ - "matomo.\${config.networking.domain}" - "stats.\${config.networking.domain}" - ]; - enableACME = false; - }; + example = literalExpression '' + { + serverAliases = [ + "matomo.''${config.networking.domain}" + "stats.''${config.networking.domain}" + ]; + enableACME = false; + } + ''; description = '' With this option, you can customize an nginx virtualHost which already has sensible defaults for Matomo. Either this option or the webServerUser option is mandatory. diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix index 1db1652022..977b6f60b2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix @@ -3,7 +3,7 @@ let inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption; - inherit (lib) concatStringsSep literalExample mapAttrsToList optional optionals optionalString types; + inherit (lib) concatStringsSep literalExpression mapAttrsToList optional optionals optionalString types; cfg = config.services.mediawiki; fpm = config.services.phpfpm.pools.mediawiki; @@ -176,6 +176,7 @@ in package = mkOption { type = types.package; default = pkgs.mediawiki; + defaultText = literalExpression "pkgs.mediawiki"; description = "Which MediaWiki package to use."; }; @@ -219,7 +220,7 @@ in Use null instead of path to enable extensions that are part of MediaWiki. ''; - example = literalExample '' + example = literalExpression '' { Matomo = pkgs.fetchzip { url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz"; @@ -286,14 +287,14 @@ in socket = mkOption { type = types.nullOr types.path; default = if cfg.database.createLocally then "/run/mysqld/mysqld.sock" else null; - defaultText = "/run/mysqld/mysqld.sock"; + defaultText = literalExpression "/run/mysqld/mysqld.sock"; description = "Path to the unix socket file to use for authentication."; }; createLocally = mkOption { type = types.bool; default = cfg.database.type == "mysql"; - defaultText = "true"; + defaultText = literalExpression "true"; description = '' Create the database and database user locally. This currently only applies if database type "mysql" is selected. @@ -303,7 +304,7 @@ in virtualHost = mkOption { type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); - example = literalExample '' + example = literalExpression '' { hostName = "mediawiki.example.org"; adminAddr = "webmaster@example.org"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix index 1bbadafa20..026bde2a92 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -35,7 +35,7 @@ in config = mkOption { type = types.attrsOf types.str; - example = literalExample '' + example = literalExpression '' { CLEANUP_FREQUENCY = "48"; LISTEN_ADDR = "localhost:8080"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/moinmoin.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/moinmoin.nix index 7a54255a46..efb73124a2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/moinmoin.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/moinmoin.nix @@ -151,7 +151,7 @@ in webHost = mkDefault name; }; })); - example = literalExample '' + example = literalExpression '' { "mywiki" = { siteName = "Example Wiki"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix index c854e084e1..6f5cfa2e34 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix @@ -2,7 +2,7 @@ let inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types; - inherit (lib) concatStringsSep literalExample mapAttrsToList optional optionalString; + inherit (lib) concatStringsSep literalExpression mapAttrsToList optional optionalString; cfg = config.services.moodle; fpm = config.services.phpfpm.pools.moodle; @@ -67,7 +67,7 @@ in package = mkOption { type = types.package; default = pkgs.moodle; - defaultText = "pkgs.moodle"; + defaultText = literalExpression "pkgs.moodle"; description = "The Moodle package to use."; }; @@ -100,7 +100,7 @@ in mysql = 3306; pgsql = 5432; }.${cfg.database.type}; - defaultText = "3306"; + defaultText = literalExpression "3306"; }; name = mkOption { @@ -131,7 +131,7 @@ in if mysqlLocal then "/run/mysqld/mysqld.sock" else if pgsqlLocal then "/run/postgresql" else null; - defaultText = "/run/mysqld/mysqld.sock"; + defaultText = literalExpression "/run/mysqld/mysqld.sock"; description = "Path to the unix socket file to use for authentication."; }; @@ -144,7 +144,7 @@ in virtualHost = mkOption { type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); - example = literalExample '' + example = literalExpression '' { hostName = "moodle.example.org"; adminAddr = "webmaster@example.org"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 3c952fd883..886e030b80 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -134,14 +134,14 @@ in { phpExtraExtensions = mkOption { type = with types; functionTo (listOf package); default = all: []; - defaultText = "all: []"; + defaultText = literalExpression "all: []"; description = '' Additional PHP extensions to use for nextcloud. By default, only extensions necessary for a vanilla nextcloud installation are enabled, but you may choose from the list of available extensions and add further ones. This is sometimes necessary to be able to install a certain nextcloud app that has additional requirements. ''; - example = literalExample '' + example = literalExpression '' all: [ all.pdlib all.bz2 ] ''; }; @@ -312,6 +312,90 @@ in { phone-numbers. ''; }; + + objectstore = { + s3 = { + enable = mkEnableOption '' + S3 object storage as primary storage. + + This mounts a bucket on an Amazon S3 object storage or compatible + implementation into the virtual filesystem. + + See nextcloud's documentation on "Object Storage as Primary + Storage" for more details. + ''; + bucket = mkOption { + type = types.str; + example = "nextcloud"; + description = '' + The name of the S3 bucket. + ''; + }; + autocreate = mkOption { + type = types.bool; + description = '' + Create the objectstore if it does not exist. + ''; + }; + key = mkOption { + type = types.str; + example = "EJ39ITYZEUH5BGWDRUFY"; + description = '' + The access key for the S3 bucket. + ''; + }; + secretFile = mkOption { + type = types.str; + example = "/var/nextcloud-objectstore-s3-secret"; + description = '' + The full path to a file that contains the access secret. Must be + readable by user nextcloud. + ''; + }; + hostname = mkOption { + type = types.nullOr types.str; + default = null; + example = "example.com"; + description = '' + Required for some non-Amazon implementations. + ''; + }; + port = mkOption { + type = types.nullOr types.port; + default = null; + description = '' + Required for some non-Amazon implementations. + ''; + }; + useSsl = mkOption { + type = types.bool; + default = true; + description = '' + Use SSL for objectstore access. + ''; + }; + region = mkOption { + type = types.nullOr types.str; + default = null; + example = "REGION"; + description = '' + Required for some non-Amazon implementations. + ''; + }; + usePathStyle = mkOption { + type = types.bool; + default = false; + description = '' + Required for some non-Amazon S3 implementations. + + Ordinarily, requests will be made with + http://bucket.hostname.domain/, but with path style + enabled requests are made with + http://hostname.domain/bucket instead. + ''; + }; + }; + }; }; enableImagemagick = mkEnableOption '' @@ -479,14 +563,31 @@ in { nextcloud-setup = let c = cfg.config; writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]"; + requiresReadSecretFunction = c.dbpassFile != null || c.objectstore.s3.enable; + objectstoreConfig = let s3 = c.objectstore.s3; in optionalString s3.enable '' + 'objectstore' => [ + 'class' => '\\OC\\Files\\ObjectStore\\S3', + 'arguments' => [ + 'bucket' => '${s3.bucket}', + 'autocreate' => ${boolToString s3.autocreate}, + 'key' => '${s3.key}', + 'secret' => nix_read_secret('${s3.secretFile}'), + ${optionalString (s3.hostname != null) "'hostname' => '${s3.hostname}',"} + ${optionalString (s3.port != null) "'port' => ${toString s3.port},"} + 'use_ssl' => ${boolToString s3.useSsl}, + ${optionalString (s3.region != null) "'region' => '${s3.region}',"} + 'use_path_style' => ${boolToString s3.usePathStyle}, + ], + ] + ''; + overrideConfig = pkgs.writeText "nextcloud-config.php" '' '${c.dbuser}',"} ${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"} ${optionalString (c.dbpass != null) "'dbpassword' => '${c.dbpass}',"} - ${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_pwd(),"} + ${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_secret('${c.dbpassFile}'),"} 'dbtype' => '${c.dbtype}', 'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)}, 'trusted_proxies' => ${writePhpArrary (c.trustedProxies)}, ${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"} + ${objectstoreConfig} ]; ''; occInstallCmd = let diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix index d4d507362c..dc50a06705 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix @@ -16,6 +16,7 @@ in package = mkOption { type = types.package; default = pkgs.nexus; + defaultText = literalExpression "pkgs.nexus"; description = "Package which runs Nexus3"; }; @@ -70,6 +71,27 @@ in -Dkaraf.startLocalConsole=false -Djava.endorsed.dirs=${cfg.package}/lib/endorsed ''; + defaultText = literalExpression '' + ''' + -Xms1200M + -Xmx1200M + -XX:MaxDirectMemorySize=2G + -XX:+UnlockDiagnosticVMOptions + -XX:+UnsyncloadClass + -XX:+LogVMOutput + -XX:LogFile=''${home}/nexus3/log/jvm.log + -XX:-OmitStackTraceInFastThrow + -Djava.net.preferIPv4Stack=true + -Dkaraf.home=''${package} + -Dkaraf.base=''${package} + -Dkaraf.etc=''${package}/etc/karaf + -Djava.util.logging.config.file=''${package}/etc/karaf/java.util.logging.properties + -Dkaraf.data=''${home}/nexus3 + -Djava.io.tmpdir=''${home}/nexus3/tmp + -Dkaraf.startLocalConsole=false + -Djava.endorsed.dirs=''${package}/lib/endorsed + ''' + ''; description = '' Options for the JVM written to `nexus.jvmopts`. diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix index 400790576d..4512907f02 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix @@ -21,7 +21,7 @@ in package = mkOption { default = pkgs.nodePackages.node-red; - defaultText = "pkgs.nodePackages.node-red"; + defaultText = literalExpression "pkgs.nodePackages.node-red"; type = types.package; description = "Node-RED package to use."; }; @@ -46,7 +46,7 @@ in configFile = mkOption { type = types.path; default = "${cfg.package}/lib/node_modules/node-red/settings.js"; - defaultText = "\${cfg.package}/lib/node_modules/node-red/settings.js"; + defaultText = literalExpression ''"''${package}/lib/node_modules/node-red/settings.js"''; description = '' Path to the JavaScript configuration file. See These plugins need to be packaged before use, see example. ''; - example = '' - # Wordpress plugin 'embed-pdf-viewer' installation example - embedPdfViewerPlugin = pkgs.stdenv.mkDerivation { - name = "embed-pdf-viewer-plugin"; - # Download the theme from the wordpress site - src = pkgs.fetchurl { - url = "https://downloads.wordpress.org/plugin/embed-pdf-viewer.2.0.3.zip"; - sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd"; + example = literalExpression '' + let + # Wordpress plugin 'embed-pdf-viewer' installation example + embedPdfViewerPlugin = pkgs.stdenv.mkDerivation { + name = "embed-pdf-viewer-plugin"; + # Download the theme from the wordpress site + src = pkgs.fetchurl { + url = "https://downloads.wordpress.org/plugin/embed-pdf-viewer.2.0.3.zip"; + sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd"; + }; + # We need unzip to build this package + nativeBuildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; }; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - - And then pass this theme to the themes list like this: - plugins = [ embedPdfViewerPlugin ]; + # And then pass this theme to the themes list like this: + in [ embedPdfViewerPlugin ] ''; }; @@ -133,23 +134,23 @@ let List of path(s) to respective theme(s) which are copied from the 'theme' directory. These themes need to be packaged before use, see example. ''; - example = '' - # Let's package the responsive theme - responsiveTheme = pkgs.stdenv.mkDerivation { - name = "responsive-theme"; - # Download the theme from the wordpress site - src = pkgs.fetchurl { - url = "https://downloads.wordpress.org/theme/responsive.3.14.zip"; - sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3"; + example = literalExpression '' + let + # Let's package the responsive theme + responsiveTheme = pkgs.stdenv.mkDerivation { + name = "responsive-theme"; + # Download the theme from the wordpress site + src = pkgs.fetchurl { + url = "https://downloads.wordpress.org/theme/responsive.3.14.zip"; + sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3"; + }; + # We need unzip to build this package + nativeBuildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; }; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - - And then pass this theme to the themes list like this: - themes = [ responsiveTheme ]; + # And then pass this theme to the themes list like this: + in [ responsiveTheme ] ''; }; @@ -204,7 +205,7 @@ let socket = mkOption { type = types.nullOr types.path; default = null; - defaultText = "/run/mysqld/mysqld.sock"; + defaultText = literalExpression "/run/mysqld/mysqld.sock"; description = "Path to the unix socket file to use for authentication."; }; @@ -217,7 +218,7 @@ let virtualHost = mkOption { type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); - example = literalExample '' + example = literalExpression '' { adminAddr = "webmaster@example.org"; forceSSL = true; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix index b4d653d2d7..7a70ae6cd5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix @@ -46,7 +46,7 @@ in https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html for more information. ''; - example = literalExample '' + example = literalExpression '' { "jetbrains.youtrack.overrideRootPassword" = "tortuga"; } @@ -60,7 +60,7 @@ in ''; type = types.package; default = pkgs.youtrack; - defaultText = "pkgs.youtrack"; + defaultText = literalExpression "pkgs.youtrack"; }; port = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/zabbix.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/zabbix.nix index e94861a90b..21567896a8 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/zabbix.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/zabbix.nix @@ -3,7 +3,7 @@ let inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types; - inherit (lib) literalExample mapAttrs optionalString versionAtLeast; + inherit (lib) literalExpression mapAttrs optionalString versionAtLeast; cfg = config.services.zabbixWeb; fpm = config.services.phpfpm.pools.zabbix; @@ -43,7 +43,7 @@ in package = mkOption { type = types.package; default = pkgs.zabbix.web; - defaultText = "zabbix.web"; + defaultText = literalExpression "zabbix.web"; description = "Which Zabbix package to use."; }; @@ -116,7 +116,7 @@ in virtualHost = mkOption { type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); - example = literalExample '' + example = literalExpression '' { hostName = "zabbix.example.org"; adminAddr = "webmaster@example.org"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix index ceb1998709..992a58875e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -407,7 +407,7 @@ in package = mkOption { type = types.package; default = pkgs.apacheHttpd; - defaultText = "pkgs.apacheHttpd"; + defaultText = literalExpression "pkgs.apacheHttpd"; description = '' Overridable attribute of the Apache HTTP Server package to use. ''; @@ -416,8 +416,8 @@ in configFile = mkOption { type = types.path; default = confFile; - defaultText = "confFile"; - example = literalExample ''pkgs.writeText "httpd.conf" "# my custom config file ..."''; + defaultText = literalExpression "confFile"; + example = literalExpression ''pkgs.writeText "httpd.conf" "# my custom config file ..."''; description = '' Override the configuration file used by Apache. By default, NixOS generates one automatically. @@ -437,7 +437,7 @@ in extraModules = mkOption { type = types.listOf types.unspecified; default = []; - example = literalExample '' + example = literalExpression '' [ "proxy_connect" { name = "jk"; path = "''${pkgs.tomcat_connectors}/modules/mod_jk.so"; } @@ -516,7 +516,14 @@ in documentRoot = "${pkg}/htdocs"; }; }; - example = literalExample '' + defaultText = literalExpression '' + { + localhost = { + documentRoot = "''${package.out}/htdocs"; + }; + } + ''; + example = literalExpression '' { "foo.example.com" = { forceSSL = true; @@ -550,7 +557,7 @@ in phpPackage = mkOption { type = types.package; default = pkgs.php; - defaultText = "pkgs.php"; + defaultText = literalExpression "pkgs.php"; description = '' Overridable attribute of the PHP package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index 3f732a5c9f..8bb7e91ec9 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -1,6 +1,6 @@ { config, lib, name, ... }: let - inherit (lib) literalExample mkOption nameValuePair types; + inherit (lib) literalExpression mkOption nameValuePair types; in { options = { @@ -266,7 +266,7 @@ in locations = mkOption { type = with types; attrsOf (submodule (import ./location-options.nix)); default = {}; - example = literalExample '' + example = literalExpression '' { "/" = { proxyPass = "http://localhost:3000"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix index fd71020963..cef27e2e59 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix @@ -83,7 +83,7 @@ in inherit config lib; })); default = { }; - example = literalExample '' + example = literalExpression '' { "hydra.example.com" = { serverAliases = [ "www.hydra.example.com" ]; @@ -162,8 +162,7 @@ in package = mkOption { default = pkgs.caddy; - defaultText = "pkgs.caddy"; - example = "pkgs.caddy"; + defaultText = literalExpression "pkgs.caddy"; type = types.package; description = '' Caddy package to use. diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix index 9f25dc34f3..8cd6d02094 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix @@ -41,11 +41,13 @@ in configText = mkOption { default = ""; - example = '' - source-filter=''${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py - about-filter=''${pkgs.cgit}/lib/cgit/filters/about-formatting.sh - cache-size=1000 - scan-path=/srv/git + example = literalExpression '' + ''' + source-filter=''${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py + about-filter=''${pkgs.cgit}/lib/cgit/filters/about-formatting.sh + cache-size=1000 + scan-path=/srv/git + ''' ''; type = types.lines; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/minio.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/minio.nix index 6b10afad49..c345e3f246 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/minio.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/minio.nix @@ -87,7 +87,7 @@ in package = mkOption { default = pkgs.minio; - defaultText = "pkgs.minio"; + defaultText = literalExpression "pkgs.minio"; type = types.package; description = "Minio package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix index 58db9b9bed..0bd8b3316c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix @@ -22,8 +22,8 @@ in { hostName = mkOption { type = types.str; - example = literalExample "config.networking.hostName"; default = config.networking.hostName; + defaultText = literalExpression "config.networking.hostName"; description = '' The hostname to respond to requests for. Requests for URLs with other hosts will result in a status 53 (PROXY REQUEST REFUSED) diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 6682472fdb..d5486be65e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -425,7 +425,7 @@ in package = mkOption { default = pkgs.nginxStable; - defaultText = "pkgs.nginxStable"; + defaultText = literalExpression "pkgs.nginxStable"; type = types.package; apply = p: p.override { modules = p.modules ++ cfg.additionalModules; @@ -440,7 +440,7 @@ in additionalModules = mkOption { default = []; type = types.listOf (types.attrsOf types.anything); - example = literalExample "[ pkgs.nginxModules.brotli ]"; + example = literalExpression "[ pkgs.nginxModules.brotli ]"; description = '' Additional third-party nginx modules to install. Packaged modules are available in @@ -674,7 +674,7 @@ in addresses = mkOption { type = types.listOf types.str; default = []; - example = literalExample ''[ "[::1]" "127.0.0.1:5353" ]''; + example = literalExpression ''[ "[::1]" "127.0.0.1:5353" ]''; description = "List of resolvers to use"; }; valid = mkOption { @@ -738,7 +738,7 @@ in Defines a group of servers to use as proxy target. ''; default = {}; - example = literalExample '' + example = literalExpression '' "backend_server" = { servers = { "127.0.0.1:8000" = {}; }; extraConfig = '''' @@ -755,7 +755,7 @@ in default = { localhost = {}; }; - example = literalExample '' + example = literalExpression '' { "hydra.example.com" = { forceSSL = true; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/location-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/location-options.nix index d8c976f202..56a5381e05 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/location-options.nix @@ -12,7 +12,7 @@ with lib; basicAuth = mkOption { type = types.attrsOf types.str; default = {}; - example = literalExample '' + example = literalExpression '' { user = "password"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix index 94645e927f..7ee041d372 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -162,7 +162,7 @@ with lib; sslTrustedCertificate = mkOption { type = types.nullOr types.path; default = null; - example = "\${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + example = literalExpression ''"''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"''; description = "Path to root SSL certificate for stapling and client certificates."; }; @@ -231,7 +231,7 @@ with lib; basicAuth = mkOption { type = types.attrsOf types.str; default = {}; - example = literalExample '' + example = literalExpression '' { user = "password"; }; @@ -261,7 +261,7 @@ with lib; inherit lib; })); default = {}; - example = literalExample '' + example = literalExpression '' { "/" = { proxyPass = "http://localhost:3000"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix index 4d302299f5..87c68fa074 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix @@ -59,7 +59,7 @@ let phpPackage = mkOption { type = types.package; default = cfg.phpPackage; - defaultText = "config.services.phpfpm.phpPackage"; + defaultText = literalExpression "config.services.phpfpm.phpPackage"; description = '' The PHP package to use for running this PHP-FPM pool. ''; @@ -78,7 +78,7 @@ let description = '' Environment variables used for this PHP-FPM pool. ''; - example = literalExample '' + example = literalExpression '' { HOSTNAME = "$HOSTNAME"; TMP = "/tmp"; @@ -107,7 +107,7 @@ let for details. Note that settings names must be enclosed in quotes (e.g. "pm.max_children" instead of pm.max_children). ''; - example = literalExample '' + example = literalExpression '' { "pm" = "dynamic"; "pm.max_children" = 75; @@ -179,7 +179,7 @@ in { phpPackage = mkOption { type = types.package; default = pkgs.php; - defaultText = "pkgs.php"; + defaultText = literalExpression "pkgs.php"; description = '' The PHP package to use for running the PHP-FPM service. ''; @@ -200,7 +200,7 @@ in { pools = mkOption { type = types.attrsOf (types.submodule poolOpts); default = {}; - example = literalExample '' + example = literalExpression '' { mypool = { user = "php"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix index 13fe98402c..f9446fe125 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix @@ -24,8 +24,8 @@ in package = mkOption { type = types.package; default = pkgs.tomcat85; - defaultText = "pkgs.tomcat85"; - example = lib.literalExample "pkgs.tomcat9"; + defaultText = literalExpression "pkgs.tomcat85"; + example = lib.literalExpression "pkgs.tomcat9"; description = '' Which tomcat package to use. ''; @@ -127,7 +127,7 @@ in webapps = mkOption { type = types.listOf types.path; default = [ tomcat.webapps ]; - defaultText = "[ pkgs.tomcat85.webapps ]"; + defaultText = literalExpression "[ pkgs.tomcat85.webapps ]"; description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; @@ -166,7 +166,7 @@ in jdk = mkOption { type = types.package; default = pkgs.jdk; - defaultText = "pkgs.jdk"; + defaultText = literalExpression "pkgs.jdk"; description = "Which JDK to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix index 3d29199dd4..eb7fd0995d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix @@ -54,7 +54,7 @@ in { staticConfigFile = mkOption { default = null; - example = literalExample "/path/to/static_config.toml"; + example = literalExpression "/path/to/static_config.toml"; type = types.nullOr types.path; description = '' Path to traefik's static configuration to use. @@ -78,7 +78,7 @@ in { dynamicConfigFile = mkOption { default = null; - example = literalExample "/path/to/dynamic_config.toml"; + example = literalExpression "/path/to/dynamic_config.toml"; type = types.nullOr types.path; description = '' Path to traefik's dynamic configuration to use. @@ -123,7 +123,7 @@ in { package = mkOption { default = pkgs.traefik; - defaultText = "pkgs.traefik"; + defaultText = literalExpression "pkgs.traefik"; type = types.package; description = "Traefik package to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/default.nix index 341e8b1397..706ea5bfef 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/default.nix @@ -62,15 +62,17 @@ in ipAllow = mkOption { type = types.nullOr yaml.type; default = builtins.fromJSON (builtins.readFile ./ip_allow.json); - defaultText = "upstream defaults"; - example = literalExample { - ip_allow = [{ - apply = "in"; - ip_addrs = "127.0.0.1"; - action = "allow"; - methods = "ALL"; - }]; - }; + defaultText = literalDocBook "upstream defaults"; + example = literalExpression '' + { + ip_allow = [{ + apply = "in"; + ip_addrs = "127.0.0.1"; + action = "allow"; + methods = "ALL"; + }]; + } + ''; description = '' Control client access to Traffic Server and Traffic Server connections to upstream servers. @@ -83,8 +85,8 @@ in logging = mkOption { type = types.nullOr yaml.type; default = builtins.fromJSON (builtins.readFile ./logging.json); - defaultText = "upstream defaults"; - example = literalExample { }; + defaultText = literalDocBook "upstream defaults"; + example = { }; description = '' Configure logs. @@ -145,7 +147,7 @@ in in valueType; default = { }; - example = literalExample { proxy.config.proxy_name = "my_server"; }; + example = { proxy.config.proxy_name = "my_server"; }; description = '' List of configurable variables used by Traffic Server. @@ -197,12 +199,14 @@ in sni = mkOption { type = types.nullOr yaml.type; default = null; - example = literalExample { - sni = [{ - fqdn = "no-http2.example.com"; - https = "off"; - }]; - }; + example = literalExpression '' + { + sni = [{ + fqdn = "no-http2.example.com"; + https = "off"; + }]; + } + ''; description = '' Configure aspects of TLS connection handling for both inbound and outbound connections. 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 68d55ee6ff..431509f7fd 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/ttyd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/ttyd.nix @@ -78,7 +78,7 @@ in clientOptions = mkOption { type = types.attrsOf types.str; default = {}; - example = literalExample ''{ + example = literalExpression ''{ fontSize = "16"; fontFamily = "Fira Code"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/unit/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/unit/default.nix index 2a264bf2e9..b2eecdbb53 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/unit/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/unit/default.nix @@ -14,7 +14,7 @@ in { package = mkOption { type = types.package; default = pkgs.unit; - defaultText = "pkgs.unit"; + defaultText = literalExpression "pkgs.unit"; description = "Unit package to use."; }; user = mkOption { @@ -45,7 +45,7 @@ in { "applications": {} } ''; - example = literalExample '' + example = '' { "listeners": { "*:8300": { diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix index 2dfc39c847..ac43595131 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix @@ -114,7 +114,7 @@ in { default = { type = "normal"; }; - example = literalExample '' + example = literalExpression '' { type = "emperor"; vassals = { @@ -163,7 +163,7 @@ in { type = types.listOf types.str; apply = caps: caps ++ optionals isEmperor imperialPowers; default = [ ]; - example = literalExample '' + example = literalExpression '' [ "CAP_NET_BIND_SERVICE" # bind on ports <1024 "CAP_NET_RAW" # open raw sockets diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/varnish/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/varnish/default.nix index 01fe3d1291..7597b80baf 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/varnish/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/varnish/default.nix @@ -16,7 +16,7 @@ in package = mkOption { type = types.package; default = pkgs.varnish; - defaultText = "pkgs.varnish"; + defaultText = literalExpression "pkgs.varnish"; description = '' The package to use ''; @@ -48,7 +48,7 @@ in extraModules = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.varnishPackages.geoip ]"; + example = literalExpression "[ pkgs.varnishPackages.geoip ]"; description = " Varnish modules (except 'std'). "; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/zope2.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/zope2.nix index ab12e87502..9221091602 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/zope2.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/zope2.nix @@ -75,7 +75,7 @@ in services.zope2.instances = mkOption { default = {}; type = with types; attrsOf (submodule zope2Opts); - example = literalExample '' + example = literalExpression '' { plone01 = { http_address = "127.0.0.1:8080"; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix index 24ca82fca7..6c7105729c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix @@ -14,7 +14,7 @@ in { default = with pkgs.xorg; [ xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud ]; - example = literalExample '' + defaultText = literalExpression '' with pkgs.xorg; [ xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud ] @@ -50,7 +50,7 @@ in { security.wrappers = { dtmail = { setgid = true; - owner = "nobody"; + owner = "root"; group = "mail"; source = "${pkgs.cdesktopenv}/bin/dtmail"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix index d201c1a533..a0a5873f72 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -26,7 +26,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gnome.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -50,7 +50,7 @@ in environment.cinnamon.excludePackages = mkOption { default = []; - example = literalExample "[ pkgs.cinnamon.blueberry ]"; + example = literalExpression "[ pkgs.cinnamon.blueberry ]"; type = types.listOf types.package; description = "Which packages cinnamon should exclude from the default environment"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix index 9bb671adbe..e65e016466 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -186,7 +186,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gnome.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GNOME Shell extensions or GSettings-conditional autostart. @@ -200,9 +200,11 @@ in internal = true; # this is messy default = defaultFavoriteAppsOverride; type = types.lines; - example = literalExample '' - [org.gnome.shell] - favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ] + example = literalExpression '' + ''' + [org.gnome.shell] + favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ] + ''' ''; description = "List of desktop files to put as favorite apps into gnome-shell. These need to be installed somehow globally."; }; @@ -242,13 +244,13 @@ in wmCommand = mkOption { type = types.str; description = "The executable of the window manager to use."; - example = "\${pkgs.haskellPackages.xmonad}/bin/xmonad"; + example = literalExpression ''"''${pkgs.haskellPackages.xmonad}/bin/xmonad"''; }; enableGnomePanel = mkOption { type = types.bool; default = true; - example = "false"; + example = false; description = "Whether to enable the GNOME panel in this session."; }; }; @@ -259,20 +261,20 @@ in panelModulePackages = mkOption { default = [ pkgs.gnome.gnome-applets ]; + defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]"; type = types.listOf types.path; description = '' Packages containing modules that should be made available to gnome-panel (usually for applets). If you're packaging something to use here, please install the modules in $out/lib/gnome-panel/modules. ''; - example = literalExample "[ pkgs.gnome.gnome-applets ]"; }; }; }; environment.gnome.excludePackages = mkOption { default = []; - example = literalExample "[ pkgs.gnome.totem ]"; + example = literalExpression "[ pkgs.gnome.totem ]"; type = types.listOf types.package; description = "Which packages gnome should exclude from the default environment"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix index af303d6fb2..b853c94d6f 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -18,8 +18,8 @@ in package = mkOption { type = types.package; default = pkgs.kodi; - defaultText = "pkgs.kodi"; - example = "pkgs.kodi.withPackages (p: with p; [ jellyfin pvr-iptvsimple vfs-sftp ])"; + defaultText = literalExpression "pkgs.kodi"; + example = literalExpression "pkgs.kodi.withPackages (p: with p; [ jellyfin pvr-iptvsimple vfs-sftp ])"; description = '' Package that should be used for Kodi. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix index 71dfad5c7c..720985ba0d 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -19,7 +19,7 @@ in environment.lxqt.excludePackages = mkOption { default = []; - example = literalExample "[ pkgs.lxqt.qterminal ]"; + example = literalExpression "[ pkgs.lxqt.qterminal ]"; type = types.listOf types.package; description = "Which LXQt packages to exclude from the default environment"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix index 19ab9edb73..f8f47a0614 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix @@ -35,7 +35,7 @@ in environment.mate.excludePackages = mkOption { default = []; - example = literalExample "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]"; + example = literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]"; type = types.listOf types.package; description = "Which MATE packages to exclude from the default environment"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index 887d6c91e8..10969a373b 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -43,7 +43,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.gnome.gpaste ]"; + example = literalExpression "[ pkgs.gnome.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -86,7 +86,7 @@ in environment.pantheon.excludePackages = mkOption { default = []; - example = literalExample "[ pkgs.pantheon.elementary-camera ]"; + example = literalExpression "[ pkgs.pantheon.elementary-camera ]"; type = types.listOf types.package; description = "Which packages pantheon should exclude from the default environment"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/surf-display.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/surf-display.nix index 9aeb0bbd2a..4b5a04f988 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/surf-display.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/surf-display.nix @@ -50,6 +50,7 @@ in { defaultWwwUri = mkOption { type = types.str; default = "${pkgs.surf-display}/share/surf-display/empty-page.html"; + defaultText = literalExpression ''"''${pkgs.surf-display}/share/surf-display/empty-page.html"''; example = "https://www.example.com/"; description = "Default URI to display."; }; @@ -57,7 +58,7 @@ in { inactivityInterval = mkOption { type = types.int; default = 300; - example = "0"; + example = 0; description = '' Setting for internal inactivity timer to restart surf-display if the user goes inactive/idle to get a fresh session for the next user of diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix index bbfdea2225..25276e1d64 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -49,7 +49,7 @@ in thunarPlugins = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.xfce.thunar-archive-plugin ]"; + example = literalExpression "[ pkgs.xfce.thunar-archive-plugin ]"; description = '' A list of plugin that should be installed with Thunar. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xterm.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xterm.nix index f76db278a9..3424ee1b0e 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -14,8 +14,8 @@ in services.xserver.desktopManager.xterm.enable = mkOption { type = types.bool; - default = (versionOlder config.system.stateVersion "19.09") && xSessionEnabled; - defaultText = if versionOlder config.system.stateVersion "19.09" then "config.services.xserver.enable" else "false"; + default = versionOlder config.system.stateVersion "19.09" && xSessionEnabled; + defaultText = literalExpression ''versionOlder config.system.stateVersion "19.09" && config.services.xserver.enable;''; description = "Enable a xterm terminal as a desktop manager."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index 584dfb63c4..7fc8db95a4 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix @@ -217,7 +217,7 @@ in session = mkOption { default = []; - example = literalExample + example = literalExpression '' [ { manage = "desktop"; name = "xterm"; @@ -305,9 +305,7 @@ in execCmd = mkOption { type = types.str; - example = literalExample '' - "''${pkgs.lightdm}/bin/lightdm" - ''; + example = literalExpression ''"''${pkgs.lightdm}/bin/lightdm"''; description = "Command to start the display manager."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix index ecd46a9ee6..930ee96b38 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -35,7 +35,7 @@ in { package = mkOption { type = types.package; default = pkgs.gnome.gnome-themes-extra; - defaultText = "pkgs.gnome.gnome-themes-extra"; + defaultText = literalExpression "pkgs.gnome.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; @@ -54,7 +54,7 @@ in { package = mkOption { type = types.package; default = pkgs.papirus-icon-theme; - defaultText = "pkgs.papirus-icon-theme"; + defaultText = literalExpression "pkgs.papirus-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; @@ -73,7 +73,7 @@ in { package = mkOption { type = types.package; default = pkgs.capitaine-cursors; - defaultText = "pkgs.capitaine-cursors"; + defaultText = literalExpression "pkgs.capitaine-cursors"; description = '' The package path that contains the cursor theme given in the name option. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index fe5a16bc60..debd4b568b 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -48,7 +48,7 @@ in package = mkOption { type = types.package; default = pkgs.gnome.gnome-themes-extra; - defaultText = "pkgs.gnome.gnome-themes-extra"; + defaultText = literalExpression "pkgs.gnome.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; @@ -69,7 +69,7 @@ in package = mkOption { type = types.package; default = pkgs.gnome.adwaita-icon-theme; - defaultText = "pkgs.gnome.adwaita-icon-theme"; + defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; @@ -90,7 +90,7 @@ in package = mkOption { type = types.package; default = pkgs.gnome.adwaita-icon-theme; - defaultText = "pkgs.gnome.adwaita-icon-theme"; + defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix index 41c1b635f5..1c9a5f978c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix @@ -148,7 +148,7 @@ in background = mkOption { type = types.path; # Manual cannot depend on packages, we are actually setting the default in config below. - defaultText = "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath"; + defaultText = literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath"; description = '' The background image or color to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index d79b3cda2f..5a4fad9c4c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -113,14 +113,12 @@ in settings = mkOption { type = iniFmt.type; default = { }; - example = '' - { - Autologin = { - User = "john"; - Session = "plasma.desktop"; - }; - } - ''; + example = { + Autologin = { + User = "john"; + Session = "plasma.desktop"; + }; + }; description = '' Extra settings merged in and overwritting defaults in sddm.conf. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix b/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix index b1c4e04975..159bed63e1 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix @@ -93,7 +93,7 @@ in extraLayouts = mkOption { type = types.attrsOf (types.submodule layoutOpts); default = {}; - example = literalExample + example = literalExpression '' { mine = { diff --git a/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix b/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix index 51f72dadbd..ae990141a5 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix @@ -21,15 +21,17 @@ in rules = mkOption { type = types.attrsOf types.str; default = {}; - example = literalExample '' - ".*" = ''' - None, Up, Button4, 8 - None, Down, Button5, 8 - Shift_L, Up, Shift_L|Button4, 4 - Shift_L, Down, Shift_L|Button5, 4 - Control_L, Up, Control_L|Button4 - Control_L, Down, Control_L|Button5 - '''; + example = literalExpression '' + { + ".*" = ''' + None, Up, Button4, 8 + None, Down, Button5, 8 + Shift_L, Up, Shift_L|Button4, 4 + Shift_L, Down, Shift_L|Button5, 4 + Control_L, Up, Control_L|Button4 + Control_L, Down, Control_L|Button5 + '''; + } ''; description = '' Window class translation rules. diff --git a/third_party/nixpkgs/nixos/modules/services/x11/picom.nix b/third_party/nixpkgs/nixos/modules/services/x11/picom.nix index 977d0fea21..dbd4b1cefe 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/picom.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/picom.nix @@ -254,7 +254,7 @@ in { in mkOption { type = topLevel; default = { }; - example = literalExample '' + example = literalExpression '' blur = { method = "gaussian"; size = 10; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/redshift.nix b/third_party/nixpkgs/nixos/modules/services/x11/redshift.nix index 60d80a2876..cc9f964754 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/redshift.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/redshift.nix @@ -76,7 +76,7 @@ in { package = mkOption { type = types.package; default = pkgs.redshift; - defaultText = "pkgs.redshift"; + defaultText = literalExpression "pkgs.redshift"; description = '' redshift derivation to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/touchegg.nix b/third_party/nixpkgs/nixos/modules/services/x11/touchegg.nix index fab7fac3f0..9d3678e769 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/touchegg.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/touchegg.nix @@ -16,7 +16,7 @@ in { package = mkOption { type = types.package; default = pkgs.touchegg; - defaultText = "pkgs.touchegg"; + defaultText = literalExpression "pkgs.touchegg"; description = "touchegg derivation to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/unclutter-xfixes.nix b/third_party/nixpkgs/nixos/modules/services/x11/unclutter-xfixes.nix index 71262431b6..0b4d06f640 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/unclutter-xfixes.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/unclutter-xfixes.nix @@ -17,7 +17,7 @@ in { description = "unclutter-xfixes derivation to use."; type = types.package; default = pkgs.unclutter-xfixes; - defaultText = "pkgs.unclutter-xfixes"; + defaultText = literalExpression "pkgs.unclutter-xfixes"; }; timeout = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/x11/unclutter.nix b/third_party/nixpkgs/nixos/modules/services/x11/unclutter.nix index 56e30c79d1..bdb5fa7b50 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/unclutter.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/unclutter.nix @@ -16,7 +16,7 @@ in { package = mkOption { type = types.package; default = pkgs.unclutter; - defaultText = "pkgs.unclutter"; + defaultText = literalExpression "pkgs.unclutter"; description = "unclutter derivation to use."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/urxvtd.nix b/third_party/nixpkgs/nixos/modules/services/x11/urxvtd.nix index 867ac38a94..0a0df447f4 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/urxvtd.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/urxvtd.nix @@ -19,7 +19,7 @@ in { package = mkOption { default = pkgs.rxvt-unicode; - defaultText = "pkgs.rxvt-unicode"; + defaultText = literalExpression "pkgs.rxvt-unicode"; description = '' Package to install. Usually pkgs.rxvt-unicode. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/awesome.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/awesome.nix index 37a14e34f5..c6c0c934f9 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/awesome.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/awesome.nix @@ -27,7 +27,7 @@ in default = []; type = types.listOf types.package; description = "List of lua packages available for being used in the Awesome configuration."; - example = literalExample "[ pkgs.luaPackages.vicious ]"; + example = literalExpression "[ pkgs.luaPackages.vicious ]"; }; package = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/bspwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/bspwm.nix index 23cd4f6529..ade24061a0 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/bspwm.nix @@ -14,15 +14,15 @@ in package = mkOption { type = types.package; default = pkgs.bspwm; - defaultText = "pkgs.bspwm"; - example = "pkgs.bspwm-unstable"; + defaultText = literalExpression "pkgs.bspwm"; + example = literalExpression "pkgs.bspwm-unstable"; description = '' bspwm package to use. ''; }; configFile = mkOption { type = with types; nullOr path; - example = "${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"; + example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"''; default = null; description = '' Path to the bspwm configuration file. @@ -34,15 +34,15 @@ in package = mkOption { type = types.package; default = pkgs.sxhkd; - defaultText = "pkgs.sxhkd"; - example = "pkgs.sxhkd-unstable"; + defaultText = literalExpression "pkgs.sxhkd"; + example = literalExpression "pkgs.sxhkd-unstable"; description = '' sxhkd package to use. ''; }; configFile = mkOption { type = with types; nullOr path; - example = "${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"; + example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"''; default = null; description = '' Path to the sxhkd configuration file. diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix index 5015852db6..78772c7997 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix @@ -13,7 +13,7 @@ in package = mkOption { type = types.package; default = pkgs.lispPackages.clfswm; - defaultText = "pkgs.lispPackages.clfswm"; + defaultText = literalExpression "pkgs.lispPackages.clfswm"; description = '' clfswm package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix index 4b707d3984..b505f720f0 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix @@ -22,7 +22,7 @@ in loadScript = mkOption { default = "(require 'exwm)"; type = types.lines; - example = literalExample '' + example = '' (require 'exwm) (exwm-enable) ''; @@ -39,8 +39,9 @@ in }; extraPackages = mkOption { type = types.functionTo (types.listOf types.package); - default = self: []; - example = literalExample '' + default = epkgs: []; + defaultText = literalExpression "epkgs: []"; + example = literalExpression '' epkgs: [ epkgs.emms epkgs.magit diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix index 548097a412..354d70c695 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix @@ -14,7 +14,7 @@ in package = mkOption { type = types.package; default = pkgs.herbstluftwm; - defaultText = "pkgs.herbstluftwm"; + defaultText = literalExpression "pkgs.herbstluftwm"; description = '' Herbstluftwm package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/i3.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/i3.nix index 0ef55d5f2c..99f9997024 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/i3.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/i3.nix @@ -30,8 +30,8 @@ in package = mkOption { type = types.package; default = pkgs.i3; - defaultText = "pkgs.i3"; - example = "pkgs.i3-gaps"; + defaultText = literalExpression "pkgs.i3"; + example = literalExpression "pkgs.i3-gaps"; description = '' i3 package to use. ''; @@ -40,7 +40,7 @@ in extraPackages = mkOption { type = with types; listOf package; default = with pkgs; [ dmenu i3status i3lock ]; - example = literalExample '' + defaultText = literalExpression '' with pkgs; [ dmenu i3status diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/wmderland.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/wmderland.nix index a6864a8277..56b6922096 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/wmderland.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/wmderland.nix @@ -28,7 +28,7 @@ in feh rxvt-unicode ]; - example = literalExample '' + defaultText = literalExpression '' with pkgs; [ rofi dunst diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix index fe8ed38125..6aa0d5f76f 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix @@ -2,7 +2,7 @@ with lib; let - inherit (lib) mkOption mkIf optionals literalExample; + inherit (lib) mkOption mkIf optionals literalExpression; cfg = config.services.xserver.windowManager.xmonad; ghcWithPackages = cfg.haskellPackages.ghcWithPackages; @@ -42,8 +42,8 @@ in { enable = mkEnableOption "xmonad"; haskellPackages = mkOption { default = pkgs.haskellPackages; - defaultText = "pkgs.haskellPackages"; - example = literalExample "pkgs.haskell.packages.ghc784"; + defaultText = literalExpression "pkgs.haskellPackages"; + example = literalExpression "pkgs.haskell.packages.ghc784"; description = '' haskellPackages used to build Xmonad and other packages. This can be used to change the GHC version used to build @@ -55,8 +55,8 @@ in { extraPackages = mkOption { type = types.functionTo (types.listOf types.package); default = self: []; - defaultText = "self: []"; - example = literalExample '' + defaultText = literalExpression "self: []"; + example = literalExpression '' haskellPackages: [ haskellPackages.xmonad-contrib haskellPackages.monad-logger diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix b/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix index 5ce08fce7c..947d8f4edf 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix @@ -27,7 +27,8 @@ in locker = mkOption { default = "${pkgs.xlockmore}/bin/xlock"; # default according to `man xautolock` - example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img"; + defaultText = literalExpression ''"''${pkgs.xlockmore}/bin/xlock"''; + example = literalExpression ''"''${pkgs.i3lock}/bin/i3lock -i /path/to/img"''; type = types.str; description = '' @@ -37,7 +38,7 @@ in nowlocker = mkOption { default = null; - example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img"; + example = literalExpression ''"''${pkgs.i3lock}/bin/i3lock -i /path/to/img"''; type = types.nullOr types.str; description = '' @@ -56,7 +57,7 @@ in notifier = mkOption { default = null; - example = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; + example = literalExpression ''"''${pkgs.libnotify}/bin/notify-send 'Locking in 10 seconds'"''; type = types.nullOr types.str; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index ee190ac3cc..cb620f10b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -217,7 +217,7 @@ in inputClassSections = mkOption { type = types.listOf types.lines; default = []; - example = literalExample '' + example = literalExpression '' [ ''' Identifier "Trackpoint Wheel Emulation" MatchProduct "ThinkPad USB Keyboard with TrackPoint" @@ -233,7 +233,7 @@ in modules = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ pkgs.xf86_input_wacom ]"; + example = literalExpression "[ pkgs.xf86_input_wacom ]"; description = "Packages to be added to the module search path of the X server."; }; @@ -351,6 +351,7 @@ in xkbDir = mkOption { type = types.path; default = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + defaultText = literalExpression ''"''${pkgs.xkeyboard_config}/etc/X11/xkb"''; description = '' Path used for -xkbdir xserver parameter. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix b/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix index 704fc15fe2..8dbfe393f1 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix @@ -110,7 +110,7 @@ in system.activationScripts = mkOption { default = {}; - example = literalExample '' + example = literalExpression '' { stdio.text = ''' # Needed by some programs. @@ -147,7 +147,7 @@ in system.userActivationScripts = mkOption { default = {}; - example = literalExample '' + example = literalExpression '' { plasmaSetup = { text = ''' ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5" @@ -193,9 +193,8 @@ in environment.usrbinenv = mkOption { default = "${pkgs.coreutils}/bin/env"; - example = literalExample '' - "''${pkgs.busybox}/bin/env" - ''; + defaultText = literalExpression ''"''${pkgs.coreutils}/bin/env"''; + example = literalExpression ''"''${pkgs.busybox}/bin/env"''; type = types.nullOr types.path; visible = false; description = '' 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 dad9acba91..026fd1791d 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -155,7 +155,7 @@ in specialisation = mkOption { default = {}; - example = lib.literalExample "{ fewJobsManyCores.configuration = { nix.buildCores = 0; nix.maxJobs = 1; }; }"; + example = lib.literalExpression "{ fewJobsManyCores.configuration = { nix.buildCores = 0; nix.maxJobs = 1; }; }"; description = '' Additional configurations to build. If inheritParentConfig is true, the system @@ -243,7 +243,7 @@ in system.replaceRuntimeDependencies = mkOption { default = []; - example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]"; + example = lib.literalExpression "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]"; type = types.listOf (types.submodule ( { ... }: { options.original = mkOption { @@ -274,7 +274,11 @@ in if config.networking.hostName == "" then "unnamed" else config.networking.hostName; - defaultText = '''networking.hostName' if non empty else "unnamed"''; + defaultText = literalExpression '' + if config.networking.hostName == "" + then "unnamed" + else config.networking.hostName; + ''; description = '' The name of the system used in the derivation. diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix index b35fb0b57c..9b52d4bbdb 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix @@ -35,7 +35,7 @@ in ''; - example = "./configuration.ovpn"; + example = literalExpression "./configuration.ovpn"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix index 00ac83a189..0999142de8 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix @@ -78,7 +78,7 @@ in authorizedKeys = mkOption { type = types.listOf types.str; default = config.users.users.root.openssh.authorizedKeys.keys; - defaultText = "config.users.users.root.openssh.authorizedKeys.keys"; + defaultText = literalExpression "config.users.users.root.openssh.authorizedKeys.keys"; description = '' Authorized keys for the root user on initrd. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix index 15a5fd2360..46f2e3fec0 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -23,7 +23,7 @@ in boot.kernel.features = mkOption { default = {}; - example = literalExample "{ debug = true; }"; + example = literalExpression "{ debug = true; }"; internal = true; description = '' This option allows to enable or disable certain kernel features. @@ -46,8 +46,8 @@ in }); # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. - defaultText = "pkgs.linuxPackages"; - example = literalExample "pkgs.linuxKernel.packages.linux_5_10"; + defaultText = literalExpression "pkgs.linuxPackages"; + example = literalExpression "pkgs.linuxKernel.packages.linux_5_10"; description = '' This option allows you to override the Linux kernel used by NixOS. Since things like external kernel module packages are @@ -65,7 +65,7 @@ in boot.kernelPatches = mkOption { type = types.listOf types.attrs; default = []; - example = literalExample "[ pkgs.kernelPatches.ubuntu_fan_4_4 ]"; + example = literalExpression "[ pkgs.kernelPatches.ubuntu_fan_4_4 ]"; description = "A list of additional patches to apply to the kernel."; }; @@ -113,7 +113,7 @@ in boot.extraModulePackages = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ config.boot.kernelPackages.nvidia_x11 ]"; + example = literalExpression "[ config.boot.kernelPackages.nvidia_x11 ]"; description = "A list of additional packages supplying kernel modules."; }; @@ -181,7 +181,7 @@ in system.requiredKernelConfig = mkOption { default = []; - example = literalExample '' + example = literalExpression '' with config.lib.kernelConfig; [ (isYes "MODULES") (isEnabled "FB_CON_DECOR") diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix index 5d9534024b..495fe74bc2 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix @@ -100,7 +100,7 @@ in settings = mkOption { type = types.attrsOf kernelItem; - example = literalExample '' with lib.kernel; { + example = literalExpression '' with lib.kernel; { "9P_NET" = yes; USB = option yes; MMC_BLOCK_MINORS = freeform "32"; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix index 1be6636703..fa8500dd42 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix @@ -329,7 +329,7 @@ in extraInstallCommands = mkOption { default = ""; - example = literalExample '' + example = '' # the example below generates detached signatures that GRUB can verify # https://www.gnu.org/software/grub/manual/grub/grub.html#Using-digital-signatures ''${pkgs.findutils}/bin/find /boot -not -path "/boot/efi/*" -type f -name '*.sig' -delete @@ -392,7 +392,7 @@ in extraFiles = mkOption { type = types.attrsOf types.path; default = {}; - example = literalExample '' + example = literalExpression '' { "memtest.bin" = "''${pkgs.memtest86plus}/memtest.bin"; } ''; description = '' @@ -413,7 +413,7 @@ in splashImage = mkOption { type = types.nullOr types.path; - example = literalExample "./my-background.png"; + example = literalExpression "./my-background.png"; description = '' Background image used for GRUB. Set to null to run GRUB in text mode. @@ -449,7 +449,7 @@ in theme = mkOption { type = types.nullOr types.path; - example = literalExample "pkgs.nixos-grub2-theme"; + example = literalExpression "pkgs.nixos-grub2-theme"; default = null; description = '' Grub theme to be used. @@ -475,7 +475,7 @@ in font = mkOption { type = types.nullOr types.path; default = "${realGrub}/share/grub/unicode.pf2"; - defaultText = ''"''${pkgs.grub2}/share/grub/unicode.pf2"''; + defaultText = literalExpression ''"''${pkgs.grub2}/share/grub/unicode.pf2"''; description = '' Path to a TrueType, OpenType, or pf2 font to be used by Grub. ''; @@ -483,7 +483,7 @@ in fontSize = mkOption { type = types.nullOr types.int; - example = literalExample 16; + example = 16; default = null; description = '' Font size for the grub menu. Ignored unless font diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/ipxe.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/ipxe.nix index 249c276193..ef8595592f 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/ipxe.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/ipxe.nix @@ -33,7 +33,7 @@ in booting from the GRUB boot menu. ''; default = { }; - example = literalExample '' + example = literalExpression '' { demo = ''' #!ipxe dhcp diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix index f87d3b07a3..fb5269e43d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -663,13 +663,11 @@ in }; encryptedPass = mkOption { - default = ""; type = types.path; description = "Path to the GPG encrypted passphrase."; }; publicKey = mkOption { - default = ""; type = types.path; description = "Path to the Public Key."; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index bf254be134..51e105bf62 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -668,6 +668,9 @@ let "SendOption" "UserClass" "VendorClass" + "DUIDType" + "DUIDRawData" + "IAID" ]) (assertValueOneOf "UseAddress" boolValues) (assertValueOneOf "UseDNS" boolValues) @@ -677,6 +680,7 @@ let (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues) (assertValueOneOf "WithoutRA" ["solicit" "information-request"]) (assertRange "SendOption" 1 65536) + (assertInt "IAID") ]; sectionDHCPv6PrefixDelegation = checkUnitConfig "DHCPv6PrefixDelegation" [ @@ -844,7 +848,6 @@ let options = { wireguardPeerConfig = mkOption { default = {}; - example = { }; type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionWireGuardPeer; description = '' Each attribute in this set specifies an option in the @@ -859,7 +862,6 @@ let netdevOptions = commonNetworkOptions // { netdevConfig = mkOption { - default = {}; example = { Name = "mybridge"; Kind = "bridge"; }; type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionNetdev; description = '' @@ -896,7 +898,6 @@ let vxlanConfig = mkOption { default = {}; - example = { Id = "4"; }; type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionVXLAN; description = '' Each attribute in this set specifies an option in the @@ -959,7 +960,7 @@ let example = { PrivateKeyFile = "/etc/wireguard/secret.key"; ListenPort = 51820; - FwMark = 42; + FirewallMark = 42; }; type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionWireGuard; description = '' @@ -1038,7 +1039,6 @@ let addressOptions = { options = { addressConfig = mkOption { - default = {}; example = { Address = "192.168.0.100/24"; }; type = types.addCheck (types.attrsOf unitOption) check.network.sectionAddress; description = '' @@ -1055,7 +1055,7 @@ let options = { routingPolicyRuleConfig = mkOption { default = { }; - example = { routingPolicyRuleConfig = { Table = 10; IncomingInterface = "eth1"; Family = "both"; } ;}; + example = { Table = 10; IncomingInterface = "eth1"; Family = "both"; }; type = types.addCheck (types.attrsOf unitOption) check.network.sectionRoutingPolicyRule; description = '' Each attribute in this set specifies an option in the @@ -1146,7 +1146,7 @@ let dhcpV6Config = mkOption { default = {}; - example = { UseDNS = true; UseRoutes = true; }; + example = { UseDNS = true; }; type = types.addCheck (types.attrsOf unitOption) check.network.sectionDHCPv6; description = '' Each attribute in this set specifies an option in the @@ -1213,7 +1213,7 @@ let ipv6Prefixes = mkOption { default = []; - example = { AddressAutoconfiguration = true; OnLink = true; }; + example = [ { AddressAutoconfiguration = true; OnLink = true; } ]; type = with types; listOf (submodule ipv6PrefixOptions); description = '' A list of ipv6Prefix sections to be added to the unit. See diff --git a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix index 2a545e5525..4b8194d2f8 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix @@ -62,6 +62,7 @@ in font = mkOption { default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"; + defaultText = literalExpression ''"''${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"''; type = types.path; description = '' Font file made available for displaying text on the splash screen. @@ -88,7 +89,7 @@ in type = types.path; # Dimensions are 48x48 to match GDM logo default = "${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"; - defaultText = ''pkgs.fetchurl { + defaultText = literalExpression ''pkgs.fetchurl { url = "https://nixos.org/logo/nixos-hires.png"; sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si"; }''; 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 03133fa1bc..bd7e955a6f 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -411,7 +411,7 @@ in boot.initrd.enable = mkOption { type = types.bool; default = !config.boot.isContainer; - defaultText = "!config.boot.isContainer"; + defaultText = literalExpression "!config.boot.isContainer"; description = '' Whether to enable the NixOS initial RAM disk (initrd). This may be needed to perform some initialisation tasks (like mounting @@ -527,7 +527,7 @@ in then "zstd" else "gzip" ); - defaultText = "zstd if the kernel supports it (5.9+), gzip if not."; + defaultText = literalDocBook "zstd if the kernel supports it (5.9+), gzip if not"; type = types.unspecified; # We don't have a function type... description = '' The compressor to use on the initrd image. May be any of: @@ -559,7 +559,7 @@ in is the path it should be copied from (or null for the same path inside and out). ''; - example = literalExample + example = literalExpression '' { "/etc/dropbear/dropbear_rsa_host_key" = ./secret-dropbear-key; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 9693e2e377..93ea77d1ee 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -426,7 +426,7 @@ in systemd.package = mkOption { default = pkgs.systemd; - defaultText = "pkgs.systemd"; + defaultText = literalExpression "pkgs.systemd"; type = types.package; description = "The systemd package."; }; @@ -446,7 +446,7 @@ in systemd.packages = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.systemd-cryptsetup-generator ]"; + example = literalExpression "[ pkgs.systemd-cryptsetup-generator ]"; description = "Packages providing systemd units and hooks."; }; @@ -663,7 +663,7 @@ in services.journald.forwardToSyslog = mkOption { default = config.services.rsyslogd.enable || config.services.syslog-ng.enable; - defaultText = "services.rsyslogd.enable || services.syslog-ng.enable"; + defaultText = literalExpression "services.rsyslogd.enable || services.syslog-ng.enable"; type = types.bool; description = '' Whether to forward log messages to syslog. @@ -722,7 +722,7 @@ in services.logind.lidSwitchExternalPower = mkOption { default = config.services.logind.lidSwitch; - defaultText = "services.logind.lidSwitch"; + defaultText = literalExpression "services.logind.lidSwitch"; example = "ignore"; type = logindHandlerType; @@ -768,7 +768,7 @@ in systemd.tmpfiles.packages = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.lvm2 ]"; + example = literalExpression "[ pkgs.lvm2 ]"; apply = map getLib; description = '' List of packages containing systemd-tmpfiles rules. diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix index 80e728d09a..8f14f04a1f 100644 --- a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix +++ b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix @@ -72,7 +72,7 @@ in environment.etc = mkOption { default = {}; - example = literalExample '' + example = literalExpression '' { example-configuration-file = { source = "/nix/store/.../etc/dir/file.conf.example"; mode = "0440"; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix index 4f56504f45..225bcbe58e 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix @@ -163,7 +163,7 @@ in fileSystems = mkOption { default = {}; - example = literalExample '' + example = literalExpression '' { "/".device = "/dev/hda1"; "/data" = { diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/nfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/nfs.nix index fd35c35d32..38c3920a78 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/nfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/nfs.nix @@ -35,7 +35,7 @@ in for details. ''; - example = literalExample '' + example = literalExpression '' { Translation = { GSS-Methods = "static,nsswitch"; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index cb0e664024..2c03ef7ba7 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -104,7 +104,7 @@ in readOnly = true; type = types.package; default = if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs; - defaultText = "if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs"; + defaultText = literalExpression "if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs"; description = "Configured ZFS userland tools package."; }; @@ -150,7 +150,6 @@ in devNodes = mkOption { type = types.path; default = "/dev/disk/by-id"; - example = "/dev/disk/by-id"; description = '' Name of directory from which to import ZFS devices. @@ -351,7 +350,7 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); - example = literalExample '' + example = literalExpression '' { ZED_DEBUG_LOG = "/tmp/zed.debug.log"; diff --git a/third_party/nixpkgs/nixos/modules/tasks/lvm.nix b/third_party/nixpkgs/nixos/modules/tasks/lvm.nix index aaa76b49fa..35316603c3 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/lvm.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/lvm.nix @@ -9,7 +9,7 @@ in { type = types.package; default = if cfg.dmeventd.enable then pkgs.lvm2_dmeventd else pkgs.lvm2; internal = true; - defaultText = "pkgs.lvm2"; + defaultText = literalExpression "pkgs.lvm2"; description = '' This option allows you to override the LVM package that's used on the system (udev rules, tmpfiles, systemd services). diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index 34a44b383a..47626bf030 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -146,7 +146,7 @@ let tempAddress = mkOption { type = types.enum (lib.attrNames tempaddrValues); default = cfg.tempAddresses; - defaultText = literalExample ''config.networking.tempAddresses''; + defaultText = literalExpression ''config.networking.tempAddresses''; description = '' When IPv6 is enabled with SLAAC, this option controls the use of temporary address (aka privacy extensions) on this @@ -257,7 +257,7 @@ let virtualType = mkOption { default = if hasPrefix "tun" name then "tun" else "tap"; - defaultText = literalExample ''if hasPrefix "tun" name then "tun" else "tap"''; + defaultText = literalExpression ''if hasPrefix "tun" name then "tun" else "tap"''; type = with types; enum [ "tun" "tap" ]; description = '' The type of interface to create. @@ -420,7 +420,7 @@ in The FQDN is required but cannot be determined. Please make sure that both networking.hostName and networking.domain are set properly. ''; - defaultText = literalExample ''''${networking.hostName}.''${networking.domain}''; + defaultText = literalExpression ''"''${networking.hostName}.''${networking.domain}"''; description = '' The fully qualified domain name (FQDN) of this host. It is the result of combining networking.hostName and networking.domain. Using this @@ -578,7 +578,6 @@ in options = { interfaces = mkOption { - example = [ "eth0" "eth1" ]; description = "The physical network interfaces connected by the vSwitch."; type = with types; attrsOf (submodule vswitchInterfaceOpts); }; @@ -691,7 +690,7 @@ in ''; in mkOption { default = { }; - example = literalExample '' + example = literalExpression '' { bond0 = { interfaces = [ "eth0" "wlan0" ]; @@ -720,7 +719,7 @@ in driverOptions = mkOption { type = types.attrsOf types.str; default = {}; - example = literalExample driverOptionsExample; + example = literalExpression driverOptionsExample; description = '' Options for the bonding driver. Documentation can be found in @@ -784,7 +783,7 @@ in networking.macvlans = mkOption { default = { }; - example = literalExample '' + example = literalExpression '' { wan = { interface = "enp2s0"; @@ -819,7 +818,7 @@ in networking.sits = mkOption { default = { }; - example = literalExample '' + example = literalExpression '' { hurricane = { remote = "10.0.0.1"; @@ -883,7 +882,7 @@ in networking.vlans = mkOption { default = { }; - example = literalExample '' + example = literalExpression '' { vlan0 = { id = 3; @@ -927,7 +926,7 @@ in networking.wlanInterfaces = mkOption { default = { }; - example = literalExample '' + example = literalExpression '' { wlan-station0 = { device = "wlp6s0"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix b/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix index 7b096bd1a9..a4da62eb5f 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix @@ -35,7 +35,7 @@ in image = mkOption { default = pkgs.anbox.image; - example = literalExample "pkgs.anbox.image"; + defaultText = literalExpression "pkgs.anbox.image"; type = types.package; description = '' Base android image for Anbox. diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix index 84824e2f90..cea3d51d3a 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix @@ -2,7 +2,7 @@ let cfg = config.virtualisation.containers; - inherit (lib) mkOption types; + inherit (lib) literalExpression mkOption types; toml = pkgs.formats.toml { }; in @@ -50,12 +50,12 @@ in containersConf.cniPlugins = mkOption { type = types.listOf types.package; - defaultText = '' + defaultText = literalExpression '' [ pkgs.cni-plugins ] ''; - example = lib.literalExample '' + example = literalExpression '' [ pkgs.cniPlugins.dnsname ] @@ -106,7 +106,7 @@ in policy = mkOption { default = {}; type = types.attrs; - example = lib.literalExample '' + example = literalExpression '' { default = [ { type = "insecureAcceptAnything"; } ]; transports = { diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix index c135081959..38766113f3 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix @@ -38,27 +38,27 @@ in type = types.nullOr types.str; default = null; description = "Override the default pause image for pod sandboxes"; - example = [ "k8s.gcr.io/pause:3.2" ]; + example = "k8s.gcr.io/pause:3.2"; }; pauseCommand = mkOption { type = types.nullOr types.str; default = null; description = "Override the default pause command"; - example = [ "/pause" ]; + example = "/pause"; }; runtime = mkOption { type = types.nullOr types.str; default = null; description = "Override the default runtime"; - example = [ "crun" ]; + example = "crun"; }; extraPackages = mkOption { type = with types; listOf package; default = [ ]; - example = literalExample '' + example = literalExpression '' [ pkgs.gvisor ] diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-init.nix b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-init.nix index 02f4de009f..4339d91de1 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-init.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-init.nix @@ -20,7 +20,7 @@ in { options.virtualisation.digitalOcean.defaultConfigFile = mkOption { type = types.path; default = defaultConfigFile; - defaultText = '' + defaultText = literalDocBook '' The default configuration imports user-data if applicable and (modulesPath + "/virtualisation/digital-ocean-config.nix"). ''; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix index 29f133786d..06858e1503 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix @@ -138,8 +138,9 @@ in package = mkOption { default = pkgs.docker; + defaultText = literalExpression "pkgs.docker"; type = types.package; - example = pkgs.docker-edge; + example = literalExpression "pkgs.docker-edge"; description = '' Docker package to be used in the module. ''; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/ecs-agent.nix b/third_party/nixpkgs/nixos/modules/virtualisation/ecs-agent.nix index 93fefe56d1..aa38a02ea0 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/ecs-agent.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/ecs-agent.nix @@ -12,7 +12,7 @@ in { type = types.path; description = "The ECS agent package to use"; default = pkgs.ecs-agent; - defaultText = "pkgs.ecs-agent"; + defaultText = literalExpression "pkgs.ecs-agent"; }; extra-environment = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix index 3c291397a9..77b43d9d84 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix @@ -50,7 +50,7 @@ in { package = mkOption { type = types.package; default = pkgs.libvirt; - defaultText = "pkgs.libvirt"; + defaultText = literalExpression "pkgs.libvirt"; description = '' libvirt package to use. ''; @@ -59,6 +59,7 @@ in { qemuPackage = mkOption { type = types.package; default = pkgs.qemu; + defaultText = literalExpression "pkgs.qemu"; description = '' Qemu package to use with libvirt. `pkgs.qemu` can emulate alien architectures (e.g. aarch64 on x86) diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix index 6732e24436..94cd22d137 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix @@ -35,7 +35,7 @@ in { package = mkOption { type = types.package; default = pkgs.lxd.override { nftablesSupport = config.networking.nftables.enable; }; - defaultText = "pkgs.lxd"; + defaultText = literalExpression "pkgs.lxd"; description = '' The LXD package to use. ''; @@ -44,7 +44,7 @@ in { lxcPackage = mkOption { type = types.package; default = pkgs.lxc; - defaultText = "pkgs.lxc"; + defaultText = literalExpression "pkgs.lxc"; description = '' The LXC package to use with LXD (required for AppArmor profiles). ''; @@ -53,7 +53,7 @@ in { zfsSupport = mkOption { type = types.bool; default = config.boot.zfs.enabled; - defaultText = "config.boot.zfs.enabled"; + defaultText = literalExpression "config.boot.zfs.enabled"; description = '' Enables lxd to use zfs as a storage for containers. diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix index f3f318412d..279c965673 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix @@ -530,7 +530,7 @@ in nixpkgs = mkOption { type = types.path; default = pkgs.path; - defaultText = "pkgs.path"; + defaultText = literalExpression "pkgs.path"; description = '' A path to the nixpkgs that provide the modules, pkgs and lib for evaluating the container. @@ -636,7 +636,7 @@ in bindMounts = mkOption { type = with types; attrsOf (submodule bindMountOpts); default = {}; - example = literalExample '' + example = literalExpression '' { "/home" = { hostPath = "/home/alice"; isReadOnly = false; }; } @@ -707,7 +707,7 @@ in })); default = {}; - example = literalExample + example = literalExpression '' { webserver = { path = "/nix/var/nix/profiles/webserver"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix index a4a92f2250..24573bba48 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix @@ -28,7 +28,7 @@ let You still need to set the image attribute, as it will be used as the image name for docker to start a container. ''; - example = literalExample "pkgs.dockerTools.buildDockerImage {...};"; + example = literalExpression "pkgs.dockerTools.buildDockerImage {...};"; }; login = { @@ -59,7 +59,7 @@ let type = with types; listOf str; default = []; description = "Commandline arguments to pass to the image's entrypoint."; - example = literalExample '' + example = literalExpression '' ["--port=9000"] ''; }; @@ -75,7 +75,7 @@ let type = with types; attrsOf str; default = {}; description = "Environment variables to set for this container."; - example = literalExample '' + example = literalExpression '' { DATABASE_HOST = "db.example.com"; DATABASE_PORT = "3306"; @@ -87,7 +87,7 @@ let type = with types; listOf path; default = []; description = "Environment files for this container."; - example = literalExample '' + example = literalExpression '' [ /path/to/.env /path/to/.env.secret @@ -160,7 +160,7 @@ let Docker engine documentation for full details. ''; - example = literalExample '' + example = literalExpression '' [ "8080:9000" ] @@ -191,7 +191,7 @@ let docker engine documentation for details. ''; - example = literalExample '' + example = literalExpression '' [ "volume_name:/path/inside/container" "/path/on/host:/path/inside/container" @@ -214,7 +214,7 @@ let Use the same name as the attribute under virtualisation.oci-containers.containers. ''; - example = literalExample '' + example = literalExpression '' virtualisation.oci-containers.containers = { node1 = {}; node2 = { @@ -228,7 +228,7 @@ let type = with types; listOf str; default = []; description = "Extra options for ${defaultBackend} run."; - example = literalExample '' + example = literalExpression '' ["--network=host"] ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix b/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix index ccf32641df..325f6f5b43 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix @@ -31,7 +31,7 @@ in { package = mkOption { type = types.package; default = pkgs.openvswitch; - defaultText = "pkgs.openvswitch"; + defaultText = literalExpression "pkgs.openvswitch"; description = '' Open vSwitch package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix index 55605b388b..d950cecff6 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix @@ -34,8 +34,7 @@ in package = mkOption { type = types.nullOr types.package; default = config.boot.kernelPackages.prl-tools; - defaultText = "config.boot.kernelPackages.prl-tools"; - example = literalExample "config.boot.kernelPackages.prl-tools"; + defaultText = literalExpression "config.boot.kernelPackages.prl-tools"; description = '' Defines which package to use for prl-tools. Override to change the version. ''; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix index 893afee4c3..385475c84a 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman.nix @@ -95,7 +95,7 @@ in extraPackages = mkOption { type = with types; listOf package; default = [ ]; - example = lib.literalExample '' + example = lib.literalExpression '' [ pkgs.gvisor ] diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix index 3824d0c168..37a93a2997 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix @@ -15,6 +15,7 @@ in { package = mkOption { type = types.package; default = pkgs.qemu.ga; + defaultText = literalExpression "pkgs.qemu.ga"; description = "The QEMU guest agent package."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index 494c2c1428..69d67685f5 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -455,7 +455,7 @@ in }; }); default = []; - example = lib.literalExample + example = lib.literalExpression '' [ # forward local port 2222 -> 22, to ssh into the VM { from = "host"; host.port = 2222; guest.port = 22; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/railcar.nix b/third_party/nixpkgs/nixos/modules/virtualisation/railcar.nix index b603effef6..e719e25650 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/railcar.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/railcar.nix @@ -41,7 +41,7 @@ let description = "Source for the in-container mount"; }; options = mkOption { - type = attrsOf (str); + type = listOf str; default = [ "bind" ]; description = '' Mount options of the filesystem to be used. @@ -77,9 +77,7 @@ in The defaults have been chosen for simple bindmounts, meaning that you only need to provide the "source" parameter. ''; - example = '' - { "/data" = { source = "/var/lib/data"; }; } - ''; + example = { "/data" = { source = "/var/lib/data"; }; }; }; runType = mkOption { @@ -112,6 +110,7 @@ in package = mkOption { type = types.package; default = pkgs.railcar; + defaultText = literalExpression "pkgs.railcar"; description = "Railcar package to use"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix index ddb0a7bda4..6c742ad371 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix @@ -43,7 +43,7 @@ in package = mkOption { type = types.package; default = pkgs.virtualbox; - defaultText = "pkgs.virtualbox"; + defaultText = literalExpression "pkgs.virtualbox"; description = '' Which VirtualBox package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix index fea43727f2..f8f4af4f6b 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix @@ -35,8 +35,8 @@ in virtualisation.xen.package = mkOption { type = types.package; - defaultText = "pkgs.xen"; - example = literalExample "pkgs.xen-light"; + defaultText = literalExpression "pkgs.xen"; + example = literalExpression "pkgs.xen-light"; description = '' The package used for Xen binary. ''; @@ -45,8 +45,8 @@ in virtualisation.xen.package-qemu = mkOption { type = types.package; - defaultText = "pkgs.xen"; - example = literalExample "pkgs.qemu_xen-light"; + defaultText = literalExpression "pkgs.xen"; + example = literalExpression "pkgs.qemu_xen-light"; description = '' The package with qemu binaries for dom0 qemu and xendomains. ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pamixer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pamixer/default.nix index 4ea432885f..ac3df5c5f9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pamixer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pamixer/default.nix @@ -1,31 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, boost, libpulseaudio }: stdenv.mkDerivation rec { pname = "pamixer"; - version = "unstable-2021-03-29"; + version = "1.5"; src = fetchFromGitHub { owner = "cdemoulins"; repo = "pamixer"; - rev = "4ea2594cb8c605dccd00a381ba19680eba368e94"; - sha256 = "sha256-kV4wIxm1WZvqqyfmgQ2cSbRJwJR154OW0MMDg2ntf6g="; + rev = version; + sha256 = "sha256-7VNhHAQ1CecQPlqb8SMKK0U1SsFZxDuS+QkPqJfMqrQ="; }; buildInputs = [ boost libpulseaudio ]; - nativeBuildInputs = [ installShellFiles ]; - - installPhase = '' - runHook preInstall - - install -Dm755 pamixer -t $out/bin - - runHook postInstall - ''; - - postInstall = '' - installManPage pamixer.1 - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "Pulseaudio command line mixer"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/samplv1/default.nix b/third_party/nixpkgs/pkgs/applications/audio/samplv1/default.nix index 8c70705168..95035570e9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/samplv1/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/samplv1/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "samplv1"; - version = "0.9.20"; + version = "0.9.23"; src = fetchurl { url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz"; - sha256 = "sha256-9tm72lV9i/155TVweNwO2jpPsCJkh6r82g7Z1wCI1ho="; + sha256 = "sha256-eJA6ixH20Wv+cD2CKGomncyfJ4tfpOL3UrTeCkb5/q0="; }; nativeBuildInputs = [ qttools pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix index c956bca9a1..62dcac327f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.13.1-beta"; + version = "0.13.3-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "07cs9yq83laajmfwfv42xfkfai3q873wg4qg7bfzw18w5fllivkg"; + sha256 = "05ai8nyrc8likq5n7i9klfi9550ki8sqklv8axjvi6ql8v9bzk61"; }; - vendorSha256 = "1hk67x8nlc0wm1pg8k8hywih623p4c0klfhfyy26b7mqq62lazia"; + vendorSha256 = "0xf8395g6hifbqwbgapllx38y0759xp374sja7j1wk8sdj5ngql5"; subPackages = ["cmd/lncli" "cmd/lnd"]; 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 db2a72f3e5..d5838a4f4f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix @@ -17,11 +17,11 @@ with lib; stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.19.2.13"; + version = "0.19.2.14"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "sha256-eXlTfSjxOGZi/0/b7myqILJZYNcbK+QqQmq+PVkh1e8="; + sha256 = "sha256-UMU3384r4RGVl0/7OPwdDva09vhQr+9Lqb1oD/PTva8="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 85cd9dd905..5a3cd7b13f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -17,8 +17,8 @@ let sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; }; latestVersion = { # canary & dev - version = "2021.1.1.12"; # "Android Studio Bumblebee (2021.1.1) Canary 12" - sha256Hash = "1dyn9435s0xbxwj28b0cciz6ry58pgfgba4rbny3jszxi5j3j0r1"; + version = "2021.1.1.13"; # "Android Studio Bumblebee (2021.1.1) Canary 13" + sha256Hash = "04w5jw79fkxk4gy1n9iy8kjxg6k3zcl59z76f04rh556n12f01gm"; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix index dc19191d76..77cf5088a4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -16,10 +16,10 @@ assert stdenv ? glibc; let platform_major = "4"; - platform_minor = "20"; + platform_minor = "21"; year = "2021"; - month = "06"; - timestamp = "${year}${month}111600"; + month = "09"; + timestamp = "${year}${month}060500"; gtk = gtk3; in rec { @@ -37,7 +37,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3ggqiwa1nfszdqzdzw1lzs1sdikkvh2fqq10bqjxsq7xdxkis4zix8g4jcjiwlsz5gz98s61gp0k4m5rqsj0krpklxs9ijwq76khc7z"; + sha512 = "3xdj7b0mlhdys9q4l19kkf1hm0d67dwx55gzfmgv90nvswv0jhyvs42my4wrlrmkh6lz8m0z6dakadhl1bxf2fd8pdp5sm4bv0w0gwc"; }; }; @@ -49,7 +49,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "38cdhy6v8jmndanvl3bimfs3pnlnl3w066fqrljy2hwki58gqmxxmbld5mphbh9y5kz9b5kiqvhx06sf0l2ywbarxy9wfhynvzb2k17"; + sha512 = "20xy4vzqlmg4sdvqimz2nc212vb45k5kwh40qagm13r6h3vfv3yrl8bznnappaf4msfa9xdaxns2kz0x94hw444zjmrnbf7614a48xi"; }; }; @@ -61,7 +61,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "2chshmn09xdq42nix0jqryhac33xc5sg7nlp2vfmz5km6q4m6mc1k7pw10jmg86zzcvcsdl9k1wkrbcsj5y2gv4cg6rddzsbx9hw3s7"; + sha512 = "29hab3ha3spk0048k3mf2x5m80hlh1l6nazsykx0xxrqy9vdkdibv6mq74dzf1n93h1bd5qh9axicnhs465kp7r1irdl04761c1wibi"; }; }; @@ -86,7 +86,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "308sszkmp5lkva5hfb1qc5cy9b1wajas96xz5nwjl7dm2fn4saiwg3ifh71hzq59wf337hndlb2c2dp6yczsfp3mzfqmsi5a3z7dchr"; + sha512 = "3ag7nfpnn1149gkva58x0037pbdb5wds0qpwv21lif7a6b1a1n7g2n056bn43a7fkxkkj38752gkz29nvqh5g8hqkg29lax8sjlm7sm"; }; }; @@ -98,7 +98,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "1wp3g85bsmv0mbpk76adsz1rzd3vbdn4y4ddv9z41bq96wi9npmybidckvwnrq57lbj8k5g8m0x0f1nhj2rv5bqbsnqjxjpknwa6is0"; + sha512 = "27h5wjr4k0jhi256rk74kbjbm5h7xi4hbml89n1jhppq1yfyv2mf75zb32iaia2pxclx6hc0cd1hvq85fwvcshnq79fw8za687yvbhv"; }; }; @@ -110,7 +110,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "35v8kjpdlhbcxncqygx7c1kjqy1644c6rhrasg8gxnrhlc69zblf4nvgzf1894vd13qzpkzzxx0qll49933prnw98dqkrd0wxcx7f49"; + sha512 = "03li2bkhkdybwp411xs8i3cp2hmrfg2xd7inbdsxh07y4b9806spi3q10vga97m7ngl6fl5n0mvgxwj8dbdvp133wn9mgrlajb1n4n8"; }; }; @@ -122,7 +122,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "1jj5h69d4814j1mq6fjd47vkswq7bshbh2flgzmn8ibs0ys67x0nd2lm2ksxmvnipj4j9rw3mh9fmw8m0dzpp41c6q8xxfa93c7pqyg"; + sha512 = "38xwwvg59bdp0a6brmcvq0wlfikik0wnqq897abf5a8vyr0ci7xp5f4ii90x2l5sj5gmcc6jiwvi99c03cjbgivpalr741yka0p3pv5"; }; }; @@ -134,7 +134,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "19fr63bdifxqp6imgb4d7v5dnkn9i0n2wmr08xzb0ph425ib936jiw84c2nwnsfnljh0yfj1r3wd36y2nn52fsj6ginl8plc6pi5416"; + sha512 = "30hhy83lmjldcwwbjpk5q9zjai5r3xyhlrddalgrw8mspknayncaa2l32gg327fw0a8qaakzgwkh68gj81pmk3dps5wzy881pf22dhc"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index 839b079ce7..46a9b6c477 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -248,12 +248,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "10.3.2"; + version = "10.4.1"; src = fetchzip { stripRoot = false; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; - sha256 = "0zrxgb8mkrzc1zm5225hzn8awj9yl5fd2dcr92692g0yg61nv4jd"; + sha256 = "1l3v6dryaqifwrv2h4knwmpyf11qbyl04p7gcvgrx3hczc82a6p1"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix index 935533b34a..c0fb568046 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix @@ -7,7 +7,7 @@ trivialBuild rec { pname = "apheleia"; - version = "0.0.0+unstable=2021-08-08"; + version = "0.pre+unstable=2021-08-08"; src = fetchFromGitHub { owner = "raxod502"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix index ee2a18cd91..876392c081 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix @@ -5,7 +5,7 @@ trivialBuild { pname = "bqn-mode"; - version = "0.0.0+unstable=2021-09-27"; + version = "0.pre+unstable=2021-09-27"; src = fetchFromGitHub { owner = "AndersonTorres"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix index feb6c0fa86..1ac8b2f707 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix @@ -7,7 +7,7 @@ trivialBuild { pname = "color-theme-solarized"; - version = "0.0.0+unstable=2017-10-24"; + version = "0.pre+unstable=2017-10-24"; src = fetchFromGitHub { owner = "sellout"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index c2ea756a06..20bb0efdd6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchgit { url = "https://github.com/nix-community/emacs2nix.git"; fetchSubmodules = true; - rev = "703b144eeb490e87133c777f82e198b4e515c312"; - sha256 = "sha256-YBbRh/Cb8u9+Pn6/Bc0atI6knKVjr8jiTGgFkD2FNGI="; + rev = "2e8d2c644397be57455ad32c2849f692eeac7797"; + sha256 = "sha256-qnOYDYHAQ+r5eegKP9GqHz5R2ig96B2W7M+uYa1ti9M="; }; in pkgs.mkShell { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix index 58c542a57f..a2605f3377 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix @@ -6,7 +6,7 @@ trivialBuild rec { pname = "evil-markdown"; - version = "0.0.0+unstable=2021-07-21"; + version = "0.pre+unstable=2021-07-21"; src = fetchFromGitHub { owner = "Somelauw"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix index 8b353409c3..503554412b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix @@ -7,7 +7,7 @@ trivialBuild { pname = "git-undo"; - version = "0.0.0+unstable=2019-12-21"; + version = "0.pre+unstable=2019-12-21"; src = fetchFromGitHub { owner = "jwiegley"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix index 1cc7a23e17..21a6561439 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix @@ -8,7 +8,7 @@ trivialBuild rec { pname = "helm-words"; - version = "0.0.0+unstable=2019-03-12"; + version = "0.pre+unstable=2019-03-12"; src = fetchFromGitHub { owner = "emacsmirror"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix index 067d6f4481..6251fd6932 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix @@ -7,7 +7,7 @@ trivialBuild { pname = "isearch-prop"; - version = "0.0.0+unstable=2019-05-01"; + version = "0.pre+unstable=2019-05-01"; src = fetchFromGitHub { owner = "emacsmirror"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix index 3bdf1a75f4..1dcf27e64e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix @@ -6,7 +6,7 @@ trivialBuild rec { pname = "nano-theme"; - version = "0.0.0+unstable=2021-06-29"; + version = "0.pre+unstable=2021-06-29"; src = fetchFromGitHub { owner = "rougier"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix index 75015a959c..d02283f25a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix @@ -6,7 +6,7 @@ trivialBuild rec { pname = "power-mode"; - version = "0.0.0+unstable=2021-06-06"; + version = "0.pre+unstable=2021-06-06"; src = fetchFromGitHub { owner = "elizagamedev"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix index e49925e057..87a20caf9f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix @@ -6,7 +6,7 @@ trivialBuild { pname = "railgun"; - version= "0.0.0+unstable=2012-10-17"; + version= "0.pre+unstable=2012-10-17"; src = fetchFromGitHub { owner = "mbriggs"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix index 09889593fe..1e1fffe9ad 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix @@ -6,7 +6,7 @@ trivialBuild rec { pname = "sunrise-commander"; - version = "0.0.0+unstable=2021-07-22"; + version = "0.pre+unstable=2021-07-22"; src = fetchFromGitHub { owner = pname; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix index b0df381b5f..7b57d69d55 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix @@ -7,7 +7,7 @@ trivialBuild { pname = "youtube-dl"; - version = "0.0.0+unstable=2018-10-12"; + version = "0.pre+unstable=2018-10-12"; src = fetchFromGitHub { owner = "skeeto"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix index a510561308..853593557d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "3.1.2"; + version = "4.0.0"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "0h5g1sirsy1f2xlq85c1ik1s52gycfipy9yx0flgaw8m4wmhz26v"; + sha256 = "0fapgc6dvzn47gmhxkqymwi3818rdiag33ml57j2mfmsi5pjxi0f"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index a8af2dfba6..d06abfea44 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre -, lcms2, openexr, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif +, lcms2, openexr, libjxl, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices , Foundation , testVersion, imagemagick @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-6"; + version = "7.1.0-9"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-rwaMAkbSBTdrJ+OVZfAOBIp1tmC7/TC34w5gBIe+J94="; + sha256 = "sha256-9eeOY6TvNykWA3yyQH1UR3ahdhOja87I9rsie9fMbso="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" ++ lib.optional (liblqr1 != null) "--with-lqr" + # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, + # let's disable it for now to unbreak the imagemagick build. + ++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" @@ -51,6 +54,10 @@ stdenv.mkDerivation rec { [ zlib fontconfig freetype ghostscript liblqr1 libpng libtiff libxml2 libheif djvulibre ] + # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, + # let's disable it for now to unbreak the imagemagick build. + ++ lib.optionals (!stdenv.isAarch64) + [ libjxl ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] ++ lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix index b279bb0e70..4f76af0afb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.1"; + version = "2.12.3"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "0x20wpqqw6534rn73660zdfy4c3jpg2n31py566k0x2nd6g0mhg5"; + sha256 = "tdXTcoI7DnrBsXtXR0r07hz0lDcAjZJad+o4wwxHcOk="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -111,6 +111,8 @@ perlPackages.buildPerlPackage rec { # # Looks like you failed 1 test of 1. # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) rm t/169_import_scan.t + # t/1604_import_multipage_DjVu.t ................ Dubious, test returned 255 (wstat 65280, 0xff00) + rm t/1604_import_multipage_DjVu.t # Disable a test which passes but reports an incorrect status # t/0601_Dialog_Scan.t .......................... All 14 subtests passed diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix index 131daffffb..f1bac3dd76 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "inkscape-applytransforms"; - version = "0.0.0+unstable=2021-05-11"; + version = "0.pre+unstable=2021-05-11"; src = fetchFromGitHub { owner = "Klowner"; diff --git a/third_party/nixpkgs/pkgs/applications/kde/default.nix b/third_party/nixpkgs/pkgs/applications/kde/default.nix index 6860075884..9bfe71e196 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/default.nix @@ -4,8 +4,8 @@ READ THIS FIRST -This module is for official packages in the KDE Applications Bundle. All -available packages are listed in `./srcs.nix`, although some are not yet +This module is for official packages in the KDE Gear. All available +packages are listed in `./srcs.nix`, although some are not yet packaged in Nixpkgs (see below). IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. @@ -174,6 +174,7 @@ let ksquares = callPackage ./ksquares.nix {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; kpkpass = callPackage ./kpkpass.nix {}; + kpublictransport = callPackage ./kpublictransport.nix {}; kreversi = callPackage ./kreversi.nix {}; krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; diff --git a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh index 9c7c1975ea..1d10789bcc 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/release-service/21.08.1/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.1/src -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/applications/kde/kpublictransport.nix b/third_party/nixpkgs/pkgs/applications/kde/kpublictransport.nix new file mode 100644 index 0000000000..fbfd3fcc8a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kpublictransport.nix @@ -0,0 +1,13 @@ +{ mkDerivation +, lib +, extra-cmake-modules +}: + +mkDerivation { + pname = "kpublictransport"; + meta = with lib; { + license = [ licenses.cc0 ]; + maintainers = [ maintainers.samueldr ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix index 0bed99ab72..b5278e7cc7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.6"; + version = "4.7"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "sha256-5kFzVHxoiZi8tz42eUprm49JHCeuA4GPwtHvdiS2RJY="; + sha256 = "sha256-+u50XorUyeDsn4FaKdD0wEtQHkwtiyVDY0IAi0vehEQ="; }; # dbus-1.pc has datadir=/etc diff --git a/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix index f98e21edf5..2863dd103d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib, stdenv, jdk8, runtimeShell }: +{ fetchzip, lib, stdenv, jdk, runtimeShell }: stdenv.mkDerivation rec { version = "5.4.4"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { # Python on Darwin; just write our own start script to avoid unnecessary dependencies cat > $out/bin/keystore-explorer < +Date: Mon, 4 Oct 2021 16:58:37 +0800 +Subject: [PATCH] close user config autostart + +--- + app/settings/universalsettings.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp +index e0010542..82b9e785 100644 +--- a/app/settings/universalsettings.cpp ++++ b/app/settings/universalsettings.cpp +@@ -77,9 +77,6 @@ void UniversalSettings::load() + //! check if user has set the autostart option + bool autostartUserSet = m_universalGroup.readEntry("userConfiguredAutostart", false); + +- if (!autostartUserSet && !autostart()) { +- setAutostart(true); +- } + + //! init screen scales + m_screenScalesGroup = m_universalGroup.group("ScreenScales"); +-- +2.33.0 diff --git a/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix index 43e3014db3..b1ba735669 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix @@ -16,7 +16,13 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem qtx11extras kcrash knewstuff ]; - + patches = [ + ./0001-close-user-autostart.patch + ]; + fixupPhase = '' + mkdir -p $out/etc/xdg/autostart + cp $out/share/applications/org.kde.latte-dock.desktop $out/etc/xdg/autostart + ''; meta = with lib; { description = "Dock-style app launcher based on Plasma frameworks"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix index 45e043b6dc..a1f119f683 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix @@ -13,12 +13,10 @@ ocamlPackages.buildDunePackage rec { sha256 = "1rx2nl6cdv609pfymnbq53pi3ql5fr4kda8x10ycd9xq2gc4f21g"; }; + patches = [ ./prefix.patch ]; + preConfigure = '' - patchShebangs scripts - substituteInPlace scripts/compute_prefix \ - --replace '"topfind"' \ - '"${ocamlPackages.findlib}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/topfind"' - export PREFIX=$out + substituteInPlace src/orpie/install.ml.in --replace '@prefix@' $out ''; buildInputs = with ocamlPackages; [ curses camlp5 num gsl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/orpie/prefix.patch b/third_party/nixpkgs/pkgs/applications/misc/orpie/prefix.patch new file mode 100644 index 0000000000..41e72ca6d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/orpie/prefix.patch @@ -0,0 +1,11 @@ +--- a/src/orpie/dune 2021-10-05 06:09:09.040120000 +0200 ++++ b/src/orpie/dune 2021-10-05 06:10:06.568418512 +0200 +@@ -18,7 +18,7 @@ + ; Support $PREFIX for overriding installation location + (rule + (targets install.ml) +- (action (run %{project_root}/scripts/compute_prefix subst %{deps} %{targets})) ++ (action (copy# %{deps} %{targets})) + (deps (file install.ml.in))) + + diff --git a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix index 009f40e1a2..7e63bf04ee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "sha256-IeFbcgwayBl3xxv3onCJr0f1oeveyyNlLxXQlzOoVq0="; + sha256 = "sha256-dLYmY2bS+DycYBLZdLw8CsRIIE8EfDJEx6RZ/r9yMS8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix index b6059ac1a7..641353f53d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -1,4 +1,13 @@ -{ fetchFromGitHub, lib, gobject-introspection, gtk3, python3Packages }: +{ fetchFromGitHub +, lib +, gobject-introspection +, gtk3 +, python3Packages +, wrapGAppsHook +, gdk-pixbuf +, libappindicator +, librsvg +}: # Although we copy in the udev rules here, you probably just want to use # logitech-udev-rules instead of adding this to services.udev.packages on NixOS @@ -13,6 +22,9 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-Ys0005hIQ+fT4oMeU5iFtbLNqn1WM6iLdIKGwdyn7BM="; }; + nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; + buildInputs = [ libappindicator librsvg ]; + propagatedBuildInputs = with python3Packages; [ gobject-introspection gtk3 @@ -23,11 +35,6 @@ python3Packages.buildPythonApplication rec { xlib ]; - makeWrapperArgs = [ - "--prefix PYTHONPATH : $PYTHONPATH" - "--prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH" - ]; - # the -cli symlink is just to maintain compabilility with older versions where # there was a difference between the GUI and CLI versions. postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index c0120e3399..56c078fd9f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.14.1"; + version = "6.15.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-JJ20LKA4gnPXO6d2Cegr3I67k+ZZc69hdL1dTUIF5OM="; + sha256 = "sha256-AsYfByiI5W50T/kOhLtD/kUSwDOWMCo33OZ6WGmNcFk="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 773393287a..8d91260b6b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "92.0"; + version = "93.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ach/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ach/firefox-93.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "f2ad99def0a6c2f778d96350b9a9db8d029cba7d6a21103f8c728f05a4143036"; + sha256 = "8be7f497a9bd28eedb3b30c4c5437242cbd599df3fa5e7a6a2912acadc126707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/af/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/af/firefox-93.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "032fa343964a31cc31953a8b39be52e2328c06e2d0d37bb25dd99c2b6a286a74"; + sha256 = "aaab5d767d832e883a5ca2ad0a81b128c0fbebe141238835064210b27e47db6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/an/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/an/firefox-93.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "65a99d7af2c738a35cd9a32aa73537fc39c03a49ff8c8bc79b2434c2d73fbdcc"; + sha256 = "8340801d581d55a249b94378c69061466aa6e6181d64790d5bda43d2b3631a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ar/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ar/firefox-93.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "37cf6f24f2d89373f5cc03969a1584e0eba8602c9720bcd9cb83510b00c37d9e"; + sha256 = "03e0cd262aad9e49b10f6626ec2c96f1646a51d1e461998be5d5487a40709626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ast/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ast/firefox-93.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "250b48aa826b8487c2a0318bd4aefa769a0e5f1ccacd3c960db76a34b8541d29"; + sha256 = "062e4bdc3144b19b5f85ded44078ef64e988bc4c9658ac189771b3411b3e0145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/az/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/az/firefox-93.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "2cd6130a3097510b0a88d71e03f902b355acb5c54b04c54fe744f02082e9258f"; + sha256 = "175fb26412691b06d82f0175bdb51bf5635ff16564df93cdd4c332d6614fbcb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/be/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/be/firefox-93.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1e6c1e3281c831040c26fe690e193eee32e04c04755776f1d5d02230aa4920d1"; + sha256 = "9841d99dd7407397388384d37a1b4d11027344e1710073ad3425163144445341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/bg/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/bg/firefox-93.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "248464ee16c46a948771977a15e0740d75a4023ac7b1381caa4ab89e8854ce50"; + sha256 = "2932865a731d33c3447aa17d545185faff6fb8db32502236537301ec7eb3d54f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/bn/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/bn/firefox-93.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "22872587d0bc7cb548032163c0944b85d60f44b8b3015cd9445a1d249f226897"; + sha256 = "b9d7a1d69e0bf88fcdb24038f410289187a3de5047fa28925513a5f6ac47ae46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/br/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/br/firefox-93.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5ce3b39bccf4557b726518addd963511b3184b2a5776422d470baec0c0737c68"; + sha256 = "ef5b6a548c200cd0e519c67a6542624a6b085ed20ca78e162b0dfb5b9d921a0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/bs/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/bs/firefox-93.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "3238ff9f73f0a13b1716d678594b051e02992813354c880144df1a442cf2bbe5"; + sha256 = "4a8e64d088509a8df5b95eea4c39267a884bb2906a71ac39056214dfc10a62c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ca-valencia/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ca-valencia/firefox-93.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "305e8800fe2760a9aed35d26fecdbf39be310633e45410d46f5e78414ee7c977"; + sha256 = "ad7401e804d5cfe80d4bea0da8c324f70d3304dee96ea9d6c7d7257c67bfca9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ca/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ca/firefox-93.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "de25616de4e2a4876309de99736db900114d9b3d2785a022eef5d4bd205f463a"; + sha256 = "ab9d9d2cdb33f3f6b490f463021e9afe12e930bbe227e4e26122c45522995c8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/cak/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/cak/firefox-93.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "348a4320ebbe14c115a419a092f73d43876b55a4788380e9145aa2d0a5bf4f14"; + sha256 = "698e4d066469ffedd1f915d93fac4358c4f614695966937858e950b9fc455bfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/cs/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/cs/firefox-93.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "9272de8867d1b590bb9912f8104e59e942463cf6aa2b47e46cb3baaa117bf62b"; + sha256 = "e6525afccdc478dc4db4cb23c30d18cfa2911c1f93bb85efd41b1647f9dbb85b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/cy/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/cy/firefox-93.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "32562b809a715a12074b0467d14a1deec0f3b48d1d2b4fe90a18d00b0ae05298"; + sha256 = "dd3bf768de4120595e2264f4c8155c7037b5d220dc1cd6120c9821125f272046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/da/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/da/firefox-93.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "63829b7a279e2eb8e43ba374c589ec3ac65a4a5de46bcc55df757b2f9f0fdd60"; + sha256 = "6b36bdd340f100ee627c34e0b959d11aa19afe15dc4d5b68fb594cd58bf3db23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/de/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/de/firefox-93.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c62aa20c3b3f8eb2462fe157872196fc01fdba14e19e2025a1c04887a14741ac"; + sha256 = "befb39ec9a21c8ab30fbe81a3aad56bdc3734c3df5f511d5b088b79edbd179b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/dsb/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/dsb/firefox-93.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "84667669ece60081417e597cd00c5db9f25df9c3bce3b72c37d660aa2f9e57d9"; + sha256 = "1b922369255e48ef6decc6914df53d8461e5fa6139741ff6946e5f68d797aad9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/el/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/el/firefox-93.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "33646c69fd8058dab93d685ef525b9c159e6161704b497f00553a9c9900713d0"; + sha256 = "ba9ddc9bdb8b7b5f1535dfcc8d6ae2062158689d57aae089a854b486e24f2b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/en-CA/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/en-CA/firefox-93.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "130a04cbb4bd463f39de36392d1d3bf465974ad866069b3eb7a1ac65c6e7ca8b"; + sha256 = "910529d6c94fadc481238b015a35a4b6aab9f532aa4fac3b815413e02ba09f5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/en-GB/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/en-GB/firefox-93.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "51839c5b3bd7c7ab471c44001318f09c0ef5fc9e82131308646adaaffca5a50d"; + sha256 = "be7b43f5e801e3528c5e9eb732d281c36166265a1bcb84c168b017ec8cc01dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/en-US/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/en-US/firefox-93.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "29050d18670a61585b101f8fa4e196fcfc22d0447178143202301836f3c048eb"; + sha256 = "9d06897b80d77cfb59e1c8bd4dfc427590b058616ae634e52cfe272af06f9b32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/eo/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/eo/firefox-93.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "155e7fa1b564bec8cb11fd12efcfd9438be986e05fae2e978251d8baa7642c08"; + sha256 = "83e76766de41b81936b5a2d5bdb3b61a654adfcd3ee7226cc58418a1b4257e4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-AR/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/es-AR/firefox-93.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "524f2abfb48663f30d92cd3da01be180ff13a182aa300f31beab3ea996ff3e92"; + sha256 = "8f7fefb869a19511065025d1b0e0ed1d84ffdc402dbb07c4c35673bb9209403a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-CL/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/es-CL/firefox-93.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "ca79ea7d15fd829845e9bccb28ff366ea2c8dd023026e16c05adf076015ba46b"; + sha256 = "62531f511e3d79a2a4d80c6a09ce120ecc62662fc5e277f8ba7f73488fd870f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-ES/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/es-ES/firefox-93.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0a31b2fc5719d46567795f4d49b0655923adee804c117d83915d8ad61dbf01f1"; + sha256 = "f3f3869780b3344746f8cf1e59dda3f44f56e5b9a97bab7bdc4cc58ba5d8b4a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/es-MX/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/es-MX/firefox-93.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f9f4e72ac67247466539ed3c844748e34e85f4b9ba28123e9eba55fa5f845fbb"; + sha256 = "55dfe3202f289bf5ab4b8fa59e3ef7824ca921c436b6c872f2fa6eab8b95dfd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/et/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/et/firefox-93.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "4a135e194c889b4a655c846e77d7fc7dc18faa9e1564a9ac9107ea492571bebb"; + sha256 = "b6ed0570c1644a00f058453b82b48953adc9e500179f51ad769a796eb7417f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/eu/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/eu/firefox-93.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9bf92e2872590cc6879fb03885e8a89d0325696d1f5269d08b7469e384ce3134"; + sha256 = "070ef21ffeb8c339c49346017626a0c6112ca2c63e2a2880c3b22b858c9322ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fa/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/fa/firefox-93.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "5025a2eb60cb136e1aee6aa846a15577bf95cb870dc30c51b6b79b5de01b3594"; + sha256 = "9dc071ecb81ba221ece8131ff54d27e94585243322a39d817ae663a35af4cc4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ff/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ff/firefox-93.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f20436867ecbf73bb2262645bcb7b566173bc7975a46a3d7fa74718ce9f1fe6d"; + sha256 = "7d1aa96cfe5c39059ebf682216083a2d5505f9ae97290f6dffb9b15912c5b6ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fi/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/fi/firefox-93.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "4e8a5ca31f6dce0891b24e03b54c0fa3774f9bba5e99b90d73bcc5cadc20b12f"; + sha256 = "3f050f0205134d52aa3e7fd08e1e78ccf2f987aed286dc20c9d5d8422e8dffd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fr/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/fr/firefox-93.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5e4d6b7d4f654b53afb2d6dd32291feda2a06fcd8d30a0fd8580a81e12716015"; + sha256 = "bc7aef8139c8e20c3ee69e027d93300b30320c24fbf9b651c14743b88d243f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/fy-NL/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/fy-NL/firefox-93.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3ef484bd72bbb0d4ad75d42d052e26e1da50f85e7bb124e3f7a02e96ba06d837"; + sha256 = "4236fc93d2d661e29f1b82157b179bc91a92543df8b623264c5e05b5d03747a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ga-IE/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ga-IE/firefox-93.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "45cffb030cb8a3efe85eaee32b97d3b995b2ab0c8a5b943cdade38bc39bf6a0a"; + sha256 = "ef874f0887ff4724e141608aeed56a2f78a40f3a0f620e3bdd35e0247bb21194"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gd/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/gd/firefox-93.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "9cc69e735cf67da632ad1765853224a7b442883c023bd45d87cfd5f1a90e06e7"; + sha256 = "bb0d22e04c024a86bddba9cc527db275199a04dd2576c170f78f98c68ffe4077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/gl/firefox-93.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "567e290d2e6a9b09db3d1b0e33ef5d88a9db2b6ab8cdfc1ebf6619327b030a98"; + sha256 = "ab958633a2f6b691b950c18147c04426fe5cdb23592e142dcf15dcd5ce86bc5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gn/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/gn/firefox-93.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "bb39c07acc3bc89d7c36a121b701776793f391c05f011087367da6ac7a3f82cf"; + sha256 = "1ec4293dd2658d598dee23fb04ecfb6674ccb19ae5b93fb60e94c3ac018056fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/gu-IN/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/gu-IN/firefox-93.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "4bb13592ece99d0f3baf0fc2ea0e4017ae5f14f0099baf4b17a83505ad811ad5"; + sha256 = "eaa2792ff2a4ff29ee5301e3827c758f5e93159d4212988c8a3e3bb19a609064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/he/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/he/firefox-93.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "ed666bd6e000d232b7c0a2e7e1c236c4cdbea638fb6327a23629be033093ab11"; + sha256 = "03ef507e5047f3f84cd4b41a1fbfe00ba72833d0f6fe2503cf0156504031228a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hi-IN/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/hi-IN/firefox-93.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "0e48dbbda7854a54465ef78c194c7c5d1dd7f3c5609ccee92739a1245e625f36"; + sha256 = "9ff924a878b7e8e69868ca33de7ac10d66a4590d022fb2255527928d905a891a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hr/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/hr/firefox-93.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9ec220bfbb0e8e1c745c89cf9e7ca4349d70ecdd9ef343fdedf8a477dd33f582"; + sha256 = "ef61afbedff8dac01c600620e82756c5bc04782d717dff13bc6f59ccc06c8ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hsb/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/hsb/firefox-93.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "23ec07f1307a41791b0a54f3160779ae10e91ab051a1a5353a2f1b97f1495468"; + sha256 = "57ed98a1bce575fc67cd290457072e0142183b9d8713d20a58574453fb3d7707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hu/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/hu/firefox-93.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "101367ecf8df3de940bb672280569ad861cfdb17af8bcb393f9c9a7877e577d9"; + sha256 = "d565f5881e15197d70bfdca1d3df7eef4afd505f7fb2e71bd9bcf5495ba33007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/hy-AM/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/hy-AM/firefox-93.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e340c664894abe8b6ebb95bf8e9c0a800f19d7fcec82325a6de9a592a00a6ea8"; + sha256 = "ee430651716013ad37fdeb0549d96aaa1ef254888653b686ba9576844976bc36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ia/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ia/firefox-93.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "cce244fe4b5387f567655f974862c3df5e77398b0803ae43eb60dce42f4614fd"; + sha256 = "d85cea5e56cff08f185084144374c782a0edbc8396a2ab7ad9e373e6d6441cab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/id/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/id/firefox-93.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a094a09793400eef4990aa638e50a2d894e434e568c2c00491a6ab444fe1a9d2"; + sha256 = "f9b95eafb8f064dc9ac02693befca85b90567b6635446a20f81bd3391fd64847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/is/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/is/firefox-93.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "10e7a8689abf2ae940500d3562c21c3186883c6a8477c012b60d56c856fe0226"; + sha256 = "d1d68fe93ef3de2424f3ca4d59d339e3add6c21ae63163fa86f0f6c7751893f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/it/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/it/firefox-93.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9b5c5ff9c7a52a1b58e31ca44bc993d31d42ed4e2ef697847391559c0986c5a3"; + sha256 = "9bf7961653ac654daf8f019ee03b242bd73667e302f9910ab1a7b64aef4b7995"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ja/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ja/firefox-93.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "3e8d6c06f7e66409c1a17ceffb81a4127b496bcc4a4cccae3be731414891a8dd"; + sha256 = "7ed411b87cbb261094c6b7cfa34d5cbfa28f0800644b10957429e0499f03b95b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ka/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ka/firefox-93.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2a0406c8205cc8de560f0d9c1dcee6963dbb2df67110ed54fe54821c82132bc6"; + sha256 = "b5e92b09a9348033abfbf9e55049c7d188821aa2e3ed973cf207130cb1f47abe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/kab/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/kab/firefox-93.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d6bcc16d8eba88cb29ab1985a717abf1e7835c01261e50f2d04bea9229327feb"; + sha256 = "71368bdaa2cae9a585b1bc7e6539d5f6ba97ae87a39c8a5910077d28bb0c80fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/kk/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/kk/firefox-93.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ce6467027b132c8a56c5fa96e26140a11761c0a6b630ebf1b8d6d1ef8ef717e5"; + sha256 = "e91bb39de263c5a41c54c50c11d82ce9a28ccaa4df95594657b92e2584210072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/km/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/km/firefox-93.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2af10a5004835e32c6ec579f621f7a2daa58f58f6eee831fe65efae0a2b6e5b7"; + sha256 = "21aaa236b79db29eeacb9c3b4509be78bf65f5584dbf8ee7c6803bc8ce89d201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/kn/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/kn/firefox-93.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "272821a500af703c960d2d9ff18347616237ecf7340fef39f9a9897e807683b0"; + sha256 = "d661f1b28960791bc2e15cf6f831fb88c69c691e81bc56b61bb6bb47f4540851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ko/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ko/firefox-93.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a8b44dbb7744cf1c2ec25f9fc64b6fed1fc19aa06089dc503e648bfc449f78ed"; + sha256 = "72b75385aac30b8e659a919710412bd532103f34498bbd921e698d8d41354f31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/lij/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/lij/firefox-93.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "e16be9d8119619328617e9c16a123a07aab4a4020eaae8cf0a8de1a87d9c6e58"; + sha256 = "9bc73f6865faf264bc411dddb362aee6b54d4d6b14abb25e088032148027f7ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/lt/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/lt/firefox-93.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "b3d3969331c25f74e65756b7bdd43a32234e5e40fed98597da073d0c67f96d98"; + sha256 = "2499f42c4da599e2b006fe92ae921b6e3fd85af8b94c895875c242e45cfd6987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/lv/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/lv/firefox-93.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a588b619b832aff9850692c622e1b458bbd3f481f0e9c6d12290dcbf16a05c4e"; + sha256 = "b413029366708222b35286b872efe6b1fcd27f092e9d5b01fa1a6ff9d48e62ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/mk/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/mk/firefox-93.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "9aaa0a446703e06249e8c0ad56982962d34d5a59a9d25bd744377bb011014904"; + sha256 = "1f87c65a87cb5a876dd8a3749ea47c1ca5d7446bbca72de1ed64d92f77f7bc74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/mr/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/mr/firefox-93.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7b889d5ace4d0ea80a496fa1d2e963c052e55d6cffc57b3e8f1d4088bc7b6091"; + sha256 = "8fa074c47ffff06f7bd596d3ce3e6e2281c7e924582f285aead35d37f71b18e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ms/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ms/firefox-93.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "bb52c8b703cef9e25b41cd3d85974cce0a009a1d83a9a97b295de6bfcdc07959"; + sha256 = "674e877cd4a2e1d0844dcad823c26a50032565239f0ac07c5dd073b919beff80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/my/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/my/firefox-93.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ed9f099d13f984e3ce3b8837066869df3861d5ebd6e6391ad0ded9a1db6bc946"; + sha256 = "8a65cdc5a9c7455c6def1e68fab652c2c5a1d943c4e7af6a83502de5f1d5738f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/nb-NO/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/nb-NO/firefox-93.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c922d44b8e8a2355e7c6231d976e9ccaed02ebee0ab1d781b079dd2bd2a6d848"; + sha256 = "9c6771132a3fee58115cee692564f43464d3ce745da721d3c61519d845592304"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ne-NP/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ne-NP/firefox-93.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "5192653edff514a71ca95aa24eacf5e56dc824a47ee47df5c25d42bfb6bf521b"; + sha256 = "110e30dc86f3996b9a3c474be5f170510383ad137a71257a5cd27ed25432ecfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/nl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/nl/firefox-93.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "9c5fc26d06f1f57e7f9f97761abcffa864b378ae259637d37e8084322df549bf"; + sha256 = "4e753199be0e8b2b927fd2bef35bfbdcb2aa47fee5a178ff34f4348849f058f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/nn-NO/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/nn-NO/firefox-93.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "85380878356b288976972c3fec4f393271975ba03a6541885676e13f78b0d1df"; + sha256 = "7f9351e18fd74c472151bc8c9ed9181542308a15820b9aec503981de97b851b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/oc/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/oc/firefox-93.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "f538de12b1c43a112c4ac1eac24ebeecff59bb9b820913cbf70b01cbd7cbdf9c"; + sha256 = "0eaefd72fef1d1d86bc0250052d80993456754be8b2818ecaf5a34d4064c4ab3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pa-IN/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/pa-IN/firefox-93.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "4bfd146cd7b05bb4e63ebd035360c4b7b2fd1c6ea551cd400df5ac8c647a89ec"; + sha256 = "d82d82b827225d9764c127b0fbddbddc9fb46ff4c85a9da7d132ce54a2ef98c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/pl/firefox-93.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "badaeaa9c937ad7766aba52a1f7a67016d50bc0c8843a0d2fc866104e5245dac"; + sha256 = "1bafb0bff6e280a6595b82dcfd99bd2dde5bde5d5bf0993f828e1658afcf0e98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pt-BR/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/pt-BR/firefox-93.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ce492dc058a636704a9483e82f95f102703136cd273f653e39f38ee8ef2381dd"; + sha256 = "ebb2bdc70f03a6aaddd3ac1e47f716f880198f3a7c5040a4a592c88a90dd7ff4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/pt-PT/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/pt-PT/firefox-93.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2661cbca38cca08a504cd58a48b20623cbb87043240cf79a40530a315dbbe8ec"; + sha256 = "c082c36c403b685e089b1a90ace81dc4fc2d612f4d82d65fd178e61fafb265ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/rm/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/rm/firefox-93.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "540351da416718343cab82f8756bc0b33a3a396377d27d02f1e9dc7e42e9db66"; + sha256 = "b42d24bbdfb7016c71c262058af2fb9fec38fe6a9dbf47f6a3c04cd2e9d9279d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ro/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ro/firefox-93.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "54b661b40ad66a5881a98d6c97fce50fb91542e677b7dc0be07f38c19e3927ad"; + sha256 = "cdf32a9e5268885f103e9a9391a247f1e05b2922b1e3e8744c26d92fac9722bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ru/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ru/firefox-93.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "250fe6abc746a74a1e1c7be095f8766b193738eabd095213da2b6e41b4e9249a"; + sha256 = "b87f839b38e8b9e7f17dd97724b210f1eac2e3d290fcd677ab729c00f341757f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sco/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sco/firefox-93.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "b14fd7e73b132fce408ad8398728c1a13e065bb8a86a37720cb3aa02bc7fb4b7"; + sha256 = "7262fb3b507d74b6d68da1426e7f4571dbecf66211cb32f9719363a6c1f2aa0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/si/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/si/firefox-93.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f6427495f30297c38225e972090efd3f02242f70a7d47ff67da06f54d747da5d"; + sha256 = "aa3e1a8d8f05eeb024eda42c6510532b297a73ced25944e0c28137ec778be9e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sk/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sk/firefox-93.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a59f87ac0ee93fa517347148be8f1d519df525d63424a93faf11b6349557bcfe"; + sha256 = "e1102e5c0961c8532cd9ae49d8b3da624de490265cd39d3e952cd4da839b394f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sl/firefox-93.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a86644ce8fa694fb6727488f566490f5cfd624edb556b94ff9ac6cd3506bd5b5"; + sha256 = "1109d8fe7a1e33fe03da7c0b3cb27e9b9f314273d4c2ba8a61f12b3a6237d6e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/son/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/son/firefox-93.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "b76724b86c8c82036b159baf9c376de3db0d9855a256060259a6800e62fefc83"; + sha256 = "676739441dcfac253974ae5092c59455b7101e294f9c4df5d31eca00ca864eb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sq/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sq/firefox-93.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "233d9bd22ddd0223c5f4d9f1e96caff90b4fdfc3527c8ca39f3da4aaa34918ee"; + sha256 = "eae6d8801a111b38fa7d7b3ee7fc5b23469940de26760b44160d09f68f5d8e5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sr/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sr/firefox-93.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "9b65446757e6438ff477df76de2c9a79c5300a40b9533df90715ad842365840e"; + sha256 = "a315f119c5cbe0d5a2794933e21180ab837e672c3063a870947e12def2fad450"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/sv-SE/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/sv-SE/firefox-93.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a9b76248c2e5043129c4b55da2cedb5456df556c8cb28a3f7814e4b99ed5a02a"; + sha256 = "3f3490ea0bb9fc22ea85d5d4f6eedb4531e204c1d53f8cf487dbaa063dc973a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/szl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/szl/firefox-93.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "532e51336b7ed703f4955ad01dbb030b19ab222f20bc44e5b224d24077d96537"; + sha256 = "a59912a923916040b87ce1cda8fa71aede4123b39bfcab88a8da4c0da2fb6ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ta/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ta/firefox-93.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "1093e65ad6bf476417dd34dd44fcf97cbaa23bb897b71cb5c7b81a30e7bb38ae"; + sha256 = "f6cda89c2b4097e5c33c0eac0819bdcb65cc18e085666fe346fb64aa8d55f64e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/te/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/te/firefox-93.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "99e4829264f1ec2ea00e3359db5f16113e30ad67d8e6f7b8611987f6c1ac5f35"; + sha256 = "dfd5f6b330b8ae139ce76c7f21451773342f960e6ec09cce6039791835f6910b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/th/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/th/firefox-93.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "fb7baf520791be7d45b197ebdd81886635328c986bb0d06ea69c2c705fcc719d"; + sha256 = "27e625b98bbed71a299607c2cac31ffc937a597d8c6bcd0aaafeb338cdcac547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/tl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/tl/firefox-93.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "1e8f5b75200fd25ad6e14f89d2be604bc724fb48d7cd15ee9b3adb2142a7d1f8"; + sha256 = "72a57301971f9bb1a2674a4c00e8e45e77fe1b5b041de9a3255ede15b124460c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/tr/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/tr/firefox-93.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ca3201648b93b16513f4aeeaf6decece145e86a36706d26a0cd708f8e1c17fb0"; + sha256 = "c939cfa088b584330179dc3563062b6e08458e4347ef1e8c66c899ecbd642413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/trs/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/trs/firefox-93.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "559d792599c51ba20a78e2a8cd4d10b47ccd61ad334a2504966b388fd4165991"; + sha256 = "3216099a1b3435591d1eeb3e50a90c66d9bdb697bf852a302cecb1819cc96c07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/uk/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/uk/firefox-93.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "290f97c09de52f639cf9c9b7cd605cf29d1b6a3419915a021a42353f9848d96f"; + sha256 = "b2a63a362d0197e065608961a57ab04017fa92f6b43a9848c6046f6da08d3bda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/ur/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/ur/firefox-93.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "296d50147acf5e8564adedc1253899a5bf67d8db40eb46f8d7abb51d3dc8ad38"; + sha256 = "faf5f628ec7b1abafb385f43c26534012d6cb888d92bc1c98f17005a4c86896b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/uz/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/uz/firefox-93.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e53df4ca508cbaf49bae355fc08d1f37c90e99bd8629d3a4968e4905fe476b64"; + sha256 = "5d2ffce85b1286958dc770a163103b6642c98f29b40bc441bd4771ca5c9817c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/vi/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/vi/firefox-93.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "35189770f0e63c9b1f5623c4ef3bef4115179adeeec2d1c3b9fe7595bae63329"; + sha256 = "6218c4c6e58dc0c07df62adef703ee5fca39be1c3e157dbd936c1a0fd670cac9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xh/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xh/firefox-93.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "df7e4988bc574de22f3419f5522cae14a8b7b6c9cb32402e990fff92895fc34b"; + sha256 = "4a61e9af94fb6fac5b3fcb9c1461b7c551583b741c66830545744b3b717b6a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/zh-CN/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/zh-CN/firefox-93.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c9d10f3798510192c2a7e04c318e69a8f80945e72e7b7f81392d3f7f716cdbe4"; + sha256 = "dc8279b92b8e030795edfb1c939a2989f8801953547f2c581740ad24701cb95b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/zh-TW/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/zh-TW/firefox-93.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "22992234bae2f13ee4c22b3f75f69aff251ea466383f423398a062e400da21ad"; + sha256 = "d0c7d5f5738d051959dc9ee4f39dbf699a8c8f6f2328858670663163600075e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ach/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ach/firefox-93.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "316ca1559fbca9ad56be2ea53636dae960e05ccb3f50868df8baf427332b289c"; + sha256 = "ad9067dc548ce33d6441c0e94dd46a93751efd5c1de391dfabee1ea7dd81c80b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/af/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/af/firefox-93.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2a7ff4409a50d76319fc4a749f516171fc1abe2a53290b4bef3f7dd87871d4f7"; + sha256 = "8267fedba7d52a5eed2dfc64b6bbba23c2f72e9f7b28370f65047b6009191730"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/an/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/an/firefox-93.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "dba4ce48f723ac4616906e7170e08aa14bff86def5f2e9edcbe4fa5bd283c4a9"; + sha256 = "ffc6725d9c9a2baad960f7b587588b221fa3aa0de7707dd6fefd3f81f61dfe89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ar/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ar/firefox-93.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "db69d68b140702d595489d732c4f5909fede55cb4d5f81a91a12a7d769f96a8a"; + sha256 = "dafd5ead95dda8f5fe119805b1d1d3482cf4d90bd8f274bbdf551846f8b7780e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ast/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ast/firefox-93.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "92185bfe4198d9d4d3fe2146e6cd1ba23dfcd258933e393d2ed29dd2239e6f23"; + sha256 = "4ff9f1379b95aedb46017b77a86766a0fa42d4fe4f0a0c2c6d3a26b4612e578f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/az/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/az/firefox-93.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "62fd888cd6639e208907268290b0d7eac668480a131052924c978b5356da8ab0"; + sha256 = "ff597f10b2f9e42e1dbf9cf7ea495732c021879afd5b3a2c5ce9d1aa9db144da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/be/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/be/firefox-93.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "41f4cc7bb3f8aea6059afd61ac7518abc32708271aed42eaae058fe17c3e7691"; + sha256 = "274297dda60b7b2e2c19687888affeec46dfab0a0745d8b251179bfa06361331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/bg/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/bg/firefox-93.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "59e502d69afdb5a80d6a3de0afd16caef6e2b69e86cdd716f62fd4d5631312c4"; + sha256 = "8acc4e37249c706f23db4964da28289cd2cfcd0984f60ed40856022b8202f147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/bn/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/bn/firefox-93.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "20b3c1c5ac49607fe6198cd078e95882e1bf0efba4456b3d0b484519ad8ff2a4"; + sha256 = "8b7e681b6d22b1d2573facfd57f0039f9afef868d38f0b4c6d15c8d9e216ff10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/br/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/br/firefox-93.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "c532e758f36f92bb06d0c9a9e99e121ea2ae8989a216334224d79303cbe9db50"; + sha256 = "6c621a574b031b19fe43376b5b7175a9b11be3ecacf6ae32ff7dbf42e2385e94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/bs/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/bs/firefox-93.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "3b642ee6d1227fe4b459bda110285826a5f1d8d4ea32e30a9f043ac2f0d290bf"; + sha256 = "d365a64a2d8dc71e2bbfd73899102671784bd313982f48a87a94fd4f5283d6ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ca-valencia/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ca-valencia/firefox-93.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "1ffb6094c6f56c79c1032bd73b01335277c49988d37ff8be7767cfdcd5ddb0a6"; + sha256 = "e9af2c49c737d5546aa65a45a26e27c971bbdd0bfd94256159eca2585470ac32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ca/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ca/firefox-93.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e70753a344a1b4bf1c95941495508de71a5c064fec7dba981fe123be48efe85d"; + sha256 = "365e008db10d5d5f1cdb584718dba289af656e9176020898ef642371d8b2cc09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/cak/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/cak/firefox-93.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f71978689dcb2040910b342ca69dc863b9d50881b8015667f0ea5e16e6730429"; + sha256 = "ca9e050e8df1b775221a3a8189b319e9dfc70aabd61421ba2ac7f8cf47da13a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/cs/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/cs/firefox-93.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7e98ec58cecce174b3a76550bc3c4e0efea5f49ed6270137697dbe3410232b07"; + sha256 = "7444caa7dce9e45adaa419c6a71d1ff3fe0a21a3ba3cfe4e0c08ddd93973e7db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/cy/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/cy/firefox-93.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5c6b89f3ad3404ce5269c9da0ce5a2a827409f989146bad2ace80a93067ee0da"; + sha256 = "ac6e4bbbcc489c514c26dfab7ce7be56d78e2544628969b0dc1578856d0c5439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/da/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/da/firefox-93.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c7f21ccb8478fcc0cc76d7895f8b4e18fb750d62f9d6a01101b106f436c015bf"; + sha256 = "1f1859f9ce3b691e4fadaa82cee1680b4c23f70567d3f68a60f9fb682f96babd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/de/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/de/firefox-93.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "69cec8959bfcfb1103097657980b9a40b946fe7fe61c93c8fe78aab996a2f30a"; + sha256 = "f5ac9118d0937638a5b011657cd529d0dbc28108885b5cc2254022b7082c3ffa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/dsb/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/dsb/firefox-93.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "568d38d8650fa65d258db761c19396da66110588b50be860a107675b0420715c"; + sha256 = "86381f8c5a5c7c1431012ad8ae44360c1c78e644197e7774de82101551cccfb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/el/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/el/firefox-93.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b3567a5124db9ff3aa6878bcc24f4f484c73ac2bbf928efcbc8d5cec50acfcf4"; + sha256 = "89d9f1bc006e1d0f824ed794f7917430ca2285c88cc82eb98fb643fc2231218e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/en-CA/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/en-CA/firefox-93.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "aee0ffc689d817fe539473a5164b6cb0ad9a6bafa23282af56fd87743261365f"; + sha256 = "4c2c968ee7f4f9fb49bbe951a36fc23d9e51178d15772cb41e4d59f41b6c2816"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/en-GB/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/en-GB/firefox-93.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "528c966c67582b5bd96e0e6ca911ecd5a30988237bb7d93d85dbb2e5979c0301"; + sha256 = "ecc57a222760119d6ec9562e3953ca7541dba4b6ea194b02cf20bf3b4fb1a994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/en-US/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/en-US/firefox-93.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "3fbb43fa7e8f1636a5c9be13af710dd5b3ef5326803b1fc35634ef68cb8db531"; + sha256 = "56294b9d6b39d94e99a507bb4f1511dbf8a2512a846b8ad49bc93e1253f1e3a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/eo/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/eo/firefox-93.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "62de83dc9b666f1699302754676b5657e587203c49ab71ff925657a73c53ad5f"; + sha256 = "33eb50b3e38eb259fc7559b60df2a9d69f4ed00efc8768a6dc2cafb2c6a93fb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-AR/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/es-AR/firefox-93.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "08d8aa305344ea45256dcc7c574c9a8fdd5e44e7ea889a1ea4e6af17eaaa09ca"; + sha256 = "0e21f3ca04c37439768a9ddd9de73dc725c688a109e25b95061c4fb241361820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-CL/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/es-CL/firefox-93.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "41fbcf2947e91b50b5467f7341dd02be42b71240414b56aac651d6ba7f53e74b"; + sha256 = "418fbd415180600791b91500a69811447578102488642c4b6e9c8d9f0d7f94ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-ES/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/es-ES/firefox-93.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e180d0e363ea6fdc4f2fe7c727c5958d33b42c27267b05b31928ffb5799a06d8"; + sha256 = "6744d826f205b162800c8c32bd4955e84ea284b6c92450ed88f1b947d4ac0bbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/es-MX/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/es-MX/firefox-93.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "00ee74e5b48685accba8e37510742821a3a6ee993649429194dd46da63b553f7"; + sha256 = "242f2d561482a1fb9859bdadb6db2756378ef364bd622485639282a537c9d7e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/et/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/et/firefox-93.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "430c623e3b855dba5f13173031ebce68079f71394194cec5f60cacd6a2e1c061"; + sha256 = "df71885748c89e6298467d70486193404ad83db7e2f77a6eae70a80df73a11df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/eu/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/eu/firefox-93.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "9e056cd390cd72fd3cb75f6c704b36798c835fed3eea46d44cd036c6d012b18f"; + sha256 = "487ef0a284b3979d5eb758bb91a51b177606b9e2a40418df914d5ee0854852c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fa/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/fa/firefox-93.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "5ab4507f0af10790e4df3f4caacabeb9ce01e82b9b002791a1102193492f7c1f"; + sha256 = "30e9d9421a3b13555008ce6f422e7567ecaeedbd7d06fd5c2e9d5a22b9f93f0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ff/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ff/firefox-93.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "031e7de2b235aa06ea74850506dd241621548032fb65fbb27b3389d557271e9d"; + sha256 = "76339d6f61adb1fd0c33b1e37902d9af4442d4d0cdbf17bc87da5d025e1658bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fi/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/fi/firefox-93.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "d3f30254a4afef69da5dc59c6f77c48eb801f402e40bca9f2e97ad69d7dedebf"; + sha256 = "ce7d5435d3b25f3db558a226ab99932f26d1de68a32c801693ff809f83f5ce80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fr/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/fr/firefox-93.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7e4063d25aba375375c6ef1749ddd6a49fe616ba2b293cac9220bcfcefa936f3"; + sha256 = "788d1fc89d22cf2a69bd412937d3a94326e780eca272eca7410d1119b2a95234"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/fy-NL/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/fy-NL/firefox-93.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "edf12cb878e8014402c8249c89fd648a0dc5ddf5621d9ee4f92694fb92b5a6e5"; + sha256 = "d691253a24487b32a646aa7c10b36ae0f35523ee4a22a1d35d41c5e871117d73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ga-IE/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ga-IE/firefox-93.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "9d7e464620bd62e81ce62fa6de176c614a8347cd2972d8ff96f3b6c7ec893c42"; + sha256 = "6f5c0ccf72bae2d35be9b256c9453d4f53c60252a09b51a96d46ae2296728277"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gd/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/gd/firefox-93.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5c48eeefa57989c23810fddf8a63c0ab022e7774050f9e69f3d0abece64a7b33"; + sha256 = "ac0d3239cad9315cb5a2441d287c741c44ea65656efd2a8f9c8dab88818bc8ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/gl/firefox-93.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "eb1904437e14194c672e8efc493e08490b8660220ad4484fbe827d4e6c36ba11"; + sha256 = "6e0f03f1f6eb30e0052ea5a4dd853f9ce4a028fae099287e8ebfffc7b45f5aed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gn/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/gn/firefox-93.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "1018ee1a262a44138a54f61c9755a42fd8fcf894466bc8f6ee63fd3db95eb08b"; + sha256 = "c5544c5847c8e1a3ed8a0ad4be937fa072fb2bf4cdb1860ed7212611cde645cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/gu-IN/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/gu-IN/firefox-93.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "63b248a8f170066cb27858a239da41c08d3bd0dd31f49c0532f47dd3b8531cce"; + sha256 = "7375ccbfc1e179282dfd2835b8b67dabdea4e2edbe8689dbc42ab08d518b1538"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/he/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/he/firefox-93.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "fa1db5d836aa3136e6051fc3a378c9ac7f6750da680e6581af1018f8f20e9c88"; + sha256 = "c918f748d226ddd8891b87c11958f9fe4df871d94bffa089fdf9d2830955b824"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hi-IN/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/hi-IN/firefox-93.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d21f6a1a4edb24aea217ead940a41846a12de5004dcb8bc1145807ee32a08998"; + sha256 = "99c86d7ed9f027a5b1f7593c840ec8c401e87bba07e90584a61e59a0d67af348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hr/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/hr/firefox-93.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "5e2fbd3e80787a8a2aad7f7324fe4d0b508bde79efe22ec0aad7f10e02db15ba"; + sha256 = "8884a70c80d07cdb57a8f825db50ce7f073da01a09860ba9db5a69a94d82825f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hsb/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/hsb/firefox-93.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "3698ae1adffdac77fb639d80114eeae27241a535f8cd248432256c4e7ba923e5"; + sha256 = "4828b9cbd728bf750d11c0e71554f9c84ed6a19303cb78e35b909f7b11a7a563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hu/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/hu/firefox-93.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "bdda2cffd94bfbb86311db1df2f70693717c37938dc5481ae4d4ff961b1f123e"; + sha256 = "6faa65b0559dd42a63199bcc576d64c9ea1140df259ef0e0c0b26f0bf0b938f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/hy-AM/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/hy-AM/firefox-93.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "8e03e849a5fc77ccde394f48e752c7b38d791edc748679fb99149c9ec55cf114"; + sha256 = "c7aaf4ab6e126608db0027524226fcd62ca6ac781d06da0bdbb0547aa0356480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ia/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ia/firefox-93.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "da963fe2f9c5f739c75e0676a588d49bcc5f55e46e502f7c8fc26962e3f6b50b"; + sha256 = "fccedf58c92bf64e15a2d4edfc8ad9b1098589821e395a5ed4455b030faf3584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/id/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/id/firefox-93.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7053bd9321bbc81e2d8c0ee44d5bae33dc61658ab98de9dc9151b23af775ce2b"; + sha256 = "79d69217a8888f00753ad5d2ce9368a3094f5454a0fb6117ceb9c82a271688a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/is/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/is/firefox-93.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "796332ab0dc70589fa719f9c43689474e6a4c4253a0334c3fcbec5ff46817a66"; + sha256 = "ba948a6f3b48ce5dac9090c0fdbc90bbbac3a04618a3891c0a77c033c61969b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/it/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/it/firefox-93.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "78b42d241584443d2bb92bf0c35a5616bf291f10ee8912eae7d729d3c51fdb95"; + sha256 = "dcd7e0357c115395040b5a33f5f3aaad07d1c7094f4068d2c2690ec28c915a30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ja/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ja/firefox-93.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9ecf782fabd96dd5e39a36b6fbd59d0ff0532107cb3e91d97857fb360f2cb00f"; + sha256 = "1d936db1e57e0fdf34a6bea460a19e2fd21a55078c50c9126d2d43041fb3d78a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ka/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ka/firefox-93.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "17d7e4467fa606abbef19fad5eb22e3fda9435eb897560406e36f9f52daff804"; + sha256 = "394659da7197aa055f4452edb4594850eb5300dd13940c14741ae0272337b16d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/kab/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/kab/firefox-93.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b06eb4fd02a68286dd12dd5a2f1708ee11ec65d0c96e151d9a4fcf676daf7b45"; + sha256 = "7c8fd02d0cb5c93cdeb8119ede9ffa54ad5f0546fe65a655a31b23ba5bb251ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/kk/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/kk/firefox-93.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0b4fea3f3f06f18cf407956d9e8f1cff7c5e9b3a262bfec787c8433ddda5b5cd"; + sha256 = "3a60f6d34d7b1563d58d58019333997f1afc548dbeccb16cc2d053b4a7082479"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/km/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/km/firefox-93.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "fd0422c095fa662c622732f2347757c058653839a9e7d29e775a5132f555797e"; + sha256 = "d480093c6c276ff17eb4d001613381e8b72018a9774acc667d1a774fc71d599e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/kn/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/kn/firefox-93.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "23da36033e71f0bfbde58d00ed47895ace26d5cb35f440fe97e6c8572f847f6c"; + sha256 = "0aa8200106375275f358a732acbe658193eea29e6fca65072f9e3de22d88eb42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ko/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ko/firefox-93.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "27279269f97127826a46fda7401fb929194c5b04107ba08158cc9169f4a35a4a"; + sha256 = "a5b2118e3761dfd182893621f045d7cadf7a75f15b46208a0f2ce878bc1a1b2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/lij/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/lij/firefox-93.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "d718cff103154a25a5159e788117767e82ca4581733c61e68b5c04dee7f1e21f"; + sha256 = "583110560cf65f6968e3cb5080227de3c47b9df3404a793a892be7985b132115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/lt/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/lt/firefox-93.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "d830090981e07344c714503b8cc37b6f2e63be4ee494a885542a998b56697ffc"; + sha256 = "e9eca5885a67bf0cb8b1ac00d3f5ea0c1b829743ae710975f3cda3e09d226849"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/lv/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/lv/firefox-93.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d4cd8d44dc024d3d992b263f6dfd40ae52a22ddd87fdec6cbe092a739f723025"; + sha256 = "4d969ee872531b2058752058bf90dceecb6c8050458d5cba5f96c82f0a6e301d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/mk/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/mk/firefox-93.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "45e4d1d02724c91f26b39dd5ea9f789a6ae966b31f9a0fa784b3f40a41d0d925"; + sha256 = "322985bb11f4e6f2f7a4da6606dda4af74d7eb63bef34b6e7b86618804adba5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/mr/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/mr/firefox-93.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "d84e53481bfad44403f1de84845444fe40cc8a92345e8a01262d98c09f47ddbf"; + sha256 = "1dfb359ada64faea03068afbe32e14431edfbdfb61ea61590ccffc954d637c55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ms/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ms/firefox-93.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "905f8ec65500b63ae4e04647126871200520d3a8ac5d6deb79227794da2b24d9"; + sha256 = "6c8541db16063140c63dcdc6314a38c049a2179376f3cdf80787cae774dac267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/my/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/my/firefox-93.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "37b93b5d29772952e00626b70e1e1655b483dd6d800a8e5fd55613d3f7910c0f"; + sha256 = "3131c70b51193a8cb0a3ca18207c6001d8ba5f458af214ce5280924d5700782e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/nb-NO/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/nb-NO/firefox-93.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f2ecd7f0f4f53c8705181716297772e78d433c3feee17730066a31582ae0c7b1"; + sha256 = "be47aa5951f3c07e11e47959b4718b21bab16085d25469fb4eafe406caddb181"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ne-NP/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ne-NP/firefox-93.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5104800ddab3310a0c21cd7fda903c822eae256622735469e845c6a169d9d783"; + sha256 = "4dfacf4d17838e75c51f60b26d8f66b0bf3a0bad9c2d9e2854c107fb30d8757c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/nl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/nl/firefox-93.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9c6c58ced571a0d044e8acbbaf8236d9de14df4378742086aaf4fd997c8b7509"; + sha256 = "9f9e628c3809f9e7afc5a338abe4854a54c3cf6b8fdcb59de8a306b09a22bda1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/nn-NO/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/nn-NO/firefox-93.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9e2a1cbc3d235df91962e9835712e1a52bdc830bc930a8e577cd2edb8b47e8fa"; + sha256 = "32f057f0ff57c17f010e19ca6f3cd0d11b6ee454401f1ec57e42c08ca1ded04d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/oc/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/oc/firefox-93.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "76da1a7f18f17a87c891252944bc6e2c2962b0ccaa450e1472e04ce5e1df2d90"; + sha256 = "681702c8a8d6d2b0fda8f4701c7c77fa305d3483c3d5f070d31c2b8006638f74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pa-IN/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/pa-IN/firefox-93.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "60804014c94b3abb6785ce7da4f3036806f2ec378314a4b7cd61b3fd21e01365"; + sha256 = "080794608bf065d92431fc5d822eae12373b3f60677229303af30e07e40a8751"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/pl/firefox-93.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f956ff3882125832feb630143ac335eb094c9e4c3102646487bd5e3a36ddaf8b"; + sha256 = "e44448176c0275da5e5f44b2aa4f6b378699cf44aa015e8f03513b89b204f5d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pt-BR/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/pt-BR/firefox-93.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ae51131c8e6c99f15034e851d48f8b08c008a5a9edbecc05e7af2df9cb4d1c43"; + sha256 = "fb970290b6efba30ac36f145ac57ad2d65045bd3757c78cd006864f841c1d52c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/pt-PT/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/pt-PT/firefox-93.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7568cd2077858ca9944fdb5eee9c991bbc5ad53cf355f161aa21342d61427a27"; + sha256 = "97af8a13778621c873dce9393b5653f48a440f401a61e4a7401a49253d6b3ec3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/rm/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/rm/firefox-93.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "089f4383a2f586a9196d683126f69164465f0ec35e7adabb57ef961820280e06"; + sha256 = "ae7852c30969fef6e8ba6d8e0fb932c5c63eeb9867a42e32135d193f8ee4ae7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ro/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ro/firefox-93.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d40ca2a9def1c5667e39d1fa711b22383ebcfc99139d2e2dd29fd891f900406b"; + sha256 = "94e69e8e91da2e22a2ac0fce179b62b246cf9eaf7a662f348907350562951262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ru/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ru/firefox-93.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3de026d11f3b6ee19f95a1ad9b6eb3620697c4afda9627d54782c0f9eff3d421"; + sha256 = "3460e2a2fb34f952bfb099671980207de7b5a45a8c5f4a7f79f2c050e6bc5e82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sco/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sco/firefox-93.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "4fe831c9d2d5444c61b8310be958de7174b5058e873f897159a5db5434a38cd6"; + sha256 = "8e1adffa5e7a46ddcad564e4d7d01b19b3c851eed451cd1e83608c634f9e8fbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/si/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/si/firefox-93.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0473706c50ba90efc8ceffcf1dd8fc7aa4f043d4494a29ff95f289d65a4d5938"; + sha256 = "0ed0ce0025e1ecf7b3fef2cb011b5c5fcb0e3eb67a0159e80b6c116b9034277f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sk/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sk/firefox-93.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ee20205a3b2e92e3aa54318dcaec7d9ad4a43c3cfde7b890652dbec7b7f36d30"; + sha256 = "1e1334c2e55a27b6b653d038f4ef30d8655b3c7c253365788cdfd92117bb1e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sl/firefox-93.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "d4890198b1d21ceef36c7d4531f37726e4b769874cfbc8ab3882ebabe36bc037"; + sha256 = "dc91d34c44bf240b2c6c9b4285c5a7b24f3c509ee5f9de300e9a6c2ff1228ebb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/son/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/son/firefox-93.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "715e12adc1a9e1597d9116f49598eca3f1e4161e4cb8bd80b666e4f8b5aa166a"; + sha256 = "29121af73aaeda8e346df00f8831a3c80c77eb759604cd51c8b39597e3f7a6ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sq/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sq/firefox-93.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "a5b982feb51839aace544c0e35244c77a3dac26ddda652ab5ee18c1472f7ee5b"; + sha256 = "2d7ca2e6680d909659241561ec2d24369749059acc642d9db8ca90d8e67201d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sr/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sr/firefox-93.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2bdba656b4b7fe0f83ed895b77ba7d0e1e0701b98c9603c210a10ebc4d0061fc"; + sha256 = "63ba06a120ac6702350330758aa98671feb1a008bbe08ab2b11d92d556a22a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/sv-SE/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/sv-SE/firefox-93.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "58bdd781766057ee0eadf439b90964c4c6d09eb27b4d085d2eb6ebdb60147922"; + sha256 = "f2f59f378be886fc283a84f58ccea2c8ae2f2313435557122b1dd7161ba03853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/szl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/szl/firefox-93.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3de916e83f388da456ecd420008dfb6a41707699c507ab318aed2b060af7e369"; + sha256 = "df9fc3563749939e20351021f90da4060adcf9c50eae74cc65eacc4c8e019e6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ta/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ta/firefox-93.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "ededbd930c5430b5582093ed385ac0ed81ac48da31cc51d02fdd11fa582eba75"; + sha256 = "2f1cef7b50cc9d44f816ab09c38a1b91a63fec3eee65d97a5a8637f503ed7eaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/te/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/te/firefox-93.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "9913061ffee19132a8a560d13c1a9948cb57c67e1fb1a243ecbfb1973fb072e0"; + sha256 = "40385b07128cccea8a3210c301795ebaf32c860423c3206297f3ebe2363d868b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/th/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/th/firefox-93.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4e9f765ae6677e00720f1c7bd9bfd3a7f83e9c68a889958444430d086991d7c5"; + sha256 = "e62c3317af6ba5ea55160898c628eaef21eba1be94a77de5c5280dfad12eef65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/tl/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/tl/firefox-93.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d98f74c41c1b39d9946f55ac3803826bcade325458b1415ebd6e93e5ff18b03f"; + sha256 = "801226da66a4a08d48483ef894e8cd4076e0f9381ab949c619d976323ceac02a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/tr/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/tr/firefox-93.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "0b0dd787cfec56d8c7cd1fec959b589958e7ed59ac9415fc0374486b1bbc567f"; + sha256 = "dde8d3b8947b8a9b87c6451cc4c1ede7fd0bb0eeb5f86eea4b58a3fa20028038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/trs/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/trs/firefox-93.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "98bf2ef8b94fc3cfeaa324ac4fb07c28723072a09150f68835ed07fc6429d796"; + sha256 = "1b0ca6672e149b343345f1d8fa7cfbe94054a9a4d67d6d04b4c06e7216e8be38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/uk/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/uk/firefox-93.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "87c66d8f1155b428879b1fe83ca0f439cbe323b1a35d33d7d1fd6c30a73ed8ed"; + sha256 = "2eecee8d2d5f34222b0009b6f5e7638e650e5b692cbdafc2f1710da677ad1e5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/ur/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/ur/firefox-93.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "8bfb0c2cdb60e7e3964cc5cfa363633d03fa28cb149411883ba00044448e0eb1"; + sha256 = "1386c6c018807e4ca189d6a9b400c3d6bd55abafee476f88b4ab7b958017d460"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/uz/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/uz/firefox-93.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2bfad6b583a7052b97c89681fe53b27e2c4ad97f40ee9e3d4be59a29b204f39a"; + sha256 = "7f92bd0536d32ca7af1f8dbe4fd7dd5eb7ce8c2f2d1383b21bfd5b1c8c7ca30e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/vi/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/vi/firefox-93.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "54557679f6f58dded05c688338829b590eaca85cddc36a1e14263e07f39bd102"; + sha256 = "04d7ac16f2d28bfe3d70e717c8a4ee10c291bea54f022521eb22856d41f421ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/xh/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/xh/firefox-93.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "dec9743fc37e7d7f614293e65874d0dead710e6641dd3e2afb9cfc377a8900d6"; + sha256 = "12591a4fe50ef293015484dcef03d43e1922cca4724b3901d38e0cd136b12274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/zh-CN/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/zh-CN/firefox-93.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "cdaf04b42adc999eda8108c18a62990ec18984c1133a98743b8059ff9a774c74"; + sha256 = "a9b69bde93512f6531740a4bea967717fb56ad5cfe88a9b89db0e4fc1a971feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/92.0/linux-i686/zh-TW/firefox-92.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/zh-TW/firefox-93.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "dc84f295a187bb49172953282ccef628a492b4f24050715d9591d842143e5688"; + sha256 = "3c790d0a8ba551c22e7b92bd993eb077159e21e2e3748e64d2aa635739511c36"; } ]; } 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 f5bc0c9028..2600b5209b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -156,23 +156,6 @@ buildStdenv.mkDerivation ({ sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; }) - # These fix Firefox on sway and other non-Gnome wayland WMs. They should be - # removed whenever the following two patches make it onto a release: - # 1. https://hg.mozilla.org/mozilla-central/rev/51c13987d1b8 - # 2. https://hg.mozilla.org/integration/autoland/rev/3b856ecc00e4 - # This will probably happen in the next point release, but let's be careful - # and double check whether it's working on sway on the next v bump. - ++ lib.optionals (lib.versionAtLeast version "92") [ - (fetchpatch { - url = "https://hg.mozilla.org/integration/autoland/raw-rev/3b856ecc00e4"; - sha256 = "sha256-d8IRJD6ELC3ZgEs1ES/gy2kTNu/ivoUkUNGMEUoq8r8="; - }) - (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/51c13987d1b8"; - sha256 = "sha256-C2jcoWLuxW0Ic+Mbh3UpEzxTKZInljqVdcuA9WjspoA="; - }) - ] - ++ patches; @@ -265,6 +248,7 @@ buildStdenv.mkDerivation ({ # this will run autoconf213 configureScript="$(realpath ./mach) configure" export MOZCONFIG=$(pwd)/mozconfig + export MOZBUILD_STATE_PATH=$(pwd)/mozbuild # Set C flags for Rust's bindgen program. Unlike ordinary C # compilation, bindgen does not invoke $CC directly. Instead it 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 a9177a3809..80750b966c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "92.0.1"; + version = "93.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "53361c231a4ac93a1808c9ccb29893d85b5e516fe939a770aac7f178abb4f43cbe3571097e5c5bf91b11fd95fc62b61f2aa215a45048357bfc9dad9eabdee9ef"; + sha512 = "b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91"; }; meta = { @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.1.0esr"; + version = "91.2.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "dad0249eb2ce66eb90ff5daf0dfb63105a19790dd45661d977f7cc889644e86b33b9b0c472f46d4032ae2e4fe02c2cf69d552156fb0ad4cf77a15b3542556ed3"; + sha512 = "f4cff7e43ff9927cbab3f02d37d360ee8bb0dbe988e280cb0638ee67bfe3c76e3a0469336de1b212fba66c958d58594b1739aafee1ebb84695d098c1e5c77b9d"; }; meta = { @@ -57,10 +57,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - version = "78.14.0esr"; + version = "78.15.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "5d5e4b1197f87b458a8ab14a62701fa0f3071e9facbb4fba71a64ef69abf31edbb4c5efa6c20198de573216543b5289270b5929c6e917f01bb165ce8c139c1ac"; + sha512 = "ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix index d12042f407..8ce36e8c31 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -5,17 +5,24 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0vsOZbSQtoWvU81wnT7QWNhvIclwGAu441lTOuZnXho="; + sha256 = "sha256-hlJfgNFHEjIrvHhaAje1XQbNO6e3D/qcCmdVFhklwqs="; }; vendorSha256 = "sha256-3OTkigryWsyCytyNMyumJJtc/BwtdryvDQRan2dzqfg="; + ldflags = [ + "-s" + "-w" + "-X github.com/k0sproject/k0sctl/version.Environment=production" + "-X github.com/k0sproject/k0sctl/version.Version=${version}" + ]; + meta = with lib; { description = "A bootstrapping and management tool for k0s clusters."; homepage = "https://k0sproject.io/"; 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 f89e9f9ff3..a584fee3b4 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 @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P7niTGe0uzg2R1UHrPWbU4tOhOA1OwlP3dslZPwuF0A="; + sha256 = "sha256-phuXsioSLO/jl1l5dwV/emoirJfgGXQSmeQHSImxm2U="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 48923330af..54959e4583 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -39,25 +39,28 @@ let passthru = data; }; - # These providers are managed with the ./update-all script - automated-providers = lib.mapAttrs (_: attrs: + # Our generic constructor to build new providers + mkProvider = attrs: (if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else buildWithGoPackage) - attrs) list; + attrs; + + # These providers are managed with the ./update-all script + automated-providers = lib.mapAttrs (_: attrs: mkProvider attrs) list; # These are the providers that don't fall in line with the default model special-providers = { # Packages that don't fit the default model - ansible = callPackage ./ansible {}; - cloudfoundry = callPackage ./cloudfoundry {}; - gandi = callPackage ./gandi {}; - hcloud = callPackage ./hcloud {}; - libvirt = callPackage ./libvirt {}; - linuxbox = callPackage ./linuxbox {}; - lxd = callPackage ./lxd {}; - vpsadmin = callPackage ./vpsadmin {}; - vercel = callPackage ./vercel {}; + ansible = callPackage ./ansible { }; + cloudfoundry = callPackage ./cloudfoundry { }; + gandi = callPackage ./gandi { }; + hcloud = callPackage ./hcloud { }; + libvirt = callPackage ./libvirt { }; + linuxbox = callPackage ./linuxbox { }; + lxd = callPackage ./lxd { }; + vpsadmin = callPackage ./vpsadmin { }; + vercel = callPackage ./vercel { }; } // (lib.optionalAttrs (config.allowAliases or false) { kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; }); in - automated-providers // special-providers +automated-providers // special-providers // { inherit mkProvider; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 85b6cf679a..cab256d927 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -114,7 +114,7 @@ let passthru = { withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins); - full = withPlugins lib.attrValues; + full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p)); # Ouch overrideDerivation = f: diff --git a/third_party/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix new file mode 100644 index 0000000000..75a11b0ea1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchurl +, appimageTools +}: + +let + pname = "cozydrive"; + version = "3.30.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage"; + sha256 = "06w305l5iadd4k70jvrvw2scwlfxycign2nz0f2vrwwhqy8bpfqs"; + }; + appimageContents = appimageTools.extract { inherit name src; }; + +in +appimageTools.wrapType2 { + inherit name src; + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/cozydrive.desktop -t $out/share/applications + substituteInPlace $out/share/applications/cozydrive.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Cozy Drive is a synchronization tool for your files and folders with Cozy Cloud."; + homepage = "https://cozy.io"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ "Simarra" ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 48ba14824c..51075425b4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.18.0"; # Please backport all updates to the stable channel. + version = "5.18.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1pajv9f6xl06597322swkjzhfqvlfavsbhbn1xnvy4r28i84mp7d"; + sha256 = "0x1wrzxyspghv0hwdh3sw8536c9qi7211d2g5cr3f33kz9db5xp4"; }; nativeBuildInputs = [ 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 f53f8d3fed..25d1de5efc 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 @@ -44,14 +44,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.19.0"; - x86_64-darwin-sha256 = "0dj51lhxiba69as6x76ni8h20d36bcpf2xz3rxr1s8881mprpfsg"; + x86_64-darwin-version = "4.20.0"; + x86_64-darwin-sha256 = "1argl690i4dgz5ih02zg9v4zrlzm282wmibnc6p7xy5jisd5g79w"; - x86_64-linux-version = "4.19.2"; - x86_64-linux-sha256 = "02npmprwl1h7c2y03khvx8ifhk1gj1axbvlwigp2hkkjdw7y4b5a"; + x86_64-linux-version = "4.20.0"; + x86_64-linux-sha256 = "1r8w8s3y74lh4klsmzq2d3f0h721b3a2b53nx8v7b0s6j8w0g0mh"; - aarch64-darwin-version = "4.19.0"; - aarch64-darwin-sha256 = "1mvs1bdyyyrpqmrbqg4sxpy6ylgchwz39nr232s441iqdz45p87v"; + aarch64-darwin-version = "4.20.0"; + aarch64-darwin-sha256 = "1argl690i4dgz5ih02zg9v4zrlzm282wmibnc6p7xy5jisd5g79w"; version = { x86_64-darwin = x86_64-darwin-version; @@ -73,7 +73,7 @@ let sha256 = aarch64-darwin-sha256; }; x86_64-linux = fetchurl { - url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; + url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb"; sha256 = x86_64-linux-sha256; }; }.${system} or throwSystem; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix index 936524918e..f45f803e80 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-MEm5mrrWfNp+mBHFjGSOGvvfvBJ+Ho/K+mPUxzJDkV0="; }; + # catgirl's configure script uses pkg-config --variable exec_prefix openssl + # to discover the install location of the openssl(1) utility. exec_prefix + # is the "out" output of libressl in our case (where the libraries are + # installed), so we need to fix this up. + postConfigure = '' + substituteInPlace config.mk --replace \ + "$($PKG_CONFIG --variable exec_prefix openssl)" \ + "${lib.getBin libressl}" + ''; + nativeBuildInputs = [ ctags pkg-config ]; buildInputs = [ libressl ncurses ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix index 074fb770b5..1918815586 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonApplication , substituteAll , fetchFromGitHub @@ -111,6 +112,11 @@ rec { "test_firefox_like_behavior" "test_if_unmodified_since" "test_get_tor_paths_linux" # expects /usr instead of /nix/store + ] ++ lib.optionals stdenv.isDarwin [ + # on darwin (and only on darwin) onionshare attempts to discover + # user's *real* homedir via /etc/passwd, making it more painful + # to fake + "test_receive_mode_webhook" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix index e69155d4c2..7a213b8803 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix @@ -45,7 +45,7 @@ mkDerivation rec { meta = with lib; { description = "Decentralized peer to peer chat application."; - homepage = "http://retroshare.sourceforge.net/"; + homepage = "https://retroshare.cc/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ StijnDW ]; 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 e492aac977..7311acf827 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 @@ -21,7 +21,7 @@ let x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F"; x64suffix = "21"; x86suffix = "21"; - homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2004.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2004.html"; }; "20.06.0" = { @@ -32,7 +32,7 @@ let x86hash = "1di29hrimbw3myjnf2nn26a14klidhdwvjqla6yxhwd3s6lil194"; x64suffix = "15"; x86suffix = "15"; - homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2006.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2006.html"; }; "20.09.0" = { @@ -43,7 +43,7 @@ let x86hash = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4"; x64suffix = "15"; x86suffix = "15"; - homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html"; }; "20.10.0" = { @@ -54,7 +54,7 @@ let x86hash = "04cr2da25v8x098ccyjwa47d4krk3jpldqkyf4kk2j3hwzbqh9yx"; x64suffix = "6"; x86suffix = "6"; - homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2010.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2010.html"; }; "20.12.0" = { @@ -65,7 +65,7 @@ let x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf"; x64suffix = "12"; x86suffix = "12"; - homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html"; }; "21.01.0" = { @@ -76,7 +76,7 @@ let x86hash = "1mmx5r3wi9i6bwh4kdlpw446m8kijkaar8shi0q1n21fv0ygg3r5"; x64suffix = "14"; x86suffix = "14"; - homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2101.html"; }; "21.03.0" = { @@ -87,7 +87,7 @@ let x86hash = "11nn9734a515dm1q880z9wmhvx8ikyh3riayyn42z22q4kd852n3"; x64suffix = "38"; x86suffix = "38"; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2103.html"; }; "21.06.0" = { @@ -98,8 +98,9 @@ let x86hash = "c2d9652ad9488a9ff171e62df8455ebe6890bcfade1cc289893ee35322d9d812"; x64suffix = "28"; x86suffix = "28"; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2106.html"; }; + "21.08.0" = { major = "21"; minor = "8"; @@ -108,6 +109,17 @@ let x86hash = "b6d1bde5a8533f22374e1f5bbb3f5949e5b89773d0703e021fbe784b455aad3f"; x64suffix = "40"; x86suffix = "40"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2108.html"; + }; + + "21.09.0" = { + major = "21"; + minor = "9"; + patch = "0"; + x64hash = "d58d5cbbcb5ace95b75b1400061d475b8e72dbdf5f03abacea6d39686991f848"; + x86hash = "c646c52889e88aa0bb051070076763d5407f21fb6ad6dfcb0fe635ac01180c51"; + x64suffix = "25"; + x86suffix = "25"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index 7c6e46c137..033386afd1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -39,7 +39,7 @@ , zlib }: let - version = "2103"; + version = "2106.1"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" @@ -50,8 +50,8 @@ let name = "vmwareHorizonClientFiles"; inherit version; src = fetchurl { - url = "https://download3.vmware.com/software/view/viewclients/CART22FQ1/VMware-Horizon-Client-Linux-2103-8.2.0-17742757.tar.gz"; - sha256 = "62f95bb802b058a98f5ee6c2296b89bd7e15884a24dc8a8ba7ce89de7e0798e4"; + url = "https://download3.vmware.com/software/view/viewclients/CART22FQ2/VMware-Horizon-Client-Linux-2106.1-8.3.1-18435609.tar.gz"; + sha256 = "b42ddb9d7e9c8d0f8b86b69344fcfca45251c5a5f1e06a18a3334d5a04e18c39"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/update.sh b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/update.sh index 126cb17a7c..eec3d1de79 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/update.sh @@ -2,13 +2,13 @@ #!nix-shell -p curl -p jq -p common-updater-scripts -i bash set -e -entryPointURL='https://my.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY' +entryPointURL='https://customerconnect.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY' function getTarballMetaUrl { curl "$entryPointURL" | jq -r ' .dlgEditionsLists | .[] | select(.name | contains("Client for Linux")) | .dlgList | .[] | select(.name | contains("tarball version")) | - @uri "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=\(.code)&productId=\(.productId)&rPId=\(.releasePackageId)" + @uri "https://customerconnect.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=\(.code)&productId=\(.productId)&rPId=\(.releasePackageId)" ' } 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 90bd951468..8022c48a5c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.56.1"; + version = "1.56.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-2UIIJMa5Wlr4rvBRXvE9kwh798x8jVa63hVLZ51Ltp0="; + sha256 = "sha256-cEh1SgIOgX04ECEF0K2pvwJdugapoUzh8xbboRaMdTs="; }; - vendorSha256 = "sha256-sTZZZ0P8F1bsFZO3/vbj9itNN7PCBJ0Q0tq4YayOPr8="; + vendorSha256 = "sha256-wQYVn8yGDIYlnlVTS7tiLEMwkNLF6p3OcY35nw1mvA8="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix index 414312f24e..92d2bba777 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonPackage rec { pname = "qnotero"; - version = "2.1.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "ealbiter"; repo = pname; rev = "v${version}"; - sha256 = "16ckcjxa3dgmz1y8gd57q2h84akra3j4bgl4fwv4m05bam3ml1xs"; + sha256 = "0y2xph4ha07slni039s034cn1wsk3q2d86hihy97h4ch47ignv20"; }; propagatedBuildInputs = [ python3Packages.pyqt5 wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index 3cf7fd1eae..6cfdf3c8f9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.47.7"; + version = "0.47.8"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1fcrc01wr8ln1i77q9h89i90wwyijpfp58fa717wbdvyly4860sh"; + sha256 = "1vnwjiv4bidw5xspcd7d7fn8dbhvgia9ws363fs5zs48c9k2hwwz"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "0qp37y3xgbhl6vj2bkwz1lfylkn82kx7n0lcfr58wxwkn00149ry"; + sha256 = "1clgw0i3vbl8lrsjdjbn71yhim6356gm8h24831mnksb4sawhh7f"; }; in { diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/alligator.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/alligator.nix new file mode 100644 index 0000000000..b88c8e3c60 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/alligator.nix @@ -0,0 +1,40 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kconfig +, kcoreaddons +, ki18n +, kirigami2 +, qtquickcontrols2 +, syndication +}: + +mkDerivation rec { + pname = "alligator"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + kcoreaddons + ki18n + kirigami2 + qtquickcontrols2 + syndication + ]; + + meta = with lib; { + description = "RSS reader made with kirigami"; + homepage = "https://invent.kde.org/plasma-mobile/alligator"; + # https://invent.kde.org/plasma-mobile/alligator/-/commit/db30f159c4700244532b17a260deb95551045b7a + # * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL + license = with licenses; [ gpl2Only gpl3Only ]; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/calindori.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/calindori.nix new file mode 100644 index 0000000000..bb10fa7bb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/calindori.nix @@ -0,0 +1,46 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kcalendarcore +, kconfig +, kcoreaddons +, kdbusaddons +, ki18n +, kirigami2 +, knotifications +, kpeople +, kservice +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "calindori"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcalendarcore + kconfig + kcoreaddons + kdbusaddons + ki18n + kirigami2 + knotifications + kpeople + kservice + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Calendar for Plasma Mobile"; + homepage = "https://invent.kde.org/plasma-mobile/calindori"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/default.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/default.nix new file mode 100644 index 0000000000..18f550955c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/default.nix @@ -0,0 +1,76 @@ +/* + +# New packages + +READ THIS FIRST + +This module is for official packages in the Plasma Mobile Gear. All +available packages are listed in `./srcs.nix`, although some are not yet +packaged in Nixpkgs. + +IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. + +See also `pkgs/applications/kde` as this is what this is based on. + +# Updates + +1. Update the URL in `./fetch.sh`. +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile` + from the top of the Nixpkgs tree. +3. Use `nox-review wip` to check that everything builds. +4. Commit the changes and open a pull request. + +*/ + +{ lib +, libsForQt5 +, fetchurl +}: + +let + minQtVersion = "5.15"; + broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; + + mirror = "mirror://kde"; + srcs = import ./srcs.nix { inherit fetchurl mirror; }; + + mkDerivation = args: + let + inherit (args) pname; + inherit (srcs.${pname}) src version; + mkDerivation = + libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + in + mkDerivation (args // { + inherit pname version src; + + outputs = args.outputs or [ "out" ]; + + meta = + let meta = args.meta or {}; in + meta // { + homepage = meta.homepage or "https://www.plasma-mobile.org/"; + platforms = meta.platforms or lib.platforms.linux; + broken = meta.broken or broken; + }; + }); + + packages = self: with self; + let + callPackage = self.newScope { + inherit mkDerivation; + }; + in { + alligator = callPackage ./alligator.nix {}; + calindori = callPackage ./calindori.nix {}; + kalk = callPackage ./kalk.nix {}; + kclock = callPackage ./kclock.nix {}; + koko = callPackage ./koko.nix {}; + krecorder = callPackage ./krecorder.nix {}; + ktrip = callPackage ./ktrip.nix {}; + plasma-dialer = callPackage ./plasma-dialer.nix {}; + plasma-phonebook = callPackage ./plasma-phonebook.nix {}; + spacebar = callPackage ./spacebar.nix {}; + }; + +in lib.makeScope libsForQt5.newScope packages diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh b/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh new file mode 100644 index 0000000000..29a8e6b4c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.kde.org/stable/plasma-mobile/21.05 -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kalk.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/kalk.nix new file mode 100644 index 0000000000..8d63991fb0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/kalk.nix @@ -0,0 +1,50 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules +, bison +, flex + +, gmp +, mpfr + +, kconfig +, kcoreaddons +, ki18n +, kirigami2 +, kunitconversion +, qtfeedback +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "kalk"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + bison + flex + ]; + + buildInputs = [ + gmp + mpfr + + kconfig + kcoreaddons + ki18n + kirigami2 + kunitconversion + qtfeedback + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Calculator built with kirigami"; + homepage = "https://invent.kde.org/plasma-mobile/kalk"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kclock.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/kclock.nix new file mode 100644 index 0000000000..058f536d79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/kclock.nix @@ -0,0 +1,44 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kconfig +, kcoreaddons +, kdbusaddons +, ki18n +, kirigami2 +, knotifications +, plasma-framework +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "kclock"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + kcoreaddons + kdbusaddons + ki18n + kirigami2 + knotifications + plasma-framework + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Clock app for plasma mobile"; + homepage = "https://invent.kde.org/plasma-mobile/kclock"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/koko.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/koko.nix new file mode 100644 index 0000000000..3543a7284b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/koko.nix @@ -0,0 +1,81 @@ +{ lib +, mkDerivation + +, fetchurl +, cmake +, extra-cmake-modules + +, exiv2 +, kconfig +, kcoreaddons +, kdeclarative +, kfilemetadata +, kguiaddons +, ki18n +, kio +, kirigami2 +, knotifications +, kpurpose +, kquickimageedit +, qtgraphicaleffects +, qtlocation +, qtquickcontrols2 +}: + +let + # URLs snapshotted through + # https://web.archive.org/save/$url + # Update when stale enough I guess? + admin1 = fetchurl { + url = "https://web.archive.org/web/20210714035424if_/http://download.geonames.org/export/dump/admin1CodesASCII.txt"; + sha256 = "0r783yzajs26hvccdy4jv2v06xfgadx2g90fz3yn7lx8flz4nhwm"; + }; + admin2 = fetchurl { + url = "https://web.archive.org/web/20210714035427if_/http://download.geonames.org/export/dump/admin2Codes.txt"; + sha256 = "1n5nzp3xblhr93rb1sadi5vfbw29slv5lc6cxq21h3x3cg0mwqh3"; + }; + cities1000 = fetchurl { + url = "https://web.archive.org/web/20210714035406if_/http://download.geonames.org/export/dump/cities1000.zip"; + sha256 = "0cwbfff8gzci5zrahh6d53b9b3bfv1cbwlv0k6076531i1c7md9p"; + }; +in +mkDerivation rec { + pname = "koko"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + exiv2 + kconfig + kcoreaddons + kdeclarative + kfilemetadata + kguiaddons + ki18n + kio + kirigami2 + knotifications + kpurpose + kquickimageedit + qtgraphicaleffects + qtlocation + qtquickcontrols2 + ]; + + prePatch = '' + ln -s ${admin1} src/admin1CodesASCII.txt + ln -s ${admin2} src/admin2Codes.txt + ln -s ${cities1000} src/cities1000.zip + ''; + + meta = with lib; { + description = "Image gallery mobile application"; + homepage = "https://apps.kde.org/koko/"; + # LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL + license = [ licenses.lgpl3Only licenses.lgpl21Only ]; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/krecorder.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/krecorder.nix new file mode 100644 index 0000000000..c41413be88 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/krecorder.nix @@ -0,0 +1,36 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kconfig +, ki18n +, kirigami2 +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "krecorder"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + ki18n + kirigami2 + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Audio recorder for Plasma Mobile"; + homepage = "https://invent.kde.org/plasma-mobile/krecorder"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/ktrip.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/ktrip.nix new file mode 100644 index 0000000000..cc1404d064 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/ktrip.nix @@ -0,0 +1,45 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kconfig +, kcontacts +, kcoreaddons +, ki18n +, kirigami-addons +, kirigami2 +, kitemmodels +, kpublictransport +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "ktrip"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + kcontacts + kcoreaddons + ki18n + kirigami-addons + kirigami2 + kitemmodels + kpublictransport + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Public transport trip planner"; + homepage = "https://apps.kde.org/ktrip/"; + # GPL-2.0-or-later + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-dialer.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-dialer.nix new file mode 100644 index 0000000000..eb71c49708 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-dialer.nix @@ -0,0 +1,54 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kcontacts +, kcoreaddons +, kdbusaddons +, ki18n +, kirigami2 +, knotifications +, kpeople +, libphonenumber +, libpulseaudio +, libqofono +, protobuf +, pulseaudio-qt +, qtquickcontrols2 +, telepathy +}: + +mkDerivation rec { + pname = "plasma-dialer"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcontacts + kcoreaddons + kdbusaddons + ki18n + kirigami2 + knotifications + kpeople + libphonenumber + libpulseaudio + libqofono + protobuf # Needed by libphonenumber + pulseaudio-qt + qtquickcontrols2 + telepathy + ]; + + meta = with lib; { + description = "Dialer for Plasma Mobile"; + homepage = "https://invent.kde.org/plasma-mobile/plasma-dialer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-phonebook.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-phonebook.nix new file mode 100644 index 0000000000..7e465260da --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-phonebook.nix @@ -0,0 +1,41 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kcontacts +, kcoreaddons +, kirigami2 +, kirigami-addons +, kpeople +, kpeoplevcard +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "plasma-phonebook"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcontacts + kcoreaddons + kirigami2 + kirigami-addons + kpeople + kpeoplevcard + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Phone book for Plasma Mobile"; + homepage = "https://invent.kde.org/plasma-mobile/plasma-phonebook"; + # https://invent.kde.org/plasma-mobile/plasma-phonebook/-/commit/3ac27760417e51c051c5dd44155c3f42dd000e4f + license = licenses.gpl3Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix new file mode 100644 index 0000000000..1c661041f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix @@ -0,0 +1,40 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kcontacts +, ki18n +, kirigami2 +, knotifications +, kpeople +, libqofono +, telepathy +}: + +mkDerivation rec { + pname = "spacebar"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcontacts + ki18n + kirigami2 + knotifications + kpeople + libqofono + telepathy + ]; + + meta = with lib; { + description = "SMS application for Plasma Mobile"; + homepage = "https://invent.kde.org/plasma-mobile/spacebar"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix new file mode 100644 index 0000000000..4df185aa0a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix @@ -0,0 +1,118 @@ +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile/ +{ fetchurl, mirror }: + +{ + alligator = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/alligator-21.05.tar.xz"; + sha256 = "04zgxfx2zmn1p2ap08i5sfsnrly3smip4ylr07ghkhkiyjzbv9w6"; + name = "alligator-21.05.tar.xz"; + }; + }; + angelfish = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/angelfish-21.05.tar.xz"; + sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075"; + name = "angelfish-21.05.tar.xz"; + }; + }; + calindori = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/calindori-21.05.tar.xz"; + sha256 = "110f9ri9r1nb6q1ybhkfxljl4q5gqxikh9z0xkzjjbxjjqfscqcj"; + name = "calindori-21.05.tar.xz"; + }; + }; + kalk = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/kalk-21.05.tar.xz"; + sha256 = "04n65hx0j9rx6b3jq69zgypi8qjd4ig3rfw7d44c3q7dgh4k451l"; + name = "kalk-21.05.tar.xz"; + }; + }; + kclock = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/kclock-21.05.tar.xz"; + sha256 = "0pa5hvax0y80l8yrqczh9mcknfm3z0vdq3xc35cxdiz1vc6fwqmd"; + name = "kclock-21.05.tar.xz"; + }; + }; + koko = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/koko-21.05.tar.xz"; + sha256 = "00hnzkl8dvf15psrcfh96b8wfb3pbggd2f7xnadzcb87sbaml035"; + name = "koko-21.05.tar.xz"; + }; + }; + kongress = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/kongress-21.05.tar.xz"; + sha256 = "0qxgpi04ra9crc6drgbdm9arjbvcx52pprjr1dj8acch07f6i2gs"; + name = "kongress-21.05.tar.xz"; + }; + }; + krecorder = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/krecorder-21.05.tar.xz"; + sha256 = "0ydaidxx2616bixihyaagvyym1r5s9rjkgg04vq9k4608d4vnn5c"; + name = "krecorder-21.05.tar.xz"; + }; + }; + ktrip = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/ktrip-21.05.tar.xz"; + sha256 = "0hxgnncyc2ir6i9p6s9fy1r4mhxgm643pxvp8lj3j5y0c5wk2kp9"; + name = "ktrip-21.05.tar.xz"; + }; + }; + plasma-dialer = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/plasma-dialer-21.05.tar.xz"; + sha256 = "0kwkjn7ry6snc86qi1j7kcq5qa6rbyk5i7v6gqf7a7wywkk9n045"; + name = "plasma-dialer-21.05.tar.xz"; + }; + }; + plasma-phonebook = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/plasma-phonebook-21.05.tar.xz"; + sha256 = "0aqqi3gvcsh4zg41zf8y0c626lwrabjchhr8pxj4n9la7y0wdvca"; + name = "plasma-phonebook-21.05.tar.xz"; + }; + }; + plasma-settings = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/plasma-settings-21.05.tar.xz"; + sha256 = "16bhx0i8gvi9ina4jxzx02xyzypyjic9646lahxvzvzmd9hn9ipi"; + name = "plasma-settings-21.05.tar.xz"; + }; + }; + qmlkonsole = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/qmlkonsole-21.05.tar.xz"; + sha256 = "1ga48n09zlgvf5vvk2m26ak3ih5gjf361xxnyfprimmd7yj23han"; + name = "qmlkonsole-21.05.tar.xz"; + }; + }; + spacebar = { + version = "21.05"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/21.05/spacebar-21.05.tar.xz"; + sha256 = "16lvi5yzmvk6gb5m7csk44y2jbkk7psn1lkljmj1938p2475b94c"; + name = "spacebar-21.05.tar.xz"; + }; + }; +} 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 bdcd82ed43..ac332f2716 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk4 vtk_7 ] ++ lib.optional stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk4 vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix index 7b3a69ae77..7ee46f7d7e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix @@ -1,16 +1,19 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv , gfortran, blas, lapack, scalapack , useMpi ? false , mpi +, fetchFromGitLab }: -stdenv.mkDerivation { - version = "4.1-b3"; +stdenv.mkDerivation rec { + version = "4.1.5"; pname = "siesta"; - src = fetchurl { - url = "https://launchpad.net/siesta/4.1/4.1-b3/+download/siesta-4.1-b3.tar.gz"; - sha256 = "1450jsxj5aifa0b5fcg7mxxq242fvqnp4zxpgzgbkdp99vrp06gm"; + src = fetchFromGitLab { + owner = "siesta-project"; + repo = "siesta"; + rev = "v${version}"; + sha256 = "0lz8rfl5xwdj17zn7a30ipi7cgjwqki21a7wg9rdg7iwx27bpnmg"; }; passthru = { @@ -64,7 +67,7 @@ stdenv.mkDerivation { matching the quality of other approaches, such as plane-wave and all-electron methods. ''; - homepage = "https://www.quantum-espresso.org/"; + homepage = "https://siesta-project.org/siesta/"; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.costrouc ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix index f285d0fc73..2f1476697e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "lukesmithxyz-st"; - version = "0.0.0+unstable=2021-08-10"; + version = "0.pre+unstable=2021-08-10"; src = fetchFromGitHub { owner = "LukeSmithxyz"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/mcaimi-st.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/mcaimi-st.nix index 847638f304..11c89cfab6 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/mcaimi-st.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/mcaimi-st.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "mcaimi-st"; - version = "0.0.0+unstable=2021-08-30"; + version = "0.pre+unstable=2021-08-30"; src = fetchFromGitHub { owner = "mcaimi"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/siduck76-st.nix index 55fcebff0e..a6753a105c 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/siduck76-st.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/siduck76-st.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "siduck76-st"; - version = "0.0.0+unstable=2021-08-20"; + version = "0.pre+unstable=2021-08-20"; src = fetchFromGitHub { owner = "siduck76"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index 74e617021c..33bb73eb63 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-d0qY0yGvFf1V8NhS9cHEawkTqMAN6roReAHJ6FT9qJ4="; + sha256 = "sha256-9F15XHyFxcE48/ePwjvB7lLkw9FxoQd49G758nupRuk="; }; - cargoSha256 = "sha256-UxV9trTm4vZ/boWB7Sl6Dbwhjk8jQnB0QT6bC+aCL+A="; + cargoSha256 = "sha256-gPf4sGDbZzfzVJy+9k3FSOdJ5b8Xci1LTjIrCmP9bW8="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix index 9e62f86a34..92c7ab0b2f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix @@ -10,13 +10,13 @@ buildGoPackage rec { pname = "containerd"; - version = "1.4.9"; + version = "1.4.11"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1ykikks6ihgg899ibk9m9m0hqrbss0cx7l7z4yjb873b10bacj52"; + sha256 = "sha256-mUagr1/LqTCFvshWuiSMxsqdRqjzogt2tZ0uwR7ZVAs="; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index cce72e2a74..844ab025f5 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "containerd"; - version = "1.5.5"; + version = "1.5.7"; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-6mDTTXHpXBcKOcT+VrGgt6HJzvTeKgJ0ItJ+IjCTJxk="; + sha256 = "sha256-BHVlGXyTkaiRkG8WG1LdtxrQs8nKS8djZFnO/AfKBUw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index a1821aa2a3..24bd7a1339 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -221,19 +221,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.8"; + version = "20.10.9"; rev = "v${version}"; - sha256 = "sha256-betZIAH4mFpb/OywWyixCjVmy5EGTrg+WbxDXkVRrsI="; + sha256 = "1msqvzfccah6cggvf1pm7n35zy09zr4qg2aalgwpqigv0jmrbyd4"; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "1pjjdwzad2z337zwby88w5zwl71ch4lcwbw0sy8slvyjv387jjlm"; + sha256 = "04xx7m8s9vrkm67ba2k5i90053h5qqkjcvw5rc8w7m5a309xcp4n"; }; - runcRev = "v1.0.1"; # v1.0.1 - runcSha256 = "1zfa1zr8i9n1915nyv7hyaj7q27cy7fiihk9rr1377ayaqg3mpn5"; - containerdRev = "v1.4.9"; # v1.4.9 - containerdSha256 = "1ykikks6ihgg899ibk9m9m0hqrbss0cx7l7z4yjb873b10bacj52"; + runcRev = "v1.0.2"; # v1.0.2 + runcSha256 = "1bpckghjah0rczciw1a1ab8z718lb2d3k4mjm4zb45lpm3njmrcp"; + containerdRev = "v1.4.11"; # v1.4.11 + containerdSha256 = "02slv4gc2blxnmv0p8pkm139vjn6ihjblmn8ps2k1afbbyps0ilr"; tiniRev = "v0.19.0"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index 74d87a1b74..c3721bbe36 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.3.0"; + version = "11.3.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "1yfffxc7drr1hyg28jcvly7jn1bm4ca76lmma5ykbmba2qqszx49"; + sha256 = "03fahljrijq4ij8a4v8d7806mpf22ppkgr61n5s974g3xfdvpl13"; }; sourceRoot = "${src.name}/open-vm-tools"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix index 17ef08af5e..5347b0961a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix @@ -57,7 +57,7 @@ let in stdenv.mkDerivation rec { pname = "cardboard"; - version = "0.0.0+unstable=2021-05-10"; + version = "0.pre+unstable=2021-05-10"; src = fetchFromGitLab { owner = "cardboardwm"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix index 03ec26f6fb..86bbfd3dc7 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix @@ -1,39 +1,40 @@ { lib , stdenv -, fetchFromBitbucket -, meson -, ninja -, pkg-config +, fetchFromGitHub , alacritty , cage , cairo , libxkbcommon +, makeWrapper +, mesa +, meson +, ninja +, pkg-config , udev , wayland , wayland-protocols , wlroots -, mesa , xwayland -, makeWrapper }: stdenv.mkDerivation rec { pname = "wio"; - version = "0.0.0+unstable=2021-06-27"; + version = "0.pre+unstable=2021-06-27"; - src = fetchFromBitbucket { - owner = "anderson_torres"; + src = fetchFromGitHub { + owner = "museoa"; repo = pname; rev = "e0b258777995055d69e61a0246a6a64985743f42"; sha256 = "sha256-8H9fOnZsNjjq9XvOv68F4RRglGNluxs5/jp/h4ROLiI="; }; nativeBuildInputs = [ + makeWrapper meson ninja pkg-config - makeWrapper ]; + buildInputs = [ cairo libxkbcommon @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + inherit (wayland.meta) platforms; }; passthru.providedSessions = [ "wio" ]; diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/add-hardening.sh b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/add-hardening.sh index 4d289a334b..0a2b2509a8 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/add-hardening.sh +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -37,7 +37,11 @@ fi for flag in "${!hardeningEnableMap[@]}"; do case $flag in pie) - if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static " || "$*" =~ " -r " || "$*" =~ " -Ur " || "$*" =~ " -i ") ]]; then + if [[ ! (" $* " =~ " -shared " \ + || " $* " =~ " -static " \ + || " $* " =~ " -r " \ + || " $* " =~ " -Ur " \ + || " $* " =~ " -i ") ]]; then if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi hardeningLDFlags+=('-pie') fi diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh index 8e2fe6c407..e5d296f6c9 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -45,11 +45,12 @@ for flag in "${!hardeningEnableMap[@]}"; do hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') ;; pie) + # NB: we do not use `+=` here, because PIE flags must occur before any PIC flags if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi - hardeningCFlags+=('-fPIE') - if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then + hardeningCFlags=('-fPIE' "${hardeningCFlags[@]}") + if [[ ! (" $* " =~ " -shared " || " $* " =~ " -static ") ]]; then if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi - hardeningCFlags+=('-pie') + hardeningCFlags=('-pie' "${hardeningCFlags[@]}") fi ;; pic) diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh index d310f82552..4b3a1c5c39 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -63,10 +63,9 @@ getRpathFromElfBinary() { # NOTE: This does not use runPatchelf because it may encounter non-ELF # files. Caller is expected to check the return code if needed. local rpath - rpath="$(patchelf --print-rpath "$1" 2> /dev/null)" || return $? + IFS=':' read -ra rpath < <(patchelf --print-rpath "$1" 2> /dev/null) || return $? - local IFS=':' - printf "%s\n" $rpath + printf "%s\n" "${rpath[@]}" } populateCacheForDep() { @@ -115,8 +114,52 @@ populateCacheWithRecursiveDeps() { done } -getSoArch() { - $OBJDUMP -f "$1" | sed -ne 's/^architecture: *\([^,]\+\).*/\1/p' +getBinArch() { + $OBJDUMP -f "$1" 2> /dev/null | sed -ne 's/^architecture: *\([^,]\+\).*/\1/p' +} + +# Returns the specific OS ABI for an ELF file in the format produced by +# readelf(1), like "UNIX - System V" or "UNIX - GNU". +getBinOsabi() { + $READELF -h "$1" 2> /dev/null | sed -ne 's/^[ \t]*OS\/ABI:[ \t]*\(.*\)/\1/p' +} + +# Tests whether two OS ABIs are compatible, taking into account the generally +# accepted compatibility of SVR4 ABI with other ABIs. +areBinOsabisCompatible() { + local wanted="$1" + local got="$2" + + if [[ -z "$wanted" || -z "$got" ]]; then + # One of the types couldn't be detected, so as a fallback we'll assume + # they're compatible. + return 0 + fi + + # Generally speaking, the base ABI (0x00), which is represented by + # readelf(1) as "UNIX - System V", indicates broad compatibility with other + # ABIs. + # + # TODO: This isn't always true. For example, some OSes embed ABI + # compatibility into SHT_NOTE sections like .note.tag and .note.ABI-tag. + # It would be prudent to add these to the detection logic to produce better + # ABI information. + if [[ "$wanted" == "UNIX - System V" ]]; then + return 0 + fi + + # Similarly here, we should be able to link against a superset of features, + # so even if the target has another ABI, this should be fine. + if [[ "$got" == "UNIX - System V" ]]; then + return 0 + fi + + # Otherwise, we simply return whether the ABIs are identical. + if [[ "$wanted" == "$got" ]]; then + return 0 + fi + + return 1 } # NOTE: If you want to use this function outside of the autoPatchelf function, @@ -127,6 +170,7 @@ getSoArch() { findDependency() { local filename="$1" local arch="$2" + local osabi="$3" local lib dep if [ $depCacheInitialised -eq 0 ]; then @@ -138,7 +182,7 @@ findDependency() { for dep in "${autoPatchelfCachedDeps[@]}"; do if [ "$filename" = "${dep##*/}" ]; then - if [ "$(getSoArch "$dep")" = "$arch" ]; then + if [ "$(getBinArch "$dep")" = "$arch" ] && areBinOsabisCompatible "$osabi" "$(getBinOsabi "$dep")"; then foundDependency="$dep" return 0 fi @@ -162,7 +206,24 @@ autoPatchelfFile() { local dep rpath="" toPatch="$1" local interpreter - interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")" + interpreter="$(< "$NIX_BINTOOLS/nix-support/dynamic-linker")" + + local interpreterArch interpreterOsabi toPatchArch toPatchOsabi + interpreterArch="$(getBinArch "$interpreter")" + interpreterOsabi="$(getBinOsabi "$interpreter")" + toPatchArch="$(getBinArch "$toPatch")" + toPatchOsabi="$(getBinOsabi "$toPatch")" + + if [ "$interpreterArch" != "$toPatchArch" ]; then + # Our target architecture is different than this file's architecture, + # so skip it. + echo "skipping $toPatch because its architecture ($toPatchArch) differs from target ($interpreterArch)" >&2 + return 0 + elif ! areBinOsabisCompatible "$interpreterOsabi" "$toPatchOsabi"; then + echo "skipping $toPatch because its OS ABI ($toPatchOsabi) is not compatible with target ($interpreterOsabi)" >&2 + return 0 + fi + if isExecutable "$toPatch"; then runPatchelf --set-interpreter "$interpreter" "$toPatch" # shellcheck disable=SC2154 @@ -175,7 +236,7 @@ autoPatchelfFile() { fi local libcLib - libcLib="$(< "$NIX_CC/nix-support/orig-libc")/lib" + libcLib="$(< "$NIX_BINTOOLS/nix-support/orig-libc")/lib" echo "searching for dependencies of $toPatch" >&2 @@ -187,14 +248,21 @@ autoPatchelfFile() { # new package where you don't yet know its dependencies. for dep in $missing; do - # Check whether this library exists in libc. If so, we don't need to do - # any futher searching -- it will be resolved correctly by the linker. - if [ -f "$libcLib/$dep" ]; then + if [[ "$dep" == /* ]]; then + # This is an absolute path. If it exists, just use it. Otherwise, + # we probably want this to produce an error when checked (because + # just updating the rpath won't satisfy it). + if [ -f "$dep" ]; then + continue + fi + elif [ -f "$libcLib/$dep" ]; then + # This library exists in libc, and will be correctly resolved by + # the linker. continue fi echo -n " $dep -> " >&2 - if findDependency "$dep" "$(getSoArch "$toPatch")"; then + if findDependency "$dep" "$toPatchArch" "$toPatchOsabi"; then rpath="$rpath${rpath:+:}${foundDependency%/*}" echo "found: $foundDependency" >&2 else diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 14d04c5007..3c9737242a 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "85edb79d7ee62685f6ccc57b932ff3920affcb77", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/85edb79d7ee62685f6ccc57b932ff3920affcb77.tar.gz", - "sha256": "13yxypamp0pwx8mcslg4mgq5599cldhmfss881m22zqjkbqvi8sj", - "msg": "Update from Hackage at 2021-09-29T20:58:23Z" + "commit": "b208fab03edb012b7005c6d4e30d0f4ddaf29434", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b208fab03edb012b7005c6d4e30d0f4ddaf29434.tar.gz", + "sha256": "08lg2b3hv0pcznzpvhp86qmgkasg9k9grrjzndpmr0qv60nk7lzn", + "msg": "Update from Hackage at 2021-10-02T21:03:40Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix b/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix index 60735eb478..29ebac848d 100644 --- a/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix @@ -1,17 +1,23 @@ -{ lib, fetchzip }: +{ lib, fetchzip, stdenvNoCC, writeText }: let version = "20210225"; -in fetchzip { +in stdenvNoCC.mkDerivation { name = "iana-etc-${version}"; - url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "sha256-NVvZG3EJEYOXFDTBXD5m9sg/8msyMiBMkiZr+ZxWZ/g="; + src = fetchzip { + url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; + sha256 = "sha256:1bbbnj2ya0apyyhnw37521yl1hrz3zy3l8dw6sacmir0y6pmx9gi"; + }; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 + installPhase = '' install -D -m0644 -t $out/etc services protocols ''; + setupHook = writeText "setup-hook" '' + export NIX_ETC_PROTOCOLS=@out@/etc/protocols + export NIX_ETC_SERVICES=@out@/etc/services + ''; + meta = with lib; { homepage = "https://github.com/Mic92/iana-etc"; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; diff --git a/third_party/nixpkgs/pkgs/data/themes/materia-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/materia-kde/default.nix index bf3b56ae66..a50cadb067 100644 --- a/third_party/nixpkgs/pkgs/data/themes/materia-kde/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/materia-kde/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "materia-kde-theme"; - version = "20210624"; + version = "20210814"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "materia-kde"; rev = version; - sha256 = "jmUJAWoQ/GVPNQOjlyZBg4rIIo+rhzr5imnCFAWOtrA="; + sha256 = "KfC1nB5WUcYixqSy5XCP+6Uqhs07Y3p2F1H+5HB8wAg="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A port of the materia theme for Plasma"; homepage = "https://github.com/PapirusDevelopmentTeam/materia-kde"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.diffumist ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld.nix b/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld.nix index 78af4ee049..359c3a21a6 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "pipeworld"; - version = "0.0.0+unstable=2021-08-01"; + version = "0.pre+unstable=2021-08-01"; src = fetchFromGitHub { owner = "letoram"; diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/prio.nix b/third_party/nixpkgs/pkgs/desktops/arcan/prio.nix index 764d82fae9..34443baa80 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/prio.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/prio.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "prio"; - version = "0.0.0+unstable=2018-09-13"; + version = "0.pre+unstable=2018-09-13"; src = fetchFromGitHub { owner = "letoram"; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch index d273e26222..e6ab62caf7 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch @@ -8,22 +8,32 @@ Because it's completely bypassing argv0! This looks at the executable file in-use according to the kernel! Wrappers cannot affect the `/proc/.../exe` symlink! ---- - src/service_utils.h | 28 +++++++++++++++++++++++++++- - 1 file changed, 27 insertions(+), 1 deletion(-) -diff --git a/src/service_utils.h b/src/service_utils.h -index 8a70c1fad..6674f553b 100644 ---- a/src/service_utils.h -+++ b/src/service_utils.h -@@ -26,8 +26,34 @@ namespace KWin - const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces"); - const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces"); - --static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName) -+static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName) - { -+ // !! Start NixOS fix +Co-authored-by: Yaroslav Bolyukin +--- + src/nixos_utils.h | 41 +++++++++++++++++++++++++++++++++++++++++ + src/service_utils.h | 4 +++- + src/waylandclient.cpp | 5 ++++- + 3 files changed, 48 insertions(+), 2 deletions(-) + create mode 100644 src/nixos_utils.h + +diff --git a/src/nixos_utils.h b/src/nixos_utils.h +new file mode 100644 +index 0000000..726065d +--- /dev/null ++++ b/src/nixos_utils.h +@@ -0,0 +1,41 @@ ++#ifndef NIXOS_UTILS_H ++#define NIXOS_UTILS_H ++ ++// kwin ++#include ++ ++namespace KWin ++{ ++ ++static QString unwrapExecutablePath(const QString &in_executablePath) ++{ + // NixOS fixes many packaging issues through "wrapper" scripts that manipulates the environment or does + // miscellaneous trickeries and mischievous things to make the programs work. + // In turn, programs often employs different mischievous schemes and trickeries to do *other things. @@ -47,11 +57,58 @@ index 8a70c1fad..6674f553b 100644 + // Approximately equivalent to s;/\.;/; + executablePath.remove(executablePath.lastIndexOf("/")+1, 1); + } -+ // !! End NixOS fix + ++ return executablePath; ++} ++ ++}// namespace ++ ++#endif // SERVICE_UTILS_H +diff --git a/src/service_utils.h b/src/service_utils.h +index 8a70c1f..475b15d 100644 +--- a/src/service_utils.h ++++ b/src/service_utils.h +@@ -19,6 +19,7 @@ + #include + //KF + #include ++#include "nixos_utils.h" + + namespace KWin + { +@@ -26,8 +27,9 @@ namespace KWin + const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces"); + const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces"); + +-static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName) ++static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName) + { ++ const QString executablePath = unwrapExecutablePath(in_executablePath); // needed to be able to use the logging category in a header static function static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg); const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) { +diff --git a/src/waylandclient.cpp b/src/waylandclient.cpp +index fd2c0c1..ae8cf96 100644 +--- a/src/waylandclient.cpp ++++ b/src/waylandclient.cpp +@@ -10,6 +10,7 @@ + #include "screens.h" + #include "wayland_server.h" + #include "workspace.h" ++#include "nixos_utils.h" + + #include + #include +@@ -173,7 +174,9 @@ void WaylandClient::updateIcon() + + void WaylandClient::updateResourceName() + { +- const QFileInfo fileInfo(surface()->client()->executablePath()); ++ const QString in_path = surface()->client()->executablePath(); ++ const QString path = unwrapExecutablePath(in_path); ++ const QFileInfo fileInfo(path); + if (fileInfo.exists()) { + const QByteArray executableFileName = fileInfo.fileName().toUtf8(); + setResourceClass(executableFileName, executableFileName); -- -2.28.0 - +2.32.0 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 cad68e6f30..cec3336dcb 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 @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.19.0"; + version = "0.20.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-WesGgLoVR435lNXnsCFYcUoKXDMuL7hWImDluori+dc="; + sha256 = "sha256-XBCauvPalIPjVOYlMfWC+5mKku28b/qqKhp9NgSkoyA="; rev = version; }; releaseType = "escript"; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix index 1255ec59c3..131fd03d86 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/webdriver/default.nix @@ -7,14 +7,14 @@ let }; pkg = self: stdenv.mkDerivation { - name = "webdriver"; - version = "0.0.0+build.18.7ceaf1f"; + pname = "webdriver"; + version = "0.pre+unstable=2015-02-08"; src = fetchFromGitHub { - owner = "Quviq"; - repo = "webdrv"; - rev = "7ceaf1f67d834e841ca0133b4bf899a9fa2db6bb"; - sha256 = "1pq6pmlr6xb4hv2fvmlrvzd8c70kdcidlgjv4p8n9pwvkif0cb87"; + owner = "Quviq"; + repo = "webdrv"; + rev = "7ceaf1f67d834e841ca0133b4bf899a9fa2db6bb"; + sha256 = "1pq6pmlr6xb4hv2fvmlrvzd8c70kdcidlgjv4p8n9pwvkif0cb87"; }; setupHook = writeText "setupHook.sh" '' @@ -36,5 +36,5 @@ let env = shell self; }; -}; + }; in lib.fix pkg diff --git a/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix index c4fa5712ea..d61d34276a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, autoconf, automake, libtool, gmp -, darwin +, darwin, libunistring }: stdenv.mkDerivation rec { @@ -13,9 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool ]; - buildInputs = lib.optional stdenv.isDarwin + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices - ; + libunistring + ]; propagatedBuildInputs = [ gmp ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix index dac50fc781..a8a7e2076c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix @@ -17,19 +17,20 @@ in stdenv.mkDerivation rec { pname = "fstar"; - version = "2021.09.11"; + version = "2021.09.30"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "1aqk6fx77zcb7mcm78dk4l4zzd323qiv7yc7hvc38494yf6gk8a0"; + sha256 = "gqy9iaLZlTyv9ufHrUG87ta2xyc1OaZ/KRGhAzB+wsQ="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = [ z3 + sedlex-2_3 ] ++ (with ocamlPackages; [ ocaml findlib @@ -42,7 +43,6 @@ stdenv.mkDerivation rec { menhir menhirLib pprint - sedlex-2_3 ppxlib ppx_deriving ppx_deriving_yojson @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { buildFlags = [ "libs" ]; + enableParallelBuilding = true; + postPatch = '' patchShebangs ulib/gen_mllib.sh substituteInPlace src/ocaml-output/Makefile --replace '$(COMMIT)' 'v${version}' @@ -74,6 +76,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md"; platforms = with platforms; darwin ++ linux; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner pnmadelaine ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index a1598d3d3f..f9dd0465b9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix @@ -73,7 +73,9 @@ let majorVersion = "10"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + + ++ [ ../libsanitizer-no-cyclades.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix index 7b7f542de0..850b267441 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix @@ -78,7 +78,9 @@ let majorVersion = "11"; }) # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + + ++ [ ../libsanitizer-no-cyclades.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index 98332290a0..e1c441e7af 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -86,6 +86,13 @@ let majorVersion = "4"; ../struct-ucontext-4.8.patch ../sigsegv-not-declared.patch ../res_state-not-declared.patch + # gcc-11 compatibility + (fetchpatch { + name = "gcc4-char-reload.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d57c99458933a21fdf94f508191f145ad8d5ec58"; + includes = [ "gcc/reload.h" ]; + sha256 = "sha256-66AMP7/ajunGKAN5WJz/yPn42URZ2KN51yPrFdsxEuM="; + }) ]; javaEcj = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index a15cb770fd..3b92ecddc0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -98,7 +98,18 @@ let majorVersion = "4"; { commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; } { commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; } { commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; } - { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }]; + { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }] + + ++ [ + ../libsanitizer-no-cyclades-9.patch + # gcc-11 compatibility + (fetchpatch { + name = "gcc4-char-reload.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d57c99458933a21fdf94f508191f145ad8d5ec58"; + includes = [ "gcc/reload.h" ]; + sha256 = "sha256-66AMP7/ajunGKAN5WJz/yPn42URZ2KN51yPrFdsxEuM="; + }) + ]; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index df4a632db0..e0ef8e3178 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -87,7 +87,9 @@ let majorVersion = "6"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb"; sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2"; - }); + }) + + ++ [ ../libsanitizer-no-cyclades-9.patch ]; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index 44e8b38fdf..dcb7d0b91f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -84,7 +84,9 @@ let majorVersion = "7"; ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + + ++ [ ../libsanitizer-no-cyclades-9.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index b264d37418..a6fd34c60c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -71,7 +71,9 @@ let majorVersion = "8"; ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + + ++ [ ../libsanitizer-no-cyclades-9.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index 43b2e0b5ef..604d90fa78 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -87,7 +87,9 @@ let majorVersion = "9"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + + ++ [ ../libsanitizer-no-cyclades-9.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/libsanitizer-no-cyclades-9.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/libsanitizer-no-cyclades-9.patch new file mode 100644 index 0000000000..072403d149 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/libsanitizer-no-cyclades-9.patch @@ -0,0 +1,82 @@ +https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2b40941d23b1570cdd90083b58fa0f66aa58c86e +https://gcc.gnu.org/PR100379 +--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -365,15 +365,6 @@ static void ioctl_table_fill() { + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE +- _(CYGETDEFTHRESH, WRITE, sizeof(int)); +- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); +- _(CYGETTHRESH, WRITE, sizeof(int)); +- _(CYGETTIMEOUT, WRITE, sizeof(int)); +- _(CYSETDEFTHRESH, NONE, 0); +- _(CYSETDEFTIMEOUT, NONE, 0); +- _(CYSETTHRESH, NONE, 0); +- _(CYSETTIMEOUT, NONE, 0); + _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); + _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); + _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -157,7 +157,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include + #include + #include + #include +@@ -466,7 +465,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); +- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) + unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); + #else +@@ -833,15 +831,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; +- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; +- unsigned IOCTL_CYGETMON = CYGETMON; +- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; +- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; +- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; +- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; +- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; +- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; + unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; + unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; + unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -1040,7 +1040,6 @@ struct __sanitizer_cookie_io_functions_t { + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + extern unsigned struct_ax25_parms_struct_sz; +- extern unsigned struct_cyclades_monitor_sz; + extern unsigned struct_input_keymap_entry_sz; + extern unsigned struct_ipx_config_data_sz; + extern unsigned struct_kbdiacrs_sz; +@@ -1385,15 +1384,6 @@ struct __sanitizer_cookie_io_functions_t { + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- extern unsigned IOCTL_CYGETDEFTHRESH; +- extern unsigned IOCTL_CYGETDEFTIMEOUT; +- extern unsigned IOCTL_CYGETMON; +- extern unsigned IOCTL_CYGETTHRESH; +- extern unsigned IOCTL_CYGETTIMEOUT; +- extern unsigned IOCTL_CYSETDEFTHRESH; +- extern unsigned IOCTL_CYSETDEFTIMEOUT; +- extern unsigned IOCTL_CYSETTHRESH; +- extern unsigned IOCTL_CYSETTIMEOUT; + extern unsigned IOCTL_EQL_EMANCIPATE; + extern unsigned IOCTL_EQL_ENSLAVE; + extern unsigned IOCTL_EQL_GETMASTRCFG; +-- +2.27.0 diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/libsanitizer-no-cyclades.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/libsanitizer-no-cyclades.patch new file mode 100644 index 0000000000..e2155cd0c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/libsanitizer-no-cyclades.patch @@ -0,0 +1,83 @@ +https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2bf34b9f4e446bf9be7f04458058dd5319fb396e +https://gcc.gnu.org/PR100379 +--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -366,15 +366,6 @@ static void ioctl_table_fill() { + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE +- _(CYGETDEFTHRESH, WRITE, sizeof(int)); +- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); +- _(CYGETTHRESH, WRITE, sizeof(int)); +- _(CYGETTIMEOUT, WRITE, sizeof(int)); +- _(CYSETDEFTHRESH, NONE, 0); +- _(CYSETDEFTIMEOUT, NONE, 0); +- _(CYSETTHRESH, NONE, 0); +- _(CYSETTIMEOUT, NONE, 0); + _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); + _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); + _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -130,7 +130,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include + #include + #include + #include +@@ -443,7 +442,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); +- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) + unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); + #else +@@ -809,15 +807,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; +- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; +- unsigned IOCTL_CYGETMON = CYGETMON; +- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; +- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; +- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; +- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; +- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; +- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; + unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; + unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; + unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -974,7 +974,6 @@ extern unsigned struct_vt_mode_sz; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + extern unsigned struct_ax25_parms_struct_sz; +-extern unsigned struct_cyclades_monitor_sz; + extern unsigned struct_input_keymap_entry_sz; + extern unsigned struct_ipx_config_data_sz; + extern unsigned struct_kbdiacrs_sz; +@@ -1319,15 +1318,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +-extern unsigned IOCTL_CYGETDEFTHRESH; +-extern unsigned IOCTL_CYGETDEFTIMEOUT; +-extern unsigned IOCTL_CYGETMON; +-extern unsigned IOCTL_CYGETTHRESH; +-extern unsigned IOCTL_CYGETTIMEOUT; +-extern unsigned IOCTL_CYSETDEFTHRESH; +-extern unsigned IOCTL_CYSETDEFTIMEOUT; +-extern unsigned IOCTL_CYSETTHRESH; +-extern unsigned IOCTL_CYSETTIMEOUT; + extern unsigned IOCTL_EQL_EMANCIPATE; + extern unsigned IOCTL_EQL_ENSLAVE; + extern unsigned IOCTL_EQL_GETMASTRCFG; +-- +2.33.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix index 069c4655ea..9430ded8b6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/default.nix @@ -287,7 +287,7 @@ in rec { rev = "jvmci-${version}"; sha256 = "0j7my76vldbrvki9x1gn9ics3x2z96j05jdy4nflbpik8i396114"; }; - buildInputs = [ mx mercurial openjdk ] ++ lib.optional stdenv.isDarwin [ + buildInputs = [ mx mercurial openjdk ] ++ lib.optionals stdenv.isDarwin [ libobjc CoreFoundation Foundation JavaNativeFoundation JavaRuntimeSupport JavaVM xcodebuild Cocoa ]; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/default.nix index faba5d97b7..657a465a3f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation { ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15 ./gnu-install-dirs.patch + ../../common/compiler-rt/libsanitizer-no-cyclades-11.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/default.nix index e5b79692ae..1111f14f9b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation { # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the # extra `/`. ./normalize-var.patch + ../../common/compiler-rt/libsanitizer-no-cyclades-11.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index 8fc32bbd0a..403924547b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -5,7 +5,7 @@ let useLLVM = stdenv.hostPlatform.useLLVM or false; bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; haveLibc = stdenv.cc.libc != null; - inherit (stdenv.hostPlatform) isMusl; + inherit (stdenv.hostPlatform) isMusl isAarch64; in @@ -27,10 +27,11 @@ stdenv.mkDerivation { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ lib.optionals (useLLVM || bareMetal || isMusl || isAarch64) [ + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" - "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" @@ -110,7 +111,5 @@ stdenv.mkDerivation { # "All of the code in the compiler-rt project is dual licensed under the MIT # license and the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; - # TODO/FIXME: Build fails on Hydra: - broken = stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/default.nix index 9f937ed140..c684437cef 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt/default.nix @@ -57,7 +57,8 @@ stdenv.mkDerivation { ./gnu-install-dirs.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ./sys-ustat.patch - ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; + ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch + ++ [ ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix index 54fd783a7c..6388cd65fb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -82,6 +82,9 @@ stdenv.mkDerivation ({ substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" rm unittests/Support/Path.cpp + + # llvm-5 does not support dwarf-5 style info, fails on gcc-11. + rm test/tools/llvm-symbolizer/print_context.c '' + optionalString stdenv.isAarch64 '' patch -p0 < ${../../aarch64.patch} '' + optionalString stdenv.hostPlatform.isMusl '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/default.nix index 7ee0943a88..74c17fd3e6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation { # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce ../../common/compiler-rt/glibc.patch ./gnu-install-dirs.patch + ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/default.nix index f6190b7991..6ea1280a40 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation { ../../common/compiler-rt/glibc.patch ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./gnu-install-dirs.patch + ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch ] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/default.nix index bbaae80373..62672b336f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation { ../../common/compiler-rt/glibc.patch ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./gnu-install-dirs.patch + ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional (useLLVM) ./crtbegin-and-end.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/default.nix index 4dc75bd1c1..83a75f516a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation { ../../common/compiler-rt/glibc.patch ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./gnu-install-dirs.patch + ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch new file mode 100644 index 0000000000..890230cc14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch @@ -0,0 +1,80 @@ +https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch +https://reviews.llvm.org/D102059 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -370,15 +370,6 @@ static void ioctl_table_fill() { + + #if SANITIZER_GLIBC + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE +- _(CYGETDEFTHRESH, WRITE, sizeof(int)); +- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); +- _(CYGETTHRESH, WRITE, sizeof(int)); +- _(CYGETTIMEOUT, WRITE, sizeof(int)); +- _(CYSETDEFTHRESH, NONE, 0); +- _(CYSETDEFTIMEOUT, NONE, 0); +- _(CYSETTHRESH, NONE, 0); +- _(CYSETTIMEOUT, NONE, 0); + _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); + _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); + _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include + #include + #include + #include +@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + + #if SANITIZER_GLIBC + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); +- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) + unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); + #else +@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; +- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; +- unsigned IOCTL_CYGETMON = CYGETMON; +- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; +- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; +- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; +- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; +- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; +- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; + unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; + unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; + unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + extern unsigned struct_ax25_parms_struct_sz; +-extern unsigned struct_cyclades_monitor_sz; + extern unsigned struct_input_keymap_entry_sz; + extern unsigned struct_ipx_config_data_sz; + extern unsigned struct_kbdiacrs_sz; +@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +-extern unsigned IOCTL_CYGETDEFTHRESH; +-extern unsigned IOCTL_CYGETDEFTIMEOUT; +-extern unsigned IOCTL_CYGETMON; +-extern unsigned IOCTL_CYGETTHRESH; +-extern unsigned IOCTL_CYGETTIMEOUT; +-extern unsigned IOCTL_CYSETDEFTHRESH; +-extern unsigned IOCTL_CYSETDEFTIMEOUT; +-extern unsigned IOCTL_CYSETTHRESH; +-extern unsigned IOCTL_CYSETTIMEOUT; + extern unsigned IOCTL_EQL_EMANCIPATE; + extern unsigned IOCTL_EQL_ENSLAVE; + extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-9.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-9.patch new file mode 100644 index 0000000000..7ef02a1692 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-9.patch @@ -0,0 +1,80 @@ +https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch +https://reviews.llvm.org/D102059 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -370,15 +370,6 @@ static void ioctl_table_fill() { + + #if SANITIZER_GLIBC + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE +- _(CYGETDEFTHRESH, WRITE, sizeof(int)); +- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); +- _(CYGETTHRESH, WRITE, sizeof(int)); +- _(CYGETTIMEOUT, WRITE, sizeof(int)); +- _(CYSETDEFTHRESH, NONE, 0); +- _(CYSETDEFTIMEOUT, NONE, 0); +- _(CYSETTHRESH, NONE, 0); +- _(CYSETTIMEOUT, NONE, 0); + _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); + _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); + _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include + #include + #include + #include +@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + + #if SANITIZER_GLIBC + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); +- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) + unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); + #else +@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; +- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; +- unsigned IOCTL_CYGETMON = CYGETMON; +- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; +- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; +- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; +- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; +- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; +- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; + unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; + unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; + unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + extern unsigned struct_ax25_parms_struct_sz; +- extern unsigned struct_cyclades_monitor_sz; + extern unsigned struct_input_keymap_entry_sz; + extern unsigned struct_ipx_config_data_sz; + extern unsigned struct_kbdiacrs_sz; +@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- extern unsigned IOCTL_CYGETDEFTHRESH; +- extern unsigned IOCTL_CYGETDEFTIMEOUT; +- extern unsigned IOCTL_CYGETMON; +- extern unsigned IOCTL_CYGETTHRESH; +- extern unsigned IOCTL_CYGETTIMEOUT; +- extern unsigned IOCTL_CYSETDEFTHRESH; +- extern unsigned IOCTL_CYSETDEFTIMEOUT; +- extern unsigned IOCTL_CYSETTHRESH; +- extern unsigned IOCTL_CYSETTIMEOUT; + extern unsigned IOCTL_EQL_EMANCIPATE; + extern unsigned IOCTL_EQL_ENSLAVE; + extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix index cd277f5149..6ea4fb281f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, version, src, cmake, python3, llvm, libcxxabi }: +{ stdenv, lib, version, src, cmake, python3, llvm, libcxxabi, fetchpatch }: stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version src; @@ -31,7 +31,13 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ]; + (fetchpatch { + name = "libsanitizer-no-cyclades-rocm.patch"; + url = "https://gist.github.com/lovesegfault/b255dcf2fa4e202411a6a04b61e6cc04/raw"; + sha256 = "sha256-PMMSLr2zHuNDn1OWqumqHwB74ktJSHxhJWkqEKB7Z64="; + stripLen = 1; + }) + ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix index 9770b9fb9c..08976c6898 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix @@ -4,7 +4,12 @@ with lib; mkCoqDerivation { pname = "StructTact"; owner = "uwplse"; inherit version; - defaultVersion = if versions.isGe "8.5" coq.coq-version then "20181102" else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.6" "8.14"; out = "20210328"; } + { case = range "8.5" "8.13"; out = "20181102"; } + ] null; + release."20210328".rev = "179bd5312e9d8b63fc3f4071c628cddfc496d741"; + release."20210328".sha256 = "sha256:1y5r1zm3hli10ah6lnj7n8hxad6rb6rgldd0g7m2fjibzvwqzhdg"; release."20181102".rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; release."20181102".sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; preConfigure = "patchShebangs ./configure"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix index d3769eb2c4..2701cf6f04 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix @@ -6,9 +6,12 @@ with lib; mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.7"; out = "20200131"; } - { case = isEq "8.6"; out = "20181102"; } + { case = range "8.7" "8.14"; out = "20210524"; } + { case = range "8.7" "8.13"; out = "20200131"; } + { case = "8.6"; out = "20181102"; } ] null; + release."20210524".rev = "54597d8ac7ab7dd4dae683f651237644bf77701e"; + release."20210524".sha256 = "sha256:05wb0km2jkhvi8807glxk9fi1kll4lwisiyzkxhqvymz4x6v8xqv"; release."20200131".rev = "fdb4ede19d2150c254f0ebcfbed4fb9547a734b0"; release."20200131".sha256 = "1a2k19f9q5k5djbxplqmmpwck49kw3lrm3aax920h4yb40czkd8m"; release."20181102".rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix index 6ba798ac32..410e585dce 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,11 +5,13 @@ with lib; mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.8" "8.14"; out = "0.11.4"; } { case = range "8.8" "8.13"; out = "0.11.3"; } { case = "8.7"; out = "0.9.7"; } { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.11.4".sha256 = "sha256:0yp8mhrhkc498nblvhq1x4j6i9aiidkjza4wzvrkp9p8rgx5g5y3"; release."0.11.3".sha256 = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42"; release."0.11.2".sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; release."0.10.3".sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; 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 82fc372f7b..203398c95d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1142,6 +1142,11 @@ self: super: { # https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/ # Therefore we jailbreak it. hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; + # 2021-10-04: too strict upper bound on Hakyll + hakyll-filestore = doJailbreak super.hakyll-filestore; + # https://github.com/LaurentRDC/hakyll-images/issues/10, fixed in 1.1.1 + hakyll-images = assert super.hakyll-images.version == "1.1.0"; + dontCheck super.hakyll-images; # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; @@ -1475,7 +1480,11 @@ self: super: { hercules-ci-cli = generateOptparseApplicativeCompletion "hci" ( # See hercules-ci-optparse-applicative in non-hackage-packages.nix. - addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative + addBuildDepend + (overrideCabal + (unmarkBroken super.hercules-ci-cli) + (drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; })) + super.hercules-ci-optparse-applicative ); # Readline uses Distribution.Simple from Cabal 2, in a way that is not @@ -1913,9 +1922,34 @@ EOT # https://github.com/Porges/email-validate-hs/issues/58 email-validate = doJailbreak super.email-validate; - # 2021-06-20: Outdated upper bounds - # https://github.com/Porges/email-validate-hs/issues/58 - ghcup = doJailbreak super.ghcup; + # 2021-10-02: Make optics 0.4 packages work together + optics-th_0_4 = super.optics-th_0_4.override { + optics-core = self.optics-core_0_4; + }; + optics-extra_0_4 = super.optics-extra_0_4.override { + optics-core = self.optics-core_0_4; + }; + optics_0_4 = super.optics_0_4.override { + optics-core = self.optics-core_0_4; + optics-extra = self.optics-extra_0_4; + optics-th = self.optics-th_0_4; + }; + + # https://github.com/plow-technologies/hspec-golden-aeson/issues/17 + hspec-golden-aeson_0_9_0_0 = dontCheck super.hspec-golden-aeson_0_9_0_0; + + # 2021-10-02: Doesn't compile with optics < 0.4 + ghcup = overrideCabal (super.ghcup.override { + hspec-golden-aeson = self.hspec-golden-aeson_0_9_0_0; + optics = self.optics_0_4; + }) (drv: { + # golden files are not shipped with the hackage tarball and hspec-golden-aeson + # needs some encouraging to create the missing files after version 0.8.0.0. + # See: https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/255 + preCheck = assert drv.version == "0.1.17.2"; '' + export CREATE_MISSING_GOLDEN=yes + '' + (drv.preCheck or ""); + }); # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; @@ -1992,19 +2026,13 @@ EOT hw-xml = assert pkgs.lib.versionOlder self.generic-lens.version "2.2.0.0"; doJailbreak super.hw-xml; - # doctests fail due to deprecation warnings in 0.2 - candid = assert pkgs.lib.versionOlder super.candid.version "0.3"; - overrideCabal super.candid (drv: { - version = "0.3"; - sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x"; - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ - self.file-embed - ]; - }); - # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { network = self.network_3_1_2_2; }); + http3 = super.http3.overrideScope (self: super: { + network = self.network_3_1_2_2; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super 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 9e30c5114d..22e0813545 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -708,14 +708,7 @@ self: super: builtins.intersectAttrs super { }; haskell-language-server = overrideCabal super.haskell-language-server (drv: { - postInstall = let - inherit (pkgs.lib) concatStringsSep take splitString; - ghc_version = self.ghc.version; - ghc_major_version = concatStringsSep "." (take 2 (splitString "." ghc_version)); - in '' - ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_version} - ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_major_version} - ''; + postInstall = "ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${self.ghc.version}"; testToolDepends = [ self.cabal-install pkgs.git ]; testTarget = "func-test"; # wrapper test accesses internet preCheck = '' @@ -980,4 +973,11 @@ self: super: builtins.intersectAttrs super { # Test suite is just the default example executable which doesn't work if not # executed by Setup.hs, but works if started on a proper TTY isocline = dontCheck super.isocline; + + # Some hash implementations are x86 only, but part of the test suite. + # So executing and building it on non-x86 platforms will always fail. + hashes = overrideCabal super.hashes { + doCheck = with pkgs.stdenv; hostPlatform == buildPlatform + && buildPlatform.isx86; + }; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 91fb2f1a95..9d6fd32fca 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -1304,6 +1304,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "BNFC_2_9_3" = callPackage + ({ mkDerivation, alex, array, base, Cabal, cabal-doctest + , containers, deepseq, directory, doctest, filepath, happy, hspec + , hspec-discover, HUnit, mtl, pretty, process, QuickCheck + , string-qq, temporary, time + }: + mkDerivation { + pname = "BNFC"; + version = "2.9.3"; + sha256 = "1b2cgnr7c8ndk9jmfr0x905d72wgk0cc9ngbrw9f1q6fbm3mbcgp"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base containers deepseq directory filepath mtl pretty process + string-qq time + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + array base containers deepseq directory doctest filepath hspec + HUnit mtl pretty process QuickCheck string-qq temporary time + ]; + testToolDepends = [ alex happy hspec-discover ]; + description = "A compiler front-end generator"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "BNFC-meta" = callPackage ({ mkDerivation, alex-meta, array, base, fail, happy-meta , haskell-src-meta, syb, template-haskell @@ -10742,10 +10771,10 @@ self: { }: mkDerivation { pname = "HsHTSLib"; - version = "1.9.2"; - sha256 = "077j64jpq64bw9bjy0n2qmar6dc768lrn62cpkwl0cl5sygpd005"; + version = "1.9.2.2"; + sha256 = "11jy5xv58x379gmzgd4whgjba58syxlagggc6v77w4n3l86wrdxm"; libraryHaskellDepends = [ - base bytestring bytestring-lexing conduit containers + base bytestring bytestring-lexing conduit containers vector ]; librarySystemDepends = [ zlib ]; libraryToolDepends = [ c2hs ]; @@ -20525,8 +20554,8 @@ self: { }: mkDerivation { pname = "Unique"; - version = "0.4.7.8"; - sha256 = "0w82pa6r2a6969w251fbrx0sr1ws8mkg2lwdyjl4qjhl5s28k43i"; + version = "0.4.7.9"; + sha256 = "14f1qnmhdmbam8qis725dhwq1mk9h86fsnzhkwhsx73ny9z29s1l"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; @@ -30487,8 +30516,8 @@ self: { }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.1.0.0"; - sha256 = "08sy50yicjgcxmnpq2828xggmvxc5yjp3xp03nd0bq4ykyr4za80"; + version = "1.1.1.0"; + sha256 = "07b4sxx36r604j2q3xyk1y962c6fgy091ly4gc27v49zhmfrmypr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42839,8 +42868,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.1.0.0"; - sha256 = "0hri2bkydcffs2d9xjsr1gc16rl75g4vymjvgd8gr35p01zdc9mq"; + version = "0.1.1.0"; + sha256 = "0raryshzgahldn03dzpin6hi9vyq4w81dxgmgcq34z7h2salia5m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -42850,14 +42879,14 @@ self: { ]; executableHaskellDepends = [ array base containers data-default deepseq directory extra factory - filepath hxt hxt-relaxng mtl process random time toolshed unix + filepath hxt hxt-relaxng mtl process random toolshed unix ]; testHaskellDepends = [ array base containers data-default deepseq extra filepath HUnit hxt mtl polyparse QuickCheck random toolshed ]; description = "Plays chess"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51174,8 +51203,8 @@ self: { "candid" = callPackage ({ mkDerivation, base, base32, bytestring, cereal, constraints - , containers, crc, directory, dlist, doctest, filepath, hex-text - , leb128-cereal, megaparsec, mtl, optparse-applicative + , containers, crc, directory, dlist, doctest, file-embed, filepath + , hex-text, leb128-cereal, megaparsec, mtl, optparse-applicative , parser-combinators, prettyprinter, row-types, scientific , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck , tasty-rerun, tasty-smallcheck, template-haskell, text @@ -51183,13 +51212,13 @@ self: { }: mkDerivation { pname = "candid"; - version = "0.2"; - sha256 = "0cif618n6m9cvlcvr7hk3gnypv2vxaz1qaa63jrxakmkcr1lm028"; + version = "0.3"; + sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base32 bytestring cereal constraints containers crc dlist - hex-text leb128-cereal megaparsec mtl parser-combinators + file-embed hex-text leb128-cereal megaparsec mtl parser-combinators prettyprinter row-types scientific split template-haskell text transformers unordered-containers vector ]; @@ -68226,21 +68255,21 @@ self: { }) {}; "cuckoo" = callPackage - ({ mkDerivation, base, bytestring, criterion, cryptonite, doctest - , hashable, memory, primitive, QuickCheck, random, stopwatch - , vector + ({ mkDerivation, base, blake2, bytestring, criterion, doctest + , hashable, hashes, primitive, QuickCheck, random, stopwatch }: mkDerivation { pname = "cuckoo"; - version = "0.2.2"; - sha256 = "1wm81a5fsq0wdvx3ayxfrljya7rm9c0vfmy5dhxa6h9zxnqrkvav"; - libraryHaskellDepends = [ base memory primitive random vector ]; + version = "0.3.0"; + sha256 = "11p7f1br9jyjdwaviy94xwq1jg3kgq5q1pqls20sakgm1f71axls"; + libraryHaskellDepends = [ + base bytestring hashes primitive random + ]; testHaskellDepends = [ - base bytestring cryptonite doctest hashable memory primitive - stopwatch + base blake2 bytestring doctest hashable stopwatch ]; benchmarkHaskellDepends = [ - base bytestring criterion memory QuickCheck stopwatch + base bytestring criterion QuickCheck stopwatch ]; doHaddock = false; description = "Haskell Implementation of Cuckoo Filters"; @@ -75752,8 +75781,8 @@ self: { }: mkDerivation { pname = "diagrams"; - version = "1.4"; - sha256 = "0fcik4vwm2zah5m3yf6p1dlf0vbs7h1jri77zfwl731bd3xgc246"; + version = "1.4.0.1"; + sha256 = "1y3yij2k2bpvmfxykr2s0hadbcprl1yi6z3pz4yjzqkib5s7y1mq"; libraryHaskellDepends = [ diagrams-contrib diagrams-core diagrams-lib diagrams-svg ]; @@ -75971,8 +76000,8 @@ self: { pname = "diagrams-gtk"; version = "1.4"; sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn"; - revision = "3"; - editedCabalFile = "0k0i3nm5zpdmrqh8wmd8y5xhw7drd67hifdva5a7dih8w5sab4ra"; + revision = "4"; + editedCabalFile = "1w6xykrsfmhanzy7rdrnfzsc3ny9d28kqz9sla4dygm3gay5509q"; libraryHaskellDepends = [ base cairo diagrams-cairo diagrams-lib gtk ]; @@ -78960,6 +78989,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "dl-fedora_0_9_2" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , http-client, http-client-tls, http-directory, http-types + , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args + , text, time, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "0.9.2"; + sha256 = "1x48nrgz34a3kyfkv126jscbjv5yra8h0csrb6sw8f9jw5x3spss"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory extra filepath http-client + http-client-tls http-directory http-types optparse-applicative + regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Fedora image download tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { @@ -81963,6 +82015,8 @@ self: { pname = "dwarf-el"; version = "0.3"; sha256 = "177y84zgl215jivbxifn09w8mdv0k65bxyky0l1hadd64hgp2nq7"; + revision = "1"; + editedCabalFile = "134jqfl7zrk1l6jcv3ws4511x1097yzhn2gi0vcn0bkz6qc8lr3s"; libraryHaskellDepends = [ base binary bytestring containers text text-show transformers ]; @@ -81978,6 +82032,8 @@ self: { pname = "dwarfadt"; version = "0.6"; sha256 = "1fzkigzrm6s9060vmxsgw4bwzpfvcxc510ghb1rkqh5gslqszcb0"; + revision = "1"; + editedCabalFile = "0rdydzqy6g24jgddc4sgg1244l9mdkhp1zyjnvjfg0jbrkgqcy73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84174,6 +84230,8 @@ self: { pname = "elf"; version = "0.30"; sha256 = "16gfpqsqfwlq4qprh0nswa4br1rz7rj7in7v803cqggkxz7s5c4p"; + revision = "1"; + editedCabalFile = "08krv9xws8gr8s5k6796y7yzng22gf4m1a4mv5g57j3yjldwkds2"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base bytestring containers hspec ]; description = "An Elf parser"; @@ -87137,6 +87195,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto_3_5_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, hspec-core, monad-logger + , mtl, mysql, mysql-simple, persistent, persistent-mysql + , persistent-postgresql, persistent-sqlite, postgresql-simple + , QuickCheck, resourcet, tagged, text, time, transformers, unliftio + , unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "3.5.3.0"; + sha256 = "0z3cf49sha6q965qw2m08jfmb91ki2rsdpnr7l39lka5b4ffxjlz"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged text time transformers + unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec hspec-core monad-logger mtl mysql mysql-simple + persistent persistent-mysql persistent-postgresql persistent-sqlite + postgresql-simple QuickCheck resourcet tagged text time + transformers unliftio unordered-containers + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -89500,8 +89587,8 @@ self: { ({ mkDerivation, base, containers, fgl, mtl, transformers }: mkDerivation { pname = "exploring-interpreters"; - version = "0.3.2.0"; - sha256 = "0wf35nnqqlvmzn8l3dxrvnr1w9clrzvmpw2vls2zyxnh9dsvrhf7"; + version = "0.4.0.0"; + sha256 = "07q4cjk2sqp471w0rgygf1x2c91vyajh93s8xzi3j09wdb23v9l3"; libraryHaskellDepends = [ base containers fgl mtl transformers ]; description = "A generic exploring interpreter for exploratory programming"; license = lib.licenses.bsd3; @@ -98838,24 +98925,25 @@ self: { broken = true; }) {}; - "functor-combinators_0_4_0_0" = callPackage + "functor-combinators_0_4_1_0" = callPackage ({ mkDerivation, assoc, base, bifunctors, comonad, constraints , containers, contravariant, dependent-sum, deriving-compat, free - , hedgehog, invariant, kan-extensions, mmorph, mtl + , hashable, hedgehog, invariant, kan-extensions, mmorph, mtl , natural-transformation, nonempty-containers, pointed, profunctors - , semigroupoids, sop-core, tagged, tasty, tasty-hedgehog, these - , transformers, trivial-constraint, vinyl + , semigroupoids, sop-core, StateVar, tagged, tasty, tasty-hedgehog + , these, transformers, trivial-constraint, unordered-containers + , vinyl }: mkDerivation { pname = "functor-combinators"; - version = "0.4.0.0"; - sha256 = "1kikldm7ih7r5ydyq26fkp01025dnwrafipsw9qv897k887b8gvg"; + version = "0.4.1.0"; + sha256 = "1b7324ia810i1rjn2z4q3h7rcbbvmfh3nl8vxswgnkglhrkcmg49"; libraryHaskellDepends = [ assoc base bifunctors comonad constraints containers contravariant - deriving-compat free invariant kan-extensions mmorph mtl + deriving-compat free hashable invariant kan-extensions mmorph mtl natural-transformation nonempty-containers pointed profunctors - semigroupoids sop-core tagged these transformers trivial-constraint - vinyl + semigroupoids sop-core StateVar tagged these transformers + trivial-constraint unordered-containers vinyl ]; testHaskellDepends = [ base bifunctors dependent-sum free hedgehog nonempty-containers @@ -99404,8 +99492,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.1.0.0"; - sha256 = "0mv3q4a6l3xp0qjlhh9f8bvgbmrmr4hypnkapb2wsn0fvb0iw2kb"; + version = "1.1.1.0"; + sha256 = "1iqrpvh79y6a3b56ybafyxc98mlilnx928aqclx6h78hs10qlysy"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -101018,6 +101106,30 @@ self: { license = lib.licenses.mit; }) {}; + "generic-data_0_9_2_1" = callPackage + ({ mkDerivation, ap-normalize, base, base-orphans, contravariant + , criterion, deepseq, generic-lens, ghc-boot-th, inspection-testing + , one-liner, show-combinators, tasty, tasty-hunit, template-haskell + , unordered-containers + }: + mkDerivation { + pname = "generic-data"; + version = "0.9.2.1"; + sha256 = "0hs5ahl1nx61kw5j0pnwgjrph7jgqq0djma956ksz6aivzldjf7q"; + libraryHaskellDepends = [ + ap-normalize base base-orphans contravariant ghc-boot-th + show-combinators + ]; + testHaskellDepends = [ + base generic-lens inspection-testing one-liner show-combinators + tasty tasty-hunit template-haskell unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Deriving instances with GHC.Generics and related utilities"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-data-surgery" = callPackage ({ mkDerivation, base, first-class-families, generic-data , show-combinators, tasty, tasty-hunit @@ -104924,53 +105036,47 @@ self: { "ghcup" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base - , base16-bytestring, binary, bytestring, bz2, case-insensitive - , casing, concurrent-output, containers, cryptohash-sha256 - , generic-arbitrary, generics-sop, haskus-utils-types - , haskus-utils-variant, hpath, hpath-directory, hpath-filepath - , hpath-io, hpath-posix, hspec, hspec-golden-aeson, libarchive - , lzma-static, megaparsec, monad-logger, mtl, optics, optics-vl - , optparse-applicative, os-release, parsec, pretty, pretty-terminal - , QuickCheck, quickcheck-arbitrary-adt, regex-posix, resourcet - , safe, safe-exceptions, split, streamly, streamly-bytestring - , streamly-posix, strict-base, string-interpolate, template-haskell - , text, time, transformers, unix, unix-bytestring - , unordered-containers, uri-bytestring, utf8-string, vector - , versions, vty, word8, yaml, zlib + , base16-bytestring, binary, bytestring, bz2, Cabal, cabal-plan + , case-insensitive, casing, containers, cryptohash-sha256, deepseq + , directory, disk-free-space, filepath, generic-arbitrary + , haskus-utils-types, haskus-utils-variant, hspec, hspec-discover + , hspec-golden-aeson, HsYAML-aeson, libarchive, lzma-static + , megaparsec, mtl, optics, optparse-applicative, os-release, pretty + , pretty-terminal, QuickCheck, quickcheck-arbitrary-adt + , regex-posix, resourcet, safe, safe-exceptions, split, strict-base + , template-haskell, temporary, text, time, transformers, unix + , unix-bytestring, unliftio-core, unordered-containers + , uri-bytestring, utf8-string, vector, versions, word8, zlib }: mkDerivation { pname = "ghcup"; - version = "0.1.14.2"; - sha256 = "1k18ira2i2ja4hd65fdxk3ab21xzh4fvd982q2rfjshzkds1a3hv"; - revision = "1"; - editedCabalFile = "1vy71ly44jibq8bil0ns80m2zn9gcpnz8f9w2mn4j404gajpqagk"; + version = "0.1.17.2"; + sha256 = "0ggajcaxbr71npn6ihmlw954aj8lmdlwq3k22n9cnf23gg8s0yfv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base base16-bytestring binary bytestring bz2 - case-insensitive casing concurrent-output containers - cryptohash-sha256 generics-sop haskus-utils-types - haskus-utils-variant hpath hpath-directory hpath-filepath hpath-io - hpath-posix libarchive lzma-static megaparsec monad-logger mtl - optics optics-vl os-release parsec pretty pretty-terminal - regex-posix resourcet safe safe-exceptions split streamly - streamly-bytestring streamly-posix strict-base string-interpolate - template-haskell text time transformers unix unix-bytestring - unordered-containers uri-bytestring utf8-string vector versions vty - word8 yaml zlib + aeson async base base16-bytestring binary bytestring bz2 Cabal + case-insensitive casing containers cryptohash-sha256 deepseq + directory disk-free-space filepath haskus-utils-types + haskus-utils-variant HsYAML-aeson libarchive lzma-static megaparsec + mtl optics os-release pretty pretty-terminal regex-posix resourcet + safe safe-exceptions split strict-base template-haskell temporary + text time transformers unix unix-bytestring unliftio-core + unordered-containers uri-bytestring vector versions word8 zlib ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers haskus-utils-variant - hpath hpath-filepath hpath-io libarchive megaparsec monad-logger - mtl optics optparse-applicative pretty pretty-terminal regex-posix - resourcet safe safe-exceptions string-interpolate template-haskell - text transformers uri-bytestring utf8-string versions yaml + aeson aeson-pretty async base bytestring cabal-plan containers + deepseq filepath haskus-utils-variant HsYAML-aeson libarchive + megaparsec mtl optics optparse-applicative pretty pretty-terminal + regex-posix resourcet safe safe-exceptions template-haskell text + transformers uri-bytestring utf8-string versions ]; testHaskellDepends = [ - base bytestring containers generic-arbitrary hpath hspec + base bytestring containers generic-arbitrary hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt text uri-bytestring versions ]; + testToolDepends = [ hspec-discover ]; description = "ghc toolchain installer"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ maralorn ]; @@ -117207,9 +117313,9 @@ self: { }) {}; "hakyll" = callPackage - ({ mkDerivation, aeson, array, base, binary, blaze-html - , blaze-markup, bytestring, containers, data-default, deepseq - , directory, file-embed, filepath, fsnotify, hashable, http-conduit + ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup + , bytestring, containers, data-default, deepseq, directory + , file-embed, filepath, fsnotify, hashable, http-conduit , http-types, lifted-async, lrucache, mtl, network-uri , optparse-applicative, pandoc, parsec, process, QuickCheck, random , regex-tdfa, resourcet, scientific, tagsoup, tasty, tasty-golden @@ -117219,15 +117325,15 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.14.1.0"; - sha256 = "1s0y7fc48zw0dkk4m9gv53mmklk1zfk4rkf7r6xawnkg5cj6sjpc"; + version = "4.15.0.1"; + sha256 = "09arikf44i4llffhi948fy2zdj76zym7z9swjx5p5axc7qvc4sqh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson array base binary blaze-html blaze-markup bytestring - containers data-default deepseq directory file-embed filepath - fsnotify hashable http-conduit http-types lifted-async lrucache mtl + aeson base binary blaze-html blaze-markup bytestring containers + data-default deepseq directory file-embed filepath fsnotify + hashable http-conduit http-types lifted-async lrucache mtl network-uri optparse-applicative pandoc parsec process random regex-tdfa resourcet scientific tagsoup template-haskell text time time-locale-compat unordered-containers vector wai wai-app-static @@ -119921,17 +120027,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashable_1_3_3_0" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit - , integer-gmp, QuickCheck, random, test-framework + "hashable_1_3_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , HUnit, integer-gmp, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; - version = "1.3.3.0"; - sha256 = "1p45rck6avm0ng963mmhphhwjljv9wcb7r2171cnka5nizjpi9cr"; + version = "1.3.4.0"; + sha256 = "0f796cs8mmk370c26qwc6g9wgx3r74m4p6m8909j1kdl5hj1sr86"; libraryHaskellDepends = [ - base bytestring deepseq ghc-prim integer-gmp text + base bytestring containers deepseq ghc-prim integer-gmp text ]; testHaskellDepends = [ base bytestring ghc-prim HUnit QuickCheck random test-framework @@ -120076,6 +120182,21 @@ self: { broken = true; }) {}; + "hashes" = callPackage + ({ mkDerivation, base, bytestring, criterion, memory, QuickCheck }: + mkDerivation { + pname = "hashes"; + version = "0.1.0.1"; + sha256 = "0r686g8ksgl680s11m433z0d5b9hq8dz7k2as31qm2r2b6rvg7yd"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion memory QuickCheck + ]; + description = "Hash functions"; + license = lib.licenses.mit; + }) {}; + "hashflare" = callPackage ({ mkDerivation, base, containers, simple-money }: mkDerivation { @@ -141084,8 +141205,8 @@ self: { ({ mkDerivation, base, hspec, tmp-proc }: mkDerivation { pname = "hspec-tmp-proc"; - version = "0.5.0.0"; - sha256 = "00w5rly9a4pkr3qmj3924md4nlkn55jwl8a4dnnmpzbinhz4mav1"; + version = "0.5.0.1"; + sha256 = "0zn0q3cvszpnb0lqlnizfh8v0z2kasjl414ny4pzni6yf13m2jfh"; libraryHaskellDepends = [ base hspec tmp-proc ]; description = "Simplify use of tmp-proc from hspec tests"; license = lib.licenses.bsd3; @@ -158373,19 +158494,19 @@ self: { , cryptohash-md5, derive-storable, derive-storable-plugin , distributive, file-embed, foldl, geomancy, GLFW-b, ktx-codec , neat-interpolation, optparse-applicative, optparse-simple - , resourcet, rio, rio-app, StateVar, tagged, template-haskell, text - , transformers, unagi-chan, unliftio, vector, vulkan, vulkan-utils - , VulkanMemoryAllocator, zstd + , resourcet, rio, rio-app, serialise, StateVar, tagged + , template-haskell, text, transformers, unagi-chan, unliftio + , vector, vulkan, vulkan-utils, VulkanMemoryAllocator, zstd }: mkDerivation { pname = "keid-core"; - version = "0.1.2.0"; - sha256 = "07l493nn691bn6b2c4z684cjfj589vkip6068szc8j2j9pwqgr23"; + version = "0.1.3.0"; + sha256 = "0nvrspga2s0w8yydk3m3vn1c9dv40zk66bbsfmskxck950n5qw6k"; libraryHaskellDepends = [ adjunctions base binary bytestring cryptohash-md5 derive-storable derive-storable-plugin distributive file-embed foldl geomancy GLFW-b ktx-codec neat-interpolation optparse-applicative - optparse-simple resourcet rio rio-app StateVar tagged + optparse-simple resourcet rio rio-app serialise StateVar tagged template-haskell text transformers unagi-chan unliftio vector vulkan vulkan-utils VulkanMemoryAllocator zstd ]; @@ -158418,8 +158539,8 @@ self: { }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.2.1"; - sha256 = "0dij5rnzzcbggc1mvsg123aynx1s337vv1a4px965aj0ny3lfn0k"; + version = "0.1.3.0"; + sha256 = "15cp34k0kmis9wf5r8x2pfihl263fjwmwfkpi9fn7p5snn36pc28"; enableSeparateDataOutput = true; libraryHaskellDepends = [ adjunctions aeson base bytestring derive-storable @@ -190421,18 +190542,19 @@ self: { ({ mkDerivation, aeson, array, base, base64, binary, bytestring , case-insensitive, containers, ede, enclosed-exceptions , http-client, http-types, network, ngx-export, ngx-export-tools - , prettyprinter, safe, snap-core, snap-server, template-haskell - , text, time, trifecta, unordered-containers + , pcre-heavy, pcre-light, prettyprinter, safe, snap-core + , snap-server, template-haskell, text, time, trifecta + , unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.7.0.0"; - sha256 = "0d7p227s33sg5g1ck5s9pmcwnwvvpanbzyq2qc54bzpawpvn5kwi"; + version = "0.8.0.0"; + sha256 = "03s47hzw82w2wgyffdqvgcf4i0nz1vmaim7f3j8pniaa2b3xj3gv"; libraryHaskellDepends = [ aeson array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-types network - ngx-export ngx-export-tools prettyprinter safe snap-core - snap-server template-haskell text time trifecta + ngx-export ngx-export-tools pcre-heavy pcre-light prettyprinter + safe snap-core snap-server template-haskell text time trifecta unordered-containers ]; description = "More extra tools for Nginx haskell module"; @@ -196195,6 +196317,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "operational_0_2_4_0" = callPackage + ({ mkDerivation, base, mtl, random }: + mkDerivation { + pname = "operational"; + version = "0.2.4.0"; + sha256 = "1hwmwbsxzwv68b39rv4gn3da6irv8zm89gqrkc3rdsgwi5ziyn3i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl ]; + executableHaskellDepends = [ base mtl random ]; + description = "Implementation of difficult monads made easy with operational semantics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "operational-alacarte" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -199992,21 +200129,24 @@ self: { "parameterized-utils" = callPackage ({ mkDerivation, base, base-orphans, constraints, containers - , deepseq, ghc-prim, hashable, hashtables, hedgehog, lens, mtl + , deepseq, ghc-prim, hashable, hashtables, hedgehog + , hedgehog-classes, indexed-traversable, lens, mtl, profunctors , tasty, tasty-ant-xml, tasty-hedgehog, tasty-hunit , template-haskell, text, th-abstraction, vector }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.3.0"; - sha256 = "1222lsdf4jbxwinv88g0sdnmbfyyxjmhfiinmasi5qbgkay4907l"; + version = "2.1.4.0"; + sha256 = "16hdmlpyjg9gbal195wpglb11i9qbaw8khp3c1433kgdlqz56hj7"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable - hashtables lens mtl template-haskell text th-abstraction vector + hashtables indexed-traversable lens mtl profunctors + template-haskell text th-abstraction vector ]; testHaskellDepends = [ - base ghc-prim hashable hashtables hedgehog lens mtl tasty - tasty-ant-xml tasty-hedgehog tasty-hunit + base ghc-prim hashable hashtables hedgehog hedgehog-classes + indexed-traversable lens mtl tasty tasty-ant-xml tasty-hedgehog + tasty-hunit ]; description = "Classes and data structures for working with data-kind indexed types"; license = lib.licenses.bsd3; @@ -202230,15 +202370,15 @@ self: { license = lib.licenses.asl20; }) {}; - "pcre2_2_0_1" = callPackage + "pcre2_2_0_2" = callPackage ({ mkDerivation, base, containers, criterion, hspec, microlens , microlens-platform, mtl, pcre-light, regex-pcre-builtin , template-haskell, text }: mkDerivation { pname = "pcre2"; - version = "2.0.1"; - sha256 = "0f93z99qhlhyvq7xsfn0nap9cxpxg2hs7790jqc5hi5kmqxlwvmy"; + version = "2.0.2"; + sha256 = "0v96cxkx1c9x9n5z2fh1xawgrnaz00pf7ip76my8r92rzayzy0kw"; libraryHaskellDepends = [ base containers microlens mtl template-haskell text ]; @@ -204938,8 +205078,8 @@ self: { ({ mkDerivation, base, subG }: mkDerivation { pname = "phonetic-languages-permutations-array"; - version = "0.1.0.0"; - sha256 = "1r8fwdphn3h9zpbrdbbgmqjwv6gwcl205ahr3kqwz6sfg78bflj4"; + version = "0.2.0.0"; + sha256 = "0czrkhiplkblgsf6gq17m4hrwas4j4gj1hlq9zab8dcak39qkmc8"; libraryHaskellDepends = [ base subG ]; description = "Permutations and universal set related functions for the phonetic-languages series"; license = lib.licenses.mit; @@ -248716,8 +248856,8 @@ self: { }: mkDerivation { pname = "souffle-haskell"; - version = "3.0.0"; - sha256 = "0zwz28w8fmz8lfwd5bzhysc43y5gfsa1px2xhlkxg5psy0j1935q"; + version = "3.1.0"; + sha256 = "1sjdfrhvncsz5lg3bv29x4j2dk0dn7c5mcaj61al8ksh9r51y05l"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl process template-haskell temporary text text-short @@ -251321,8 +251461,8 @@ self: { }: mkDerivation { pname = "stack-clean-old"; - version = "0.3.1"; - sha256 = "034y2a8zhfjrf2wjqhsvkxycwypyykyq9abq2ir33nadgxlshfk4"; + version = "0.4"; + sha256 = "180jpmdvc0lkzb4fcr88y370j150vr74ih4hsypjydn0x3khx3f1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -255563,8 +255703,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "string-interpreter"; - version = "0.5.2.0"; - sha256 = "1i6y41kyhbarwsppm55rlb1ddqihnpcc89yfgsd8mjgmbrmpsr3l"; + version = "0.5.3.0"; + sha256 = "0ny0py7fhcbv1zkr96ngypb9mf241avds0i77lynnpig96j1ay14"; libraryHaskellDepends = [ base ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; @@ -269438,19 +269578,22 @@ self: { "tmp-proc" = callPackage ({ mkDerivation, async, base, bytestring, connection, data-default - , doctest, hspec, http-client, http-client-tls, http-types, mtl - , network, process, req, text, unliftio, wai, warp, warp-tls + , hspec, http-client, http-client-tls, http-types, mtl, network + , process, req, text, unliftio, wai, warp, warp-tls }: mkDerivation { pname = "tmp-proc"; - version = "0.5.0.0"; - sha256 = "0vqmi5dpq7b8yn1djlpg662nwwjqzhqblz85f83qvlhiyikqkhdp"; + version = "0.5.0.1"; + sha256 = "11mh34jirabrdx9jbai42r0pgbx2q2v6028zigjznvhrsc7lkk4l"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring mtl network process text unliftio wai warp warp-tls ]; testHaskellDepends = [ - base bytestring connection data-default doctest hspec http-client + base bytestring connection data-default hspec http-client http-client-tls http-types req text wai warp warp-tls ]; description = "Run 'tmp' processes in integration tests"; @@ -284452,8 +284595,9 @@ self: { }: mkDerivation { pname = "wai-middleware-delegate"; - version = "0.1.2.2"; - sha256 = "0g2zbvzi3d3pd3b4a2lrhp3vxk93agcg236yif0wghw3d0rqv1mr"; + version = "0.1.2.4"; + sha256 = "17r2qay83xnsg6f61bxpy7kvjw73827hdl8srxiwqirw6zzc1pha"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ async base blaze-builder bytestring case-insensitive conduit conduit-extra data-default http-client http-conduit http-types @@ -290195,8 +290339,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.10.0"; - sha256 = "1168vg2f3qd5yiwg2fcps0ciqpwns6scyk89bd07ws3qh6kayqfr"; + version = "0.11.0"; + sha256 = "1yhf1gh23ccvhkx8xbmiaa24r1mrilyvq3fwa15h8imf7qfvmr6x"; libraryHaskellDepends = [ base containers mtl pretty xml ]; description = "Parses XML files used by the XCB project"; license = lib.licenses.bsd3; @@ -293340,8 +293484,8 @@ self: { }: mkDerivation { pname = "yapb"; - version = "0.1.3"; - sha256 = "11p3ygnfpsh9dqlnpppi02baa5bk86pw6w6f1gawdd848qh7q9if"; + version = "0.1.3.1"; + sha256 = "1jscmf1rm6fknsd4088ij0nsldgrz14v4xwfkbc5500hg81ikpqv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/001-remove-vendoring.diff b/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/001-remove-vendoring.diff deleted file mode 100644 index 253740df8b..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/001-remove-vendoring.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/makefile b/makefile -index a5f3d75..f617e25 100644 ---- a/makefile -+++ b/makefile -@@ -109,9 +109,7 @@ ${bd}/%.o: src/builtins/%.c - - - src/gen/customRuntime: -- @echo "Copying precompiled bytecode from the bytecode branch" -- git checkout remotes/origin/bytecode src/gen/{compiler,formatter,runtime0,runtime1,src} -- git reset src/gen/{compiler,formatter,runtime0,runtime1,src} -+ @echo "src/gen/ files retrieved externally" - ${bd}/load.o: src/gen/customRuntime - - -include $(bd)/*.d diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix index 68bd9a2b87..71fdcae005 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -29,23 +29,18 @@ stdenv.mkDerivation rec { dontConfigure = true; - patches = [ - # self-explaining - ./001-remove-vendoring.diff - ]; - postPatch = '' sed -i '/SHELL =.*/ d' makefile ''; - preBuild = - if genBytecode - then '' - ${bqn-path} genRuntime ${mbqn-source} - '' - else '' - cp ${cbqn-bytecode-files}/src/gen/{compiler,formatter,runtime0,runtime1,src} src/gen/ - ''; + preBuild = '' + # inform make we are providing the runtime ourselves + touch src/gen/customRuntime + '' + (if genBytecode then '' + ${bqn-path} genRuntime ${mbqn-source} + '' else '' + cp ${cbqn-bytecode-files}/src/gen/{compiler,formatter,runtime0,runtime1,src} src/gen/ + ''); makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix index 1d6abb5950..452d0edc3e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , unzip -, version ? "2.13.1" +, version ? "2.14.3" , sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; x86_64 = "x64"; @@ -10,24 +10,24 @@ aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.13.1"; + version = "2.14.3"; in { "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya"; + sha256 = "0is4gz99i06yb4jisxcz2c15jqkaz6ayhg9b8zb3s0s8yp59r2iq"; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq"; + sha256 = "0wg1mnj4qrv22z510032jnwb3z39gvzlrv5wic2ci5mg7316xlya"; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj"; + sha256 = "0gnjk3lh63m0naaw67g9w7wys5cgx2ipzd1dznqnlvxp2vj1gj5p"; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc"; + sha256 = "1j7snnf3a0jly85njq8npqikrdhz9lkirhvik1hkpd9sv7qfbvd6"; }; } }: @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.dartlang.org/"; - maintainers = with maintainers; [ grburst thiagokokada ]; + maintainers = with maintainers; [ grburst thiagokokada flexagoon ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' Dart is a class-based, single inheritance, object-oriented language diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix index 2b2fd9dc51..566e2f60af 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.1.1"; - sha256 = "sha256-y5QtLCrYeMT4WdHkFngKv02CZ35eYZF3sjfI5OZNAH0="; + version = "24.1.2"; + sha256 = "sha256-P0XU+gqDyhW0QQf1UzO+CV9Yc6YP70MRf3MLgdKzeU4="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix index 7bc067c92c..45c12b9720 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, fetchFromGitHub, pkgs, buildPackages +{ config, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, pkgs, buildPackages , callPackage , enableThreading ? true, coreutils, makeWrapper }: @@ -41,7 +41,14 @@ let ] ++ optional stdenv.isSunOS ./ld-shared.patch ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] - ++ optional crossCompiling ./MakeMaker-cross.patch; + ++ optionals crossCompiling [ + ./MakeMaker-cross.patch + # https://github.com/arsv/perl-cross/pull/120 + (fetchpatch { + url = "https://github.com/arsv/perl-cross/commit/3c318ae6572f8b36cb077c8b49c851e2f5fe181e.patch"; + sha256 = "0cmcy8bams3c68f6xadl52z2w378wcpdjzi3qi4pcyvcfs011l6g"; + }) + ]; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -59,7 +66,7 @@ let unset src ''; - # Build a thread-safe Perl with a dynamic libperls.o. We need the + # Build a thread-safe Perl with a dynamic libperl.so. We need the # "installstyle" option to ensure that modules are put under # $out/lib/perl5 - this is the general default, but because $out # contains the string "perl", Configure would select $out/lib. @@ -71,13 +78,14 @@ let ++ [ "-Uinstallusrbinperl" "-Dinstallstyle=lib/perl5" - "-Duseshrplib" + ] ++ lib.optional (!crossCompiling) "-Duseshrplib" ++ [ "-Dlocincpth=${libcInc}/include" "-Dloclibpth=${libcLib}/lib" ] ++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads" + ++ optional stdenv.hostPlatform.isStatic "--all-static" ++ optionals (!crossCompiling) [ "-Dprefix=${placeholder "out"}" "-Dman1dir=${placeholder "out"}/share/man/man1" 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 353535ed68..7bb2bb2889 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -45,9 +45,7 @@ # enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility. # enabling LTO on 32bit arch causes downstream packages to fail when linking # enabling LTO on *-darwin causes python3 to fail when linking. -# enabling LTO with musl and dynamic linking fails with a linker error although it should -# be possible as alpine is doing it: https://github.com/alpinelinux/aports/blob/a8ccb04668c7729e0f0db6c6ff5f25d7519e779b/main/python3/APKBUILD#L82 -, enableLTO ? stdenv.is64bit && stdenv.isLinux && !(stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isStatic) +, enableLTO ? stdenv.is64bit && stdenv.isLinux , reproducibleBuild ? false , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: diff --git a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix index d3ff6f48fe..49cf6e095d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix @@ -35,6 +35,6 @@ mkDerivation rec { homepage = "https://supercollider.github.io"; maintainers = with maintainers; [ mrmebelman ]; license = licenses.gpl3Plus; - platforms = [ "x686-linux" "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/eigen/default.nix b/third_party/nixpkgs/pkgs/development/libraries/eigen/default.nix index 3718058042..18fe7450d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/eigen/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/eigen/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "eigen"; - version = "3.3.9"; + version = "3.4.0"; src = fetchFromGitLab { owner = "libeigen"; repo = pname; rev = version; - sha256 = "sha256-JMIG7CLMndUsECfbKpXE3BtVFuAjn+CZvf8GXZpLkFQ="; + sha256 = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/eigen/include-dir.patch b/third_party/nixpkgs/pkgs/development/libraries/eigen/include-dir.patch index 42f8e189c0..9928bbdbed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/eigen/include-dir.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/eigen/include-dir.patch @@ -1,23 +1,22 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ +@@ -1,5 +1,5 @@ + # cmake_minimum_require must be the first command of the file +-cmake_minimum_required(VERSION 3.5.0) ++cmake_minimum_required(VERSION 3.7.0) + project(Eigen3) --cmake_minimum_required(VERSION 2.8.5) -+cmake_minimum_required(VERSION 3.7) - - # guard against in-source builds - -@@ -407,7 +407,7 @@ set(PKGCONFIG_INSTALL_DIR - CACHE STRING "The directory relative to CMAKE_PREFIX_PATH where eigen3.pc is installed" +@@ -443,7 +443,7 @@ set(PKGCONFIG_INSTALL_DIR + CACHE PATH "The directory relative to CMAKE_INSTALL_PREFIX where eigen3.pc is installed" ) -foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) +foreach(var CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) + # If an absolute path is specified, make it relative to "{CMAKE_INSTALL_PREFIX}". if(IS_ABSOLUTE "${${var}}") - message(FATAL_ERROR "${var} must be relative to CMAKE_PREFIX_PATH. Got: ${${var}}") - endif() -@@ -429,13 +429,6 @@ install(FILES + file(RELATIVE_PATH "${var}" "${CMAKE_INSTALL_PREFIX}" "${${var}}") +@@ -466,13 +466,6 @@ install(FILES DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) @@ -28,10 +27,10 @@ - ) -endif() - - add_subdirectory(Eigen) + install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) - add_subdirectory(doc EXCLUDE_FROM_ALL) -@@ -531,8 +524,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) + +@@ -593,8 +586,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) set ( EIGEN_DEFINITIONS "") @@ -46,8 +45,8 @@ + ) +endif() - # Interface libraries require at least CMake 3.0 - if (NOT CMAKE_VERSION VERSION_LESS 3.0) + include (CMakePackageConfigHelpers) + --- a/eigen3.pc.in +++ b/eigen3.pc.in @@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r diff --git a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix index ecdc1c19ff..0e81e2188a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: +{ lib, stdenv, fetchurl, fetchpatch, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: stdenv.mkDerivation rec { pname = "freeglut"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l"; }; + patches = [ + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + url = "https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c.patch"; + sha256 = "0j43vrnm22mz3r3c43szgcnil19cx9vcydzky9gwzqlyacr51swd"; + stripLen = 2; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix index 36a9309560..3a64cc5639 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix @@ -14,25 +14,19 @@ stdenv.mkDerivation rec { pname = "gd"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; - sha256 = "0n5czhxzinvjvmhkf5l9fwjdx5ip69k5k7pj6zwb6zs1k9dibngc"; + sha256 = "1yypywkh8vphcy4qqpf51kxpb0a3r7rjqk3fc61rpn70hiq092j7"; }; hardeningDisable = [ "format" ]; patches = [ - # Fixes an issue where some other packages would fail to build - # their documentation with an error like: - # "Error: Problem doing text layout" - # - # Can be removed if Wayland can still be built successfully with - # documentation. (fetchpatch { - url = "https://github.com/libgd/libgd/commit/3dd0e308cbd2c24fde2fc9e9b707181252a2de95.patch"; - excludes = [ "tests/gdimagestringft/.gitignore" ]; - sha256 = "12iqlanl9czig9d7c3rvizrigw2iacimnmimfcny392dv9iazhl1"; + name = "CVE-2021-40812.partial.patch"; + url = "https://github.com/libgd/libgd/commit/6f5136821be86e7068fcdf651ae9420b5d42e9a9.patch"; + sha256 = "11rvhd23bl05ksj8z39hwrhqqjm66svr4hl3y230wrc64rvnd2d2"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index edb37d2ddd..679a91d1bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -134,8 +134,6 @@ stdenv.mkDerivation rec { "-DG_DISABLE_CAST_CHECKS" ]; - hardeningDisable = [ "pie" ]; - postPatch = '' chmod +x gio/tests/gengiotypefuncs.py patchShebangs gio/tests/gengiotypefuncs.py diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix index fe8fd6d80c..a715ba752e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -120,6 +120,9 @@ stdenv.mkDerivation ({ }) ./fix-x64-abi.patch + + /* https://github.com/NixOS/nixpkgs/pull/137601 */ + ./nix-nss-open-files.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/nix-nss-open-files.patch b/third_party/nixpkgs/pkgs/development/libraries/glibc/nix-nss-open-files.patch new file mode 100644 index 0000000000..9a515c4662 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/nix-nss-open-files.patch @@ -0,0 +1,51 @@ +diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c +index 1db9e46127..3a567e0224 100644 +--- a/nss/nss_files/files-XXX.c ++++ b/nss/nss_files/files-XXX.c +@@ -75,8 +75,20 @@ internal_setent (FILE **stream) + + if (*stream == NULL) + { +- *stream = __nss_files_fopen (DATAFILE); +- ++ const char *file = DATAFILE; ++ ++ #ifdef NIX_DATAFILE ++ // use the Nix environment variable such as `NIX_ETC_PROTOCOLS` ++ char *path = secure_getenv (NIX_DATAFILE); ++ ++ // if the environment variable is set, then read from the /nix/store entry instead ++ if (path && path[0]) { ++ file = path; ++ } ++ #endif ++ ++ *stream = __nss_files_fopen (file); ++ + if (*stream == NULL) + status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; + } +diff --git a/nss/nss_files/files-proto.c b/nss/nss_files/files-proto.c +index c30bedc0aa..b321e68d3c 100644 +--- a/nss/nss_files/files-proto.c ++++ b/nss/nss_files/files-proto.c +@@ -23,6 +23,7 @@ NSS_DECLARE_MODULE_FUNCTIONS (files) + + #define ENTNAME protoent + #define DATABASE "protocols" ++#define NIX_DATAFILE "NIX_ETC_PROTOCOLS" + + struct protoent_data {}; + +diff --git a/nss/nss_files/files-service.c b/nss/nss_files/files-service.c +index bfc2590699..0bff36aee5 100644 +--- a/nss/nss_files/files-service.c ++++ b/nss/nss_files/files-service.c +@@ -24,6 +24,7 @@ NSS_DECLARE_MODULE_FUNCTIONS (files) + + #define ENTNAME servent + #define DATABASE "services" ++#define NIX_DATAFILE "NIX_ETC_SERVICES" + + struct servent_data {}; + 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 fd4a420012..e6ad0f1ae3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.0.0"; + version = "5.2.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hyrmh9r1zd5kjh5ch9d7bhk2kphbqhm7ijfxfkcdln8q0rnd0k4"; + sha256 = "ybNPoCZU9WziL6CIJ9idtLqBYxsubX0x6mXRPHKUMOk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 5d7e04e759..de9bf8d972 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; - rev = "${pname}-${version}"; + rev = "intel-gmmlib-${version}"; sha256 = "0dzqfgbd0fxl8rxgf5nmj1jd4izzaqfb0s53l96qwz1j57q5ybj5"; }; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { OpenCL(TM) and the Intel(R) Media Driver for VAAPI. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos SuperSandro2000 ]; }; } 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 a3825df47a..c6271b13a8 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 @@ -1,7 +1,14 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config -, libva, libpciaccess, intel-gmmlib -, enableX11 ? stdenv.isLinux, libX11 +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, libva +, libpciaccess +, intel-gmmlib +, enableX11 ? stdenv.isLinux +, libX11 }: stdenv.mkDerivation rec { @@ -11,12 +18,20 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchFromGitHub { - owner = "intel"; - repo = "media-driver"; - rev = "intel-media-${version}"; + owner = "intel"; + repo = "media-driver"; + rev = "intel-media-${version}"; sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr"; }; + patches = [ + # fix platform detection + (fetchpatch { + url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; + sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0="; + }) + ]; + cmakeFlags = [ "-DINSTALL_DRIVER_SYSCONF=OFF" "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri" @@ -24,6 +39,8 @@ stdenv.mkDerivation rec { "-DMEDIA_RUN_TEST_SUITE=OFF" ]; + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libva libpciaccess intel-gmmlib ] @@ -45,6 +62,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; license = with licenses; [ bsd3 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ primeos jfrankenau ]; + maintainers = with maintainers; [ primeos jfrankenau SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kirigami-addons/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kirigami-addons/default.nix new file mode 100644 index 0000000000..3af1c44bf8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/kirigami-addons/default.nix @@ -0,0 +1,44 @@ +{ lib +, mkDerivation +, fetchFromGitLab + +, cmake +, extra-cmake-modules + +, ki18n +, kirigami2 +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "kirigami-addons"; + version = "21.05"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = pname; + rev = "v${version}"; + sha256 = "0pwkpag15mvzhd3hvdwx0a8ajwq9j30r6069vsx85bagnag3zanh"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + ki18n + kirigami2 + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Add-ons for the Kirigami framework"; + homepage = "https://invent.kde.org/libraries/kirigami-addons"; + # https://invent.kde.org/libraries/kirigami-addons/-/blob/b197d98fdd079b6fc651949bd198363872d1be23/src/treeview/treeviewplugin.cpp#L1-5 + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ samueldr ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix index 6dd23d219d..3cc2e0eee8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix @@ -13,10 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - # This can be removed after >=1.20.0, or if the build suceeds with - # pie enabled (default on Musl). - hardeningDisable = [ "pie" ]; - # This problem is gone on libiscsi master. NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix index 5e3b0c6798..22a6de9fd9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ]; - patches = [ ./fedora-fixes.patch ]; + patches = [ + ./fedora-fixes.patch + ./fno-common.patch + ]; doCheck = false; # fails diff --git a/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/fno-common.patch b/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/fno-common.patch new file mode 100644 index 0000000000..be70391ada --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/fno-common.patch @@ -0,0 +1,32 @@ +Fix build faiure on gcc-10 (defaults to -fno-common). +--- a/src/omx_reference_resource_manager.c ++++ b/src/omx_reference_resource_manager.c +@@ -30,6 +30,11 @@ + #include "base/omx_base_component.h" + #include "queue.h" + ++int globalIndex; ++NameIndexType *listOfcomponentRegistered; ++ComponentListType **globalComponentList; ++ComponentListType **globalWaitingComponentList; ++ + /** + * This is the static base pointer of the list + */ +--- a/src/omx_reference_resource_manager.h ++++ b/src/omx_reference_resource_manager.h +@@ -49,10 +49,10 @@ struct NameIndexType { + }; + + +-int globalIndex; +-NameIndexType *listOfcomponentRegistered; +-ComponentListType **globalComponentList; +-ComponentListType **globalWaitingComponentList; ++extern int globalIndex; ++extern NameIndexType *listOfcomponentRegistered; ++extern ComponentListType **globalComponentList; ++extern ComponentListType **globalWaitingComponentList; + + OMX_ERRORTYPE RM_RegisterComponent(char *name, int max_components); + OMX_ERRORTYPE addElemToList(ComponentListType **list, OMX_COMPONENTTYPE *openmaxStandComp, int index, OMX_BOOL bIsWaiting); diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix index 976c39a9ef..546d89449d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "sha256-q938WA+vJDqGVutVzWdEP7ujDAmfj3vluliomVd0om0="; + sha256 = "sha256-riNcIC60gw9qxF8UmPjq03XuD3of0BxKbZpgwjMNh3c="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix index 85afe93ea7..562820bed6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix @@ -15,7 +15,10 @@ }: let - enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind; + enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind + # Apparently valgrind doesn't support some new ARM features on (some) Hydra machines: + # VEX: Mismatch detected between RDMA and atomics features. + && !stdenv.isAarch64; in stdenv.mkDerivation rec { pname = "libpsl"; version = "0.21.0"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqofono/0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch b/third_party/nixpkgs/pkgs/development/libraries/libqofono/0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch new file mode 100644 index 0000000000..b93562a663 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libqofono/0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch @@ -0,0 +1,29 @@ +From 8b508d427c4fd472639ba8d4a0d3b8ab69e3f2e3 Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel +Date: Tue, 30 Mar 2021 16:37:52 -0400 +Subject: [PATCH] [NixOS] Skip tests, they're shock-full of hardcoded FHS paths + +--- + libqofono.pro | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/libqofono.pro b/libqofono.pro +index 60d0b89..638a4a8 100644 +--- a/libqofono.pro ++++ b/libqofono.pro +@@ -1,5 +1,5 @@ + TEMPLATE = subdirs +-SUBDIRS += src plugin test ofonotest ++SUBDIRS += src plugin + OTHER_FILES += \ + rpm/libqofono-qt5.spec \ + TODO \ +@@ -7,5 +7,3 @@ OTHER_FILES += \ + + src.target = src-target + plugin.depends = src-target +-test.depends = src-target +-ofonotest.depends = src-target +-- +2.28.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch b/third_party/nixpkgs/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch new file mode 100644 index 0000000000..94b4c61bef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch @@ -0,0 +1,34 @@ +From 04106010ae2a13b3a2a93e210062998ee51778ca Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel +Date: Tue, 30 Mar 2021 15:47:38 -0400 +Subject: [PATCH] [NixOS] provide mobile-broadband-provider-info path + +--- + src/qofonoconnectioncontext.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/qofonoconnectioncontext.cpp b/src/qofonoconnectioncontext.cpp +index b5877ed..455167c 100644 +--- a/src/qofonoconnectioncontext.cpp ++++ b/src/qofonoconnectioncontext.cpp +@@ -346,7 +346,7 @@ bool QOfonoConnectionContext::validateProvisioning(const QString &providerString + QXmlQuery query; + QString provider = providerString; + +- query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); ++ query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); + + if (provider.contains("\'")) { + provider = provider.replace("\'", "'"); +@@ -457,7 +457,7 @@ void QOfonoConnectionContext::provision(const QString &provider, const QString & + { + #ifdef QOFONO_PROVISIONING + QXmlQuery query; +- query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); ++ query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); + + QString providerStr = provider; + if (providerStr.contains("\'")) { +-- +2.28.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqofono/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqofono/default.nix new file mode 100644 index 0000000000..361421466e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libqofono/default.nix @@ -0,0 +1,58 @@ +{ lib +, substituteAll +, mkDerivation +, fetchFromGitLab +, mobile-broadband-provider-info +, qmake +, qtbase +, qtdeclarative +}: + +mkDerivation rec { + pname = "libqofono"; + version = "0.103"; + + src = fetchFromGitLab { + domain = "git.sailfishos.org"; + owner = "mer-core"; + repo = "libqofono"; + rev = version; + sha256 = "1ly5aj412ljcjvhqyry6nhiglbzzhczsy1a6w4i4fja60b2m1z45"; + }; + + patches = [ + (substituteAll { + src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch; + inherit mobile-broadband-provider-info; + }) + ./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch + ]; + + # Replaces paths from the Qt store path to this library's store path. + postPatch = '' + substituteInPlace src/src.pro \ + --replace /usr $out \ + --replace '$$[QT_INSTALL_PREFIX]' "$out" \ + --replace 'target.path = $$[QT_INSTALL_LIBS]' "target.path = $out/lib" + + substituteInPlace plugin/plugin.pro \ + --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}' + ''; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtbase + qtdeclarative + ]; + + meta = with lib; { + description = "Library for accessing the ofono daemon, and declarative plugin for it"; + homepage = "https://git.sailfishos.org/mer-core/libqofono/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ samueldr ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix index bda7f72a55..643752da1d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, xz, coreutils }: +{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, coreutils }: stdenv.mkDerivation rec { pname = "libunwind"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0dc46flppifrv2z0mrdqi60165ghxm1wk0g47vcbyzjdplqwjnfz"; }; - patches = [ ./backtrace-only-with-glibc.patch ]; + patches = [ + ./backtrace-only-with-glibc.patch + + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + url = "https://github.com/libunwind/libunwind/commit/29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e.patch"; + sha256 = "1angwfq6h0jskg6zx8g6w9min38g5mgmrcbppcy5hqn59cgsxbw0"; + }) + ]; postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix index 2d41863851..10f90a16c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "minimal"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "1zfv4kjx0715sy62lkpv0s31f9xwy232z5zwqi5all4w1jr630i7"; + sha256 = "0vsvli3xc0gqqp06p7wkm973lhr7c5qgnyz5jfjmf8kv75rajazp"; }; outputs = [ "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index 81d553547c..1d7b73a541 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -13,6 +13,8 @@ , withValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light , enableGalliumNine ? stdenv.isLinux , enableOSMesa ? stdenv.isLinux +, enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 +, libclc }: /** Packaging design: @@ -31,7 +33,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.2.2"; + version = "21.2.3"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +47,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1i75k6gh76f49vy6kksbsikf593jmgk6slqwbs1fs5s2jyzz3an4"; + sha256 = "0x3ivd34j938js2iffzlvnlj4hwywxrscd8q1rvq894x2m52hibj"; }; # TODO: @@ -53,7 +55,7 @@ self = stdenv.mkDerivation { # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl - ./opencl-install-dir.patch + ./opencl.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch # Fix `-Werror=int-conversion` pthread warnings on musl. # TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available @@ -88,7 +90,8 @@ self = stdenv.mkDerivation { outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa" - ++ lib.optional stdenv.isLinux "driversdev"; + ++ lib.optional stdenv.isLinux "driversdev" + ++ lib.optional enableOpenCL "opencl"; # TODO: Figure out how to enable opencl without having a runtime dependency on clang mesonFlags = [ @@ -118,6 +121,9 @@ self = stdenv.mkDerivation { "-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) ] ++ optionals stdenv.isLinux [ "-Dglvnd=true" + ] ++ optionals enableOpenCL [ + "-Dgallium-opencl=icd" # Enable the gallium OpenCL frontend + "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" ]; buildInputs = with xorg; [ @@ -128,6 +134,7 @@ self = stdenv.mkDerivation { ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] ++ lib.optionals stdenv.isDarwin [ libunwind ] + ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped ] ++ lib.optional withValgrind valgrind-light; depsBuildBuild = [ pkg-config ]; @@ -162,7 +169,7 @@ self = stdenv.mkDerivation { if [ -n "$(shopt -s nullglob; echo "$out"/lib/lib*_mesa*)" ]; then # Move other drivers to a separate output - mv $out/lib/lib*_mesa* $drivers/lib + mv -t $drivers/lib $out/lib/lib*_mesa* fi # Update search path used by glvnd @@ -175,6 +182,17 @@ self = stdenv.mkDerivation { for js in $drivers/share/vulkan/icd.d/*.json; do substituteInPlace "$js" --replace "$out" "$drivers" done + '' + optionalString enableOpenCL '' + # Move OpenCL stuff + mkdir -p $opencl/lib + mv -t "$opencl/lib/" \ + $out/lib/gallium-pipe \ + $out/lib/libMesaOpenCL* + + # We construct our own .icd file that contains an absolute path. + rm -r $out/etc/OpenCL + mkdir -p $opencl/etc/OpenCL/vendors/ + echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd '' + lib.optionalString enableOSMesa '' # move libOSMesa to $osmesa, as it's relatively big mkdir -p $osmesa/lib @@ -209,7 +227,10 @@ self = stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-common"; + NIX_CFLAGS_COMPILE = optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ + "-UPIPE_SEARCH_DIR" + "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" + ]; passthru = { inherit libdrm; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/opencl-install-dir.patch b/third_party/nixpkgs/pkgs/development/libraries/mesa/opencl-install-dir.patch deleted file mode 100644 index fe85d2c90b..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/opencl-install-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index 317ad8dab4a..5567308caf0 100644 ---- a/src/gallium/targets/opencl/meson.build -+++ b/src/gallium/targets/opencl/meson.build -@@ -68,6 +68,6 @@ if with_opencl_icd - input : 'mesa.icd.in', - output : 'mesa.icd', - install : true, -- install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), -+ install_dir : join_paths(get_option('prefix'), 'etc', 'OpenCL', 'vendors'), - ) - endif diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/opencl.patch b/third_party/nixpkgs/pkgs/development/libraries/mesa/opencl.patch new file mode 100644 index 0000000000..ce6e3d5750 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/opencl.patch @@ -0,0 +1,70 @@ +diff --git a/meson_options.txt b/meson_options.txt +index a7030aba31e..1d2d8814992 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -18,6 +18,12 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + # SOFTWARE. + ++option( ++ 'clang-libdir', ++ type : 'string', ++ value : '', ++ description : 'Locations to search for clang libraries.' ++) + option( + 'platforms', + type : 'array', +diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build +index b77826b6e1e..14fa9ba7177 100644 +--- a/src/gallium/targets/opencl/meson.build ++++ b/src/gallium/targets/opencl/meson.build +@@ -30,6 +30,7 @@ if with_ld_version_script + endif + + llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') ++clang_libdir = get_option('clang-libdir') + opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL' + + polly_dep = null_dep +@@ -60,19 +61,19 @@ else + endif + if not (dep_clang.found() and dep_clang_usable) + dep_clang = [ +- cpp.find_library('clangCodeGen', dirs : llvm_libdir), +- cpp.find_library('clangFrontendTool', dirs : llvm_libdir), +- cpp.find_library('clangFrontend', dirs : llvm_libdir), +- cpp.find_library('clangDriver', dirs : llvm_libdir), +- cpp.find_library('clangSerialization', dirs : llvm_libdir), +- cpp.find_library('clangParse', dirs : llvm_libdir), +- cpp.find_library('clangSema', dirs : llvm_libdir), +- cpp.find_library('clangAnalysis', dirs : llvm_libdir), +- cpp.find_library('clangAST', dirs : llvm_libdir), +- cpp.find_library('clangASTMatchers', dirs : llvm_libdir), +- cpp.find_library('clangEdit', dirs : llvm_libdir), +- cpp.find_library('clangLex', dirs : llvm_libdir), +- cpp.find_library('clangBasic', dirs : llvm_libdir), ++ cpp.find_library('clangCodeGen', dirs : clang_libdir), ++ cpp.find_library('clangFrontendTool', dirs : clang_libdir), ++ cpp.find_library('clangFrontend', dirs : clang_libdir), ++ cpp.find_library('clangDriver', dirs : clang_libdir), ++ cpp.find_library('clangSerialization', dirs : clang_libdir), ++ cpp.find_library('clangParse', dirs : clang_libdir), ++ cpp.find_library('clangSema', dirs : clang_libdir), ++ cpp.find_library('clangAnalysis', dirs : clang_libdir), ++ cpp.find_library('clangAST', dirs : clang_libdir), ++ cpp.find_library('clangASTMatchers', dirs : clang_libdir), ++ cpp.find_library('clangEdit', dirs : clang_libdir), ++ cpp.find_library('clangLex', dirs : clang_libdir), ++ cpp.find_library('clangBasic', dirs : clang_libdir), + polly_dep, polly_isl_dep, + ] + # check clang once more +@@ -120,6 +121,6 @@ if with_opencl_icd + input : 'mesa.icd.in', + output : 'mesa.icd', + install : true, +- install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ++ install_dir : join_paths(get_option('prefix'), 'etc', 'OpenCL', 'vendors'), + ) + endif diff --git a/third_party/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix index 75dd5ecd54..7dbcecab0c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix @@ -25,14 +25,10 @@ stdenv.mkDerivation rec { buildInputs = [ opencl-headers ]; - postPatch = '' - sed -i 's,"/etc/OpenCL/vendors","${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c - ''; - meta = with lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = "https://github.com/OCL-dev/ocl-icd"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix index ee5e849f2e..1fae668290 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.1.1"; + version = "3.1.2"; outputs = [ "bin" "dev" "out" "doc" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "1p0l07vfpb25fx6jcgk1747v8x9xgpifx4cvvgi3g2473wlx6pyb"; + sha256 = "0vyclrrikphwkkpyjg8kzh3qzflzk3d6xsidgqllgfdgllr9wmgv"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix index afb79c7eaf..d5921a5afe 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.optional stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix index 188fa9b16b..dbf8f6b750 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix @@ -1,30 +1,33 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.36"; + version = "10.37"; src = fetchurl { url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2"; - sha256 = "0p3699msps07p40g9426lvxa3b41rg7k2fn7qxl2jm0kh4kkkvx9"; + hash = "sha256-TZWpbouAUpiTtFYr4SZI15i5V7G6Gq45YGu8KrlW0nA="; }; # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 configureFlags = [ "--enable-pcre2-16" "--enable-pcre2-32" - ] ++ lib.optional (!stdenv.hostPlatform.isRiscV && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit"; + ] ++ lib.optional (!stdenv.hostPlatform.isRiscV && + !(stdenv.hostPlatform.isDarwin && + stdenv.hostPlatform.isAarch64)) "--enable-jit"; outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; - doCheck = false; # fails 1 out of 3 tests, looks like a bug - postFixup = '' moveToOutput bin/pcre2-config "$dev" ''; meta = with lib; { - description = "Perl Compatible Regular Expressions"; homepage = "http://www.pcre.org/"; + description = "Perl Compatible Regular Expressions"; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 96040bf9e6..a5ff1f6257 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , removeReferencesTo , python3 , meson @@ -99,6 +100,12 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch + # Fix compilation on AArch64 + # XXX: REMOVE ON NEXT RELEASE + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f8817b439433798bd7217dc4ae72197887b0fc96.diff"; + sha256 = "0j4xds01h20mc606xp90h5v56kf17hf7n06k0xfa9qmmmfrh7i04"; + }) ]; nativeBuildInputs = [ 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 3b8540ca68..10d0d49236 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 @@ -45,10 +45,9 @@ let }; version = "5.212.0-alpha4"; }; - qtwebengine = let - branchName = "5.15.5"; + branchName = "5.15.6"; rev = "v${branchName}-lts"; in { @@ -56,24 +55,26 @@ let src = fetchgit { url = "https://github.com/qt/qtwebengine.git"; - sha256 = "12wf30d34sgn82mbz91xybxyn3j1mhvxda452cfkxm232n1f2kjb"; + sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr"; inherit rev branchName; fetchSubmodules = true; leaveDotGit = true; name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz"; postFetch = '' # remove submodule .git directory - rm -rf $out/src/3rdparty/.git + rm -rf "$out/src/3rdparty/.git" # compress to not exceed the 2GB output limit - mv $out source # try to make a deterministic tarball tar -I 'gzip -n' \ - --sort name \ - --mtime 1970-01-01 \ + --sort=name \ + --mtime=1970-01-01 \ --owner=root --group=root \ --numeric-owner --mode=go=rX,u+rw,a-s \ - -cf $out source + --transform='s@^@source/@' \ + -cf temp -C "$out" . + rm -r "$out" + mv temp "$out" ''; }; }; 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 3cb8a3e801..0d82acc709 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 @@ -11,7 +11,7 @@ , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm -, zlib +, zlib, at-spi2-core # optional dependencies , cups ? null, libmysqlclient ? null, postgresql ? null @@ -68,7 +68,7 @@ stdenv.mkDerivation { ] ++ lib.optional libGLSupported libGL ); - buildInputs = [ python3 ] + buildInputs = [ python3 at-spi2-core ] ++ lib.optionals (!stdenv.isDarwin) ( [ libinput ] @@ -84,6 +84,8 @@ stdenv.mkDerivation { propagatedNativeBuildInputs = [ lndir ]; + enableParallelBuilding = true; + outputs = [ "bin" "dev" "out" ]; inherit patches; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix index 14f7937a2e..dccc3d6f81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -3,7 +3,7 @@ qtModule { pname = "qtwebview"; qtInputs = [ qtdeclarative qtwebengine ]; - buildInputs = lib.optional stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation WebKit ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix index 9843141fc0..c8465dbf29 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; platforms = platforms.linux; + changelog = "https://github.com/raysan5/raylib/blob/${version}/CHANGELOG"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix new file mode 100644 index 0000000000..2f26fdceb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchzip }: + +let + pname = "restinio"; + version = "0.6.13"; +in +fetchzip { + name = "${pname}-${version}"; + url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}-full.tar.bz2"; + sha256 = "0cwbd5ni5pm25c7njs3wllrblb2i853ibjvpbb1iicy833zais8d"; + + postFetch = '' + mkdir -p $out/include/restinio + tar -xjf $downloadedFile --strip-components=3 -C $out/include/restinio --wildcards "*/dev/restinio" + ''; + + meta = with lib; { + description = "Cross-platform, efficient, customizable, and robust asynchronous HTTP/WebSocket server C++14 library"; + homepage = "https://github.com/Stiffstream/restinio"; + license = licenses.bsd3; + platforms = platforms.all; + }; +} 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 55ee5ab4fb..15465c501b 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 @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "; meta = with lib; { - homepage = "http://elastix.isi.uu.nl/"; + homepage = "https://elastix.lumc.nl"; description = "Image registration toolkit based on ITK"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.x86_64; # libitkpng linker issues with ITK 5.1 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 06e1ac9409..5ab4ff3b41 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -26,11 +26,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config doxygen perl ]; - buildInputs = [ openssl json_c curl libgcrypt ]; - checkInputs = [ - cmocka uthash ibm-sw-tpm2 iproute2 procps_pkg which + + # cmocka is checked / used(?) in the configure script + # when unit and/or integration testing is enabled + buildInputs = [ openssl json_c curl libgcrypt uthash ] + # cmocka doesn't build with pkgsStatic, and we don't need it anyway + # when tests are not run + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + cmocka ]; + checkInputs = [ + cmocka which openssl procps_pkg iproute2 ibm-sw-tpm2 + ]; + + strictDeps = true; preAutoreconf = "./bootstrap"; enableParallelBuilding = true; @@ -49,7 +59,7 @@ stdenv.mkDerivation rec { --replace '@PREFIX@' $out/lib ''; - configureFlags = [ + configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "--enable-unit" "--enable-integration" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix index 22d2b314b2..0bb3fe135d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ucx"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "07yyvb87i2f4w9rlvkracwzm133phwjw4zv9rs7xw6ql4pkrhrr3"; + sha256 = "0a4rbgr3hn3h42krb7lasfidhqcavacbpp1pv66l4lvfc0gkwi2i"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix b/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix index 870aa068af..60ad50a8e4 100644 --- a/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, buildPackages }: +{ stdenv, fetchurl, buildPackages +, # "newlib-nano" is what the official ARM embedded toolchain calls this build + # configuration that prioritizes low space usage. We include it as a preset + # for embedded projects striving for a similar configuration. + nanoizeNewlib ? false +}: stdenv.mkDerivation rec { pname = "newlib"; @@ -22,10 +27,21 @@ stdenv.mkDerivation rec { "--disable-newlib-supplied-syscalls" "--disable-nls" + "--enable-newlib-retargetable-locking" + ] ++ (if !nanoizeNewlib then [ "--enable-newlib-io-long-long" "--enable-newlib-register-fini" - "--enable-newlib-retargetable-locking" - ]; + ] else [ + "--enable-newlib-reent-small" + "--disable-newlib-fvwrite-in-streamio" + "--disable-newlib-fseek-optimization" + "--disable-newlib-wide-orient" + "--enable-newlib-nano-malloc" + "--disable-newlib-unbuf-stream-opt" + "--enable-lite-exit" + "--enable-newlib-global-atexit" + "--enable-newlib-nano-formatted-io" + ]); dontDisableStatic = true; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index db1312b5cc..bbc9a804aa 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -280,19 +280,19 @@ let prisma = super.prisma.override { nativeBuildInputs = [ pkgs.makeWrapper ]; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.1.1.tgz"; - sha512 = "sha512-+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.2.0.tgz"; + sha512 = "sha512-o8+DH0RD5DbP8QTZej2dsY64yvjOwOG3TWOlJyoCHQ+8DH9m4tzxo38j6IF/PqpN4PmAGPpHuNi/nssG1cvYlQ=="; }; dependencies = [ { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f"; + version = "3.2.0-34.afdab2f10860244038c4e32458134112852d4dad"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f.tgz"; - sha512 = "sha512-6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.2.0-34.afdab2f10860244038c4e32458134112852d4dad.tgz"; + sha512 = "sha512-MiZORXXsGORXTF9RqqKIlN/2ohkaxAWTsS7qxDJTy5ThTYLrXSmzxTSohM4qN/AI616B+o5WV7XTBhjlPKSufg=="; }; } ]; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 312c35c581..2c9654d1b8 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -9,6 +9,7 @@ , "@nerdwallet/shepherd" , "@nestjs/cli" , "@squoosh/cli" +, "@tailwindcss/language-server" , "@vue/cli" , "@webassemblyjs/cli" , "@webassemblyjs/repl" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 813590cc82..44790bb45d 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -238,13 +238,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apollo/client-3.4.15" = { + "@apollo/client-3.4.16" = { name = "_at_apollo_slash_client"; packageName = "@apollo/client"; - version = "3.4.15"; + version = "3.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.15.tgz"; - sha512 = "CnlT9i7TgHagkKQNvti81A9KcbIMqgpUPGJJL6bg5spTsB2R/5J6E7qiPcMvXuuXwR2xe4FmE4Ey4HizStb8Hg=="; + url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.16.tgz"; + sha512 = "iF4zEYwvebkri0BZQyv8zfavPfVEafsK0wkOofa6eC2yZu50J18uTutKtC174rjHZ2eyxZ8tV7NvAPKRT+OtZw=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -1633,22 +1633,22 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/hcl2cdk-0.6.3" = { + "@cdktf/hcl2cdk-0.6.4" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.6.3.tgz"; - sha512 = "HlftsTONtdqtn3y/vjGWAPoyZGKSAkz7NAE+xo4ukdbH7HRYCmb5nrh5t40bIKiWtXe4kdYGxRWsNC0VHCOt5A=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.6.4.tgz"; + sha512 = "prJ7VSSMJy8W7QYup0GMBJdCzFSorYtqsWEn10z/SLLg12JYOF5gzW+QU7KenK8MbTIMV8dFEbORObpm2pzTUA=="; }; }; - "@cdktf/hcl2json-0.6.3" = { + "@cdktf/hcl2json-0.6.4" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.6.3.tgz"; - sha512 = "DVHTsD13IoNPFDFMXg8PzCI9qUp8hKHvhmysDECbTIMqQ5CzkdM3u9CMojTdco5HEbdmymFkaVX07xn+9ITKQA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.6.4.tgz"; + sha512 = "xtfetZdKKSsF+xRGcaDO4ynfx0aJWZauBw6wCSz5PqHThJ/myOtMzw+Prk9N3zEBNzRdO5OM/lbNSYeyjbWuVw=="; }; }; "@chemzqm/neovim-5.4.0" = { @@ -2443,13 +2443,13 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/react-7.177.1" = { + "@fluentui/react-7.177.2" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.177.1"; + version = "7.177.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.177.1.tgz"; - sha512 = "FdOnF8KwSOpLeDK8r9VIFUHD5kWIl/uH5zD4v4SpgA9xZSOzL3zpr9LMVdUEZ3PkQMbGarMoi4JVxomg/4+o0w=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.177.2.tgz"; + sha512 = "jNaCKBtcGRpJ0CzADI/dgBm4gP0D8nXmDCx6VTImIS9Fbas0X+rJhCvEGnTlRaRalN2mPG8D5kUO9WIAXr61pQ=="; }; }; "@fluentui/react-focus-7.18.0" = { @@ -2578,13 +2578,13 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/import-6.4.2" = { + "@graphql-tools/import-6.5.0" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.4.2"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.4.2.tgz"; - sha512 = "FOiusunuS9STdF3mrnOTvNJauM/P85Sq3kVar8F0/OXyFL+AxuTCF/RKTXMUls2owSQN2VV53PCkzK9Rfg5S4A=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.5.0.tgz"; + sha512 = "q0zP95TVCVEQ1rfBxSDkPVgZAg5/7LptmPih9R4V0XZGY7aL1Hd4A1oe+Sr4B3sFy7OyWJpxhZek84nQBWNKmw=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -3217,22 +3217,22 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/check-node-1.35.0" = { + "@jsii/check-node-1.36.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.35.0.tgz"; - sha512 = "fnybJqSJx6qLi5Qk5ji1qGGJNW/UGlxz7PglLMiq6rtTCiFmIsn3DF1Rr2HJq7Wz69wdka8SqQ7n3rxUA45Ulw=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.36.0.tgz"; + sha512 = "/WgRJ93hg7a6H/VTOhE9366VjvrW5HU0wGtO/i3zskxBpK6LmpnYhw69AiGvmAZHyBaUuJ2KGCSa7TEge62NwA=="; }; }; - "@jsii/spec-1.35.0" = { + "@jsii/spec-1.36.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.35.0.tgz"; - sha512 = "zcOdxDKztpe4w/X/aosP3ChPjCsqF82xlk7LyCJwspK333sOIy6ChhIMDOu16ba9iZyQ6DoDy4s1UfFPqZRIlw=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.36.0.tgz"; + sha512 = "CZrol5FphC3WZdaEYWRyCysbc6IRvaXjHOlFgjin4RJ9MrAdskcH0/x/Hyez1PwFkZl1f2qWFwVG3L9eA5+Fsg=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -4009,13 +4009,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.216" = { + "@microsoft/load-themed-styles-1.10.217" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.216"; + version = "1.10.217"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.216.tgz"; - sha512 = "JHJwWWY3J1vKDMRREIm2U8JB5sgpGPqlF6Kf7Sjl2I8f0AeLFt43+fdPDm77sNyt5sVB1yp9hiV45i5K4s6Yag=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.217.tgz"; + sha512 = "r3iwLv8SwlJ/3V+4veN/evjtSqm9q1vH7jiu2bnMcpGUflZ10r1JBS6uZOQWicKx4kgoWrpyTorHc3y1FWnFjg=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4090,13 +4090,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-18.13.6" = { + "@netlify/build-18.13.7" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.13.6"; + version = "18.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.13.6.tgz"; - sha512 = "lIdFvwbcYBfA+oqh5J/m5E1fQ7NqiL4YzEQ0nviK2nWKdKHZLqbGV53/V9aN/N00X2J8rqXKoWmpctnY1BQJ4A=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.13.7.tgz"; + sha512 = "maeTnUJ/onAtWDQfyx4OpgJ21W9CUuUMuwMgVXyqNxiH7n6hL0/cneSJ/rla5P4xcaoWOKKP1Uc16zRUNm6Zhw=="; }; }; "@netlify/cache-utils-2.0.4" = { @@ -4108,13 +4108,13 @@ let sha512 = "P6tomPTt5tdyFrrYbBWHIGBHTwiuewrElxVRMnYW1W4GfTP4Me4+iV5lOyU/Yw9OuTPg7dPzah2J0GA6cA1YCw=="; }; }; - "@netlify/config-15.6.3" = { + "@netlify/config-15.6.4" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "15.6.3"; + version = "15.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-15.6.3.tgz"; - sha512 = "VYJSJgWAh1VwjCOhMt8h3lEb6ZzfHa6qAzA5TyEtfqFV3chBrIso9qx7JkVapAFlFnEiIb1BFX1n81xkmx/8oA=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-15.6.4.tgz"; + sha512 = "E3vRhsaSe3dZsGpwNxRWIX0Ebq9aE7GAW8X+CztobOg+/HY4Hi/5RoA9ek99VheaPwkyyguVf+Tlxd/uL+nVsQ=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4495,13 +4495,13 @@ let sha512 = "qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA=="; }; }; - "@npmcli/node-gyp-1.0.2" = { + "@npmcli/node-gyp-1.0.3" = { name = "_at_npmcli_slash_node-gyp"; packageName = "@npmcli/node-gyp"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz"; - sha512 = "yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="; + url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz"; + sha512 = "fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA=="; }; }; "@npmcli/package-json-1.0.1" = { @@ -4738,13 +4738,13 @@ let sha512 = "r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ=="; }; }; - "@octokit/request-5.6.1" = { + "@octokit/request-5.6.2" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.1.tgz"; - sha512 = "Ls2cfs1OfXaOKzkcxnqw5MR6drMA/zWX/LIS/p8Yjdz7QKTPQLMsB3R+OvoxE6XnXeXEE2X7xe4G4l4X0gRiKQ=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz"; + sha512 = "je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA=="; }; }; "@octokit/request-error-2.1.0" = { @@ -7222,13 +7222,13 @@ let sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; }; }; - "@types/react-16.14.15" = { + "@types/react-16.14.16" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.15"; + version = "16.14.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.15.tgz"; - sha512 = "jOxlBV9RGZhphdeqJTCv35VZOkjY+XIEY2owwSk84BNDdDv2xS6Csj6fhi+B/q30SR9Tz8lDNt/F2Z5RF3TrRg=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.16.tgz"; + sha512 = "7waDQ0h1TkAk99S04wV0LUiiSXpT02lzrdDF4WZFqn2W0XE5ICXLBMtqXWZ688aX2dJislQ3knmZX/jH53RluQ=="; }; }; "@types/react-dom-16.9.14" = { @@ -7573,6 +7573,15 @@ let sha512 = "JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww=="; }; }; + "@types/ws-8.2.0" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-8.2.0.tgz"; + sha512 = "cyeefcUCgJlEk+hk2h3N+MqKKsPViQgF5boi9TTHSK+PoR9KWBb/C5ccPcDyAqgsbAYHTwulch725DV84+pSpg=="; + }; + }; "@types/yargs-15.0.14" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -7618,13 +7627,13 @@ let sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw=="; }; }; - "@typescript-eslint/eslint-plugin-4.32.0" = { + "@typescript-eslint/eslint-plugin-4.33.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.32.0"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.32.0.tgz"; - sha512 = "+OWTuWRSbWI1KDK8iEyG/6uK2rTm3kpS38wuVifGUTDB6kjEuNrzBI1MUtxnkneuWG/23QehABe2zHHrj+4yuA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz"; + sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7636,13 +7645,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.32.0" = { + "@typescript-eslint/experimental-utils-4.33.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.32.0"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.32.0.tgz"; - sha512 = "WLoXcc+cQufxRYjTWr4kFt0DyEv6hDgSaFqYhIzQZ05cF+kXfqXdUh+//kgquPJVUBbL3oQGKQxwPbLxHRqm6A=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz"; + sha512 = "zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7654,22 +7663,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.32.0" = { + "@typescript-eslint/parser-4.33.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.32.0"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.32.0.tgz"; - sha512 = "lhtYqQ2iEPV5JqV7K+uOVlPePjClj4dOw7K4/Z1F2yvjIUvyr13yJnDzkK6uon4BjHYuHy3EG0c2Z9jEhFk56w=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz"; + sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/scope-manager-4.32.0" = { + "@typescript-eslint/scope-manager-4.33.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.32.0"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz"; - sha512 = "DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz"; + sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7681,13 +7690,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.32.0" = { + "@typescript-eslint/types-4.33.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.32.0"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.32.0.tgz"; - sha512 = "LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz"; + sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7699,13 +7708,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.32.0" = { + "@typescript-eslint/typescript-estree-4.33.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.32.0"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.32.0.tgz"; - sha512 = "tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz"; + sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7717,13 +7726,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.32.0" = { + "@typescript-eslint/visitor-keys-4.33.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.32.0"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz"; - sha512 = "e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz"; + sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; "@uifabric/foundation-7.10.0" = { @@ -7735,13 +7744,13 @@ let sha512 = "rUVRSNvzWPUpWPJINpogsk01m4dzIDf9CbIbJNAq+SLsVvxk9yRoLfnPwX0ZYVpFqUQxYxnII8lmWdEQzoExmQ=="; }; }; - "@uifabric/icons-7.6.0" = { + "@uifabric/icons-7.6.1" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.6.0"; + version = "7.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.6.0.tgz"; - sha512 = "Xx+CVMYOafJDijllYYkgE22lvKpKaodrB9XUgVSI77QveGcOV+x9z5FVa5CzwERb6Zjoafyj7q7SmH/EOi+AZw=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.6.1.tgz"; + sha512 = "EbIDmVWl007NjhX2f6/7G0srY6uq9BR6HLOkMCg4fbvyNcePPr66t8VH/rTvl1asL4w+jFt2y6RHyLRDvTWUyw=="; }; }; "@uifabric/merge-styles-7.19.2" = { @@ -9076,13 +9085,13 @@ let sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; }; }; - "acorn-import-assertions-1.7.6" = { + "acorn-import-assertions-1.8.0" = { name = "acorn-import-assertions"; packageName = "acorn-import-assertions"; - version = "1.7.6"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz"; - sha512 = "FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA=="; + url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"; + sha512 = "m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw=="; }; }; "acorn-jsx-3.0.1" = { @@ -10687,13 +10696,13 @@ let sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; }; }; - "array-includes-3.1.3" = { + "array-includes-3.1.4" = { name = "array-includes"; packageName = "array-includes"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz"; - sha512 = "gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A=="; + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz"; + sha512 = "ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw=="; }; }; "array-initial-1.1.0" = { @@ -11542,13 +11551,13 @@ let sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ=="; }; }; - "autoprefixer-9.8.7" = { + "autoprefixer-9.8.8" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "9.8.7"; + version = "9.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.7.tgz"; - sha512 = "7Hg99B1eTH5+LgmUBUSmov1Z3bsggQJS7v3IMGo6wcScnbRuvtMc871J9J+4bSbIqa9LSX/zypFXJ8sXHpMJeQ=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz"; + sha512 = "eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA=="; }; }; "available-typed-arrays-1.0.5" = { @@ -11587,6 +11596,15 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; + "aws-sdk-2.1000.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.1000.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1000.0.tgz"; + sha512 = "PhL4WPIJ5fyOBbmWdEaskD6+qvu9VD4kVLEBK/SchcZXmivUKhED3POR6dbfskhwTksxwkrwa6G4NNI3yY7d1g=="; + }; + }; "aws-sdk-2.920.0" = { name = "aws-sdk"; packageName = "aws-sdk"; @@ -11596,15 +11614,6 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.999.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.999.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.999.0.tgz"; - sha512 = "OcnD7m+HCZv2qDzmS7TgABGf26mVPfIyah0Dgz7hHAxBtx78qFWi/s9U6BDxVBKWLg7OKWVHf0opiMG4ujteqg=="; - }; - }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -14053,13 +14062,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.17.2" = { + "browserslist-4.17.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.17.2"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.2.tgz"; - sha512 = "jSDZyqJmkKMEMi7SZAgX5UltFdR5NAO43vY0AwTpu4X3sGH7GLLQ83KiUomgrnvZRCeW0yPPnKqnxPqQOER9zQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz"; + sha512 = "59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ=="; }; }; "brq-0.1.8" = { @@ -15089,13 +15098,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001263" = { + "caniuse-lite-1.0.30001264" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001263"; + version = "1.0.30001264"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001263.tgz"; - sha512 = "doiV5dft6yzWO1WwU19kt8Qz8R0/8DgEziz6/9n2FxUasteZNwNNYSmJO3GLBH8lCVE73AB1RPDPAeYbcO5Cvw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001264.tgz"; + sha512 = "Ftfqqfcs/ePiUmyaySsQ4PUsdcYyXG2rfoBVsk3iY1ahHaJEw65vfb7Suzqm+cEkwwPIv/XWkg27iCpRavH4zA=="; }; }; "canvas-2.8.0" = { @@ -15107,13 +15116,13 @@ let sha512 = "gLTi17X8WY9Cf5GZ2Yns8T5lfBOcGgFehDFb+JQwDqdOoBOcECS9ZWMEAqMSVcMYwXD659J8NyzjRY/2aE+C2Q=="; }; }; - "canvg-3.0.8" = { + "canvg-3.0.9" = { name = "canvg"; packageName = "canvg"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/canvg/-/canvg-3.0.8.tgz"; - sha512 = "9De5heHfVRgCkln3CGEeSJMviN5U2RyxL4uutYoe8HxI60BjH2XnT2ZUHIp+ZaAZNTUd5Asqfut8WEEdANqfAg=="; + url = "https://registry.npmjs.org/canvg/-/canvg-3.0.9.tgz"; + sha512 = "rDXcnRPuz4QHoCilMeoTxql+fvGqNAxp+qV/KHD8rOiJSAfVjFclbdUNHD2Uqfthr+VMg17bD2bVuk6F07oLGw=="; }; }; "caporal-1.4.0" = { @@ -15242,6 +15251,15 @@ let sha512 = "nMmaLWbj7+bC6MsApKRIig8h+yjgNLhPLXaCelq5+C7mpWsHgIcseZSdvgexSY5uE1Q3m2uPvIDZwSdxdo7qig=="; }; }; + "cbor-8.0.2" = { + name = "cbor"; + packageName = "cbor"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cbor/-/cbor-8.0.2.tgz"; + sha512 = "H5WTjQYgyHQI0VrCmbyQBOPy1353MjmUi/r3DbPib4U13vuyqm7es9Mfpe8G58bN/mCdRlJWkiCrPl1uM1wAlg=="; + }; + }; "ccount-1.1.0" = { name = "ccount"; packageName = "ccount"; @@ -15251,31 +15269,31 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.54" = { + "cdk8s-1.0.0-beta.57" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.54"; + version = "1.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.54.tgz"; - sha512 = "m7rrz0zJPut/BUeVWnK19kBs3lcZZ+laVfBU731W9X86G8j1qqFliVxuVk95/xr0culGje0NH2CgXfUGrI90bA=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.57.tgz"; + sha512 = "AP0T2s0HubyA1riQ5m6c7ccwMqREhFD6xMZSmv4PTEfhMsx6IhUOjWnRMvrYm9MBMB47Gt1xxeUmKIq3EkurNw=="; }; }; - "cdk8s-plus-22-1.0.0-beta.5" = { + "cdk8s-plus-22-1.0.0-beta.9" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.5"; + version = "1.0.0-beta.9"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.5.tgz"; - sha512 = "q63klY0wfgwNv1iGuaR7CaLvro8VQynmuOqpD1RJYiIMEIkGms45+pA96KbesUC1vjDAOmWGSVy6FxCyqxjbBw=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.9.tgz"; + sha512 = "j8I0b0yJ182mcSgF5KB0mIjjgqbmVUMJQQgajpTtgNzuko9HsYQfK+uFT29ua1PyFTtn8FHQLOT/goYJjg1SEQ=="; }; }; - "cdktf-0.6.3" = { + "cdktf-0.6.4" = { name = "cdktf"; packageName = "cdktf"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.6.3.tgz"; - sha512 = "N0JxulsgED3uQQFjlKgl1sLzDtjX0sdDMpj9Zd8ejsH/JRhLDKOCqRWKukOFfW0X43TtU9r8SiLn3MagLmVG5w=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.6.4.tgz"; + sha512 = "vRsVL5v6DZb5EoLNRevwGp2VfJLrJiA3TMPu3sAjaLEGrdOFY8py4iugArFUeiaIsti4Vz4+64Oc1cseSs71Fg=="; }; }; "center-align-0.1.3" = { @@ -15872,13 +15890,13 @@ let sha1 = "01296a3e5d130cce34974eb509cbbc7d6f78dd3d"; }; }; - "chromecasts-1.10.1" = { + "chromecasts-1.10.2" = { name = "chromecasts"; packageName = "chromecasts"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/chromecasts/-/chromecasts-1.10.1.tgz"; - sha512 = "NsbbMxwLEDevtJtVTrTkr5sQhJPZYJiwJ6RXQ1qO9RURtIlcLBnfoncfrjlQPRLAKuPETHkQcCbxYnqTHvILJA=="; + url = "https://registry.npmjs.org/chromecasts/-/chromecasts-1.10.2.tgz"; + sha512 = "Pa5nrrCMWukBafWxQ8wwmeRuqs/6nVFAdhRXYcxpDePduAbZZ8lXNZhtGZ5/mmWI1rzrSR6tpRR9J3BtR84yUw=="; }; }; "chromium-pickle-js-0.2.0" = { @@ -16232,6 +16250,15 @@ let sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg=="; }; }; + "cli-spinners-2.6.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz"; + sha512 = "t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q=="; + }; + }; "cli-spinners-2.6.1" = { name = "cli-spinners"; packageName = "cli-spinners"; @@ -16790,13 +16817,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.35.0" = { + "codemaker-1.36.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.35.0.tgz"; - sha512 = "CJTtcTtaHpOl7+N76qF8GIsDJCa8d7xhtMGuL72zdG9X9xvO/aOQc1GA49g4J0qaUSLA8TjIyyL8vgOyUnAlwQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.36.0.tgz"; + sha512 = "Ey1aIPW5OkkKyRcqoWE61MAc5ghfDrnxysGUmauTy0RyL6sXPjYuxZXQWjqsHHQ35fCH5i7/rifoifE+jkZQhQ=="; }; }; "codepage-1.4.0" = { @@ -16952,15 +16979,6 @@ let sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; }; }; - "colorette-2.0.12" = { - name = "colorette"; - packageName = "colorette"; - version = "2.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-2.0.12.tgz"; - sha512 = "lHID0PU+NtFzeNCwTL6JzUKdb6kDpyEjrwTD1H0cDZswTbsjLh2wTV2Eo2sNZLc0oSg0a5W1AI4Nj7bX4iIdjA=="; - }; - }; "colorette-2.0.14" = { name = "colorette"; packageName = "colorette"; @@ -17952,22 +17970,22 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.41.0" = { + "contentful-management-7.42.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.41.0"; + version = "7.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.41.0.tgz"; - sha512 = "JBpSdnG2F5rxjm/gmt1f9yy+HHoqKf+20kPMsSuuzsZ3czddoBjprIRzk8RFn2hInIBrcd3UCT/pFhnNg9TPTw=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.42.0.tgz"; + sha512 = "Ux0l6iUEG1Tnc1Vl89jXEwddsRfo8/v06pFTpA/+N6tGdTvwF3RtQWLOpVxKWuy+9NK5TJh4oUnpc+zPsynoQA=="; }; }; - "contentful-sdk-core-6.9.1" = { + "contentful-sdk-core-6.10.1" = { name = "contentful-sdk-core"; packageName = "contentful-sdk-core"; - version = "6.9.1"; + version = "6.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.9.1.tgz"; - sha512 = "5AV21J1evUa1Wi+ehSWUJVpZ/NUy4mQPEk73ORxbv/FYcPNtOXBo0CPmXZZHQ80SADhYXgiiLLUGH2+UIGwYMQ=="; + url = "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.10.1.tgz"; + sha512 = "q1dh5AHL3FoBc3CZThQMtnaxgFbs9BrJW8wDysdp/IT/Q2edgUQASh2fvj02T6cCh3ftMspRRe/HMfZDF9FfIQ=="; }; }; "continuable-1.1.8" = { @@ -20571,13 +20589,13 @@ let sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; }; }; - "date-fns-2.24.0" = { + "date-fns-2.25.0" = { name = "date-fns"; packageName = "date-fns"; - version = "2.24.0"; + version = "2.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/date-fns/-/date-fns-2.24.0.tgz"; - sha512 = "6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw=="; + url = "https://registry.npmjs.org/date-fns/-/date-fns-2.25.0.tgz"; + sha512 = "ovYRFnTrbGPD4nqaEqescPEv1mNwvt+UTqI3Ay9SzNtey9NZnYu6E2qCcBBgJ6/2VF1zGGygpyTDITqpQQ5e+w=="; }; }; "date-format-1.2.0" = { @@ -23118,13 +23136,13 @@ let sha512 = "9oxNmKlDCaf651c+yJWCDIBpF6A9aY+wQtasLEeR5AsPYPuOKEX6xHnC2+WgCLOC94JEpCZznecyC84fbwZq4A=="; }; }; - "electron-to-chromium-1.3.857" = { + "electron-to-chromium-1.3.859" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.857"; + version = "1.3.859"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.857.tgz"; - sha512 = "a5kIr2lajm4bJ5E4D3fp8Y/BRB0Dx2VOcCRE5Gtb679mXIME/OFhWler8Gy2ksrf8gFX+EFCSIGA33FB3gqYpg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.859.tgz"; + sha512 = "gXRXKNWedfdiKIzwr0Mg/VGCvxXzy+4SuK9hp1BDvfbCwx0O5Ot+2f4CoqQkqEJ3Zj/eAV/GoAFgBVFgkBLXuQ=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -24209,13 +24227,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.18.0" = { + "eslint-plugin-vue-7.19.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.18.0"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.18.0.tgz"; - sha512 = "ceDXlXYMMPMSXw7tdKUR42w9jlzthJGJ3Kvm3YrZ0zuQfvAySNxe8sm6VHuksBW0+060GzYXhHJG6IHVOfF83Q=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.19.0.tgz"; + sha512 = "pqsJY1q0cjdQerWSlGHo+NfnWZ8Xuc5tetddljJJ7726auWsnHty7F5qgj/EcjkPgyj8s5Lw4YGuhsFHkzIrkQ=="; }; }; "eslint-scope-3.7.3" = { @@ -24740,6 +24758,15 @@ let sha512 = "HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw=="; }; }; + "eventemitter2-6.4.5" = { + name = "eventemitter2"; + packageName = "eventemitter2"; + version = "6.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.5.tgz"; + sha512 = "bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw=="; + }; + }; "eventemitter3-1.2.0" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -28421,13 +28448,13 @@ let sha512 = "0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw=="; }; }; - "gl-matrix-3.3.0" = { + "gl-matrix-3.4.0" = { name = "gl-matrix"; packageName = "gl-matrix"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.3.0.tgz"; - sha512 = "COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA=="; + url = "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.0.tgz"; + sha512 = "n7fF4meQ6jbBSw91jGmP83I/wkQud5kIRSW/dr5z+9YJdQz61GWpgmRK9k7c4O/1QsXaIXu9o2vf/q2Gu3Ybow=="; }; }; "glob-3.2.11" = { @@ -31627,13 +31654,13 @@ let sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; }; }; - "import-local-3.0.2" = { + "import-local-3.0.3" = { name = "import-local"; packageName = "import-local"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz"; - sha512 = "vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA=="; + url = "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz"; + sha512 = "bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA=="; }; }; "imurmurhash-0.1.4" = { @@ -34850,40 +34877,40 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.35.0" = { + "jsii-1.36.0" = { name = "jsii"; packageName = "jsii"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.35.0.tgz"; - sha512 = "uk3lk/8b6q0nmKOUTDp5RKzzPEuES7Im+5GxGbvwPo9TjRzZ0VMfiePNYFPwwkw5BTId80ssumq3VOFelxPJ2Q=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.36.0.tgz"; + sha512 = "7wuW6iv3lnYxdUb2W9KRPqFDP7xPPhVMmt3eDQbLQGCcMNQ65QgPWgun23+1X1X1ImCcoh5GWaRS0oF0NAJbQA=="; }; }; - "jsii-pacmak-1.35.0" = { + "jsii-pacmak-1.36.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.35.0.tgz"; - sha512 = "UF9GSG+FBzk+vpcCsFMrgC8yAtPeWG6jJwmNyYVsDj5byHPl9p8QCfbeNxDRzhKJukIO9K/iUlatjn+PvKXj1A=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.36.0.tgz"; + sha512 = "wRJk6S81OTi1KeXQhpasvWQ3kBXURtg1d99wBBSktDAJAfAj17x/0XbVe43DRFsD/wZARyVj2g1EDC5MexXJZw=="; }; }; - "jsii-reflect-1.35.0" = { + "jsii-reflect-1.36.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.35.0.tgz"; - sha512 = "DVSAwbhydNpJoU1/Mj5Mnr8vuJnkCoQCHoBBfR5V1+CmswbPshzK/9fbdtIlSCGxjBKRlW83RBZqP0ON6hvPig=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.36.0.tgz"; + sha512 = "MWhRxSTv29QetIAhtoVO9Awne6TofUPmVeK9SU3G0RqoxCx7F6erbLxcSYIa1KqcBbI6fmT1/JT1kdmCgg0QmQ=="; }; }; - "jsii-rosetta-1.35.0" = { + "jsii-rosetta-1.36.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.35.0.tgz"; - sha512 = "AKk7llmUmheKDIQXBRXlmHd5B+BU+Si3jpsfZzFdTpU2qR+yvIZ00XpWWnX+zpyKebOaMwAI+R+5DhsrRZ2GBQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.36.0.tgz"; + sha512 = "TML7uw5ihRy0S5QKV8nNRxERzIblIeMTn/+eDG9dw/FOpx3oB3dBo9A277skVbs4QPbZuU8ceWb5n1kg/PlbOw=="; }; }; "jsii-srcmak-0.1.357" = { @@ -36623,6 +36650,15 @@ let sha512 = "DI21mqAdwBM/Os3pcAnBrpUCoaKQzJFTEv2c+DEJUzPBnpxRGGKGurlT5FDz9QZSTag7YgBb5ghsqtjQ2MlFWg=="; }; }; + "lightning-4.10.1" = { + name = "lightning"; + packageName = "lightning"; + version = "4.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-4.10.1.tgz"; + sha512 = "MNX67mGzWx7hkd2GUPtCt/vzLSaROg/aDmg/WcW9mdrXY6PQVyGW/gdaTRy9e2hJZ4R8KGMuZ7wZqsDPpRRawQ=="; + }; + }; "lightning-4.5.0" = { name = "lightning"; packageName = "lightning"; @@ -36659,15 +36695,6 @@ let sha512 = "K/+GISxMDmpCl7bjauCxsVMslXAV6UMbfZSbeHsZuEN0yKSHq5cnPxHLGG2R12cOfKOar1fVDPbsiXO39Upqiw=="; }; }; - "lightning-4.7.2" = { - name = "lightning"; - packageName = "lightning"; - version = "4.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.7.2.tgz"; - sha512 = "8EJA+1Tx5637U1DJVfOogphicY2xPNp0krIt/eWphEXyWYXS/i0iu/3nI5FHM5vc9HDVyJHBWrU9rRWth9pn8A=="; - }; - }; "lilconfig-2.0.3" = { name = "lilconfig"; packageName = "lilconfig"; @@ -36857,6 +36884,15 @@ let sha512 = "upswAJU9Mrfh3l+q46rvmRu8Pf7iYR2vkKyq16dgiBgxKw7fzvI8aL2Xi0xrtyoRUOUODOyEzO7/MRRhNKcvMA=="; }; }; + "ln-service-52.10.1" = { + name = "ln-service"; + packageName = "ln-service"; + version = "52.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.10.1.tgz"; + sha512 = "T1Vjud0X8pbRBh1tKSqzyELHGy4Cxt/71q9q4sd81m8IFw9htsOXYQEkliMmYK33EzLrT2qzFTCJF/YF9UwYvQ=="; + }; + }; "ln-service-52.4.0" = { name = "ln-service"; packageName = "ln-service"; @@ -36875,15 +36911,6 @@ let sha512 = "tLJMrknIzK6MMIx/N1r8iRjVWBPFmt0S1hI2l+DNL6+ln930nSUN+/aW3SUZho48ACLPBJDSgXwAU50ExrC+rQ=="; }; }; - "ln-service-52.8.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "52.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-52.8.0.tgz"; - sha512 = "slZ62J04S3p19z/7r8AYradKVDohpzWppU1ejG9h8Yfwz8ZMzHbHW7H0dTp64/U0PaMQQIFRoAzGSBj1ej6/wA=="; - }; - }; "ln-sync-2.0.0" = { name = "ln-sync"; packageName = "ln-sync"; @@ -39215,15 +39242,6 @@ let sha512 = "aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ=="; }; }; - "markdown-it-12.0.4" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "12.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.4.tgz"; - sha512 = "34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q=="; - }; - }; "markdown-it-12.2.0" = { name = "markdown-it"; packageName = "markdown-it"; @@ -39413,22 +39431,22 @@ let sha512 = "Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A=="; }; }; - "markdownlint-0.23.1" = { + "markdownlint-0.24.0" = { name = "markdownlint"; packageName = "markdownlint"; - version = "0.23.1"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint/-/markdownlint-0.23.1.tgz"; - sha512 = "iOEwhDfNmq2IJlaA8mzEkHYUi/Hwoa6Ss+HO5jkwUR6wQ4quFr0WzSx+Z9rsWZKUaPbyirIdL1zGmJRkWawr4Q=="; + url = "https://registry.npmjs.org/markdownlint/-/markdownlint-0.24.0.tgz"; + sha512 = "OJIGsGFV/rC9irI5E1FMy6v9hdACSwaa+EN3224Y5KG8zj2EYzdHOw0pOJovIYmjNfEZ9BtxUY4P7uYHTSNnbQ=="; }; }; - "markdownlint-rule-helpers-0.14.0" = { + "markdownlint-rule-helpers-0.15.0" = { name = "markdownlint-rule-helpers"; packageName = "markdownlint-rule-helpers"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.14.0.tgz"; - sha512 = "vRTPqSU4JK8vVXmjICHSBhwXUvbfh/VJo+j7hvxqe15tLJyomv3FLgFdFgb8kpj0Fe8SsJa/TZUAXv7/sN+N7A=="; + url = "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.15.0.tgz"; + sha512 = "A+9mswc3m/kkqpJCqntmte/1VKhDJ+tjZsERLz5L4h/Qr7ht2/BkGkgY5E7/wsxIhcpl+ctIfz+oS3PQrMOB2w=="; }; }; "marked-0.3.19" = { @@ -41699,23 +41717,13 @@ let sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; }; }; - "multicast-dns-7.2.3" = { + "multicast-dns-7.2.4" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "7.2.3"; + version = "7.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.3.tgz"; - sha512 = "TzxgGSLRLB7tqAlzjgd2x2ZE0cDsGFq4rs9W4yE5xp+7hlRXeUQGtXZsTGfGw2FwWB45rfe8DtXMYBpZGMLUng=="; - }; - }; - "multicast-dns-git://github.com/webtorrent/multicast-dns.git#fix-setMulticastInterface" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "7.2.3"; - src = fetchgit { - url = "git://github.com/webtorrent/multicast-dns.git"; - rev = "9cd95b2b8ac5843bf1da8bdb7f4092f1d7d6f17b"; - sha256 = "94ac6a61617c2ee660616d2323e3cbff2eeed5694e0c589714a22471122a7c1b"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.4.tgz"; + sha512 = "XkCYOU+rr2Ft3LI6w4ye51M3VK31qJXFIxu0XLw169PtKG0Zx47OrXeVW/GCYOfpC9s1yyyf1S+L8/4LY0J9Zw=="; }; }; "multicast-dns-service-types-1.1.0" = { @@ -42943,13 +42951,13 @@ let sha1 = "5f5665d93351335caabef8f1c554516cf5f1e4e5"; }; }; - "node-downloader-helper-1.0.18" = { + "node-downloader-helper-1.0.19" = { name = "node-downloader-helper"; packageName = "node-downloader-helper"; - version = "1.0.18"; + version = "1.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.18.tgz"; - sha512 = "C7hxYz/yg4d8DFVC6c4fMIOI7jywbpQHOznkax/74F8NcC8wSOLO+UxNMcwds/5wEL8W+RPXT9C389w3bDOMxw=="; + url = "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.19.tgz"; + sha512 = "Bwp8WWDDP5ftg+FmAKU08a9+oiUTPoYzMvXgUqZZPQ7VMo1qKBzW3XdTXHeYnqjGLfkTZ2GPibgAWpApfpeS2g=="; }; }; "node-emoji-1.10.0" = { @@ -44376,22 +44384,22 @@ let sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; }; }; - "object.entries-1.1.4" = { + "object.entries-1.1.5" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz"; - sha512 = "h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz"; + sha512 = "TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g=="; }; }; - "object.getownpropertydescriptors-2.1.2" = { + "object.getownpropertydescriptors-2.1.3" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"; - sha512 = "WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz"; + sha512 = "VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw=="; }; }; "object.map-1.0.1" = { @@ -44430,13 +44438,13 @@ let sha1 = "6fe348f2ac7fa0f95ca621226599096825bb03ad"; }; }; - "object.values-1.1.4" = { + "object.values-1.1.5" = { name = "object.values"; packageName = "object.values"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz"; - sha512 = "TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz"; + sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; }; }; "object_values-0.1.2" = { @@ -44520,13 +44528,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.177.1" = { + "office-ui-fabric-react-7.177.2" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.177.1"; + version = "7.177.2"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.177.1.tgz"; - sha512 = "AEsXZTH7KDGYN8NCMac7KMJfmFtfzMP2IZ95iyawghgD5safzxNZzFMwLfzIGj5GxRnUMxZ8AwugxJCcBbYFEw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.177.2.tgz"; + sha512 = "YKDdpU7s+ISHFGtOlSOv4qC9R6pW2Ixw73WkVaj7PcRQTx1UXz5tZfZHJadN27x7vJKxYQqgv6mFYgYQnTb4qQ=="; }; }; "omggif-1.0.10" = { @@ -44700,13 +44708,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.35.0" = { + "oo-ascii-tree-1.36.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.35.0.tgz"; - sha512 = "1cvFhd6oN+ZRC2ZdkBRlO7bYr0C9O5DZOntwCFYX0nS3zG6CmnpwwVdwh8o3rArf6eL5U21/UKSujWQPpSCapw=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.36.0.tgz"; + sha512 = "VGo4IhIbwJgYnwBAtk5+6puhwOjyMdaviPhxZgEteh6/twR7m8T6C47kSNuXIX51H6ogh6y8GeuOIuWyPcc9Cg=="; }; }; "opal-runtime-1.0.11" = { @@ -45780,6 +45788,15 @@ let sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g=="; }; }; + "p-throttle-4.1.1" = { + name = "p-throttle"; + packageName = "p-throttle"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-throttle/-/p-throttle-4.1.1.tgz"; + sha512 = "TuU8Ato+pRTPJoDzYD4s7ocJYcNSEZRvlxoq3hcPI2kZDZ49IQ1Wkj7/gDJc3X7XiEAAvRGtDzdXJI0tC3IL1g=="; + }; + }; "p-timeout-1.2.1" = { name = "p-timeout"; packageName = "p-timeout"; @@ -47148,6 +47165,15 @@ let sha1 = "18de2f97e4bf7a9551ad7511942b5496f7aba660"; }; }; + "picocolors-0.2.1" = { + name = "picocolors"; + packageName = "picocolors"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"; + sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; + }; + }; "picomatch-2.2.3" = { name = "picomatch"; packageName = "picomatch"; @@ -47797,13 +47823,13 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; - "postcss-7.0.38" = { + "postcss-7.0.39" = { name = "postcss"; packageName = "postcss"; - version = "7.0.38"; + version = "7.0.39"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.38.tgz"; - sha512 = "wNrSHWjHDQJR/IZL5IKGxRtFgrYNaAA/UrkW2WqbtZO6uxSLMxMN+s2iqUMwnAWm3fMROlDYZB41dr0Mt7vBwQ=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"; + sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; "postcss-8.3.6" = { @@ -47815,13 +47841,13 @@ let sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; }; - "postcss-8.3.8" = { + "postcss-8.3.9" = { name = "postcss"; packageName = "postcss"; - version = "8.3.8"; + version = "8.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.8.tgz"; - sha512 = "GT5bTjjZnwDifajzczOC+r3FI3Cu+PgPvrsjhQdRqa2kTJ4968/X9CUce9xttIB0xOs5c6xf0TCWZo/y9lF6bA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz"; + sha512 = "f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw=="; }; }; "postcss-calc-7.0.5" = { @@ -49111,13 +49137,13 @@ let sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; }; }; - "promise.prototype.finally-3.1.2" = { + "promise.prototype.finally-3.1.3" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz"; - sha512 = "A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA=="; + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz"; + sha512 = "EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ=="; }; }; "promised-temp-0.1.0" = { @@ -50416,13 +50442,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.173" = { + "pyright-1.1.175" = { name = "pyright"; packageName = "pyright"; - version = "1.1.173"; + version = "1.1.175"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.173.tgz"; - sha512 = "ksprslKAgZSmvz0Ndbo6EfSzRzP2klB/o6NKPtSqNCRDyIyLWAVGP7hqdhepKBAVNRktLuatM7R9VEBGLC7duQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.175.tgz"; + sha512 = "LCYO4t/wvZPSipRgz5wCRNQWqLBhiVx2H05sU7Xr6db6tesS1mPfwyBoa0X7oMCUycwoEmApdPCSQvrggXQ1oQ=="; }; }; "q-0.9.7" = { @@ -56086,13 +56112,13 @@ let sha512 = "tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg=="; }; }; - "slugify-1.6.0" = { + "slugify-1.6.1" = { name = "slugify"; packageName = "slugify"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/slugify/-/slugify-1.6.0.tgz"; - sha512 = "FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang=="; + url = "https://registry.npmjs.org/slugify/-/slugify-1.6.1.tgz"; + sha512 = "5ofqMTbetNhxlzjYYLBaZFQd6oiTuSkQlyfPEFIMwgUABlZQ0hbk5xIV9Ydd5jghWeRoO7GkiJliUvTpLOjNRA=="; }; }; "smart-buffer-4.2.0" = { @@ -57634,13 +57660,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.84" = { + "sscaff-1.2.85" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.84"; + version = "1.2.85"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.84.tgz"; - sha512 = "M2CkfbEzeatkbSX65dkqeQ0FM47h3wdefyi+LY7MP7+hREQ7vr9eDz5xyXPwga/1P5c/UPikDZuoEjo2ZVJjtQ=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.85.tgz"; + sha512 = "SJqw5nwHNDsH6NevVODqvMIytAd0HfdEkmPOdVbvA6ij5aX/qoo5Y9PDcAvwul9E/FiQEAAavJAiKoHeTx6T+A=="; }; }; "ssh-config-1.1.6" = { @@ -58480,13 +58506,13 @@ let sha1 = "aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"; }; }; - "string.prototype.trim-1.2.4" = { + "string.prototype.trim-1.2.5" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz"; - sha512 = "hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.5.tgz"; + sha512 = "Lnh17webJVsD6ECeovpVN17RlAKjmz4rF9S+8Y45CkMc/ufVpTkU3vZIyIC7sllQ1FCvObZnnCdNs/HXTUOTlg=="; }; }; "string.prototype.trimend-1.0.4" = { @@ -59371,13 +59397,13 @@ let sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"; }; }; - "svg-pathdata-5.0.5" = { + "svg-pathdata-6.0.3" = { name = "svg-pathdata"; packageName = "svg-pathdata"; - version = "5.0.5"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-5.0.5.tgz"; - sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow=="; + url = "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz"; + sha512 = "qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw=="; }; }; "svg-tags-1.0.0" = { @@ -66078,13 +66104,13 @@ let sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; - "webpack-5.56.0" = { + "webpack-5.56.1" = { name = "webpack"; packageName = "webpack"; - version = "5.56.0"; + version = "5.56.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.56.0.tgz"; - sha512 = "pJ7esw2AGkpZL0jqsEAKnDEfRZdrc9NVjAWA+d1mFkwj68ng9VQ6+Wnrl+kS5dlDHvrat5ASK5vd7wp6I7f53Q=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.56.1.tgz"; + sha512 = "MRbTPooHJuSAfbx7Lh/qEMRUe/d0p4cRj2GPo/fq+4JUeR/+Q1EfLvS1lexslbMcJZyPXxxz/k/NzVepkA5upA=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -68412,7 +68438,7 @@ in sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" - sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" sources."@schematics/angular-12.2.8" @@ -69705,7 +69731,7 @@ in sources."moment-2.29.1" sources."mountable-hypertrie-2.8.0" sources."ms-2.0.0" - sources."multicast-dns-7.2.3" + sources."multicast-dns-7.2.4" sources."mutexify-1.3.1" sources."nanoassert-1.1.0" sources."nanoguard-1.3.0" @@ -69731,7 +69757,7 @@ in sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.2" + sources."object.getownpropertydescriptors-2.1.3" sources."once-1.4.0" sources."p-debounce-2.1.0" sources."p-limit-2.3.0" @@ -69952,7 +69978,7 @@ in sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.11.4" sources."@octokit/plugin-retry-3.0.9" - sources."@octokit/request-5.6.1" + sources."@octokit/request-5.6.2" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.11.4" sources."@octokit/types-6.31.3" @@ -70120,11 +70146,11 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -70150,7 +70176,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.3" // { @@ -70248,7 +70274,6 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mute-stream-0.0.8" - sources."nanocolors-0.2.12" sources."neo-async-2.6.2" sources."node-emoji-1.11.0" sources."node-releases-1.1.77" @@ -70271,6 +70296,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" sources."pluralize-8.0.0" sources."pump-3.0.0" @@ -70435,6 +70461,23 @@ in bypassCache = true; reconstructLock = true; }; + "@tailwindcss/language-server" = nodeEnv.buildNodePackage { + name = "_at_tailwindcss_slash_language-server"; + packageName = "@tailwindcss/language-server"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.4.tgz"; + sha512 = "7d0wkTY7abvLr/PQvSqBOni91LsTt2ahbUHf5sW55SxcQtJc1y9TnwjrB2uR4lzbFhyexplZSFol8AN99TmDLw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Tailwind CSS Language Server"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; @@ -70734,7 +70777,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -70754,7 +70797,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -70881,7 +70924,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -71191,7 +71234,6 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nanocolors-0.2.12" sources."nanoid-2.1.11" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -71254,7 +71296,7 @@ in sources."object-path-0.11.8" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.2" + sources."object.getownpropertydescriptors-2.1.3" sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -71288,6 +71330,7 @@ in sources."path-type-3.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" (sources."pid-from-port-1.1.3" // { dependencies = [ @@ -71895,8 +71938,8 @@ in sources."async-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.2" - sources."caniuse-lite-1.0.30001263" + sources."browserslist-4.17.3" + sources."caniuse-lite-1.0.30001264" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -71906,7 +71949,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -71952,7 +71995,6 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" - sources."nanocolors-0.2.12" sources."node-releases-1.1.77" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { @@ -71963,6 +72005,7 @@ in }) sources."parse-passwd-1.0.0" sources."path-parse-1.0.7" + sources."picocolors-0.2.1" sources."pkginfo-0.4.1" sources."resolve-1.20.0" sources."safe-buffer-5.1.2" @@ -72029,20 +72072,20 @@ in autoprefixer = nodeEnv.buildNodePackage { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.3.6"; + version = "10.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.6.tgz"; - sha512 = "3bDjTfF0MfZntwVCSd18XAT2Zndufh3Mep+mafbzdIQEeWbncVRUVDjH8/EPANV9Hq40seJ24QcYAyhUsFz7gQ=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.7.tgz"; + sha512 = "EmGpu0nnQVmMhX8ROoJ7Mx8mKYPlcUHuxkwrRYEYMz85lu7H09v8w6R1P0JPdn/hKU32GjpLBFEOuIlDWCRWvg=="; }; dependencies = [ - sources."browserslist-4.17.2" - sources."caniuse-lite-1.0.30001263" - sources."electron-to-chromium-1.3.857" + sources."browserslist-4.17.3" + sources."caniuse-lite-1.0.30001264" + sources."electron-to-chromium-1.3.859" sources."escalade-3.1.1" sources."fraction.js-4.1.1" - sources."nanocolors-0.2.12" sources."node-releases-1.1.77" sources."normalize-range-0.1.2" + sources."picocolors-0.2.1" sources."postcss-value-parser-4.1.0" ]; buildInputs = globalBuildInputs; @@ -72072,7 +72115,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.999.0" // { + (sources."aws-sdk-2.1000.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -72276,10 +72319,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.0.0"; + version = "11.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.0.0.tgz"; - sha512 = "73DP1tAPH/s4WLyGnLjCoi72fZ3o9vkKvhCzZdDSsdd/RwoJMPaWD2uV+ZP/lyy4GsWB/YJ1eJhH13fXL1tRKQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.2.1.tgz"; + sha512 = "+PhZ0vTiHHeHmrRpVIm4hhl5YT7PQgVaAPj2pairo+lmDmcAFSJQApolr3fJpt3V88wWw6Y687TJfIJmRma27w=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -72419,7 +72462,7 @@ in sources."colorette-1.4.0" ]; }) - sources."cbor-8.0.0" + sources."cbor-8.0.2" sources."cert-info-1.5.1" (sources."chalk-1.1.3" // { dependencies = [ @@ -72448,7 +72491,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-2.0.12" + sources."colorette-2.0.14" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-6.2.1" @@ -72524,6 +72567,7 @@ in dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."cbor-8.0.0" sources."ln-service-52.0.3" ]; }) @@ -72614,6 +72658,7 @@ in dependencies = [ sources."@types/node-16.7.3" sources."bn.js-5.2.0" + sources."cbor-8.0.0" ]; }) (sources."ln-accounting-5.0.3" // { @@ -72621,19 +72666,21 @@ in sources."@grpc/proto-loader-0.6.5" sources."@types/node-16.9.1" sources."bn.js-5.2.0" + sources."cbor-8.0.0" sources."lightning-4.5.0" sources."ln-service-52.4.0" sources."ws-8.2.2" ]; }) - (sources."ln-service-52.8.0" // { + (sources."ln-service-52.10.1" // { dependencies = [ sources."@grpc/proto-loader-0.6.5" - sources."@types/node-16.9.6" + sources."@types/node-16.10.2" + sources."@types/ws-8.2.0" sources."bn.js-5.2.0" sources."bolt09-0.2.0" - sources."lightning-4.7.2" - sources."ws-8.2.2" + sources."lightning-4.10.1" + sources."ws-8.2.3" ]; }) (sources."ln-sync-2.0.2" // { @@ -72642,6 +72689,7 @@ in sources."@types/node-16.9.6" sources."bn.js-5.2.0" sources."bolt09-0.2.0" + sources."cbor-8.0.0" sources."colorette-2.0.7" sources."lightning-4.7.1" ]; @@ -72650,8 +72698,11 @@ in dependencies = [ sources."@grpc/proto-loader-0.6.5" sources."@types/node-16.6.1" + sources."ansi-regex-5.0.1" sources."bn.js-5.2.0" + sources."cbor-8.0.0" sources."colorette-1.4.0" + sources."is-fullwidth-code-point-3.0.0" sources."lightning-4.1.0" sources."ln-service-52.0.1" (sources."ln-sync-2.0.0" // { @@ -72660,6 +72711,9 @@ in sources."lightning-4.6.0" ]; }) + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."table-6.7.1" sources."ws-8.1.0" ]; }) @@ -72754,6 +72808,7 @@ in sources."@grpc/proto-loader-0.6.5" sources."@types/node-16.9.1" sources."bn.js-5.2.0" + sources."cbor-8.0.0" sources."lightning-4.7.0" sources."ln-service-52.6.0" sources."ws-8.2.2" @@ -72858,7 +72913,7 @@ in sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."table-6.7.1" // { + (sources."table-6.7.2" // { dependencies = [ sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" @@ -75382,14 +75437,14 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.62"; + version = "1.0.0-beta.66"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.62.tgz"; - sha512 = "BpSFLHSP+VNWzaUdeeLig/TDfLtQ+i62ugFwPy2T36w9KFizaOmUitHPaDKcRlPuifPOsP+UZEHmg39iG2N/QA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.66.tgz"; + sha512 = "R0jcuhminjhGxzGUFrhEI6qdYxK6qR2ihqmNtj4f6tgwzyqC2objDsaSSGXvptXwndcAEpRfYwwzmdSEx7f8jQ=="; }; dependencies = [ - sources."@jsii/check-node-1.35.0" - sources."@jsii/spec-1.35.0" + sources."@jsii/check-node-1.36.0" + sources."@jsii/spec-1.36.0" sources."@types/node-12.20.27" sources."@xmldom/xmldom-0.7.5" sources."ajv-8.6.3" @@ -75400,12 +75455,12 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.54" - sources."cdk8s-plus-22-1.0.0-beta.5" + sources."cdk8s-1.0.0-beta.57" + sources."cdk8s-plus-22-1.0.0-beta.9" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.35.0" // { + (sources."codemaker-1.36.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -75470,25 +75525,25 @@ in sources."is-weakref-1.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.35.0" // { + (sources."jsii-1.36.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.35.0" // { + (sources."jsii-pacmak-1.36.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.35.0" // { + (sources."jsii-reflect-1.36.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.35.0" // { + (sources."jsii-rosetta-1.36.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" @@ -75517,7 +75572,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.35.0" + sources."oo-ascii-tree-1.36.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -75539,7 +75594,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.84" + sources."sscaff-1.2.85" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -75589,13 +75644,13 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.6.3.tgz"; - sha512 = "bWY44GnPyUQGixmM6daB1xB2MqOunwQ0W/6K3NUCV6rZnl/mljWXfoIECEmbBonYxu02ojZQ60s7i7zryBBJ7g=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.6.4.tgz"; + sha512 = "+/UpcjyL8UC+cYm3KYaf2UfoiHPojX3WpezTGdkBsjaSEOLbJOkpvgwMyoILrx4Ob2Pa2dCqgyCt6grqUdhqFw=="; }; dependencies = [ - sources."@apollo/client-3.4.15" + sources."@apollo/client-3.4.16" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -75619,14 +75674,14 @@ in sources."@babel/parser-7.15.7" sources."@babel/template-7.15.4" sources."@babel/types-7.15.6" - sources."@cdktf/hcl2cdk-0.6.3" - sources."@cdktf/hcl2json-0.6.3" + sources."@cdktf/hcl2cdk-0.6.4" + sources."@cdktf/hcl2json-0.6.4" (sources."@graphql-tools/graphql-file-loader-6.2.7" // { dependencies = [ sources."tslib-2.1.0" ]; }) - sources."@graphql-tools/import-6.4.2" + sources."@graphql-tools/import-6.5.0" (sources."@graphql-tools/load-6.2.8" // { dependencies = [ sources."tslib-2.2.0" @@ -75655,8 +75710,8 @@ in }) sources."@graphql-typed-document-node/core-3.1.0" sources."@josephg/resolvable-1.0.1" - sources."@jsii/check-node-1.35.0" - sources."@jsii/spec-1.35.0" + sources."@jsii/check-node-1.36.0" + sources."@jsii/spec-1.36.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -75759,7 +75814,7 @@ in ]; }) sources."case-1.6.3" - sources."cdktf-0.6.3" + sources."cdktf-0.6.4" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -75778,7 +75833,7 @@ in sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.6.0" sources."cli-truncate-2.1.0" sources."cli-width-3.0.0" sources."cliui-7.0.4" @@ -75823,7 +75878,7 @@ in }) sources."cross-spawn-7.0.3" sources."cssfilter-0.0.10" - sources."date-fns-2.24.0" + sources."date-fns-2.25.0" sources."date-format-3.0.0" sources."debug-2.6.9" sources."decamelize-1.2.0" @@ -75980,29 +76035,29 @@ in sources."iterall-1.3.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.35.0" // { + (sources."jsii-1.36.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.35.0" // { + (sources."jsii-pacmak-1.36.0" // { dependencies = [ sources."clone-2.1.2" - sources."codemaker-1.35.0" + sources."codemaker-1.36.0" sources."decamelize-5.0.1" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.35.0" // { + (sources."jsii-reflect-1.36.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.35.0" // { + (sources."jsii-rosetta-1.36.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" @@ -76082,7 +76137,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.35.0" + sources."oo-ascii-tree-1.36.0" sources."open-7.4.2" sources."optimism-0.16.1" sources."ora-5.4.1" @@ -76175,7 +76230,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.84" + sources."sscaff-1.2.85" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -76585,10 +76640,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.19"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.19.tgz"; - sha512 = "Pxsf2EVaepuqr3yHe/6RZS/YIfJK84RQdaWUGFSpVE6621oUIhjw3M+vAl3HXBQGi8H68zLNivdht+X2ZJE1gA=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.19.0.tgz"; + sha512 = "b6V4EVjeX6sfyDf9M/gmTB+OVKnkHxvO0XDwWs4/iqF+rhRyC7q7vGrp4ezUPOED2FOklFPCYZ+HGHJ2ldFn0g=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -77019,7 +77074,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."process-nextick-args-2.0.1" - sources."promise.prototype.finally-3.1.2" + sources."promise.prototype.finally-3.1.3" sources."promisify-child-process-4.1.1" sources."pump-3.0.0" sources."rc-1.2.8" @@ -77186,7 +77241,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -77284,7 +77339,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -78089,7 +78144,7 @@ in sha512 = "Wu+aAcy/8OR8Q7tE3039iSCe+Kc0BV36hssXinCbzLQoTpgWXjbPQpdkZFUgtzYOb9Xbx1kNGSd/XFHp2VM/dg=="; }; dependencies = [ - sources."pyright-1.1.173" + sources."pyright-1.1.175" ]; buildInputs = globalBuildInputs; meta = { @@ -78282,7 +78337,7 @@ in sources."array-union-2.1.0" sources."arrify-1.0.1" sources."astral-regex-2.0.0" - sources."autoprefixer-9.8.7" + sources."autoprefixer-9.8.8" sources."bail-1.0.5" sources."balanced-match-2.0.0" (sources."brace-expansion-1.1.11" // { @@ -78291,11 +78346,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -78332,7 +78387,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -78429,7 +78484,6 @@ in ]; }) sources."ms-2.1.2" - sources."nanocolors-0.2.12" sources."node-releases-1.1.77" (sources."normalize-package-data-3.0.3" // { dependencies = [ @@ -78451,8 +78505,9 @@ in sources."path-is-inside-1.0.2" sources."path-parse-1.0.7" sources."path-type-4.0.0" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" - (sources."postcss-7.0.38" // { + (sources."postcss-7.0.39" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -78773,7 +78828,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.18.0" // { + (sources."eslint-plugin-vue-7.19.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -79578,7 +79633,7 @@ in sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" - sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" sources."@sindresorhus/is-0.14.0" @@ -81208,7 +81263,7 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.3" sources."multi-random-access-2.1.1" - (sources."multicast-dns-7.2.3" // { + (sources."multicast-dns-7.2.4" // { dependencies = [ sources."dns-packet-5.3.0" ]; @@ -81676,7 +81731,7 @@ in sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" sources."@types/rc-1.2.0" - sources."@types/react-16.14.15" + sources."@types/react-16.14.16" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" sources."@types/react-window-infinite-loader-1.0.5" @@ -81718,7 +81773,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -81729,7 +81784,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -81797,7 +81852,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.5.1" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -81868,7 +81923,7 @@ in sources."get-stdin-7.0.0" sources."get-stream-6.0.1" sources."get-value-2.0.6" - sources."gl-matrix-3.3.0" + sources."gl-matrix-3.4.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -81972,7 +82027,6 @@ in sources."ms-2.1.2" sources."murmurhash-js-1.0.0" sources."nan-2.15.0" - sources."nanocolors-0.2.12" sources."nanomatch-1.2.13" sources."napi-macros-2.0.0" sources."node-fetch-2.6.5" @@ -82011,6 +82065,7 @@ in sources."path-parse-1.0.7" sources."pbf-3.2.1" sources."pend-1.2.0" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" sources."pify-3.0.0" sources."popper.js-1.16.1" @@ -83240,13 +83295,13 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -83275,7 +83330,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -83364,7 +83419,6 @@ in sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."ms-2.1.2" - sources."nanocolors-0.2.12" sources."nice-try-1.0.5" sources."node-releases-1.1.77" sources."normalize-package-data-2.5.0" @@ -83387,6 +83441,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.7" + sources."picocolors-0.2.1" (sources."pkg-dir-4.2.0" // { dependencies = [ sources."find-up-4.1.0" @@ -83519,7 +83574,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.177.1" + sources."@fluentui/react-7.177.2" sources."@fluentui/react-focus-7.18.0" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -83534,7 +83589,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.216" + sources."@microsoft/load-themed-styles-1.10.217" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -83585,7 +83640,7 @@ in sources."@types/tough-cookie-4.0.1" sources."@types/url-join-4.0.0" sources."@uifabric/foundation-7.10.0" - sources."@uifabric/icons-7.6.0" + sources."@uifabric/icons-7.6.1" sources."@uifabric/merge-styles-7.19.2" sources."@uifabric/react-hooks-7.14.0" sources."@uifabric/set-version-7.0.24" @@ -84562,7 +84617,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.177.1" + sources."office-ui-fabric-react-7.177.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -85573,7 +85628,7 @@ in sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."semver-6.3.0" ]; }) @@ -85775,7 +85830,7 @@ in sources."rimraf-3.0.2" ]; }) - sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" sources."@react-native-community/cli-debugger-ui-5.0.1" @@ -86022,7 +86077,7 @@ in }) sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -86156,7 +86211,7 @@ in }) (sources."core-js-compat-3.18.1" // { dependencies = [ - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."semver-7.0.0" ]; }) @@ -86288,7 +86343,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -86859,7 +86914,6 @@ in sources."mv-2.1.1" sources."mz-2.7.0" sources."nan-2.15.0" - sources."nanocolors-0.2.12" sources."nanomatch-1.2.13" sources."ncp-2.0.0" (sources."needle-2.9.1" // { @@ -86946,10 +87000,10 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.entries-1.1.4" - sources."object.getownpropertydescriptors-2.1.2" + sources."object.entries-1.1.5" + sources."object.getownpropertydescriptors-2.1.3" sources."object.pick-1.3.0" - sources."object.values-1.1.4" + sources."object.values-1.1.5" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -87054,6 +87108,7 @@ in sources."path-type-4.0.0" sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" @@ -87087,7 +87142,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.38" // { + (sources."postcss-7.0.39" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -87402,7 +87457,7 @@ in }) sources."sisteransi-1.0.5" sources."slash-3.0.0" - sources."slugify-1.6.0" + sources."slugify-1.6.1" sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -87974,7 +88029,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-2.0.0" @@ -87982,7 +88037,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -88006,7 +88061,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -88073,7 +88128,6 @@ in sources."minimist-options-4.1.0" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" - sources."nanocolors-0.2.12" sources."node-fetch-2.6.5" sources."node-releases-1.1.77" (sources."normalize-package-data-3.0.3" // { @@ -88093,6 +88147,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."pend-1.2.0" + sources."picocolors-0.2.1" sources."pkg-dir-4.2.0" sources."progress-2.0.3" sources."prop-types-15.7.2" @@ -90887,7 +90942,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { @@ -90898,7 +90953,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -90947,8 +91002,8 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.41.0" - sources."contentful-sdk-core-6.9.1" + sources."contentful-management-7.42.0" + sources."contentful-sdk-core-6.10.1" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { dependencies = [ @@ -90997,7 +91052,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -91229,7 +91284,6 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanocolors-0.2.12" sources."negotiator-0.6.2" sources."nice-try-1.0.5" sources."no-case-3.0.4" @@ -91254,6 +91308,7 @@ in sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" + sources."p-throttle-4.1.1" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ @@ -91288,6 +91343,7 @@ in sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."peek-readable-4.0.1" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -91543,7 +91599,7 @@ in sources."@octokit/plugin-paginate-rest-2.16.7" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.11.4" - sources."@octokit/request-5.6.1" + sources."@octokit/request-5.6.2" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.11.4" sources."@octokit/types-6.31.3" @@ -92394,7 +92450,7 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.4.2" // { + (sources."@graphql-tools/import-6.5.0" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -94410,7 +94466,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.999.0" + sources."aws-sdk-2.1000.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -95720,7 +95776,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.999.0" // { + (sources."aws-sdk-2.1000.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -97662,7 +97718,7 @@ in sources."natural-orderby-2.0.3" sources."next-tick-1.0.0" sources."nice-try-1.0.5" - sources."node-downloader-helper-1.0.18" + sources."node-downloader-helper-1.0.19" sources."object-inspect-1.11.0" sources."object-treeify-1.1.33" sources."onetime-5.1.2" @@ -98024,12 +98080,12 @@ in sources."brace-expansion-1.1.11" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."buffer-from-1.1.2" sources."bytes-3.1.0" sources."bytesish-0.4.4" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-1.3.0" @@ -98080,7 +98136,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -98207,7 +98263,6 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.1.2" - sources."nanocolors-0.2.12" sources."negotiator-0.6.2" sources."node-environment-flags-1.0.6" sources."node-fetch-2.6.5" @@ -98219,7 +98274,7 @@ in sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.2" + sources."object.getownpropertydescriptors-2.1.3" sources."on-finished-2.3.0" sources."once-1.4.0" sources."openpgp-4.10.10" @@ -98233,6 +98288,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" + sources."picocolors-0.2.1" sources."pify-4.0.1" sources."pirates-4.0.1" sources."pkg-dir-3.0.0" @@ -99067,7 +99123,7 @@ in sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" - sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" sources."@octokit/auth-token-2.5.0" @@ -99083,7 +99139,7 @@ in sources."@octokit/plugin-paginate-rest-2.16.7" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.11.4" - (sources."@octokit/request-5.6.1" // { + (sources."@octokit/request-5.6.2" // { dependencies = [ sources."is-plain-object-5.0.0" ]; @@ -99314,7 +99370,7 @@ in sources."resolve-from-4.0.0" ]; }) - sources."import-local-3.0.2" + sources."import-local-3.0.3" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" @@ -99499,7 +99555,7 @@ in sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.2" + sources."object.getownpropertydescriptors-2.1.3" sources."once-1.4.0" sources."onetime-5.1.2" sources."os-homedir-1.0.2" @@ -99722,10 +99778,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-4.1.1.tgz"; - sha512 = "w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw=="; + url = "https://registry.npmjs.org/less/-/less-4.1.2.tgz"; + sha512 = "EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA=="; }; dependencies = [ sources."copy-anything-2.0.3" @@ -99746,7 +99802,7 @@ in sources."sax-1.2.4" sources."semver-5.7.1" sources."source-map-0.6.1" - sources."tslib-1.14.1" + sources."tslib-2.3.1" ]; buildInputs = globalBuildInputs; meta = { @@ -100921,7 +100977,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -100937,7 +100993,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -101060,7 +101116,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -101344,7 +101400,6 @@ in }) sources."ms-2.1.2" sources."nan-2.15.0" - sources."nanocolors-0.2.12" sources."nanomatch-1.2.13" sources."ncp-2.0.0" sources."neo-async-2.6.2" @@ -101415,6 +101470,7 @@ in sources."pbkdf2-3.1.2" sources."peek-stream-1.1.3" sources."performance-now-2.1.0" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-1.0.0" @@ -101823,22 +101879,22 @@ in markdownlint-cli = nodeEnv.buildNodePackage { name = "markdownlint-cli"; packageName = "markdownlint-cli"; - version = "0.28.1"; + version = "0.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.28.1.tgz"; - sha512 = "RBKtRRBzcuAF/H5wMSzb4zvEtbUkyYNEeaDtlQkyH9SoHWPL01emJ2Wrx6NEOa1ZDGwB+seBGvE157Qzc/t/vA=="; + url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.29.0.tgz"; + sha512 = "SEXRUT1ri9sXV8xQK88vjGAgmz2X9rxEG2tXdDZMljzW8e++LNTO9zzBBStx3JQWrTDoGTPHNrcurbuiyF97gw=="; }; dependencies = [ sources."argparse-2.0.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."commander-8.0.0" + sources."commander-8.2.0" sources."concat-map-0.0.1" sources."deep-extend-0.6.0" sources."entities-2.1.0" sources."fs.realpath-1.0.0" sources."get-stdin-8.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."ignore-5.1.8" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -101848,9 +101904,9 @@ in sources."linkify-it-3.0.3" sources."lodash.differencewith-4.5.0" sources."lodash.flatten-4.4.0" - sources."markdown-it-12.0.4" - sources."markdownlint-0.23.1" - sources."markdownlint-rule-helpers-0.14.0" + sources."markdown-it-12.2.0" + sources."markdownlint-0.24.0" + sources."markdownlint-rule-helpers-0.15.0" sources."mdurl-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -102428,10 +102484,10 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.13.0"; + version = "8.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.13.0.tgz"; - sha512 = "pFpFVB32NC76IhxZ8rjfdSsMO0HakcsSdlRXGCI6EbFGEFswfLURfPDJl7bmY6rBlU/74p5p6AcNW06YvsqxyQ=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.13.2.tgz"; + sha512 = "/VCmgVj8oIi63Sp3zeNJbT1O5ExXbxjSAq5IWYXf4XaeMo2JiVjeNyLwUzp7uvDPugbm6jxoeqPDK5t36hP2aw=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" @@ -102909,10 +102965,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.9.28"; + version = "6.9.30"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.9.28.tgz"; - sha512 = "L7wLmCTbsl3Ka/anwLOh852FufDjFngjpmD4V2UONSkKGi2SZHKsXyFZ+Wz9dHo1YKLZyRGOo2hpgMXzYP9OBQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.9.30.tgz"; + sha512 = "CM3k7tUgfcaTjO+9xP+/C+cOF/Ke6464GV3EeJow3H1IEzoIufCBB6s6a0wUsVVD6+cKOs3OwQvLCQv03pftYw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -103047,7 +103103,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-26.6.2" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.13.6" // { + (sources."@netlify/build-18.13.7" // { dependencies = [ sources."resolve-2.0.0-next.3" ]; @@ -103074,7 +103130,7 @@ in sources."to-regex-range-5.0.1" ]; }) - (sources."@netlify/config-15.6.3" // { + (sources."@netlify/config-15.6.4" // { dependencies = [ sources."dot-prop-5.3.0" ]; @@ -103229,7 +103285,7 @@ in sources."@octokit/plugin-paginate-rest-2.16.7" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.11.4" - (sources."@octokit/request-5.6.1" // { + (sources."@octokit/request-5.6.2" // { dependencies = [ sources."is-plain-object-5.0.0" ]; @@ -103277,9 +103333,9 @@ in sources."@types/semver-7.3.8" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.32.0" - sources."@typescript-eslint/typescript-estree-4.32.0" - sources."@typescript-eslint/visitor-keys-4.32.0" + sources."@typescript-eslint/types-4.33.0" + sources."@typescript-eslint/typescript-estree-4.33.0" + sources."@typescript-eslint/visitor-keys-4.33.0" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."agent-base-6.0.2" @@ -103380,7 +103436,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -103404,7 +103460,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."cardinal-2.1.1" (sources."chalk-4.1.2" // { dependencies = [ @@ -103655,7 +103711,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -104166,7 +104222,6 @@ in ]; }) sources."mute-stream-0.0.7" - sources."nanocolors-0.2.12" sources."nanoid-3.1.28" sources."nanomatch-1.2.13" sources."natural-orderby-2.0.3" @@ -104364,13 +104419,14 @@ in sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pend-1.2.0" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pkg-dir-5.0.0" sources."posix-character-classes-0.1.1" - sources."postcss-8.3.8" + sources."postcss-8.3.9" sources."postcss-values-parser-2.0.1" sources."precinct-8.1.0" sources."precond-0.2.3" @@ -106262,7 +106318,7 @@ in sources."ignore-walk-3.0.4" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" - (sources."import-local-3.0.2" // { + (sources."import-local-3.0.3" // { dependencies = [ sources."pkg-dir-4.2.0" ]; @@ -106625,10 +106681,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.24.1"; + version = "7.24.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.24.1.tgz"; - sha512 = "U7/C++ZgB3zNH/kzhSJMnp3pO2iLrZRGUUXAgCCLB/by+sR+dKVhP/ik9+sTOGk9wk3zbmwHAYDT8igkv1ss0g=="; + url = "https://registry.npmjs.org/npm/-/npm-7.24.2.tgz"; + sha512 = "120p116CE8VMMZ+hk8IAb1inCPk4Dj3VZw29/n2g6UI77urJKVYb7FZUDW8hY+EBnfsjI/2yrobBgFyzo7YpVQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -106657,7 +106713,7 @@ in sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" - sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" sources."@sindresorhus/is-0.14.0" @@ -107462,7 +107518,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -107479,7 +107535,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -107616,7 +107672,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -107867,7 +107923,6 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."nan-2.15.0" - sources."nanocolors-0.2.12" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -107896,9 +107951,9 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.2" + sources."object.getownpropertydescriptors-2.1.3" sources."object.pick-1.3.0" - sources."object.values-1.1.4" + sources."object.values-1.1.5" sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -107920,9 +107975,10 @@ in sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" sources."physical-cpu-count-2.0.0" + sources."picocolors-0.2.1" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - sources."postcss-7.0.38" + sources."postcss-7.0.39" (sources."postcss-calc-7.0.5" // { dependencies = [ sources."postcss-value-parser-4.1.0" @@ -109508,7 +109564,7 @@ in (sources."@pm2/io-5.0.0" // { dependencies = [ sources."async-2.6.3" - sources."eventemitter2-6.4.4" + sources."eventemitter2-6.4.5" sources."semver-6.3.0" sources."tslib-1.9.3" ]; @@ -109516,7 +109572,7 @@ in (sources."@pm2/js-api-0.6.7" // { dependencies = [ sources."async-2.6.3" - sources."eventemitter2-6.4.4" + sources."eventemitter2-6.4.5" ]; }) sources."@pm2/pm2-version-check-1.0.4" @@ -109716,10 +109772,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.16.0"; + version = "6.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.16.0.tgz"; - sha512 = "g5rbneSqacQaEW0gdvGouxNHbDIpLTShg+cS4yCUwnj32RwMHwxChtcxPOR9VNZvNegcKE9LFUA0PA/uN37mDA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.16.1.tgz"; + sha512 = "oTZtaWJvvQ1V4KzpPya/BYYF90c6ICKmFYof8DAzMi0g2PEGseSVRdw/A2ov6mQJxBjHyRyYp/j42j8QOqRuKw=="; }; buildInputs = globalBuildInputs; meta = { @@ -109762,14 +109818,14 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.3.8"; + version = "8.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.8.tgz"; - sha512 = "GT5bTjjZnwDifajzczOC+r3FI3Cu+PgPvrsjhQdRqa2kTJ4968/X9CUce9xttIB0xOs5c6xf0TCWZo/y9lF6bA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz"; + sha512 = "f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw=="; }; dependencies = [ - sources."nanocolors-0.2.12" sources."nanoid-3.1.28" + sources."picocolors-0.2.1" sources."source-map-js-0.6.2" ]; buildInputs = globalBuildInputs; @@ -110584,10 +110640,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.173"; + version = "1.1.175"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.173.tgz"; - sha512 = "ksprslKAgZSmvz0Ndbo6EfSzRzP2klB/o6NKPtSqNCRDyIyLWAVGP7hqdhepKBAVNRktLuatM7R9VEBGLC7duQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.175.tgz"; + sha512 = "LCYO4t/wvZPSipRgz5wCRNQWqLBhiVx2H05sU7Xr6db6tesS1mPfwyBoa0X7oMCUycwoEmApdPCSQvrggXQ1oQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -111150,7 +111206,7 @@ in sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."atob-2.1.2" - sources."autoprefixer-9.8.7" + sources."autoprefixer-9.8.8" sources."axios-0.21.4" sources."babel-core-7.0.0-bridge.0" (sources."babel-loader-8.2.2" // { @@ -111232,7 +111288,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -111266,7 +111322,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -111490,7 +111546,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -111920,7 +111976,6 @@ in sources."mutation-observer-1.0.3" sources."mute-stream-0.0.7" sources."nan-2.15.0" - sources."nanocolors-0.2.12" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."neo-async-2.6.2" @@ -111971,9 +112026,9 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.2" + sources."object.getownpropertydescriptors-2.1.3" sources."object.pick-1.3.0" - sources."object.values-1.1.4" + sources."object.values-1.1.5" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -112018,6 +112073,7 @@ in sources."peek-stream-1.1.3" sources."pend-1.2.0" sources."performance-now-2.1.0" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" @@ -112030,7 +112086,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.38" // { + (sources."postcss-7.0.39" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -113421,13 +113477,13 @@ in sources."@types/node-14.17.20" sources."@types/node-fetch-2.5.12" sources."@types/vscode-1.60.0" - sources."@typescript-eslint/eslint-plugin-4.32.0" - sources."@typescript-eslint/experimental-utils-4.32.0" - sources."@typescript-eslint/parser-4.32.0" - sources."@typescript-eslint/scope-manager-4.32.0" - sources."@typescript-eslint/types-4.32.0" - sources."@typescript-eslint/typescript-estree-4.32.0" - sources."@typescript-eslint/visitor-keys-4.32.0" + sources."@typescript-eslint/eslint-plugin-4.33.0" + sources."@typescript-eslint/experimental-utils-4.33.0" + sources."@typescript-eslint/parser-4.33.0" + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + sources."@typescript-eslint/typescript-estree-4.33.0" + sources."@typescript-eslint/visitor-keys-4.33.0" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -114105,10 +114161,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.60.3"; + version = "2.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.60.3.tgz"; - sha512 = "YlMVUc0O9ZbOXDSE1zAqudw3ryB3JvSiHpxpiliYin09MrmYa2scLNx+zBPU42zihz+UMdA3Kt1NGaa5yQucJg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.61.0.tgz"; + sha512 = "a0Kha0IJ7dekoXgecoo1jsoH7c1d5tOdYaalZt0ZjrFBJq/hURpqJurPzuDlx4MwecbrGTe2aMjGUYFBFcDlRw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -114261,7 +114317,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.999.0" // { + (sources."aws-sdk-2.1000.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -115630,10 +115686,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.729.0"; + version = "1.731.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.729.0.tgz"; - sha512 = "+JFr+wvJCUJajsaEUF298Z7oJTkIrGQgBeqW6R8ZKOjUzawue8s406ILJ+E/40Jh14QkT00iOLKxr1pjS/CUIw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.731.0.tgz"; + sha512 = "1bRMFH7ZrjmaUkBnbOtCmLSSpAlj9vPKndBiP4hjCLysN8peVZ9SMdxGWhhJsmvqmRZYCdmPQyL+sKev8dsRkw=="; }; buildInputs = globalBuildInputs; meta = { @@ -116721,7 +116777,7 @@ in ]; }) sources."string-width-1.0.2" - sources."string.prototype.trim-1.2.4" + sources."string.prototype.trim-1.2.5" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" @@ -116899,7 +116955,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.999.0" // { + (sources."aws-sdk-2.1000.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -117725,7 +117781,7 @@ in sources."array-union-2.1.0" sources."arrify-1.0.1" sources."astral-regex-2.0.0" - sources."autoprefixer-9.8.7" + sources."autoprefixer-9.8.8" sources."bail-1.0.5" sources."balanced-match-2.0.0" (sources."brace-expansion-1.1.11" // { @@ -117734,11 +117790,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -117775,7 +117831,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -117871,7 +117927,6 @@ in ]; }) sources."ms-2.1.2" - sources."nanocolors-0.2.12" sources."node-releases-1.1.77" (sources."normalize-package-data-3.0.3" // { dependencies = [ @@ -117892,8 +117947,9 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" - (sources."postcss-7.0.38" // { + (sources."postcss-7.0.39" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -120166,7 +120222,7 @@ in sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w=="; }; dependencies = [ - sources."array-includes-3.1.3" + sources."array-includes-3.1.4" sources."call-bind-1.0.2" sources."define-properties-1.1.3" sources."es-abstract-1.19.1" @@ -120700,10 +120756,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.133.0"; + version = "0.133.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.133.0.tgz"; - sha512 = "1p8xTXnJD4hMM2Ktm7+FqOOBoImBoftKnKtAZT/b9AQeL3LhRkVu/HnIJhWA69qIMvUYpjfnunNsO4WdObw1ZQ=="; + url = "https://registry.npmjs.org/three/-/three-0.133.1.tgz"; + sha512 = "WydohO8ll949B0FTD6MGz59Yv2Lwj8hvObg/0Heh2r42S6+tQC1WByfCNRdmG4D7+odfGod+n8JPV1I2xrboWw=="; }; buildInputs = globalBuildInputs; meta = { @@ -120718,10 +120774,10 @@ in tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; - version = "5.1.23"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.23.tgz"; - sha512 = "U5P6CdVncHqfoMRAYGj8NxqbP2JJICdLre+jAlXzV8nhllRL9ZFIE0y80wASXc6xip6++TA67Pam7+FJ73A1Vw=="; + url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.2.0.tgz"; + sha512 = "X/gDXUTZqdBjzuw0/EfvPxQEVuW/hPE/O7hmOqysvDRpfwS7an6hHGzeNkyPHmb1b2uONgd8tfDuScuwTkjIvA=="; }; buildInputs = globalBuildInputs; meta = { @@ -122117,7 +122173,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.18.0" // { + (sources."eslint-plugin-vue-7.19.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -122490,7 +122546,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.5.0" - sources."acorn-import-assertions-1.7.6" + sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -122506,12 +122562,12 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -122551,7 +122607,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.2" sources."domutils-2.8.0" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.3" @@ -122595,7 +122651,7 @@ in sources."hosted-git-info-4.0.2" sources."htmlparser2-6.1.0" sources."human-signals-2.1.0" - sources."import-local-3.0.2" + sources."import-local-3.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."interpret-2.2.0" @@ -122652,7 +122708,6 @@ in sources."mocha-8.4.0" sources."ms-2.1.3" sources."mute-stream-0.0.8" - sources."nanocolors-0.2.12" sources."nanoid-3.1.20" sources."neo-async-2.6.2" sources."node-releases-1.1.77" @@ -122676,6 +122731,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."pend-1.2.0" + sources."picocolors-0.2.1" sources."picomatch-2.3.0" (sources."pkg-dir-4.2.0" // { dependencies = [ @@ -122764,7 +122820,7 @@ in sources."vscode-debugadapter-testsupport-1.49.0" sources."vscode-debugprotocol-1.49.0" sources."watchpack-2.2.0" - sources."webpack-5.56.0" + sources."webpack-5.56.1" (sources."webpack-cli-4.8.0" // { dependencies = [ sources."commander-7.2.0" @@ -124088,7 +124144,7 @@ in sources."browser-process-hrtime-1.0.0" sources."btoa-1.2.1" sources."canvas-2.8.0" - sources."canvg-3.0.8" + sources."canvg-3.0.9" sources."chownr-2.0.0" (sources."cliui-7.0.4" // { dependencies = [ @@ -124220,7 +124276,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."svg-pathdata-5.0.5" + sources."svg-pathdata-6.0.3" sources."svg2img-0.9.3" sources."symbol-tree-3.2.4" sources."tar-6.1.11" @@ -124876,10 +124932,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.56.0"; + version = "5.56.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.56.0.tgz"; - sha512 = "pJ7esw2AGkpZL0jqsEAKnDEfRZdrc9NVjAWA+d1mFkwj68ng9VQ6+Wnrl+kS5dlDHvrat5ASK5vd7wp6I7f53Q=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.56.1.tgz"; + sha512 = "MRbTPooHJuSAfbx7Lh/qEMRUe/d0p4cRj2GPo/fq+4JUeR/+Q1EfLvS1lexslbMcJZyPXxxz/k/NzVepkA5upA=="; }; dependencies = [ sources."@types/eslint-7.28.0" @@ -124905,15 +124961,15 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.5.0" - sources."acorn-import-assertions-1.7.6" + sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.17.2" + sources."browserslist-4.17.3" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001263" + sources."caniuse-lite-1.0.30001264" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.857" + sources."electron-to-chromium-1.3.859" sources."enhanced-resolve-5.8.3" sources."es-module-lexer-0.9.2" sources."escalade-3.1.1" @@ -124937,10 +124993,10 @@ in sources."merge-stream-2.0.0" sources."mime-db-1.50.0" sources."mime-types-2.1.33" - sources."nanocolors-0.2.12" sources."neo-async-2.6.2" sources."node-releases-1.1.77" sources."p-limit-3.1.0" + sources."picocolors-0.2.1" sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" @@ -124996,7 +125052,7 @@ in sources."get-stream-6.0.1" sources."has-1.0.3" sources."human-signals-2.1.0" - sources."import-local-3.0.2" + sources."import-local-3.0.3" sources."interpret-2.2.0" sources."is-core-module-2.7.0" sources."is-plain-object-2.0.4" @@ -125043,10 +125099,10 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.3.0.tgz"; - sha512 = "kuqP9Xn4OzcKe7f0rJwd4p8xqiD+4b5Lzu8tJa8OttRL3E1Q8gI2KmUtouJTgDswjjvHOHlZDV8LTQfSY5qZSA=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.3.1.tgz"; + sha512 = "qNXQCVYo1kYhH9pgLtm8LRNkXX3XzTfHSj/zqzaqYzGPca+Qjr+81wj1jgPMCHhIhso9WEQ+kX9z23iG9PzQ7w=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -125494,7 +125550,7 @@ in sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" sources."chrome-net-3.3.4" - (sources."chromecasts-1.10.1" // { + (sources."chromecasts-1.10.2" // { dependencies = [ sources."mime-1.6.0" ]; @@ -125601,7 +125657,7 @@ in sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.3" sources."ms-2.0.0" - (sources."multicast-dns-git://github.com/webtorrent/multicast-dns.git#fix-setMulticastInterface" // { + (sources."multicast-dns-7.2.4" // { dependencies = [ sources."thunky-1.1.0" ]; @@ -125966,7 +126022,7 @@ in ]; }) sources."@npmcli/name-from-folder-1.0.1" - sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/package-json-1.0.1" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix index 77635e8848..f9af4ab8ca 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix @@ -10,10 +10,9 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ]; - createFindlibDestdir = true; - - configurePhase = '' - mkdir $out/bin + preInstall = '' + mkdir -p $out/bin + mkdir -p $OCAMLFIND_DESTDIR ''; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix index c083f5b68f..1fbcb57f3a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uucp, uutf, cmdliner }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uucp, uutf, cmdliner }: let pname = "uuseg"; @@ -8,22 +8,22 @@ in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "11.0.0"; + version = "14.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "17mn8p9pn340kmvfgnl1m64zbpy60r6svkwsdn2lcg3yi2jlbrwp"; + sha256 = "sha256:1g9zyzjkhqxgbb9mh3cgaawscwdazv6y8kdqvmy6yhnimmfqv25p"; }; buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ]; - propagatedBuildInputs = [ uucp uchar ]; + propagatedBuildInputs = [ uucp ]; inherit (topkg) buildPhase installPhase; meta = with lib; { description = "An OCaml library for segmenting Unicode text"; homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix index 15dd3f5bc5..1afa8f2ae3 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.1.5"; + version = "2.1.8"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1v4hjwbv1y5jvj91i2fj8bvmfsymp9ls8h231zd85svfqdy5b5dy"; + sha256 = "141myfivdjnkx8myvkgl2sclhvx9z1c6a1my4xzscx0injhsrf3p"; }; dontUnpack = true; 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 84e9c9ed89..f98cf112eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.10055"; + version = "9.0.10072"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RaYwPWKFYbDbWm5lZYk9qaDCgL8HcimIRZasbPPOlqo="; + sha256 = "sha256-sUyR9X/+JedJGsiQQuwgJQB5e1+S1I516P5jDCQRzAw="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index f37eaf47ee..3d40e7ff52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "9.1.4"; + version = "9.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I7SFujEh5s+WgRktmjTrcQlASOjywXvlC1SiltcKRAE="; + sha256 = "sha256-PPag65ZMz9KZEe9FmiB42/DgeM0vJw5L0haAG/jBjqg="; }; propagatedBuildInputs = [ 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 cf1c5c160c..342ff82c3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.10055"; + version = "9.0.10072"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-egj24DBP2Bq2GMYOhZZPXmnobpbjxbD2V8MWwZpqhUg="; + sha256 = "sha256-mdGcEeuWXo0Qyi8+mU8RSpUoTbUkVBmduTz3B4TW2zg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix index 4b16964fa4..a71c6e3c7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.10055"; + version = "9.0.10072"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OAn57lt25ZmEU62pJLJd+3T0v2nCYRDnwuVhiZfA7Uk="; + sha256 = "sha256-FTKvGhONDUifwZhoKBXTZQFNbC/vTcHdLIge3j6U8uo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix index eec3b5cc81..d035c3267a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "5.0.8"; + version = "5.2.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tnuWKEB66bwVuwu3H3mHG99ZP+/msGhMDMRL5fyQgD8="; + sha256 = "sha256-eQIDVtk/UD0syGmnJw48BDFtUQ4ztiZO3AjH0NsOgGE="; }; nativeBuildInputs = [ @@ -52,18 +52,6 @@ buildPythonPackage rec { "--numprocesses" "auto" ]; - postPatch = '' - # Both patches are addressed in https://github.com/ansible-community/ansible-lint/pull/1549 - # and should be removed once merged upstream - - # fixes test_get_yaml_files_umlaut and test_run_inside_role_dir - substituteInPlace src/ansiblelint/file_utils.py \ - --replace 'os.path.join(root, name)' 'os.path.normpath(os.path.join(root, name))' - # fixes test_custom_kinds - substituteInPlace src/ansiblelint/file_utils.py \ - --replace "if name.endswith('.yaml') or name.endswith('.yml')" "" - ''; - preCheck = '' # ansible wants to write to $HOME and crashes if it can't export HOME=$(mktemp -d) @@ -80,8 +68,18 @@ buildPythonPackage rec { disabledTests = [ # requires network + "test_cli_auto_detect" + "test_install_collection" "test_prerun_reqs_v1" "test_prerun_reqs_v2" + "test_require_collection_wrong_version" + # re-execs ansible-lint which does not works correct + "test_custom_kinds" + "test_run_inside_role_dir" + "test_run_multiple_role_path_no_trailing_slash" + "test_runner_exclude_globs" + + "test_discover_lintables_umlaut" ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-base ]}" ]; 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 6f7f3c47ad..e20cb09326 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.10055"; + version = "9.0.10072"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eQBART7WSAJKQRKNwmR1JKTkrlerHeHVgTK5v0R644Q="; + sha256 = "sha256-Nwt2QD+A67Lbgzg/HSR+yaNWk9+EsUWA5nxm4JTikS8="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 8be13364e1..f500e9068a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3d4fdfd0bd666984f7bdc7bc0c7a6018c35a5d46a81a32dd193b07c03b528b72"; + sha256 = "5e1d8f03939eafe29c301659c7b819053513be6f224861388b0048ca62e7a75d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix index db998e00e6..554b97c356 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "azure-synapse-spark"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "ac7564a61ba314e0a9406c0f73c3cede04091a131a0c58971bcba0c158b7455d"; + sha256 = "86fa29463a24b7c37025ff21509b70e36b4dace28e5d92001bc920488350acd5"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 3ecc2034d4..6d8cb85fa8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.18.31"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.18.54"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-WURdDh1VyMlnVpfqQcmKDYIImkvjB26mDjqHy+lNwUE="; + sha256 = "sha256-LYHcSEAgBZ/HOBZZhDBBB9TbHGd0tjENCMiSoXUfaYA="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index cdb3f54c85..bf29141160 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.21.31"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.21.54"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-WM0xXirglxrNs9fNqcnDa0HHMYH0GUOnRDgS1tPJrRg="; + sha256 = "sha256-RhJ7OjhdDsc9GZS4lYsjt54GE+EsSGNxoQDfmStyobk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix index f23bc566ba..f157f291f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.1.0"; + version = "4.1.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3L1ZzZ7eomzJLvtlGK7YOi81b4G/1azHML/iAvsnwcE="; + sha256 = "cdbdb3e02ef0c0655bb55be8b05ec1cb830b5ec629923ccb24bfd71dede3d1c3"; }; propagatedBuildInputs = [ six webob ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index e5b6b6cc1c..6fe2bc2be0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-tCszN+sy4Z6nOwULj9ra5/TtW4YYi32fkbMKub5i2Xk="; + sha256 = "sha256-SO8vy9x2jwK5AOHety7RuxRK+OEIHpMXqetW3bqfzZI="; }; sourceRoot = "source/${pname}"; 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 e403891726..584067e102 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.10055"; + version = "9.0.10072"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QHhZVnUv54I8R7oCOBJgBcKZr8csg2OEOGxn4MKgmtk="; + sha256 = "sha256-bsFfp1ocgHhe0/1wWwgnXDQm37gmWQylZvy6HiyQGSw="; }; # Use upstream z3 implementation diff --git a/third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix deleted file mode 100644 index 1accefe5f1..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/class-registry/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, nose -, pythonOlder -}: - -buildPythonPackage rec { - pname = "class-registry"; - version = "3.0.5"; - disabled = pythonOlder "3.5"; - - src = fetchFromGitHub { - owner = "todofixthis"; - repo = pname; - rev = version; - sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q"; - }; - - checkInputs = [ - nose - ]; - - pythonImportsCheck = [ "class_registry" ]; - - meta = with lib; { - description = "Factory and registry pattern for Python classes"; - homepage = "https://class-registry.readthedocs.io/en/latest/"; - license = licenses.mit; - maintainers = with maintainers; [ kevincox ]; - }; -} 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 0a55542b48..c5dea6ece1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.10055"; + version = "9.0.10072"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fqnumSz3BfpG5/ReQQOhSGvsOMuinLs8q2HlPAxYQWM="; + sha256 = "sha256-uY0Pp+BssnkQvF8fsVlRW2Wj/JmMBSBudDf9AHekBtw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix index c782a5f674..2656dd593c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.1.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "c7f89a272a177a17a045ceab26bbb7e35d28ca5597c384de96817784b610c977"; + sha256 = "7e34085b7fc4d352e482ff9cf7d09ae4524e730675e25432ab1d25a2dd94e583"; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) 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 2b20c7de4a..883ff8bcb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "11v8zqz183vpiyg2cp0fghb1hxqsn3yaydm1d97nqd9g2mfy37s1"; + sha256 = "0sxqw1y070cpg7102a6a1bha8s25vwdgfcjp9nzlrzgd2p6pav41"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index d278b8bcf4..686a167d74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.5.1"; + version = "4.5.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "0pj6rcink4awjyq1v30camilqr03kd0sb2p03fk9v4lm63d8w28f"; + sha256 = "1zz4p13ww9y5x0ifvcj652hgfbjqbnmr3snwrs0p315sc3y47ggm"; }; propagatedBuildInputs = [ 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 eff080fa2f..4b606f2772 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/foxdot/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, tkinter, supercollider }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, tkinter +, supercollider +}: buildPythonPackage rec { pname = "FoxDot"; @@ -9,7 +15,10 @@ buildPythonPackage rec { sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90"; }; - propagatedBuildInputs = [ tkinter supercollider ]; + propagatedBuildInputs = [ 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 ]; # Requires a running SuperCollider instance doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index f2e3276705..a3ecf1a6ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.7"; + version = "0.1.8"; src = fetchPypi { inherit pname version; - sha256 = "02adf212c8d280298ffe03a0c91743618693ec394b42cbb85b4a29f8d9544afa"; + sha256 = "29101f61fa0e07db6385a94da45aef8edb4efde0d2b700fbbf65164c045744a8"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 62956e1e46..eff1cef578 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -6,6 +6,7 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pytz , mock }: @@ -18,7 +19,7 @@ buildPythonPackage rec { sha256 = "fcb71ebe5c5b232d24fe7d666b65709e4fc8db43263c8182e5ed8e5a52abefec"; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 9bac30fd3c..15f496c991 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.8.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "f58192b534b5324c874547835808ed7d5c116e986f07e57b27b0ac5e12baddca"; + sha256 = "dc0302b1fa4a435ffd97c13d669ed5b1a60c5a0a21d5528418466ca54d0cd4d5"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 0da292a342..91a1e354ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.32.5"; + version = "0.32.6"; src = fetchPypi { inherit pname version; - sha256 = "2f7b2a69f4506239a54f2d88dda872db27fdb0fdfa0d5a9494fefb7ae360aa20"; + sha256 = "3f333aa1f6a47cb5a38f3416c4ac9a4bbeaceeb1f3f2381fef9553c9fb665cc7"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index bb74540b0f..50560585b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.11.0"; + version = "3.11.1"; src = fetchPypi { inherit pname version; - sha256 = "8ffb36f3c1392213c9dff57f1dcb18810f6e805898ee7b4626a4da2b9b6c4b63"; + sha256 = "b993b4c68f11dd6fe0f66e0c437a71f9bed8d77f6bf1ddc4aad422ce3b330ecb"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 9eb3fcf242..90ec3078d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.9.1"; + version = "2.9.3"; src = fetchPypi { inherit pname version; - sha256 = "321a11863124d2fba73c519594d5a8803650f1f4323b08b9de3d096e536e98c1"; + sha256 = "52b8a056f26e9ed082576b7b173c9a86f286a12c2883ec7cf5a0e8be68020bac"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix index 1e010f9560..d3cc01e453 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "google-crc32c"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; rev = "v${version}"; - sha256 = "0snpqmj2avgqvfd7w26g03w78s6phwd8h55bvpjwm4lwj8hm8id7"; + sha256 = "005ra4pfv71rq53198k7q6k63f529q3g6hkbxbwfcf82jr77hxga"; }; buildInputs = [ crc32c ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix index 30947c1430..38c11cc4c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix @@ -11,26 +11,19 @@ , pytest-mock , pytz , snapshottest -, fetchpatch }: buildPythonPackage rec { pname = "graphene"; - version = "3.0.0b7"; + version = "3.0.0b8"; src = fetchFromGitHub { owner = "graphql-python"; repo = "graphene"; rev = "v${version}"; - sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338="; + sha256 = "sha256-Pgln369s4qXdKqLxhX+AkgpDQm+MfSZ/OVmB1AaawHI="; }; - patches = [ (fetchpatch { - # Allow later aniso8601 releases, https://github.com/graphql-python/graphene/pull/1331 - url = "https://github.com/graphql-python/graphene/commit/26b16f75b125e35eeb2274b7be503ec29f2e8a45.patch"; - sha256 = "qm96pNOoxPieEy1CFZpa2Mx010pY3QU/vRyuL0qO3Tk="; - }) ]; - propagatedBuildInputs = [ aniso8601 graphql-core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix index 348d83e110..e3eee7d72e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - version = "0.8.0"; + version = "0.8.1"; pname = "javaproperties"; format = "pyproject"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "jwodder"; repo = pname; rev = "v${version}"; - sha256 = "0n6dz6rnpq8wdwqyxqwv0q7vrl26vfmvvysdjvy557fck1q2l0kf"; + sha256 = "16rcdw5gd4a21v2xb1j166lc9z2dqcv68gqvk5mvpnm0x6nwadgp"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix index 6dcc8e9273..426b990cca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.6.2"; + version = "2.6.3"; src = fetchPypi { inherit pname version; - sha256 = "878c479c933346cc8cc60b6d145973568ac23e7c453e193cf55625e7921a9b62"; + sha256 = "4eee93d0af203af7cee54a8f0c7bd28af683e829edf1fd68feba85d0ad737395"; }; postPatch = '' 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 76d0617f4c..68c6492bfc 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 @@ -26,12 +26,12 @@ buildPythonPackage rec { pname = "jupyter_server"; - version = "1.11.0"; + version = "1.11.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-irT0hKSiaY91fP8HadJ7XZkeAjKmZtVPTWraTmphMws="; + sha256 = "ab7ab1cc38512f15026cbcbb96300fb46ec8b24aa162263d9edd00e0a749b1e8"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix index 485bc44ff6..66a2bb355b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "langcodes"; - version = "3.1.0"; + version = "3.2.0"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "1ccd37e3a68760d29ec3b17f5962cd1d8f242f4d9705ad1601c5cb7fab48199c"; + sha256 = "38e06cd104847be351b003a9857e79f108fb94b49dd2e84dbab905fd3777530a"; }; propagatedBuildInputs = [ marisa-trie ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix index c62e4c7457..9ac682b424 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.7.1"; + version = "1.7.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-TNDQV1BOVVdvr0XAyWGcwgMbe4mV7J05hQeKVUqVT9s="; + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-fPSvxdr329SxAe4N7lTa7hddFp1WVUplkhYD1oDQXAI="; }; nativeBuildInputs = [ installShellFiles ]; @@ -56,9 +56,9 @@ buildPythonPackage rec { meta = with lib; { description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices"; - homepage = "https://github.com/liquidctl/liquidctl"; - changelog = "https://github.com/liquidctl/liquidctl/blob/master/CHANGELOG.md"; - license = licenses.gpl3Plus; + homepage = "https://github.com/liquidctl/liquidctl"; + changelog = "https://github.com/liquidctl/liquidctl/blob/master/CHANGELOG.md"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ arturcygan evils ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 6e0beb7974..2ef611a0ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.10.8"; + version = "0.10.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-25zLhlGMwDja5wGmkqYuYtSUqOdD/gzUKGi79f1Tsjs="; + sha256 = "b774a2e1178a2f9812ce02119c6ee374b1ea08d34bad4c09a1ecc92d08d98f28"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index b5c061a6ba..f245994cc4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.53"; + version = "1.18.54"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4579f837aa87b439014c8aa40ff0cf2510a6d01dcb370179a19c5c45c8aecb9c"; + sha256 = "fdbb7ff1687fba8e7ac521502cb2d2ca4b845e1a331f5b4fe55aff7c17e1f985"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix index afca46ec8a..564a08b4eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.9.4"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "0mpvj8imsaqhrgfq1cxx16flc5201y78kqa7bh2i5zxsc29843mx"; + sha256 = "c01fbaf62ad2eb791e97158d1f30349e830bee2dd3e9503a87f6c3ffae8d1cf0"; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix index b2021b7776..9bfdbe89aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix @@ -1,6 +1,5 @@ { lib , fetchPypi -, fetchpatch , buildPythonPackage , flake8 , flake8-polyfill diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix index ad8aca089e..291ceb90e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.50"; + version = "2.1.51"; src = fetchPypi { inherit pname version; - sha256 = "c67365b26060452631c0083a0f5d50af3cba9287b84b2c157404c959cb4bb74d"; + sha256 = "32c5bf3926c1ac001d57f6b7569fc1fdd7ccfe747190f2e61d6baf610811beb8"; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix index 94538dc6e7..0cb94be921 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix @@ -1,28 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - pname = "phx-class-registry"; + pname = "class-registry"; version = "3.0.5"; + disabled = pythonOlder "3.5"; - disabled = isPy27; - - src = fetchPypi { - inherit pname version; - sha256 = "14iap8db2ldmnlf5kvxs52aps31rl98kpa5nq8wdm30a86n6457i"; + src = fetchFromGitHub { + owner = "todofixthis"; + repo = pname; + rev = version; + sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q"; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - disabledTests = [ - "test_branding" - "test_happy_path" - "test_len" + pythonImportsCheck = [ + "class_registry" ]; meta = with lib; { - description = "Registry pattern for Python classes, with setuptools entry points integration"; - homepage = "https://github.com/todofixthis/class-registry"; + description = "Factory and registry pattern for Python classes"; + homepage = "https://class-registry.readthedocs.io/en/latest/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ kevincox SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix index 1264e40f30..a175b2a813 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "21.9.1"; + version = "21.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "1pgvpg5sjmd9p1i9lm39k4r5qsz158wfgwfa56rx0p8xqf00h1xp"; + sha256 = "0dmszxwmkgvpl7w0g4qd3dp67bw2indvd2my6jjgfn0wgwyn46r1"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix index df97d1c4d7..e623840f1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.19.0"; + version = "1.19.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-zmaVzoBDg61vOSxLsYdMMjiWKQofZWVg3jZBa6gy2R4="; + sha256 = "sha256-ylMLBxjGJbpj8VGrP83INrWTQ9FJt9/RXsLc6zhEwi0="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix index 5eefe5ade5..67f8da66be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.4.4"; + version = "2.6.0"; disabled = pythonOlder "3.6"; src = fetchFromBitbucket { owner = "mustang51"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G7SShq2zjd9KGM7t1KsAMehqm2onB5cYdcOO3k8Sb30="; + sha256 = "sha256-Fk6zMWgvhKp+7BMDGw89Akb4fgK6+xi+AyvEY3pdTQQ="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { urllib3 ]; - # while they have tests, they do not run them in their CI and they fail as of 2.4.4 + # while they have tests, they do not run them in their CI and they fail as of 2.6.0 # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix index 3c5310690c..9238e38148 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyenchant"; - version = "3.2.1"; + version = "3.2.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5e206a1d6596904a922496f6c9f7d0b964b243905f401f5f2f40ea4d1f74e2cf"; + sha256 = "1cf830c6614362a78aab78d50eaf7c6c93831369c52e1bb64ffae1df0341e637"; }; propagatedBuildInputs = [ enchant2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix index 5a0a53005b..0306008aa7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pylast"; - version = "4.2.1"; + version = "4.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R1enQk6luuBiobMPDn5x1SXx7zUI/5c8dPtyWkmG/18="; + sha256 = "71fd876e3753009bd10ea55b3f8f7c5d68591ee18a4127d257fc4a418010aa5c"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 7d2bdf6c99..9e44a6b151 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.2.2"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RuZfCvYeO4mthZrg06UhwPp57qvuUI1yYyne5nzIHhE="; + sha256 = "sha256-zoKJ9g7cXcQhickkhRjYwl6SqOar2Kautg5dHf3PqGk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix index 1146fe892f..e1ae55fd5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "1.4.0"; + version = "1.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xvHvZx22orJR94cRMyyXey27Ksh2/ULHRvv7xxXv11k="; + sha256 = "f8bc6ebbe2c2bf37009b50b16e34747b0cfe35dd249aed4525b68c3af061941f"; }; propagatedBuildInputs = [ requests ]; 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 6a4215236d..dc7c0c84b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.10055"; + version = "9.0.10072"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZfsFr8EkzdDYMyE/OJVwQylHVKcOrW1NBMI8cGmyF9A="; + sha256 = "sha256-F6NUvcGYshPbfcfhkfbnzIxkXmfpAc/kfHFk5fuaICA="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rdflib-jsonld/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rdflib-jsonld/default.nix index 9a0b02c329..3872ef5d2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rdflib-jsonld/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rdflib-jsonld/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rdflib-jsonld"; - version = "0.5.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "4f7d55326405071c7bce9acf5484643bcb984eadb84a6503053367da207105ed"; + sha256 = "107cd3019d41354c31687e64af5e3fd3c3e3fa5052ce635f5ce595fd31853a63"; }; nativeBuildInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index 2239b5824e..65a949ebe7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "3.1.5"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "0jm4x66kk7aa19hablkij43vsnsyy85a638zjfjsqghwqppwklgw"; + sha256 = "sha256-H3ZTts9tk0D53IcnmROCgylhVerctUg/AQCjFo5iJZY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index fb4f59c6d7..f8a2c8f020 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.59.6"; + version = "2.59.7"; src = fetchPypi { inherit pname version; - sha256 = "4bf7a6c541dbb0d29af9a7fba0159946f67974fbc8e76d2587e601d59f83fd45"; + sha256 = "sha256-6tNUI08Fp2zITH1ILfVVEU0VhgvLogWfXPr9dkAKQEk="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix index 5f6721f816..9be77facf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-splash/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scrapy-splash"; - version = "0.7.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488"; + sha256 = "a7c17735415151ae01f07b03c7624e7276a343779b3c5f4546f655f6133df42f"; }; propagatedBuildInputs = [ scrapy six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch b/third_party/nixpkgs/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch index c51490ce6a..dfeb50db8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch @@ -4,15 +4,9 @@ Date: Mon, 20 Jul 2020 19:51:20 +0200 Subject: [PATCH] Disable tests that fail on Darwin (macOS) or with sandboxing Signed-off-by: Sirio Balmelli ---- - test.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/test.py b/test.py -index f8029c0..ba1d141 100644 --- a/test.py +++ b/test.py -@@ -404,6 +404,7 @@ exit(3) +@@ -377,6 +377,7 @@ exit(3) self.assertEqual(sed(_in="one test three", e="s/test/two/").strip(), "one two three") @@ -20,7 +14,7 @@ index f8029c0..ba1d141 100644 def test_ok_code(self): from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2 -@@ -1004,6 +1005,7 @@ print(sys.argv[1]) +@@ -982,6 +983,7 @@ print(sys.argv[1]) now = time.time() self.assertGreater(now - start, sleep_time) @@ -28,7 +22,7 @@ index f8029c0..ba1d141 100644 def test_background_exception(self): from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2 p = ls("/ofawjeofj", _bg=True, _bg_exc=False) # should not raise -@@ -1801,6 +1803,7 @@ exit(49) +@@ -1779,6 +1781,7 @@ exit(49) p = python(py.name, _ok_code=49, _bg=True) self.assertEqual(49, p.exit_code) @@ -36,7 +30,15 @@ index f8029c0..ba1d141 100644 def test_cwd(self): from sh import pwd from os.path import realpath -@@ -2899,6 +2902,7 @@ print("hi") +@@ -2777,6 +2780,7 @@ print("cool") + # on osx. so skip it for now if osx + @not_macos + @requires_progs("lsof") ++ @skipUnless(False, "Flaky on Hydra") + def test_no_fd_leak(self): + import sh + import os +@@ -2879,6 +2883,7 @@ print("hi") python(py.name, _in=stdin) @requires_utf8 @@ -44,6 +46,3 @@ index f8029c0..ba1d141 100644 def test_unicode_path(self): from sh import Command --- -2.27.0 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix index 621da7ae8d..05298549d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "somecomfort"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CbV8NOpCXzVz0dBKhUclUCPrD4530zv5HIYxsbNO+OA="; + sha256 = "f201109104a61d05624022d3d0ebf23bf487570408517cac5f3f79dbde4b225d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix index c13ca40720..94e7410d6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix @@ -3,6 +3,7 @@ , fetchPypi , buildPythonPackage , pytorch +, pythonOlder , spacy , spacy-alignments , srsly @@ -11,11 +12,13 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.0.2"; + version = "1.0.6"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-AYshH2trMTgeSkAPRb6wRWpm4gA5FaKV2NJd+PhzAy4="; + sha256 = "sha256-zkpSaiqb0wUTugmbeREVJyZzv5qxXXw4YFBpXzdSUXE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/annotate.py b/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/annotate.py index eb62880848..515b8f57b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/annotate.py +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/annotate.py @@ -26,10 +26,10 @@ def test_entities(doc_en_core_web_sm): assert entities == [ ('Sebastian Thrun', 'PERSON'), + ('Google', 'ORG'), ('2007', 'DATE'), ('American', 'NORP'), - ('Thrun', 'PERSON'), - ('Recode', 'PERSON'), + ('Thrun', 'GPE'), ('earlier this week', 'DATE'), ] 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 376686e0a6..c0c8593452 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -23,15 +23,20 @@ , packaging , pathy , pydantic +, python +, tqdm +, typing-extensions }: buildPythonPackage rec { pname = "spacy"; - version = "3.0.6"; + version = "3.1.3"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ViirifH1aAmciAsSqcN/Ts4pq4kmBmDP33KMAnEYecU="; + sha256 = "sha256-WAhOZKJ5lxkupI8Yq7MOwUjFu+edBNF7pNL8JiEAwqI="; }; propagatedBuildInputs = [ @@ -42,32 +47,27 @@ buildPythonPackage rec { jsonschema murmurhash numpy + packaging + pathy preshed + pydantic requests setuptools srsly spacy-legacy thinc - wasabi - packaging - pathy - pydantic + tqdm typer - ] ++ lib.optional (pythonOlder "3.4") pathlib; + wasabi + ] ++ lib.optional (pythonOlder "3.8") typing-extensions; checkInputs = [ pytest ]; doCheck = false; - # checkPhase = '' - # ${python.interpreter} -m pytest spacy/tests --vectors --models --slow - # ''; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \ - --replace "pydantic>=1.7.1,<1.8.0" "pydantic>=1.7.1,<1.8.3" + checkPhase = '' + ${python.interpreter} -m pytest spacy/tests --vectors --models --slow ''; pythonImportsCheck = [ "spacy" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json index a2989b6da5..7c2212359b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json @@ -1,332 +1,332 @@ [ { "pname": "da_core_news_lg", - "version": "3.0.0", - "sha256": "0l0wljc1lm9a72ngfd4aa90laz4zcc37ix9nsiaqlw004v01z7wj", + "version": "3.1.0", + "sha256": "0mchfkj0l1fx1l3bvilwyj7y3frg8hpxyga87vcpf7rzm1iynz1z", "license": "cc-by-sa-40" }, { "pname": "da_core_news_md", - "version": "3.0.0", - "sha256": "14h3ym22224aimfk2kj88pmn83hkb57w402i0x6pd7ra86n372lh", + "version": "3.1.0", + "sha256": "0vbg353cfjlid8k3nk8zzzxsrsvl2qmjhdg5qfr3f91klzy385cg", "license": "cc-by-sa-40" }, { "pname": "da_core_news_sm", - "version": "3.0.0", - "sha256": "05893dpmx76waqnlysnkq8hz9271rkk30xf6hy98gka6244l9a1l", + "version": "3.1.0", + "sha256": "0c0nv42737jbyhvfvz1aqqn97fpd6jrh4bxmkzyjx0svyc1n3bxz", "license": "cc-by-sa-40" }, { "pname": "de_core_news_lg", - "version": "3.0.0", - "sha256": "0s7vfpr9gv22pvh697ffg35fppxkjhw23ynf4bpz73hl9jikdqvj", + "version": "3.1.0", + "sha256": "03hyx9d0050y8hr1mjadbqrxvw7g8xv3zd1vgw4yq68ran6ggjbl", "license": "mit" }, { "pname": "de_core_news_md", - "version": "3.0.0", - "sha256": "09vvlm3rxmyiima81y4bvcyxhn9bjxrqlkbmglzmwhrhxm84nkmx", + "version": "3.1.0", + "sha256": "1n2j4bjlc4vhrr5i6f2vrn4pwwrd0jjc3wc2g8c4dr9jgdcwnl0n", "license": "mit" }, { "pname": "de_core_news_sm", - "version": "3.0.0", - "sha256": "1w5aqfzknnnxpsi9i6kn6bki58j0mp24d4gr2203bf6g5kahiq03", + "version": "3.1.0", + "sha256": "0s82qhyv5x1wzvwy69jwh1sddw53q741ci5d10128mkmjyapdhzv", "license": "mit" }, { "pname": "de_dep_news_trf", - "version": "3.0.0", - "sha256": "1snkm911jn73mqfz0y0anr12r6j3gdi6wd8qmd5alwm623x4s6hm", + "version": "3.1.0", + "sha256": "0ws9xvzz6aimpn4cgi2rdi06acqrisf9c4v31yn1ljrrkwv9clwk", "license": "mit" }, { "pname": "el_core_news_lg", - "version": "3.0.0", - "sha256": "011lqmx3f3laf2vvqp0hxp5y105pn54kwdh1xzw4hs2pj6fac9p5", + "version": "3.1.0", + "sha256": "1gf85gr5dyd3hk38zzp9aax1adhq1f5hhvl6s8sxh4myakpvmikw", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", - "version": "3.0.0", - "sha256": "0p75c18sg38j9dj79ykmm5kzcwjxccpgrcw4cjcscb6ad6wwvcjx", + "version": "3.1.0", + "sha256": "05k3fp1afhd89v5m46jngvzncf08546r0ic1micc70mzrxifs3jl", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", - "version": "3.0.0", - "sha256": "0gvisa7yg1w49hpfp79ahy50v64l3rmk56k0k7zkgc8ml1gn892r", + "version": "3.1.0", + "sha256": "0g7riydqghnri95wbxdbfchgrm88jg7qhv3hfhb4f9zp7viy2fx9", "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", - "version": "3.0.0", - "sha256": "0sdb85zvfb12d14k3wy23dfryy3xwc9ag79zq71qnxwpvvygmc8y", + "version": "3.1.0", + "sha256": "106mi060r9q06b90cx2hhsr39bajj70gkliwxfbg9mps69ci8xdy", "license": "mit" }, { "pname": "en_core_web_md", - "version": "3.0.0", - "sha256": "0c669b1vsp3z28n52lfsijmkn9465r8zjjygjml5rlf9lf1paxa5", + "version": "3.1.0", + "sha256": "1565swsn628515gfw47h5pf868kw4bnag22iwxyf3mmnlyif63bz", "license": "mit" }, { "pname": "en_core_web_sm", - "version": "3.0.0", - "sha256": "0risizvzkicffw7vgrj92z23dfb7zvvzihqgvjcrx8989b7b6wq6", + "version": "3.1.0", + "sha256": "0q3nz1q4nmj58s5f5h4n43w4pcfai8n51vgr9w7ckrhiappcn97n", "license": "mit" }, { "pname": "en_core_web_trf", - "version": "3.0.0", - "sha256": "0plmg77rv1spr0swn4jakci16mbqsxm32mz9nnwc9ylynbvgrhmn", + "version": "3.1.0", + "sha256": "087dzqazrpl2bc2bys8rdqb8s08il8lc3zjk9scalggkgyqn6h20", "license": "mit" }, { "pname": "es_core_news_lg", - "version": "3.0.0", - "sha256": "0832w8qmg0fp2q8329ndlbbzpfkpbw9v38ny7106a45xaz0rn2xc", + "version": "3.1.0", + "sha256": "1jrkx80n4wkvwvw6lmqd9kxdxag7qr2vfhi0msc43li11bb01dxi", "license": "gpl3" }, { "pname": "es_core_news_md", - "version": "3.0.0", - "sha256": "01is980r63a5418jq917scapzkl9xydj56lrsxbr16fya0hh8qnn", + "version": "3.1.0", + "sha256": "0x4l9d3ky15rsf9h0zx0k9z5g0alwly0lch6dzn5b3ngphz01d43", "license": "gpl3" }, { "pname": "es_core_news_sm", - "version": "3.0.0", - "sha256": "1wgya0f25dgix57pb60fyl4hf2msma16d1f6cf617ypk6g3v80rb", + "version": "3.1.0", + "sha256": "1y3ibgc1q1ck6qrkbwvsv401vcyy9cnpxkzj5lvdhz7xwm8agqw6", "license": "gpl3" }, { "pname": "es_dep_news_trf", - "version": "3.0.0", - "sha256": "07lim35p0mxb75qiym79wcrak3j7wcan393260haxgwrj29rzpvv", + "version": "3.1.0", + "sha256": "1p47ng7837iixfcfir5rrsbix9633hbi8hvg46zyw9waygyp57l3", "license": "gpl3" }, { "pname": "fr_core_news_lg", - "version": "3.0.0", - "sha256": "1frg734lb64gkm7pagqp1mj7lqpwsxxj5vyjm10yja0rkdi6kcca", + "version": "3.1.0", + "sha256": "1vpzhny33i2x9pnh9d9wajj3m5bpxk1bc21r434ir0x81zl61nm8", "license": "lgpllr" }, { "pname": "fr_core_news_md", - "version": "3.0.0", - "sha256": "1xshr9r639hdb8vkj5nribk4lkm3a5fb7zrxj3y3p678dr53xalz", + "version": "3.1.0", + "sha256": "1bqn779zbv8izisk028d8xgga38f4snys3w8kfb05bgmgv9c4qwb", "license": "lgpllr" }, { "pname": "fr_core_news_sm", - "version": "3.0.0", - "sha256": "0n23c9rbg1b44c8yjlf6cc0g8ccj6x0rmfjg76ddmpkjaj83jwv1", + "version": "3.1.0", + "sha256": "0958mpfdmq73gasbqzyg8gjsih0c6bc9b3iyr0llmsibq0lfhglx", "license": "lgpllr" }, { "pname": "fr_dep_news_trf", - "version": "3.0.0", - "sha256": "192l6n5yxn1ndc4fk8k759j2d5hryj9mfkpy2aminaxr4dmp2imr", + "version": "3.1.0", + "sha256": "0afn0a665sqbf28lh4lxz9w2w5982m52kfqzysh5a9r6j734dxqv", "license": "lgpllr" }, { "pname": "it_core_news_lg", - "version": "3.0.0", - "sha256": "121nki732wrnfyzcflvsv54nvrz3l3hx55hkd72hlhrvjw0kvkv5", + "version": "3.1.0", + "sha256": "08l84f9vgi6y1ahkac9pq5i95ninlzcw276vpx4h53zijhk6hvkv", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_md", - "version": "3.0.0", - "sha256": "0m168wrf1p6dz5kc4n5ga2h8c0d6jzxx876i3ndrg6b7z418hhi5", + "version": "3.1.0", + "sha256": "1zkw3h626rm2x5pv06yzgbj0hwjlbyn00vg8hjk8k0f5hwad5sf3", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_sm", - "version": "3.0.0", - "sha256": "132v06cah8l7q4caxg6n4nw34v9jd8y8cqp20njryx4nirm9c36l", + "version": "3.1.0", + "sha256": "0dn593h105ggzjql8rc0rfn4i78a1l90v7fbycqb427q88fbzkk9", "license": "cc-by-nc-sa-30" }, { "pname": "lt_core_news_lg", - "version": "3.0.0", - "sha256": "034qycqpbdiyzhpzjz92kpnx6z2nai70dddz75r48hylzlw1d92h", + "version": "3.1.0", + "sha256": "1qqds0hxn0lcl51934mgl0c22m7a3vy13rnswb46i5x9lj89d50c", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_md", - "version": "3.0.0", - "sha256": "18mb2lmrjwnsc7s4yaq3yvdbh8p8p1k0xpm8cqn521hanpr0jqj3", + "version": "3.1.0", + "sha256": "0xd8wa1cmywndgd1byiny9rv3008iawxb89pnyradglcbklmffd4", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "3.0.0", - "sha256": "1p998h9lnp16czj3gg8781gywg17dap2h9f8qc6f87daxyc9bdjs", + "version": "3.1.0", + "sha256": "0bpf5k09xqdx64rfkpc7949s46b5xm893wx6jwwn2mx4ay6x23s5", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_lg", - "version": "3.0.0", - "sha256": "1fmrpgq9plndid7402wkybidpi0phnybb3031jxppan99ihr3hfj", + "version": "3.1.0", + "sha256": "08i96r0980dgkz2ygj76d0v0lgx0lpb5bxmhxdhv7mhzqs38v436", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_md", - "version": "3.0.0", - "sha256": "1mnabkyjxph2xa4g2an5rqp24d4gbq969ln27zpjycyiwxlkz7vl", + "version": "3.1.0", + "sha256": "1dnah0ycgzy5wp6anpbiclyn0fs6jf7s43sr87rcpfcaflnp1qcs", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_sm", - "version": "3.0.0", - "sha256": "1ax6pl61n0p4qf4wcd6c7d42zqjrgh3vhlpl6xby57a78547asxr", + "version": "3.1.0", + "sha256": "1q1v3i1rpq70nznwhqji2wpjkrxma4v50nsvack1pmqnh9zkcn17", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_lg", - "version": "3.0.0", - "sha256": "07a8nsfswlpb2jc2afzf201bjkl2nlz40kqmjx3dbva8jphj3ljs", + "version": "3.1.0", + "sha256": "0cjd6cl4iaa4c6j7h3gh9iwpnaazhn3w0fmwyp33827y0r1bxanx", "license": "mit" }, { "pname": "nb_core_news_md", - "version": "3.0.0", - "sha256": "0y1vydhhgb6cifq7k4vc7dy4jl6wb1z6pklbv65v6nxl7rhn76fz", + "version": "3.1.0", + "sha256": "17c6khcmpxq7gkdb1hglz3z9jpwdxghfidl4p3cdrphvyxsx8wni", "license": "mit" }, { "pname": "nb_core_news_sm", - "version": "3.0.0", - "sha256": "1lk1869cb2176j6lvd8lraclfl706p12m1gvvf1ixm99ra8zkxhs", + "version": "3.1.0", + "sha256": "0rbq5f5p24yb9j8i4h1z7xrg2knixzdnz9pnpah4klqql9n0w5aw", "license": "mit" }, { "pname": "nl_core_news_lg", - "version": "3.0.0", - "sha256": "0iq4ayzh9g9gil4l8kcl5qcm0l16hymavsqgiczf3ddvamciqaxs", + "version": "3.1.0", + "sha256": "1bg74ig9vcl94sd68m6c2z0vviw41x1mqz3829gzk349qb78h55l", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_md", - "version": "3.0.0", - "sha256": "0g9dkzwxndcf05bnhkd9fzqj7n614naspyhalg6h9h1kb7v3m2ak", + "version": "3.1.0", + "sha256": "1jw2is3n8dg3bkxjq3ziix2xgx3f29s4i7ipibk5w8f0k6d8gyyh", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "3.0.0", - "sha256": "1l4mk3gs15yc5kssy4x4lyab9kmg9y199h4hvizwh8y1ifqbqy03", + "version": "3.1.0", + "sha256": "14q8sdl79l5fb32vfk13z69kb3mjb35s6ksbhv0bp7yaav35s8gv", "license": "cc-by-sa-40" }, { "pname": "pl_core_news_lg", - "version": "3.0.0", - "sha256": "14ldch7rps1qxh3ldczh7f29ra3dq2kxaxpfbx7r6f1xpmk5s1rv", + "version": "3.1.0", + "sha256": "1rmb63dvi8fgmnb6q04li1xghb0grlgnbsv6maybnnzmi9471kly", "license": "gpl3" }, { "pname": "pl_core_news_md", - "version": "3.0.0", - "sha256": "0fx6ipd8ll2d0w8qwn9cjw0q7w0r3l40467d6mizi4mx93q7m7iw", + "version": "3.1.0", + "sha256": "11hl9nz1xfb5bz93z3cpzbq58fs4yb4s0184bnsh8bnmqqqkqxmx", "license": "gpl3" }, { "pname": "pl_core_news_sm", - "version": "3.0.0", - "sha256": "0p1gcniyrn9qya4wg1qd6ijfchc7lhk0dh4iba8y71mss3n162fs", + "version": "3.1.0", + "sha256": "05kgv093bq833qczsvksd695494kb7i3gmxcq874z2gg8bhjb70b", "license": "gpl3" }, { "pname": "pt_core_news_lg", - "version": "3.0.0", - "sha256": "1vsw1ng364466jz6ffyj9dj3jh4s68gk7csxylc1fj7wac8jxrbj", + "version": "3.1.0", + "sha256": "1lbzv8789vkcm1jw50g9ny85k3pf245rz9rgr1c7j91d3gzlqkg8", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_md", - "version": "3.0.0", - "sha256": "11laikyd6m9zprk7bnfn0v2lixvkcgvpv95dp0zpc0q2izmky6q8", + "version": "3.1.0", + "sha256": "0a6bs6lpw3n90jzkblkp831xffbglwv33ss16kh2mcvsx41apdhp", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "3.0.0", - "sha256": "12d59q1gvpx8dj48iq17sindd6wid09hnjb4fw0rb00bb28rmqk1", + "version": "3.1.0", + "sha256": "0b65ji3sfnx6qhr66m2jm206zgf1vkx8jmp3qxsz8prarsj6az0n", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_lg", - "version": "3.0.0", - "sha256": "11mkip5piy6g7rg51ljqjn61s4ydlafl6qp3v29zmm3lghc66h8c", + "version": "3.1.0", + "sha256": "055yxc0n3c9k28wi4bzq4pvwihj7lq84z7s374cpz8kmykddxjvz", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_md", - "version": "3.0.0", - "sha256": "1jyf3khki7xqbp6ir0p4y2p7rdhs36zq2i1960ik4kr2mhnzrblg", + "version": "3.1.0", + "sha256": "1l1i6jm29qij27laghzgb3ba4a3vk0l5hl09qhrwmrqccycx546r", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_sm", - "version": "3.0.0", - "sha256": "0gc61gdfgji92mjdpznkf30nl1fz7378h9bz8dlhvnc401hjzsky", + "version": "3.1.0", + "sha256": "17dvqn2dip34n3hckdsizjm0mikfqpy5f9f1mz0r9pf2c9fjk1gr", "license": "cc-by-sa-40" }, { "pname": "ru_core_news_lg", - "version": "3.0.0", - "sha256": "1x1hxvhki62ypj3x0s4syfhz3znlflp36qkp4l2g2sbxjj2qw7n3", + "version": "3.1.0", + "sha256": "1748i34rb4cqsjslippay592769gmdzsvly95pfl6nh67vmyd9my", "license": "mit" }, { "pname": "ru_core_news_md", - "version": "3.0.0", - "sha256": "0ks0qdyq6627cbg8fbbhvr83d3m8njs2aj8pri540gz9nrbj5479", + "version": "3.1.0", + "sha256": "0zg3ar1fbrlh2gm30xfc0zz7br4dzzr3bixjvkp5q4k9d2dxmzxh", "license": "mit" }, { "pname": "ru_core_news_sm", - "version": "3.0.0", - "sha256": "1x3bmd7f0fqf03wds01imwpbv4xng1qq9iq61m8rbqvskm5jlzbb", + "version": "3.1.0", + "sha256": "1a507iwgq2940g9gj5a6g25l4l21md0yihivk6fch1k0mjkjrgd0", "license": "mit" }, { "pname": "xx_ent_wiki_sm", - "version": "3.0.0", - "sha256": "1115vap4c6snvkwq8bmc8dld1mw5ky0w9n112hadp85pv012ccds", + "version": "3.1.0", + "sha256": "03kal7nv42yiv8bn9kdi7ngrylzgilk4gqj26jd9q1fszlr018gj", "license": "mit" }, { "pname": "xx_sent_ud_sm", - "version": "3.0.0", - "sha256": "062g3xfb3fp33b56wa4fj84smr5rlc0dbja102khxnqm2aakk99k", + "version": "3.1.0", + "sha256": "0wvfxg2jid3lmxqc9nhizpkqy7206m2axllqbcjgi7pgq56gy7nw", "license": "cc-by-sa-30" }, { "pname": "zh_core_web_lg", - "version": "3.0.0", - "sha256": "1ai34fc2wfmb35f1zissddf6jjqpg51wqiyqqq35h03jyf4731jr", + "version": "3.1.0", + "sha256": "19g557a6n9mwljkbcf3j2ibnizryvnqkl0l5viz8mg8bw39bay2g", "license": "mit" }, { "pname": "zh_core_web_md", - "version": "3.0.0", - "sha256": "10npzl8nvyj4jdn2f9iai9inq5c4x3hxdk0ycgg9wcgqaj09gnxa", + "version": "3.1.0", + "sha256": "1ja4swiy1bx113hpjjx56nixj1xgvw4wlarbxma4xw91g7mmbikg", "license": "mit" }, { "pname": "zh_core_web_sm", - "version": "3.0.0", - "sha256": "1f9x5lr8vnvb1n8hc59vm2xi6kv2rj78x1vm916z6ic3vg7vwl1h", + "version": "3.1.0", + "sha256": "1z97l381ccf1g16834myss4ccyb7x4pbbf6m5skb7300s7csdi1g", "license": "mit" }, { "pname": "zh_core_web_trf", - "version": "3.0.0", - "sha256": "178w8dfcvx4aabasid6r0pnwqd5k02cvlq35siqjgfn7j3zb56z0", + "version": "3.1.0", + "sha256": "11ra9jf10piv79hdyvgg10bwrgcxbb8ml611d3069jjab6vaa8xn", "license": "mit" } ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index 819f294972..54f21c49f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.23"; + version = "1.4.25"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dv8kaIH1KAib8ZOFExuWYZe7SUZTmQOW0s4TjipEdYM="; + sha256 = "sha256-Gt89JeLjOvvNSM+tgHb5N4eTvkPn/sPkM0MGysa+wTg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stestr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stestr/default.nix index 1e5f965a80..2071d20a75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stestr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stestr/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "stestr"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "fb492cbdf3d3fdd6812645804efc84a99a68bb60dd7705f15c1a2949c8172bc4"; + sha256 = "sha256-wj7nq0QSKNiDZZBKIk+4RC2gwCifkBz0qUIukpt76c0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix index ec35b41182..3b6869fbf9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "systembridge"; - version = "2.1.0"; + version = "2.1.3"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "sha256-P148xEcvPZMizUyRlVeMfX6rGVNf0Efw2Ekvm5SEvKQ="; + sha256 = "1p0w1phmlifkag7inx8395g8li13r4b7dvgkpj6fysdi42glvvxp"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix index c330b5e18b..be217a16b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.18.1"; + version = "6.18.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CmQic39tibRc3vHi31V29SrQ9QeVYALOECDaqfRCEdY="; + sha256 = "sha256-JgAQCulv/QgjNLN441VVD++LSlKab6TDT0cTCQXHQm0="; }; checkInputs = [ 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 6ad29d5736..f2a70500a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -2,41 +2,48 @@ , lib , buildPythonPackage , fetchPypi -, pythonOlder -, pytest +, pytestCheckHook , blis , catalogue , cymem , cython -, darwin +, Accelerate +, CoreFoundation +, CoreGraphics +, CoreVideo , hypothesis , mock , murmurhash , numpy , pathlib , plac +, pythonOlder , preshed , pydantic , srsly , tqdm +, typing-extensions , wasabi }: buildPythonPackage rec { pname = "thinc"; - version = "8.0.3"; + version = "8.0.10"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-w3CnpG0BtYjY1fmdjV42s8usRRJjg1b6Qw9/Urs6iJc="; + hash = "sha256-teTbjSTmvopfHkoXhUdyt5orVgIkUZ9Qoh85UcokAB8="; }; - buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = [ cython ] + ++ lib.optionals stdenv.isDarwin [ Accelerate CoreFoundation CoreGraphics CoreVideo - ]); + ]; propagatedBuildInputs = [ blis @@ -50,27 +57,20 @@ buildPythonPackage rec { tqdm pydantic wasabi - ] ++ lib.optional (pythonOlder "3.4") pathlib; - + ] ++ lib.optional (pythonOlder "3.8") typing-extensions; checkInputs = [ hypothesis mock - pytest + pytestCheckHook ]; # Cannot find cython modules. doCheck = false; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \ - --replace "pydantic>=1.7.1,<1.8.0" "pydantic~=1.7" - ''; - - checkPhase = '' - pytest thinc/tests - ''; + pytestFlagsArray = [ + "thinc/tests" + ]; pythonImportsCheck = [ "thinc" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix index e208e3a768..0e0d19e4f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.7.4"; + version = "0.7.5"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "149fgrqnwf8nyv3msj6p614zbdi7m7s785y3fvh8fm8k7lmgqk8w"; + sha256 = "sha256-vC2teem231Lw7cglVc+0M+QbgMgZ23JzTYy7wvnhFI4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix index d03909d191..ae4df6ae93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { # E return Headers(result) # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True> "TestMultiPart" + "TestHTTPUtility" ] ++ lib.optionals stdenv.isDarwin [ "test_get_machine_id" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix index b7472d68a8..8c06676bb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.5"; + version = "0.7.6"; disabled = pythonOlder "3.4"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-lEroQ2Gy1ldeIkkSMYcXJk6j6Ls2zigImrIWOPq70D0="; + sha256 = "sha256-inp6JKHA1ZgYPNMcQbL/tXOfhBDeMycIycLr69cOEGE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch b/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch deleted file mode 100644 index cd09f0edff..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/coregrind-makefile-race.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7820fc268fae4353118b6355f1d4b9e1b7eeebec Mon Sep 17 00:00:00 2001 -From: Philippe Waroquiers -Date: Sun, 28 Oct 2018 18:35:11 +0100 -Subject: [PATCH 1/1] Fix dependencies between libcoregrind*.a and - *m_main.o/*m_libcsetjmp.o - -The primary and secondary coregrind libraries must be updated -when m_main.c or m_libcsetjmp.c are changed. - -A dependency was missing between libcoregrind*.a and libnolto_coregrind*.a, -and so tools were not relinked when m_main.c or m_libcsetjmp.c were -changed. ---- - coregrind/Makefile.am | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am -index 914a270..8de1996 100644 ---- a/coregrind/Makefile.am -+++ b/coregrind/Makefile.am -@@ -511,6 +511,8 @@ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS += \ - endif - libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_LIBADD = \ - $(libnolto_coregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_OBJECTS) -+libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_DEPENDENCIES = \ -+ libnolto_coregrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a - - if VGCONF_HAVE_PLATFORM_SEC - libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \ -@@ -531,6 +533,8 @@ libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS += \ - endif - libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_LIBADD = \ - $(libnolto_coregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_OBJECTS) -+libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_DEPENDENCIES = \ -+ libnolto_coregrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a - endif - - #---------------------------------------------------------------------------- --- -2.9.3 - diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix index 5a787d9c3f..5d747317e4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "valgrind"; - version = "3.16.1"; + version = "3.17.0"; src = fetchurl { url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1jik19rcd34ip8a5c9nv5wfj8k8maqb8cyclr4xhznq2gcpkl7y9"; + sha256 = "18l5jbk301j3462gipqn9bkfx44mdmwn0pwr73r40gl1irkfqfmd"; }; outputs = [ "out" "dev" "man" "doc" ]; @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit" ++ lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include"; - doCheck = false; # fails + doCheck = true; postInstall = '' - for i in $out/lib/valgrind/*.supp; do + for i in $out/libexec/valgrind/*.supp; do substituteInPlace $i \ --replace 'obj:/lib' 'obj:*/lib' \ --replace 'obj:/usr/X11R6/lib' 'obj:*/lib' \ diff --git a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix index e2a20da68d..5e00f1bc39 100644 --- a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.12.1"; + version = "10.12.2"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-kujY7Qgis2pie0WVQAokVopD3TYkjjBnqhw6XZTG16o="; + sha256 = "sha256-NmWCaTmQlCAKaVDumDlubHQhUjhY7uYawkjrP2ggczk="; }; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/default.nix index 9396821f8c..cec465e714 100644 --- a/third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "azure-functions-core-tools"; - version = "3.0.3568"; + version = "3.0.3734"; src = fetchurl { url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip"; - sha256 = "0yxdqc5d1xsixjj2dlvs32d6fz4vh58ih2l00lc456fg15mfw3lg"; + sha256 = "sha256-27kUnXSnDKZ/m8d1KAZG5DrFzB5uqlCLgtN7lXJ+eTY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix index 070546a3ff..a326f85eac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix @@ -29,7 +29,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ b2sdk - class-registry phx-class-registry setuptools docutils 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 53cb289cb3..31cd9ca3cf 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 @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "bd4c3e80a0a07c78407422de13039ce5889fb4b0"; - version = "2021-09-15"; + rev = "aff36a23f7213d94189aabfcc47a32b11f3a6fba"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "NBERpDSY1FoGzD0AXJx1yTG37fjzw+VsTAgkIBfJdhs="; + sha256 = "CBPiA9UdTc31EbfCdG70j88sn53CfZBr8rlt6+ViivI="; }; dontBuild = true; 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 6a100bb799..eeba3f49fd 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 @@ -11,19 +11,19 @@ let node-api-lib = (if stdenv.isDarwin then "libquery_engine.dylib" else "libquery_engine.so"); in rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-7c9jlqMKocA3Kp39zDu2in9nRw4hZRZO1+u/eFfzWa4="; + sha256 = "sha256-q0MF6LyIB7dCotYlXiZ4rXl2xMOLqXe5Y+zO+bpoCoY="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-W3VaxG9taRv62RW6hQkfdGJo72uHK2X6JIESJEu3PXg="; + cargoSha256 = "sha256-NAXoKz+tZmjmZ/PkDaXEp9D++iu/3Knp0Yy6NJWEoDM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf ]; 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 62bef68b50..40c4e459a2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.6"; + version = "0.6.8"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-I7vsOQtXY/n2Zu0F94f5/uF1ia96R/qQw+duG7X8Dpo="; + sha256 = "sha256-Aistr85doKEOD0/uTS/7iRzYggb+hC3njVi4mWt8ndM="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix b/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix index 12dd9f662c..6ee649595a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dt-schema/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "dtschema"; - version = "2021.7"; + version = "2021.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-11eCRY3zptsXI4kAIz3jLrTON4j2QTz/xG7vgUgyVA0="; + sha256 = "d09c94d13f46e6674ba11ff31220651ad1b02dae860f5a87905dfac6b8d768d9"; }; nativeBuildInputs = [ setuptools-scm git ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix b/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix new file mode 100644 index 0000000000..c51e5738b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub}: + +buildGoModule rec { + pname = "dyff"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "homeport"; + repo = "dyff"; + rev = "v${version}"; + sha256 = "0r1nfwglyw8b46n17bpmgscfmjhjsbk83lgkpm63ysy0h5r84dq8"; + }; + + vendorSha256 = "12mirnw229x5jkzda0c45vnjnv7fjvzf0rm3fcy5f3wza6hkx6q7"; + + subPackages = [ + "cmd/dyff" + "pkg/dyff" + "internal/cmd" + ]; + + meta = with lib; { + description = "A diff tool for YAML files, and sometimes JSON"; + longDescription = '' + dyff is inspired by the way the old BOSH v1 deployment output reported + changes from one version to another by only showing the parts of a YAML + file that change. + + Each difference is referenced by its location in the YAML document by + using either the Spruce or go-patch path syntax. + ''; + homepage = "https://github.com/homeport/dyff"; + license = licenses.mit; + maintainers = with maintainers; [ edlimerkaj ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix index 0fcbda6966..afd91a03f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix @@ -1,23 +1,36 @@ { lib, buildGoModule, fetchFromGitHub }: +let bins = [ "crane" "gcrane" ]; in + buildGoModule rec { pname = "go-containerregistry"; - version = "0.4.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-3mvGHAPKDUmrQkBKwlxnF6PG0ZpZDqlM9SMkCyC5ytE="; + sha256 = "0sk3g1i4w8sh40y1ffa61ap7jsscdvnhvh09k8nznydi465csbmq"; }; vendorSha256 = null; subPackages = [ "cmd/crane" "cmd/gcrane" ]; + outputs = [ "out" ] ++ bins; + ldflags = let t = "github.com/google/go-containerregistry"; in [ "-s" "-w" "-X ${t}/cmd/crane/cmd.Version=v${version}" "-X ${t}/pkg/v1/remote/transport.Version=${version}" ]; + postInstall = + lib.concatStringsSep "\n" ( + map (bin: '' + mkdir -p ''$${bin}/bin && + mv $out/bin/${bin} ''$${bin}/bin/ && + ln -s ''$${bin}/bin/${bin} $out/bin/ + '') bins + ); + # NOTE: no tests doCheck = false; @@ -25,6 +38,6 @@ buildGoModule rec { description = "Tools for interacting with remote images and registries including crane and gcrane"; homepage = "https://github.com/google/go-containerregistry"; license = licenses.apsl20; - maintainers = with maintainers; [ yurrriq ]; + maintainers = with maintainers; [ superherointj yurrriq ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 64e26698ae..7e8839b2e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -10,8 +10,6 @@ let inherit (lib) concatStringsSep concatMapStringsSep take splitString; getPackages = version: haskell.packages."ghc${version}"; - getMajorVersion = packages: - concatStringsSep "." (take 2 (splitString "." packages.ghc.version)); tunedHls = hsPkgs: haskell.lib.justStaticExecutables (haskell.lib.overrideCabal hsPkgs.haskell-language-server (old: { @@ -27,7 +25,6 @@ let let packages = getPackages version; in [ "haskell-language-server-${packages.ghc.version}" - "haskell-language-server-${getMajorVersion packages}" ]; makeSymlinks = version: concatMapStringsSep "\n" (x: 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 ea0002d78c..88e3393ded 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -26,11 +26,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename; - version = "10.2"; + version = "11.1"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - sha256 = "0aag1c0fw875pvhjg1qp7x8pf6gf92bjv5gcic5716scacyj58da"; + sha256 = "151z6d0265hv9cgx9zqqa4bd6vbp20hrljhd6bxl7lr0gd0crkyc"; }; postPatch = if stdenv.isDarwin then '' 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 d6e6bced40..8d8f1e1627 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation { && !stdenv.isDarwin && !stdenv.isSunOS; # flaky - checkFlagsArray = if version == "6.8" then [ + checkFlagsArray = [ # Test is known to fail on various locales on texinfo-6.8: # https://lists.gnu.org/r/bug-texinfo/2021-07/msg00012.html "XFAIL_TESTS=test_scripts/layout_formatting_fr_icons.sh" - ] else null; + ]; meta = { homepage = "https://www.gnu.org/software/texinfo/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 8a9dd7be6d..c7236e301a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "c9e1952d311cf87762a42a79cb801c7bef1af815", - "date": "2021-09-09T23:38:47+01:00", - "path": "/nix/store/cl05d3zpbbkhms5fmd6wc4jhasjhg12l-tree-sitter-c-sharp", - "sha256": "0kn7p203ij8vz1cdxmxvn85mf3hpmz08l5psza96xxif2lcz8li8", + "rev": "52ad1d506debcd4623d641339f8f452e6ea8f10c", + "date": "2021-09-23T08:24:24+01:00", + "path": "/nix/store/ag2r3d659gj14hgfgdf0nv5dwcihxy3w-tree-sitter-c-sharp", + "sha256": "1n8jnw2yp966svkcyh68wwwbqjhrvhykzxilj6k8rn5yx9lpymz5", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 2f589a92d2..82ca08f94f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "f71e80b9f20c3968c131518ae8d272a3cf81a60b", - "date": "2021-09-18T14:26:00-05:00", - "path": "/nix/store/22iw8rdpmvxmyrsmxxbyx8yi44jq05qd-tree-sitter-c", - "sha256": "13qr8ms8w7y92a33p0wisg4kzj4q3dzi2bn7wd6x815j8hfz627q", + "rev": "e348e8ec5efd3aac020020e4af53d2ff18f393a9", + "date": "2021-09-20T10:21:48-07:00", + "path": "/nix/store/bnc2zml2igbpprx4i0h053inv023z6nj-tree-sitter-c", + "sha256": "0fmh8b94ra5fi0j9by9yqbc1pf9sh9pjwc3symrslg855w8a0yx7", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json index 3da60411f9..c25aebe78a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json @@ -1,9 +1,9 @@ { "url": "https://github.com/stsewd/tree-sitter-comment", - "rev": "8d480c0a86e3b95812252d29292b2686eb92418d", - "date": "2021-08-13T15:03:50-05:00", - "path": "/nix/store/4aqsac34f0pzpa889067dqci743axrmx-tree-sitter-comment", - "sha256": "0fqhgvpd391nxrpyhxcp674h8qph280ax6rm6dz1pj3lqs3grdka", + "rev": "5dd3c62f1bbe378b220fe16b317b85247898639e", + "date": "2021-10-01T17:13:56-05:00", + "path": "/nix/store/isrc5wlyxvcawfj35yi4nmblshy69b1j-tree-sitter-comment", + "sha256": "1wk6lxzndaikbrn72pa54y59qs0xnfaffc8mxmm6c5v5x16l8vb3", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 394040a79d..7f77cee08b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "8b112a131b910ec009853fc9dd1c27eae267a7a6", - "date": "2021-09-18T10:53:12-05:00", - "path": "/nix/store/bpfw6wckk0yfpr99nrv473g3r3b84vbv-tree-sitter-cpp", - "sha256": "0rskvx5krakfkkcmiv9qd0zf8rf63iaigv76x3dq7v00sj8m0xsn", + "rev": "a7652fce5943c9d5d9c49dd8e3256a699aa33bf5", + "date": "2021-09-24T15:54:22-05:00", + "path": "/nix/store/9q4xnklmv1220yjgwdz96qf0l8swx2j6-tree-sitter-cpp", + "sha256": "10dbif87axvban83mglvh81gjckbp7qya0rf525s10h8ihy7rbpm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json index 7adb92cdd6..d9156557c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json @@ -1,9 +1,9 @@ { "url": "https://github.com/rydesun/tree-sitter-dot", - "rev": "e6f55c43b87b81cc982e38d414f0147fefa2515c", - "date": "2021-09-01T14:36:57+08:00", - "path": "/nix/store/n5a6bzh8rf35865wvcr3cis9r0fn2047-tree-sitter-dot", - "sha256": "1s3fpd0lnbm3gk9nbskdkdjlmdm7kz0l0g2zipv1m7qkc05nnkfy", + "rev": "3a32e207e126a7f1cdd17de2473db1f03e6a3dac", + "date": "2021-10-05T10:30:04+08:00", + "path": "/nix/store/zz4sj2r6jyl7k4l7g8qggr0gv4wh5nx7-tree-sitter-dot", + "sha256": "17j8spga68y40fy2yizpkx7bmxp7h5p9l334w2b0685w2mnvrlgg", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json index 43d38746c4..f6e11391fa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/wilfred/tree-sitter-elisp", - "rev": "166777abacfe5821d3b7b6873e6d2fd70a99f348", - "date": "2021-09-05T23:34:46-07:00", - "path": "/nix/store/gfyr8hl9pj2i0dj0qqpwh53jphff2bcd-tree-sitter-elisp", - "sha256": "18798jb3cisrvhkmzhq2qxly19hxvznf9k1n5pzl8l1dhw1yvl2a", + "rev": "4b0e4a3891337514126ec72c7af394c0ff2cf48c", + "date": "2021-10-02T12:14:40-07:00", + "path": "/nix/store/1g3q3xzv5n9wzi84awrlbxwm6q3zh8qz-tree-sitter-elisp", + "sha256": "1g6qmpxn1y9hzk2kkpp9gpkphaq9j7vvm4nl5zv8a4wzy3w8p1wv", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index df550680b4..8684e176cb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -1,9 +1,9 @@ { "url": "https://github.com/travonted/tree-sitter-fennel", - "rev": "42823442a18dd2aa7b0b22dc719abb54abb3fe2e", - "date": "2021-09-08T19:22:08-04:00", - "path": "/nix/store/2v174r3fc3cqsy8yanq2kdcjqvzl1jx9-tree-sitter-fennel", - "sha256": "0a59hgx7mmdicw9fq2q8dcd2ffmcgjdkk3rpwj84ya1qiyvs5x5s", + "rev": "fce4331731a960077ff5f98939bc675179f1908a", + "date": "2021-09-30T09:09:52-04:00", + "path": "/nix/store/mhpkw4gl6lzi306q21kckafqcdc0a715-tree-sitter-fennel", + "sha256": "1k8acyav26248liz0psk2r9dl7472mqgdyrjwg3pfxx94jgqjcik", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 02fff8098a..3839bd61dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "42b1e657c3a394c01df51dd3eadc8b214274a73c", - "date": "2021-08-16T18:29:17+02:00", - "path": "/nix/store/a1crqhfrd8v9g9w0565aca7nc9k2x7a0-tree-sitter-go", - "sha256": "1khsl8qz6r4dqw7h43m3jw3iqhh79sgpnsps0jy95f165iy496z3", + "rev": "7f6bfd0161b2fe97f03564edad3287ebea0494a3", + "date": "2021-10-04T13:10:27-04:00", + "path": "/nix/store/64xzxzc8z4fmwhfb7wbdkcxlk7r3bia2-tree-sitter-go", + "sha256": "12naks95vzb0sf219i39myvfpkycr2dh3lv7i7i6kwddmlhqsjnl", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index a5d506dc24..b4a4b7b447 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "435db852fbeff8fe298e25ad967c634d9698eec0", - "date": "2021-09-13T13:32:20-07:00", - "path": "/nix/store/idvb37g3nqpidw0jviiw4b71sqpihhs0-tree-sitter-javascript", - "sha256": "0plc5jxxh1bm1dig6gsk1ma7gp29ad3p0169jd9xlagc4vysfgc3", + "rev": "fdeb68ac8d2bd5a78b943528bb68ceda3aade2eb", + "date": "2021-10-04T13:07:24-04:00", + "path": "/nix/store/psmsgqhg4di7mkkd6sgyvcs41jvvq2c3-tree-sitter-javascript", + "sha256": "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 6c288b7cda..82c97d923f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "d1bdb1e535d39d4f93f7373f406e1837c8a7bb25", - "date": "2021-09-10T08:16:50+02:00", - "path": "/nix/store/4zzs4f1hz5il35pqyf355aps6k4a83i8-tree-sitter-php", - "sha256": "0ymkwlh1japlwsajxd06254qadzq9bvm5db02cg4n3zv0pkvyrzz", + "rev": "31550c1506b2033c5631cd18886edd600b67861e", + "date": "2021-09-27T11:44:23-07:00", + "path": "/nix/store/bls6gpbwqacgz7hr900khlfhbal29y27-tree-sitter-php", + "sha256": "1qykyziapwmw5qhd5svawzksp4w9hjdql84d7lqs3w0dfa60bjax", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 67800f5081..5a597fffb7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "9b84b7fd9da1aa74c8a8afae58b7dcc4c109cda4", - "date": "2021-09-16T13:02:06+02:00", - "path": "/nix/store/vxh1bdkdqj3n6knlz6bbdyl5l4qj2a2v-tree-sitter-python", - "sha256": "0r5daw3pbqcaf08gnhghjr15n7vv43njvh4ky6vz985sjzdnjz02", + "rev": "8600d7fadf5a51b9396eacbc6d105d0649b4c6f6", + "date": "2021-09-30T09:07:59-07:00", + "path": "/nix/store/0m86a8y8p8cxq616gacd5wydhayl8g70-tree-sitter-python", + "sha256": "0ydiizy1jhmfv0kr7xw9k57jgfpkda95nc1rawzqmsxd7nixnrkp", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json index 3e2a463b54..4d3596b7c3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json @@ -1,9 +1,9 @@ { "url": "https://github.com/stsewd/tree-sitter-rst", - "rev": "a9281c2250e0d32750de159413cdd87120407389", - "date": "2021-09-17T19:21:59-05:00", - "path": "/nix/store/3cnj1q9xfl0yh096pahqvlrf66azyhsr-tree-sitter-rst", - "sha256": "1fxknsmkn3pz1km77mii3w917fdl6h57h4mnw20b0syn4v1ag07d", + "rev": "632596b1fe5816315cafa90cdf8f8000e30c93e4", + "date": "2021-10-01T17:00:56-05:00", + "path": "/nix/store/pnbw1j9ynj4zgjqxjnhq9hgqp3nxm77j-tree-sitter-rst", + "sha256": "1l831aw4a080qin7dkq04b28nnyxs1r8zqrbp92d7j4y2lz31dla", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 47dea4c92c..b39d7753aa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "3383cebec9c9546587d9fe00c2e565d91163014a", - "date": "2021-09-16T13:01:51-07:00", - "path": "/nix/store/ml188xckf51g1r6gw380svxsg639kjgc-tree-sitter-typescript", - "sha256": "0vgkhn36cyg134ygx5wzld3ic9rd4lq9s2rp2dkxh0zg610ilcms", + "rev": "ef6ee5b39d6c4660809a61c1c8556fb547283864", + "date": "2021-10-04T11:58:33-05:00", + "path": "/nix/store/ny8gc7l6hpa4snhccyw3149f7s92071l-tree-sitter-typescript", + "sha256": "1gyim8yackz9pq6s62wrywr3gsgwa68jwvd0s6i28xxvln2r7wlb", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json index 700ec9f22d..28e2deacc8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-verilog", - "rev": "1b624ab8b3f8d54ecc37847aa04512844f0226ac", - "date": "2021-03-31T21:27:26-07:00", - "path": "/nix/store/4j6hrf8bc8zjd7r9xnna9njpw0i4z817-tree-sitter-verilog", - "sha256": "0ygm6bdxqzpl3qn5l58mnqyj730db0mbasj373bbsx81qmmzkgzz", + "rev": "6fae7414fa854b5052bee9111b200e9137797f3d", + "date": "2021-10-04T10:25:49-07:00", + "path": "/nix/store/aklrgpy0si72r8vac5fqjbzvcpqiy5lk-tree-sitter-verilog", + "sha256": "0yjhb2rp7drwkwfp35fgwnp6d7qf6k1k6zlf0dfxygjywnjy0bfs", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index 7302892c6b..fade08dabe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "59595443fb486449f42db839934117221358a85f", - "date": "2021-08-31T08:57:29+02:00", - "path": "/nix/store/9sixkkk37c2bl09aik32cd1jd322ywri-tree-sitter-viml", - "sha256": "1kh3il5vwlz5qxi9553ks7a0dpwx1n7wnqkv5v8jhslhn7w1c1l1", + "rev": "fd7bc35927ab44670e02d5ad035e0363f4ffde2b", + "date": "2021-09-27T15:41:51+02:00", + "path": "/nix/store/q2z07daw81cgn15z79qsfdqc2jc8ib9l-tree-sitter-viml", + "sha256": "0s1bp1c8p2ify67x49fv9wh0brn98lix3742zlds892985xl9zrj", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index e7a9dfc826..e91d3683e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "5ca53bb7bd649069a6af48f4dfd32f3187491db1", - "date": "2021-09-06T21:30:14+09:00", - "path": "/nix/store/x2dfgc97jmvyq5fnbyg9w7rsjz8cknj6-tree-sitter-zig", - "sha256": "1c50pvza6l4snmvgj3by053j4z7asy828i9pi1zwm6121sl7ffpd", + "rev": "1f27fd1dfe7f352408f01b4894c7825f3a1d6c47", + "date": "2021-09-20T17:51:34+09:00", + "path": "/nix/store/c4slv3kpl9dxi2fn6nbhar098ikpfivf-tree-sitter-zig", + "sha256": "1sbxvn400wizwwgjw7qcxb0z9gazvzcp3z2986lblff2xw8759vw", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/regclient/default.nix b/third_party/nixpkgs/pkgs/development/tools/regclient/default.nix new file mode 100644 index 0000000000..8df0a3abfd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/regclient/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +let bins = [ "regbot" "regctl" "regsync" ]; in + +buildGoModule rec { + pname = "regclient"; + version = "0.3.8"; + tag = "v${version}"; + + src = fetchFromGitHub { + owner = "regclient"; + repo = "regclient"; + rev = tag; + sha256 = "14w0g24sgphgib33sdvrvwk86p7km2pasb5fmr3p48i7sc71ja3h"; + }; + vendorSha256 = "sha256-9sRjP7lxMRdt9D9ElIX+mbYIvCaknWMgDyYl+1/q0/g="; + + outputs = [ "out" ] ++ bins; + + ldflags = [ + "-s" + "-w" + "-X main.VCSTag=${tag}" + ]; + + postInstall = + lib.concatStringsSep "\n" ( + map (bin: '' + mkdir -p ''$${bin}/bin && + mv $out/bin/${bin} ''$${bin}/bin/ && + ln -s ''$${bin}/bin/${bin} $out/bin/ + '') bins + ); + + meta = with lib; { + description = "Docker and OCI Registry Client in Go and tooling using those libraries"; + homepage = "https://github.com/regclient/regclient"; + license = licenses.asl20; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix b/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix index a3599d9ee9..73bb7606c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.30.0-01"; + version = "3.32.0-03"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "sha256-axhuw1FNut+JqS1WCxyQmP08qh0tXn9UAvz2Gj1kGPs="; + sha256 = "17cgbpv1id4gbp3c42pqc3dxnh36cm1c77y7dysskyml4qfh5f7m"; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix index 422969d2c6..320fcb1b04 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sunxi-tools/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, dtc, libusb1, zlib }: stdenv.mkDerivation rec { pname = "sunxi-tools"; - version = "unstable-2018-11-13"; + version = "unstable-2021-08-29"; src = fetchFromGitHub { owner = "linux-sunxi"; repo = "sunxi-tools"; - rev = "6d598a0ed714201380e78130213500be6512942b"; - sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig"; + rev = "74273b671a3fc34048383c40c85c684423009fb9"; + sha256 = "1gwamb64vr45iy2ry7jp1k3zc03q5sydmdflrbwr892f0ijh2wjl"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 zlib ]; + buildInputs = [ dtc libusb1 zlib ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/xcbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/xcbuild/default.nix index af0f546eb8..3c90603477 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xcbuild/default.nix @@ -30,6 +30,8 @@ in stdenv.mkDerivation { sha256 = "1xxwg2849jizxv0g1hy0b1m3i7iivp9bmc4f5pi76swsn423d41m"; }; + patches = [ ./includes.patch ]; + prePatch = '' rmdir ThirdParty/* cp -r --no-preserve=all ${googletest} ThirdParty/googletest diff --git a/third_party/nixpkgs/pkgs/development/tools/xcbuild/includes.patch b/third_party/nixpkgs/pkgs/development/tools/xcbuild/includes.patch new file mode 100644 index 0000000000..7a05a33eb6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/xcbuild/includes.patch @@ -0,0 +1,10 @@ +--- a/Libraries/plist/Sources/Format/Encoding.cpp ++++ b/Libraries/plist/Sources/Format/Encoding.cpp +@@ -11,6 +11,7 @@ + #include + + #include ++#include /* abort() */ + + #if defined(__linux__) + #include diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 5a218f908e..34bcd7992e 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.14.2"; + version = "1.14.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7FcGwmJKKOmpuCJgHl65+EnwOWQAbmq6X1lZMhTlDaE="; + sha256 = "sha256-Ersfn69vRGKzJ4LV7qLI2orLftHz7tuI8+/zUEPctAE="; }; - cargoSha256 = "sha256-mPxPieatGuROIwLGuQHBrZ8VTGd8c/6bKA+tt3Iv3OI="; + cargoSha256 = "sha256-BnJH/jbNiPyRmNjvfE5bNQX58iuAFFaQ93bZsXooTfI="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index d7b16d6a59..6fb597b81a 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.30.0"; + version = "0.31.0"; shas = { - x86_64-linux = "sha256-p5Vbt2fQPFR9SfLJ03f62/a8o9QIJOTXbA1s2liwNXY="; - aarch64-linux = "sha256-j12KjdnL19d5U/QRfB/7ahUzcYnUddItp29bLM/mWzs="; - x86_64-darwin = "sha256-w3k9oj+mP+i/hSf+ZjYLF+zsAcyLezbxhWXYoaPpn+U="; - aarch64-darwin = "sha256-bOtZoG8vXnSBNTPJDkyW0xbMEbmGNtq+mEPKoP78Yew="; + x86_64-linux = "sha256-KPoxq6rZnwghcDR5cMexN8EMeCfyuKoBcTZ3bv1mEpw="; + aarch64-linux = "sha256-S+lHGwbnCu2uNCIE+R5MljltOIqXpFAxvx0cglV8ZNI="; + x86_64-darwin = "sha256-o8O+X4SEXP7eY/dfHqe8NT7johtnPJQTBOgApFqOOhY="; + aarch64-darwin = "sha256-OQNQh6byNn9R0a6madgUMdUxbUv/R9psnwtTSr3BfzE="; }; } diff --git a/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix b/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix index 987d0005d2..fea0d620a7 100644 --- a/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix +++ b/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.10.2"; + version = "5.10.3"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-NUBodIojvlw46yLZ9Bn2pCpBwyVW8noOHQMM4uGmO3U="; + sha256 = "sha256-F1cK8qusxOHM0DkLEYV5i2ixP3II8ZttwKxd8htd0+A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/games/starsector/default.nix b/third_party/nixpkgs/pkgs/games/starsector/default.nix new file mode 100644 index 0000000000..a4819a4fda --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/starsector/default.nix @@ -0,0 +1,57 @@ +{ lib +, alsa-lib +, fetchzip +, libXxf86vm +, makeWrapper +, openjdk +, stdenv +, xorg +}: + +stdenv.mkDerivation rec { + pname = "starsector"; + version = "0.95a-RC15"; + + src = fetchzip { + url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip"; + sha256 = "sha256-/5ij/079aOad7otXSFFcmVmiYQnMX/0RXGOr1j0rkGY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with xorg; [ + alsa-lib + libXxf86vm + ]; + + dontBuild = true; + + # need to cd into $out in order for classpath to pick up correct jar files + installPhase = '' + mkdir -p $out/bin + rm -r jre_linux # remove jre7 + rm starfarer.api.zip + cp -r ./* $out + + wrapProgram $out/starsector.sh \ + --prefix PATH : ${lib.makeBinPath [ openjdk ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \ + --run "mkdir -p \$XDG_DATA_HOME/starsector; cd $out" + ln -s $out/starsector.sh $out/bin/starsector + ''; + + # it tries to run everything with relative paths, which makes it CWD dependent + # also point mod, screenshot, and save directory to $XDG_DATA_HOME + postPatch = '' + substituteInPlace starsector.sh \ + --replace "./jre_linux/bin/java" "${openjdk}/bin/java" \ + --replace "./native/linux" "$out/native/linux" \ + --replace "./" "\$XDG_DATA_HOME/starsector/" + ''; + + meta = with lib; { + description = "Open-world single-player space-combat, roleplaying, exploration, and economic game"; + homepage = "https://fractalsoftworks.com"; + license = licenses.unfree; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/steam/runtime.nix b/third_party/nixpkgs/pkgs/games/steam/runtime.nix index a986e1baa2..fc38c2eab9 100644 --- a/third_party/nixpkgs/pkgs/games/steam/runtime.nix +++ b/third_party/nixpkgs/pkgs/games/steam/runtime.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; - # from https://repo.steampowered.com/steamrt-images-scout/snapshots/ - version = "0.20210630.0"; + # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt + version = "0.20210906.1"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "sha256-vwSgk3hEaI/RO9uvehAx3+ZBynpqjwGDzuyeyGCnu18="; + sha256 = "1dkynar5y4q0pi32ihdhl7r81v9jxsb7lhc91mqhy43f6462qz1h"; name = "scout-runtime-${version}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/games/steam/steam.nix b/third_party/nixpkgs/pkgs/games/steam/steam.nix index f988363357..74ee8778b3 100644 --- a/third_party/nixpkgs/pkgs/games/steam/steam.nix +++ b/third_party/nixpkgs/pkgs/games/steam/steam.nix @@ -2,15 +2,15 @@ let traceLog = "/tmp/steam-trace-dependencies.log"; - version = "1.0.0.70"; + version = "1.0.0.72"; in stdenv.mkDerivation { pname = "steam-original"; inherit version; src = fetchurl { - url = "https://repo.steampowered.com/steam/archive/stable/steam_${version}.tar.gz"; - sha256 = "sha256-n/iKV3jHsA77GPMk1M0MKC1fQ42tEgG8Ppgi4/9qLf8="; + url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; + sha256 = "0l54ljnlnx289i1ssnss78251vyga726dnzsrhgnxwn1p1125m45"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; @@ -40,7 +40,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "A digital distribution platform"; - homepage = "http://store.steampowered.com/"; + homepage = "https://store.steampowered.com/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ jagajaga jonringer ]; }; diff --git a/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix b/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix index c3be2213c3..49d27487ba 100644 --- a/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix @@ -80,6 +80,12 @@ in { filesToInstall = ["build/${platform}/release/bl31.bin"]; }; + armTrustedFirmwareAllwinnerH616 = buildArmTrustedFirmware rec { + platform = "sun50i_h616"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["build/${platform}/release/bl31.bin"]; + }; + armTrustedFirmwareQemu = buildArmTrustedFirmware rec { platform = "qemu"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/duckstation/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/duckstation/default.nix index 29b867f0e9..e4cf7d89b3 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/duckstation/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/duckstation/default.nix @@ -1,33 +1,88 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, SDL2, qtbase -, wrapQtAppsHook, qttools, ninja, gtk3 }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, extra-cmake-modules +, pkg-config +, SDL2 +, qtbase +, wrapQtAppsHook +, qttools +, ninja +, gtk3 +, libevdev +, curl +, libpulseaudio +, sndio +, mesa +}: mkDerivation rec { pname = "duckstation"; - version = "unstable-2020-12-29"; + version = "unstable-2021-10-01"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "f8dcfabc44ff8391b2d41eab2e883dc8f21a88b7"; - sha256 = "0v6w4di4yj1hbxpqqrcw8rbfjg18g9kla8mnb3b5zgv7i4dyzykw"; + rev = "a7096f033ecca48827fa55825fc0d0221265f1c2"; + sha256 = "sha256-e/Y1TJBuY76q3/0MCAqu9AJzLxIoJ8FJUV5vc/AgcjA="; }; - nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; + nativeBuildInputs = [ cmake ninja pkg-config extra-cmake-modules wrapQtAppsHook qttools ]; - buildInputs = [ SDL2 qtbase gtk3 pkg-config ]; + buildInputs = [ + SDL2 + qtbase + gtk3 + libevdev + sndio + mesa + curl + libpulseaudio + ]; + + cmakeFlags = [ + "-DUSE_DRMKMS=ON" + "-DUSE_EGL=ON" + ]; + + postPatch = '' + substituteInPlace extras/linux-desktop-files/duckstation-qt.desktop \ + --replace "duckstation-qt" "duckstation" \ + --replace "TryExec=duckstation" "tryExec=duckstation-qt" \ + --replace "Exec=duckstation" "Exec=duckstation-qt" + substituteInPlace extras/linux-desktop-files/duckstation-nogui.desktop \ + --replace "duckstation-nogui" "duckstation" \ + --replace "TryExec=duckstation" "tryExec=duckstation-nogui" \ + --replace "Exec=duckstation" "Exec=duckstation-nogui" + ''; installPhase = '' - mkdir -p $out/ - mv bin $out/ + runHook preInstall + mkdir -p $out/bin $out/share $out/share/pixmaps $out/share/applications + rm bin/common-tests + + cp -r bin $out/share/duckstation + ln -s $out/share/duckstation/duckstation-{qt,nogui} $out/bin/ + + cp ../extras/icons/icon-256px.png $out/share/pixmaps/duckstation.png + cp ../extras/linux-desktop-files/* $out/share/applications/ + runHook postInstall + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + ./bin/common-tests + runHook postCheck ''; # TODO: # - vulkan graphics backend (OpenGL works). # - default sound backend (cubeb) does not work, but SDL does. meta = with lib; { - description = - "PlayStation 1 emulator focusing on playability, speed and long-term maintainability"; + description = "PlayStation 1 emulator focusing on playability, speed and long-term maintainability"; homepage = "https://github.com/stenzek/duckstation"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.guibou ]; }; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix index 65081153ab..7949a3f2b0 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/emu2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "emu2"; - version = "0.0.0+unstable=2021-09-22"; + version = "0.pre+unstable=2021-09-22"; src = fetchFromGitHub { owner = "dmsc"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/uxn/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/uxn/default.nix index 3e4928412b..0b797e2e16 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/uxn/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/uxn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "uxn"; - version = "0.0.0+unstable=2021-08-30"; + version = "0.pre+unstable=2021-08-30"; src = fetchFromSourcehut { owner = "~rabbits"; diff --git a/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix b/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix index 9098ed2ac5..43c9af533f 100644 --- a/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.5056"; + version = "1.0.5307"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "06qxa9h2ry92xrk2jklp76nv3sl8nvykdvsqmhn33lz6q6vmw2xr"; + sha256 = "VsOoW8h7yFgMRVTP6AHs2HOqSwXMnRNgJI8FM/rHp2I="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/misc/uboot/0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch b/third_party/nixpkgs/pkgs/misc/uboot/0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch new file mode 100644 index 0000000000..8c4c3eff54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/uboot/0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch @@ -0,0 +1,92 @@ +From 65d90cd17ad7cd3f9aeeb805a08be780fc5bae1a Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Sun, 22 Aug 2021 16:36:55 +0200 +Subject: [PATCH] rpi: Copy properties from firmware dtb to the loaded dtb + +The RPI firmware adjusts several property values in the dtb it passes +to u-boot depending on the board/SoC revision. Inherit some of these +when u-boot loads a dtb itself. Specificaly copy: + +* /model: The firmware provides a more specific string +* /memreserve: The firmware defines a reserved range, better keep it +* emmc2bus and pcie0 dma-ranges: The C0T revision of the bcm2711 Soc (as + present on rpi 400 and some rpi 4B boards) has different values for + these then the B0T revision. So these need to be adjusted to boot on + these boards +* blconfig: The firmware defines the memory area where the blconfig + stored. Copy those over so it can be enabled. +* /chosen/kaslr-seed: The firmware generates a kaslr seed, take advantage + of that. + +Signed-off-by: Sjoerd Simons +Origin: https://patchwork.ozlabs.org/project/uboot/patch/20210822143656.289891-1-sjoerd@collabora.com/ +--- + board/raspberrypi/rpi/rpi.c | 48 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c +index 372b26b6f2..64b8684b68 100644 +--- a/board/raspberrypi/rpi/rpi.c ++++ b/board/raspberrypi/rpi/rpi.c +@@ -495,10 +495,58 @@ void *board_fdt_blob_setup(void) + return (void *)fw_dtb_pointer; + } + ++int copy_property(void *dst, void *src, char *path, char *property) ++{ ++ int dst_offset, src_offset; ++ const fdt32_t *prop; ++ int len; ++ ++ src_offset = fdt_path_offset(src, path); ++ dst_offset = fdt_path_offset(dst, path); ++ ++ if (src_offset < 0 || dst_offset < 0) ++ return -1; ++ ++ prop = fdt_getprop(src, src_offset, property, &len); ++ if (!prop) ++ return -1; ++ ++ return fdt_setprop(dst, dst_offset, property, prop, len); ++} ++ ++/* Copy tweaks from the firmware dtb to the loaded dtb */ ++void update_fdt_from_fw(void *fdt, void *fw_fdt) ++{ ++ /* Using dtb from firmware directly; leave it alone */ ++ if (fdt == fw_fdt) ++ return; ++ ++ /* The firmware provides a more precie model; so copy that */ ++ copy_property(fdt, fw_fdt, "/", "model"); ++ ++ /* memory reserve as suggested by the firmware */ ++ copy_property(fdt, fw_fdt, "/", "memreserve"); ++ ++ /* Adjust dma-ranges for the SD card and PCI bus as they can depend on ++ * the SoC revision ++ */ ++ copy_property(fdt, fw_fdt, "emmc2bus", "dma-ranges"); ++ copy_property(fdt, fw_fdt, "pcie0", "dma-ranges"); ++ ++ /* Bootloader configuration template exposes as nvmem */ ++ if (copy_property(fdt, fw_fdt, "blconfig", "reg") == 0) ++ copy_property(fdt, fw_fdt, "blconfig", "status"); ++ ++ /* kernel address randomisation seed as provided by the firmware */ ++ copy_property(fdt, fw_fdt, "/chosen", "kaslr-seed"); ++} ++ + int ft_board_setup(void *blob, struct bd_info *bd) + { + int node; + ++ update_fdt_from_fw(blob, (void *)fw_dtb_pointer); ++ + node = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer"); + if (node < 0) + lcd_dt_simplefb_add_node(blob); +-- +2.32.0 + diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index 71f3e13fc9..ee3d497921 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix @@ -11,6 +11,7 @@ , swig , meson-tools , armTrustedFirmwareAllwinner +, armTrustedFirmwareAllwinnerH616 , armTrustedFirmwareRK3328 , armTrustedFirmwareRK3399 , armTrustedFirmwareS905 @@ -18,10 +19,10 @@ }: let - defaultVersion = "2021.04"; + defaultVersion = "2021.10"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "06p1vymf0dl6jc2xy5w7p42mpgppa46lmpm2ishmgsycnldqnhqd"; + sha256 = "1m0bvwv8r62s4wk4w3cmvs888dhv9gnfa98dczr4drk2jbhj7ryd"; }; buildUBoot = { version ? null @@ -42,6 +43,11 @@ let patches = [ ./0001-configs-rpi-allow-for-bigger-kernels.patch + + # Make U-Boot forward some important settings from the firmware-provided FDT. Fixes booting on BCM2711C0 boards. + # See also: https://github.com/NixOS/nixpkgs/issues/135828 + # Source: https://patchwork.ozlabs.org/project/uboot/patch/20210822143656.289891-1-sjoerd@collabora.com/ + ./0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch ] ++ extraPatches; postPatch = '' @@ -108,7 +114,6 @@ let maintainers = with maintainers; [ dezgeg samueldr lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" ]); - in { inherit buildUBoot; @@ -282,6 +287,13 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootOrangePiZero2 = buildUBoot { + defconfig = "orangepi_zero2_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareAllwinnerH616}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootPcduino3Nano = buildUBoot { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; extraMeta.platforms = ["armv7l-linux"]; @@ -328,6 +340,12 @@ in { filesToInstall = ["u-boot.bin"]; }; + ubootQemuRiscv64Smode = buildUBoot { + defconfig = "qemu-riscv64_smode_defconfig"; + extraMeta.platforms = ["riscv64-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + ubootRaspberryPi = buildUBoot { defconfig = "rpi_defconfig"; extraMeta.platforms = ["armv6l-linux"]; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 916a94241a..6afeda61ed 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -281,12 +281,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2021-09-29"; + version = "2021-10-05"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "52f3c85027a7fe851e27fd267dfe29900e50bbdf"; - sha256 = "1nyraagc3m2dx1qx3wmr0s89rq12kz5mjmkiqm353mf4f9jxf5n3"; + rev = "6e638309efcad2f308eb9c5eaccf6f62b794bbab"; + sha256 = "0kvhwn3gr5x5vf2cgjda22naf8cvgkc43zalvxvr99s9jcjyynki"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-10-03"; + version = "2021-10-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "b224cc55bee059dfa1bcfd7cdb188f0b6f09c5af"; - sha256 = "04x3jfbhn8r8yi68m0xa6j768ypnxbxxab4pn4l8asbbxv9mrl3l"; + rev = "33828c635ef856919889b229ab771268089d4c36"; + sha256 = "0645p6mwgnhdp5lnri4c4h6ryyfn1s3487ydnhkr4p629vnrsl4k"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1074,12 +1074,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-10-03"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "331776e240e14c54f98428a31b830b12062b3275"; - sha256 = "1cygri250v41g99w1vjkfmxnw9n1knsi6bljkfg8cy60zn6ig8wm"; + rev = "ab2c491a941dda7fcec50fe58f472c024fac96e9"; + sha256 = "0h9d8i525cafxvdqxygfx9mchmcjlaq1kza3d4jiaa8azx9bfpzr"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1604,12 +1604,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-09-28"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "3c4d98eec6604fdbbfec9dd86e8fd2a3d3c4b113"; - sha256 = "1624gwlkvr6myw0l7srha0dk9053g0dsnfkbxsyrq1s17day69zf"; + rev = "73671fbfc70f0b78c743894b31c009b22a6ddaa3"; + sha256 = "0mbz6901l0i0cy49d63542jfvzk93d2xnbkpnih65x8whhx35vdc"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1979,12 +1979,12 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2021-10-01"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "880de9e83a3390a1c15fb20ad24fa48006d8cefd"; - sha256 = "1xrhqb8dsfhf2v0kb0k8fdmizaxsyf1dlryrynyn8v4s644h7zyl"; + rev = "8ffc845bdd546ff3a6f5d90096a52542a1463de0"; + sha256 = "0d98hhhyxknimppp144kj3432xxd284zs0xxiilwybsx0pzpl3qk"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; @@ -2135,12 +2135,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-09-27"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "805b12a9b7b1997a47b185cdb2938e0f3e428714"; - sha256 = "0lvf9i2px2s54rn0ahp0z0adn8d9qm051jaxqxmpn718kibknl7k"; + rev = "ceb2dcb23f569ce337deb1b1ce7d4a51434cec32"; + sha256 = "0q7a2pa6am99656a07zpnhqlgzjkn9z0jg6lvc45c7mqavl21xis"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2267,12 +2267,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-09-28"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "b8be59288d8f120bd24c456c6ec62b6ea03d0fa0"; - sha256 = "158sd6n6hali2zaxq8wnjp4qd0nndfkv84fvlln7mm6mp22ynq7k"; + rev = "8f95a04c0a8d4d7b84b089a11a2c41d58693d89c"; + sha256 = "1nzr0148zi89mq4yil77ns2nrs0ldnl3fh8aqxa89fivy8lg9p64"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2495,12 +2495,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-09-29"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "a5c8b551e290113b0e54530f7d5bdee14bcdedff"; - sha256 = "057qf4c5vxn5vf6x4i4crmqlcl8kw6qavncsk9h9gyq0h8zaqv1g"; + rev = "31fe9b4ac3eaaac0bf5e90d607662c32f59dc0b7"; + sha256 = "1fwyrp5w7q4pz4a5dh24j2v8qrm4pr71p7qm14hj7xw3a80s9bci"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2784,12 +2784,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-09-19"; + version = "2021-10-05"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "f80ff99c434d4d233a4a8bf2d116289b6619fbcd"; - sha256 = "0l0jy9wj95vz86rzmf5yvrvmbapg8g6rfx8ls21i95kzbm02c435"; + rev = "583358ec0dd9a6a1937eb3e46614ebad017325b9"; + sha256 = "1ngf54bz0v940y0sf9axbvsf3vcnajdrp4lhvbh0zw28piqxlkap"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -3024,12 +3024,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2021-09-26"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "8f89ab239ef2569096b6805ea093a322985b8e4e"; - sha256 = "0cjx5xbmwkjbvcg0ak33lbz14ssqn84rikwkc0615fsrz323r36j"; + rev = "24bea0c8697a360f96f7050b15b46e5f1ab8383a"; + sha256 = "0xdr9n6jq9ma1bkck05xcpxja1wwvqwhg36s2v5kl11anb67vqhz"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3084,12 +3084,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-10-03"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "90b509ccd12c3aee211a322c60b44f6eba60832c"; - sha256 = "0aykgqmdl83d6qg02rzxj6w01c91nq9i073yq1hj25ljqspzfsqz"; + rev = "2f7e2b173386c9a5f26fbc22a765301784893e1c"; + sha256 = "02w690fhlhmbjb03958kz5migh8iv5rnmhh3lg8sb08haclh14g3"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3768,12 +3768,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2021-10-01"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "84c1d22f2108034f3597045155ac8fac230c90db"; - sha256 = "0bz6h1c6hfw80nw1y1b89gnlbdnb2zjn4inn6fkhdvyg04yi8sn5"; + rev = "15dfe546111a96e5f30198d5bd163658acdbbe3b"; + sha256 = "0a03i8i5fjzffqv4pp29x32ld3h5azvia2a1b3sc5i0bbzishxb5"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4164,24 +4164,24 @@ final: prev: nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-09-21"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "5b265fe19a3a60b6429b34c8cfdb0284ce52de33"; - sha256 = "0m2kq0rs0rkif8d8783dbd9dwahzih67zfz3wi58r5lsm4fnai9h"; + rev = "fb7fa4adf6c6464784e248b3a12e6ca0b3f4855a"; + sha256 = "1p7i1vq6w9ghp9xhv78rbjj9c5sp01b3qqyhskqdzn1pkgj4pwr8"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-10-01"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "507f8a570ac2b8b8dabdd0f62da3b3194bf822f8"; - sha256 = "11jcmvma2lbqrpgznhgid25l8angfjrn0qwnjwcbnv0l34amlw62"; + rev = "30442900db62ff875013b3f1584e8c0a832c43d2"; + sha256 = "1v0hmf5sv884l1svvfb20yb5q9vfbc4ap0268hcxc7393al4fs2f"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4308,12 +4308,12 @@ final: prev: nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-09-28"; + version = "2021-10-05"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "d4f0193c2a5e947247c2fc407c266bfb09b55a7b"; - sha256 = "1pg3yc1vlx7a0iwx1cgkzs3jpmg1rlw6db7dyjxkp0926vz7dv0k"; + rev = "e1f54e1627176337b3803a11403ac0e9d09de818"; + sha256 = "0xg3c8msd9fsmwlxgpxwbz2h9aizc3f7jn9p1q23pjlpcxr8xwll"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -4476,12 +4476,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2021-09-27"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedark.nvim"; - rev = "092e270b76940dff9a8270f97c2cec7eca97d31e"; - sha256 = "0c3axfdr2mz5sgmpsk510z9yj62iw58ds3amkbqd03nywn3s6bjv"; + rev = "5675f60acdf31fef35acf066ff754173d0cffa44"; + sha256 = "1q1d6b8yyknhsfaqk2805hivxv7rq6y0fsj45n7hwgqll195hcci"; }; meta.homepage = "https://github.com/olimorris/onedark.nvim/"; }; @@ -5294,12 +5294,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-09-28"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "3f34e4a1e78ab1049aa6b350008f8902f2855467"; - sha256 = "1hzqrx7dp9yv276fr9sddwpds50n1vmfik9fiq44djdqwd0z092v"; + rev = "81e19fc3db1af37ec5acf2d7cb11b97ae48c34b6"; + sha256 = "1g67hpnk366z71an7kl0g8x0ikn9v4yiaqv87b5n6s2ax6h3z9lr"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5716,12 +5716,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2021-09-01"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "cf3a1deb9cf165c60d54b3c05ef6b08ac9eb0056"; - sha256 = "05fjh17si1gv31da64m9qfdsy492c3njrp6l4l6qsf7n6dwjjsi6"; + rev = "4c46d468595d28d92bf340256e6cbbc3748ae6f0"; + sha256 = "1kkmac237n0if5hssjxw1gwdwdrhaf4kppg5zrpaqgva5bgg5idj"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -5801,12 +5801,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-09-30"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "440c598de419858a056e7d9d42a0a6829cd5bb05"; - sha256 = "08rv6jd7r07n1pj7wjnwlq2wh25vp1hv5kkfywjavrvmb1ka6ik6"; + rev = "ec487779909ebc8bffbbe054a2e8a4fbe05c0e51"; + sha256 = "0xwl54wfh78s0gs6hdqhj7k3smdqsjdifxibkb9543msdnpvh0y0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6174,12 +6174,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2021-09-29"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "6898b7fcbc36324c127ba42cabe488ab15c785f4"; - sha256 = "0wrp5ja8vrqv0cpzvs6czfmv0kih25ac9xxzb9q2y1zb2ran3lim"; + rev = "69d1d341e6e8c5424be178cc60375b517c9e4d4e"; + sha256 = "1zh6jg0ycalwq0dz7b65lrvhr5af6317j12k1s2xl7piabjbhxrx"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7710,12 +7710,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-10-03"; + version = "2021-10-05"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "2578f7fd4a431fcb12ad2700ddd5a042457103a9"; - sha256 = "18js4znanr8hln9xldyayk82rx3rm4dp4hpb4qr1ps5clj3lc66x"; + rev = "81f8cd0ca270a7f6e3773644e163ac7de263e24c"; + sha256 = "08y3maidpya4qb5n7rrywnzk551m2dky428aw69r44597a2ivnqr"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8743,6 +8743,18 @@ final: prev: meta.homepage = "https://github.com/LnL7/vim-nix/"; }; + vim-noctu = buildVimPluginFrom2Nix { + pname = "vim-noctu"; + version = "2015-06-27"; + src = fetchFromGitHub { + owner = "noahfrederick"; + repo = "vim-noctu"; + rev = "de2ff9855bccd72cd9ff3082bc89e4a4f36ea4fe"; + sha256 = "14z1mwmvq0crvljsk6x29bxxhbavbjsggjr68f6aiz3635yih8vy"; + }; + meta.homepage = "https://github.com/noahfrederick/vim-noctu/"; + }; + vim-nong-theme = buildVimPluginFrom2Nix { pname = "vim-nong-theme"; version = "2020-12-16"; @@ -10018,12 +10030,12 @@ final: prev: vim-tmux = buildVimPluginFrom2Nix { pname = "vim-tmux"; - version = "2020-07-25"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux"; - rev = "7e7680fb1bb05bca1c800213b265f45433ed1e33"; - sha256 = "19al4a4g8wfz43am32ncz8dg58wxhzn30p7r4n1780pv8hzkdrsb"; + rev = "cfe76281efc29890548cf9eedd42ad51c7a1faf0"; + sha256 = "0z263z1iwbxms90sp6jwk8kc4cf0zj1y3qfyh5p410ghadjnci99"; }; meta.homepage = "https://github.com/tmux-plugins/vim-tmux/"; }; @@ -10583,12 +10595,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-10-03"; + version = "2021-10-04"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2d032e54c95593f1ea8bd458fc940a20a8f390f9"; - sha256 = "02vfbfgr8ipf20n0046h7wx66r15wvxdj5xcw80qv12zshdd0qi4"; + rev = "fc51b70d818a1df807f414b6ee47e7e0fbf74903"; + sha256 = "1n7390x33pk48sxiyhp0nsw87mj837535is3dmz8si5jj7nf6lb8"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index b7b73e1d42..13e4d58379 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -510,6 +510,7 @@ nicoe/deoplete-khard nishigori/increment-activator nixprime/cpsm NLKNguyen/papercolor-theme +noahfrederick/vim-noctu noc7c9/vim-iced-coffee-script norcalli/nvim-colorizer.lua norcalli/nvim-terminal.lua diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 579f080bbf..1c1db601da 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -1472,6 +1472,18 @@ let }; }; + takayama.vscode-qq = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "takayama"; + name = "vscode-qq"; + version = "1.4.0"; + sha256 = "sha256-DYjNWSKOrDYvdiV7G24uKz6w4ggeYUMkQIiOGZAbMSI="; + }; + meta = { + license = lib.licenses.mpl20; + }; + }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "even-better-toml"; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix index 1de3bce3d0..da3630f97c 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -6,8 +6,14 @@ let # Same as "Unique Identifier" on the extension's web page. # For the moment, only serve as unique extension dir. vscodeExtUniqueId, - configurePhase ? ":", - buildPhase ? ":", + configurePhase ? '' + runHook preConfigure + runHook postConfigure + '', + buildPhase ?'' + runHook preBuild + runHook postBuild + '', dontPatchELF ? true, dontStrip ? true, buildInputs ? [], diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix index 6fa7ba28d8..a7f17e4495 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix @@ -37,7 +37,14 @@ stdenv.mkDerivation rec { # TODO: Remove the musl patches when # https://github.com/linux-audit/audit-userspace/pull/25 # is available with the next release. - patches = [ ./patches/weak-symbols.patch ] + patches = [ + ./patches/weak-symbols.patch + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + url = "https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f.patch"; + sha256 = "100xa1rzkv0mvhjbfgpfm72f7c4p68syflvgc3xm6pxgrqqmfq8h"; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl [ ( let patch = fetchpatch { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix new file mode 100644 index 0000000000..e9931f0ab7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix @@ -0,0 +1,60 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "autosuspend"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "languitar"; + repo = pname; + rev = "v${version}"; + sha256 = "03qca6avn7bwxcavif7q2nqfzivzp0py7qw3i4hsb28gjrq9nz36"; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace '--cov-config=setup.cfg' "" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + portalocker + psutil + dbus-python + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + python-dbusmock + pytest-httpserver + dateutils + freezegun + pytest-mock + requests + requests-file + icalendar + tzlocal + jsonpath-ng + mpd2 + lxml + pytest-datadir + ]; + + # Disable tests that need root + disabledTests = [ + "test_smoke" + "test_multiple_sessions" + ]; + + doCheck = true; + + meta = with lib ; { + description = "A daemon to automatically suspend and wake up a system"; + homepage = "https://autosuspend.readthedocs.io"; + license = licenses.gpl2Only; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix index 929981df47..221f38faa8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap, bash, libbpf @@ -29,12 +29,6 @@ python.pkgs.buildPythonApplication rec { # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch - # Add definition for BTF_KIND_FLOAT, added in Linux 5.14 - # Can be removed once linuxHeaders (used here via glibc) are bumped to 5.14+. - (fetchpatch { - url = "https://salsa.debian.org/debian/bpfcc/-/raw/71136ef5b66a2ecefd635a7aca2e0e835ff09095/debian/patches/0004-compat-defs.patch"; - sha256 = "05s1zxihwkvbl2r2mqc5dj7fpcipqyvwr11v8b9hqbwjkm3qpz40"; - }) ]; propagatedBuildInputs = [ python.pkgs.netaddr ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpfmon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bpfmon/default.nix new file mode 100644 index 0000000000..32781d3654 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bpfmon/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, lib, libpcap, yascreen }: + +stdenv.mkDerivation rec { + pname = "bpfmon"; + version = "2.50"; + + src = fetchFromGitHub { + owner = "bbonev"; + repo = "bpfmon"; + rev = "v${version}"; + sha256 = "sha256-x4EuGZBtg45bD9q1B/6KwjDRXXeRsdFmRllREsech+E="; + }; + + buildInputs = [ libpcap yascreen ]; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "BPF based visual packet rate monitor"; + homepage = "https://github.com/bbonev/bpfmon"; + maintainers = with maintainers; [ arezvov ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 4d0ae9a1d5..73b9cf08b8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.29"; + version = "1.0.31"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "sha256-4wvVls6Z42GtC/MVFTvCv1UV/w5nt4p9oTMU4Bqh4JU="; + sha256 = "sha256-agtaQ5Te4WcbIdCt8TDK4Y2y/9aHrDCUWuPRE5+aFjc="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "sha256-x2FO4UWtsvUeKgPxaqjdxtp9vWJq9vLIqQPyGF8nQG4="; + cargoSha256 = "sha256-QFHyrvLR1v09RNlXiO/E+blvxPukKwPRRX+vQvlZSNQ="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hid-nintendo/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hid-nintendo/default.nix index 321f96d0d3..e9ee88252e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hid-nintendo/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hid-nintendo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hid-nintendo"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "nicman23"; repo = "dkms-hid-nintendo"; rev = version; - sha256 = "sha256-IanH3yHfkQhqtKvKD8lh+muc9yX8XJ5bfdy1Or8Vd5g="; + sha256 = "1c262xarslicn9ildndl66sf97i5pzwzra54zh2rp11j7kkvvbyr"; }; setSourceRoot = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Nintendo HID kernel module"; homepage = "https://github.com/nicman23/dkms-hid-nintendo"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.rencire ]; platforms = platforms.linux; broken = versionOlder kernel.version "4.14"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix index 9d727838b3..27428b3728 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix @@ -81,12 +81,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.12"; in + linuxHeaders = let version = "5.14"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "sha256-fQ328r8jhNaNC9jh/j4HHWQ2Tc3GAC57XIfJLUj6w2Y="; + sha256 = "sha256-fgaLXg0mpisQ5TILJdzldYjLvG94HAkEQhOMnJwycbI="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix index e4c9f03539..e5a9032d3b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.6"; + version = "5.14.9"; suffix = "lqx4"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-arje/B/oXW/2QUHKi1vJ2n20zNbri1bcMU58mE0evOM="; + sha256 = "sha256-nT8lc/JeuXsKVHGPQxK+w8BTasxyIfxCdKbAvoFgbYg="; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index dc59a3f261..44e0b1d77b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -261,8 +261,7 @@ let find . -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w # Keep root and arch-specific Makefiles - chmod u-w Makefile - chmod u-w arch/$arch/Makefile* + chmod u-w Makefile arch/"$arch"/Makefile* # Keep whole scripts dir chmod u-w -R scripts diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix index 21d803e2b7..6e6eecd493 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix @@ -29,6 +29,13 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/kexec-tools/raw/cb1e5463b5298b064e9b6c86ad6fe3505fec9298/f/kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch"; sha256 = "1kzmcsbhwfdgxlc5s88ir0n494phww1j16yk0z42x09qlkxxkg0l"; }) + + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + name = "fno-common.patch"; + url = "https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=cc087b11462af9f971a2c090d07e8d780a867b50"; + sha256 = "043hcsy6m14h64p6b9w25c7a3y0f487322dj81l6mbm6sws6s9lv"; + }) ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix index 732ad88c70..e90c089420 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, flex }: +{ lib, stdenv, fetchurl, fetchpatch, flex }: stdenv.mkDerivation rec { pname = "libsepol"; @@ -13,6 +13,20 @@ stdenv.mkDerivation rec { sha256 = "0ygb6dh5lng91xs6xiqf5v0nxa68qmjc787p0s5h9w89364f2yjv"; }; + patches = [ + # upstream build fix against -fno-common compilers like >=gcc-10 + (fetchpatch { + url = "https://github.com/SELinuxProject/selinux/commit/a96e8c59ecac84096d870b42701a504791a8cc8c.patch"; + sha256 = "0aybv4kzbhx8xq6s82dsh4ib76k59qzh2bgxmk44iq5cjnqn5rd6"; + stripLen = 1; + }) + (fetchpatch { + url = "https://github.com/SELinuxProject/selinux/commit/3d32fc24d6aff360a538c63dad08ca5c957551b0.patch"; + sha256 = "1mphwdlj4d6mwmsp5xkpf6ci4rxhgbi3fm79d08h4jbzxaf4wny4"; + stripLen = 1; + }) + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' substituteInPlace src/Makefile --replace 'all: $(LIBA) $(LIBSO)' 'all: $(LIBA)' sed -i $'/^\t.*LIBSO/d' src/Makefile diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index 242a4d0381..ae7fee7730 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -2,18 +2,16 @@ , pandoc, ethtool, iproute2, libnl, udev, python3, perl } : -let - version = "36.0"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rdma-core"; - inherit version; + version = "37.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "0x3mpwmhln6brwrwix9abdq1bs9zi4qnr3r64vwqk7l6f43mqd30"; + sha256 = "0cz6dq34w0zxm1c6xk4pqascvvppa1b0m8jfnpncg5a68day8x65"; }; nativeBuildInputs = [ cmake pkg-config pandoc docutils ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix index 38ce20deea..8ef0e40312 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "system76-power"; - version = "1.1.17"; + version = "1.1.18"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-power"; rev = version; - sha256 = "sha256-9ndukZPNB0qtU0hA9eUYpiAC8Tw1eF16W+sVU7XKvsg="; + sha256 = "1zm06ywc3siwh2fpb8p7lp3xqjy4c08j8c8lipd6dyy3bakjh4r1"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libusb1 ]; - cargoSha256 = "sha256-6mtBY77d2WAwTpj+g0KVpW/n39uanAL2GNHWC8Qbtqk="; + cargoSha256 = "0hda8cxa1pjz90bg215qmx5x2scz9mawq7irxbsw6zmcm7wahlii"; postInstall = '' install -D -m 0644 data/system76-power.conf $out/etc/dbus-1/system.d/system76-power.conf diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/system76/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/system76/default.nix index aa0ff0331f..7d9cd9bde0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/system76/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/system76/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel }: let - version = "1.0.12"; - sha256 = "0k098zkxa8spj5rbmzpndxs0cf5i2n22g3ym6kq4j43kvs18x6c7"; + version = "1.0.13"; + sha256 = "162hhmnww8z9k0795ffs8v3f61hlfm375law156sk5l08if19a4r"; in stdenv.mkDerivation { name = "system76-module-${version}-${kernel.version}"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 9f92c34cee..e0a4128b0c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -183,9 +183,6 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" substituteInPlace src/boot/efi/meson.build \ - --replace \ - "find_program('ld'" \ - "find_program('${stdenv.cc.bintools.targetPrefix}ld'" \ --replace \ "find_program('objcopy'" \ "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" @@ -408,6 +405,7 @@ stdenv.mkDerivation { "-Dsmack=true" "-Db_pie=true" "-Dinstall-sysconfdir=false" + "-Defi-ld=${stdenv.cc.bintools.targetPrefix}ld" /* As of now, systemd doesn't allow runtime configuration of these values. So the settings in /etc/login.defs have no effect on it. Many people think this diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index be6259e955..bf75eb4d3a 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.10.2"; + version = "1.10.3"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-mA/s3J0ylE3C3IGaYfadeZV6PQ5Ooth6iQ4JEgPl44Q="; + sha256 = "sha256-Jn8cF+8Wf4zZ/PFXvjCGpomSa/DvraBGW0LsZQ+Zy+4="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-MWQ1m2nvKdP8ZCDs0sjZCiW4DSGe3NnVl4sQ448cu5M="; + vendorSha256 = "sha256-cQP1po9LGunFVocl4+HPs67oae2KpgyfRRB+xGVySUY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix index faf87a9048..98e2230104 100644 --- a/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dict-db-wiktionary"; - version = "20210901"; + version = "20210920"; src = fetchurl { url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "S87E0aAFITOTugvsXOmbq8+P/LS2J+GmFvJYeYj79PM="; + sha256 = "UeufbpSpRL+JrU3SkhxzWJncEsrM1es88grRmFwGABk="; }; # script in nixpkgs does not support python2 diff --git a/third_party/nixpkgs/pkgs/servers/gonic/default.nix b/third_party/nixpkgs/pkgs/servers/gonic/default.nix index 57623a8026..b2f3d61d8f 100644 --- a/third_party/nixpkgs/pkgs/servers/gonic/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gonic/default.nix @@ -12,19 +12,19 @@ buildGoModule rec { pname = "gonic"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "sentriz"; repo = pname; rev = "v${version}"; - sha256 = "08zr5cbmn25wfi1sjfsb311ycn1855x57ypyn5165zcz49pcfzxn"; + sha256 = "sha256-wX97HtvHgHpKTDwZl/wHQRpiyDJ7U38CpdzWu/CYizQ="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ taglib zlib ] ++ lib.optionals stdenv.isLinux [ alsa-lib ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox AppKit ]; - vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; + vendorSha256 = "sha256-oTuaA5ZsZ7zMcjzGh37zO/1XyOfj6xjfNr6A7ecrOiA="; # TODO(Profpatsch): write a test for transcoding support, # since it is prone to break 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 2ec30cbf0a..788eb81227 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 @@ -9,35 +9,28 @@ , luaSupport ? false, lua5 }: -let inherit (lib) optional; -in - -assert sslSupport -> aprutil.sslSupport && openssl != null; -assert ldapSupport -> aprutil.ldapSupport && openldap != null; -assert http2Support -> nghttp2 != null; - stdenv.mkDerivation rec { - version = "2.4.49"; pname = "apache-httpd"; + version = "2.4.50"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0fqkfjcpdd40ji2279wfxh5hddb5jdxlnpjr0sbhva8fi7b6bfb5"; + sha256 = "6a2817c070c606682eb53ed963511407d3c3d7a379cdf855971467b00fb3890f"; }; # FIXME: -dev depends on -doc outputs = [ "out" "dev" "man" "doc" ]; setOutputFlags = false; # it would move $out/modules, etc. - buildInputs = [perl] ++ - optional brotliSupport brotli ++ - optional sslSupport openssl ++ - optional ldapSupport openldap ++ # there is no --with-ldap flag - optional libxml2Support libxml2 ++ - optional http2Support nghttp2 ++ - optional stdenv.isDarwin libiconv; + buildInputs = [ perl ] ++ + lib.optional brotliSupport brotli ++ + lib.optional sslSupport openssl ++ + lib.optional ldapSupport openldap ++ # there is no --with-ldap flag + lib.optional libxml2Support libxml2 ++ + lib.optional http2Support nghttp2 ++ + lib.optional stdenv.isDarwin libiconv; - prePatch = '' + postPatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|' ''; @@ -93,9 +86,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Apache HTTPD, the world's most popular web server"; - homepage = "http://httpd.apache.org/"; + homepage = "https://httpd.apache.org/"; license = licenses.asl20; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ lovek323 peti ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix index 76f5106c08..02d6fd7828 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "synadm"; - version = "0.29"; + version = "0.30"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1vy30nwsns4jnv0s5i9jpyplxpclgwyw0gldpywv4z3fljs0lzik"; + sha256 = "9e7c2e2540fb786c1064a9a2bfe6ef3ec8b0ed27f6fd6beda80ed615c72a6103"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index fd26dfd3fc..87c13e972f 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -54,6 +54,7 @@ in python.pkgs.buildPythonPackage rec { pillow lxml setuptools + prometheus-client ] ++ lib.optionals withE2BE [ asyncpg python-olm diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix index 5f70bf702a..b3da1a5604 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-boEgCC3uWvJvb6VKpNhh6vHCfeE7oun5oneI2ITKh9g="; + sha256 = "sha256-Up7HBG6h24XIjBRvQYZpuB5lWXYTipQql9loykwwd1k="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index bbcd7b6ead..848bcaca43 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.1.5"; + version = "8.1.6"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-Tr5U+bXBW7UIcmqrbmt/e82sZWLDMEObYsxl0INqXxw="; + sha256 = "sha256-PUVRFa3b+O2lY6q3vO+rLUcC+fx80iB78tt60f6Vugk="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-yE7mhX3peYnTdiY0YwKJ7SMvz4iXmvJncz002vdFXFg="; + sha256 = "sha256-So9xzet9kPkjcDwNts3iXlCd+u2uiXTo0LVcLc8toyk="; }; - vendorSha256 = "sha256-DFD6orsM5oDOLgHbCbrD+zNKVGbQT3Izm1VtNCZO40I="; + vendorSha256 = "sha256-dn4sliRp58oZALZ8Iu7kE83ntkcMIU84Xr5WoeXlhCI="; preBuild = '' # The testcase makes an API call against grafana.com: diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix index 745cfdd345..da01415331 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unifi-poller"; - version = "2.1.0"; + version = "2.1.3"; src = fetchFromGitHub { owner = "unifi-poller"; repo = "unifi-poller"; rev = "v${version}"; - sha256 = "sha256-C7QjMzmy2CMCk2oqRiThUQBKgltT0PzZArvZ+gOmJ2I="; + sha256 = "sha256-xh9s1xAhIeEmeDprl7iPdE6pxmxZjzgMvilobiIoJp0="; }; - vendorSha256 = "sha256-LOBkdyfsw7ua6TsLglO5jdR9NWo5Df8rnQ8MH+eIz4g="; + vendorSha256 = "sha256-HoYgBKTl9HIMVzzzNYtRrfmqb7HCpPHVPeR4gUXneWk="; ldflags = [ "-w" "-s" @@ -26,6 +26,5 @@ buildGoModule rec { homepage = "https://github.com/unifi-poller/unifi-poller"; license = licenses.mit; maintainers = with maintainers; [ elseym ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/moonraker/default.nix b/third_party/nixpkgs/pkgs/servers/moonraker/default.nix index 06a68557d7..00d721be2e 100644 --- a/third_party/nixpkgs/pkgs/servers/moonraker/default.nix +++ b/third_party/nixpkgs/pkgs/servers/moonraker/default.nix @@ -11,16 +11,17 @@ let inotify-simple libnacl paho-mqtt + pycurl ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2021-09-04"; + version = "unstable-2021-09-21"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "db3f69e0dddcc8ac07e895a9a65906a8e08707e7"; - sha256 = "uam3Vp/NA8HWxqqy6l8UkeaR5OSqHMwb5uXUL4E0jBQ="; + rev = "2447ccab6252fddc829da3eec8b29d1abe3dee60"; + sha256 = "qaorF26e2pkOCxiUfo8MOPQVpZjx5G1uo66jFoQpMcs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix index daa17def35..351a2cb3c2 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "6.2.5"; + version = "6.2.6"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1bjismh8lrvsjkm1wf5ak0igak5rr9cc39i0brwb6x0vk9q7b6jb"; + sha256 = "1ariw5x33hmmm3d5al0j3307l5kf3vhmn78wpyaz67hia1x8nasv"; }; # Cross-compiling fixes diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix index a49c0549a6..cab0b70b64 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -92,7 +92,7 @@ common = rec { # attributes common to both builds # Remove Development components. Need to use libmysqlclient. rm "$out"/lib/mysql/plugin/daemon_example.ini rm "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} - rm "$out"/bin/{mariadb_config,mysql_config} + rm "$out"/bin/{mariadb-config,mariadb_config,mysql_config} rm -r $out/include rm -r $out/lib/pkgconfig rm -rf "$out"/share/aclocal 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 ecc4000f5f..626e4e0290 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 @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_repack"; - version = "1.4.6"; + version = "1.4.7"; buildInputs = [ postgresql openssl zlib readline ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "reorg"; repo = "pg_repack"; rev = "refs/tags/ver_${version}"; - sha256 = "01n320cvn0z48ac4mbclpbzspdraaqzzw4xdcns7fj33vqq8nqm7"; + sha256 = "12j8crgljvkm9dz790xcsr8l7sv8ydvb2imrb0jh1jvj0r9yg1v5"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 02a5f4fe13..86c9e54526 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0v102hbszq52jvydj2qrysfs1g46wv4vmgwaa9zj0pvknh58lb43"; + sha256 = "10rj35xxcfg10nvq3zqxm25hfb3hw58z4dda1b4hh8ibyz2489vy"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix index 2c67b65d76..c1bd999ebf 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ankane"; repo = pname; rev = "v${version}"; - sha256 = "0kq28k96y5r0k6nhz78c3frqzhf8d1af54dqbpayn7fgvdl0vlm2"; + sha256 = "1jl6rpys24qxhkv3q798pp9v03z2z7gswivp19yria9xr3bg6wjv"; }; buildInputs = [ postgresql ]; diff --git a/third_party/nixpkgs/pkgs/servers/ums/default.nix b/third_party/nixpkgs/pkgs/servers/ums/default.nix index 3d4e4fdf51..48398a5ba6 100644 --- a/third_party/nixpkgs/pkgs/servers/ums/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ums/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "ums"; - version = "9.4.2"; + version = "10.12.0"; src = { i686-linux = fetchurl { url = "mirror://sourceforge/project/unimediaserver/${version}/" + lib.toUpper "${pname}-${version}" + "-x86.tgz"; - sha256 = "0i319g2c3z9j131nwh5m92clgnxxxs3izplzhjb30bx4lldmjs1j"; + sha256 = "0j3d5zcwwswlcr2vicmvnnr7n8cg3q46svz0mbmga4j3da4473i6"; }; x86_64-linux = fetchurl { url = "mirror://sourceforge/project/unimediaserver/${version}/" + lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; - sha256 = "07wc0is86fdfyz4as3f17q8pfzl8x55ci65zvpls0a9rfyyvjjw3"; + sha256 = "06f96vkf593aasyfw458fa4x3rnai2k83vpgzc83hlwr0rw70qfn"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh` # script will correctly fall back to the JRE specified by JAVA_HOME - rm -rf $out/jre + rm -rf $out/jre8 makeWrapper "$out/UMS.sh" "$out/bin/ums" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath [ libzen libmediainfo] }" \ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix index e554a1213e..100769977a 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix @@ -57,7 +57,8 @@ mkYarnPackage { preInstall = '' mkdir $out - cp -R ./deps/lemmy-ui/dist/assets $out + cp -R ./deps/lemmy-ui/dist $out + cp -R ./node_modules $out ''; distPhase = "true"; diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/done.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/done.nix index 8d1a14e19f..ffbd8dfdaa 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/done.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/done.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "done"; - version = "1.16.3"; + version = "1.16.5"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - sha256 = "Xld66z9vVp3kxikndZ9k/zlNvP0YSoSCNTBkJ8rT3uo="; + sha256 = "E0wveeDw1VzEH2kzn63q9hy1xkccfxQHBV2gVpu2IdQ="; }; checkPlugins = [ fishtape ]; diff --git a/third_party/nixpkgs/pkgs/shells/oil/default.nix b/third_party/nixpkgs/pkgs/shells/oil/default.nix index 48bd2fcd83..3d9a2ec24e 100644 --- a/third_party/nixpkgs/pkgs/shells/oil/default.nix +++ b/third_party/nixpkgs/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-msPRus7J/qMfFFaayQfrjFFqhSvPuwpr6EaobOCBaUE="; + sha256 = "sha256-YvNgcvafM3jgO3nY1SVcHRNglOwRQQ208W7oLxZg79o="; }; postPatch = '' 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 bff4ee38df..1566974bad 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,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-09-22"; + version = "2021-10-05"; pname = "oh-my-zsh"; - rev = "5b3d2b2f0c02ef059fcbcbdb619b22318b8cc13a"; + rev = "e5b9b80008a2fd71b441ef39fe620ed47dad82e5"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "SSvPU/YWFcGN8oyOyQXZhNOuOS7Z8a6Vel94z9EoyAU="; + sha256 = "09oTsUYLLZAoUwM63gAVYLWFvp0aKTM9K79alTISEJw="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix index 901f489fb4..bdb38a45e7 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "aws-nuke"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "rebuy-de"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FntHZi+L0Ti2QFbd8keF1sxcdXc01hs13Np23hF/pVc="; + sha256 = "sha256-8ILjEWr91YMUUN2GMXnS3sRrwGvUsYjDmRnM+fY5PkY="; }; - vendorSha256 = "sha256-VtsHUxI5RuKbQOSu55qPCJHsDO5+cNGT92y9dlibXlc="; + vendorSha256 = "sha256-sAII1RD9CG3Ape9OwD0956atlmaJVzSpRRBdo+ozTuk="; preBuild = '' if [ "x$outputHashAlgo" != "x" ]; then diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index cf87652ab3..d11ed86e08 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.20.31"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.20.54"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-qDKnxh4M+LOXYp1xCvW0S0IE5NnwvFpYelUCCjA18zQ="; + sha256 = "sha256-stnuPobBKIpKA4iTKGTO5kmMEl7grFdZNryz40S599M="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 4206136ec6..cf765a53c5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -11,12 +11,12 @@ let }; }); botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev147"; + version = "2.0.0dev148"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "afa015418df6b3aeef0f5645e8704de64adea3d7"; - sha256 = "sha256-ypqDhCQXPqG8JCsLWt1V/4s95Hm+lClz+eOA2GnIhYg="; + rev = "c0734f100f61bbef413cb04d9890bbffbccd230f"; + sha256 = "sha256-ndSJdBF3NMNtpyHgYAksCUBDqlwPhugTkIK6Nby20oI="; }; propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt]; }); @@ -27,19 +27,26 @@ let sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; }; }); + s3transfer = super.s3transfer.overridePythonAttrs (oldAttrs: rec { + version = "0.4.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; + }; + }); }; }; in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.2.39"; # N.B: if you change this, change botocore to a matching version too + version = "2.2.40"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-3GYj6+08J05Lu17jjydmzlypI5TUuV+5HA398oExkiU="; + sha256 = "sha256-IHnNRER9ePKVI9ez15HgxLDR1n6QR0iRESgNqbxQPx8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix index 6856794675..83d16c3eb7 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.4.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+5uy6zVfC+utXfwBCEo597CRo4di73ff0eqHyDUxxII="; + sha256 = "sha256-ytU1G0kT8/sx9kR8yrrGqUta+vi96aCovoABit0857g="; }; - vendorSha256 = "sha256-JgGDP5H7zKQ8sk36JtM/FCWXl7oTScHNboQ/mE5AisU="; + vendorSha256 = "sha256-EK2E2YWdk2X1awdUhMOJh+qr+jnnftnKuPPpiHzXZHk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix index 5b57dc20e3..1ae8de975a 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { "1qkrhi3lbxk6hflp6w3h4sgssc0wblv8r0qgxqzbjrm36pqwxiwh") (fp "3" "236684f6deb3178043fe72a8e2faca538fa2aae1" "0pidkbxalpj5yz4fr95x8h0rizgjij0xgvjgirfkjk460giawwg6") + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + name = "fno-common-fix.patch"; + url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=641d3f489cf6238bb916368d4ba0d9325a235afb"; + sha256 = "1ffawzxjw72kzpdwffi2y7pvibrmwf4jzrxdq9f4a75q6crl66iq"; + }) ]; preConfigure = lib.optionalString stdenv.isCygwin '' diff --git a/third_party/nixpkgs/pkgs/tools/archivers/sharutils/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/sharutils/default.nix index ec0f096915..c504ed8f16 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/sharutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/sharutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, coreutils }: +{ lib, stdenv, fetchurl, fetchpatch, gettext, coreutils }: stdenv.mkDerivation rec { pname = "sharutils"; @@ -30,6 +30,19 @@ stdenv.mkDerivation rec { url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-4/debian/patches/02-fix-ftbfs-with-glibc-2.28.patch"; sha256 = "15kpjqnfs98n6irmkh8pw7masr08xala7gx024agv7zv14722vkc"; }) + + # pending upstream build fix against -fno-common compilers like >=gcc-10 + # Taken from https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/msg00002.html + (fetchpatch { + name = "sharutils-4.15.2-Fix-building-with-GCC-10.patch"; + url = "https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/txtDL8i6V6mUU.txt"; + sha256 = "0kfch1vm45lg237hr6fdv4b2lh5b1933k0fn8yj91gqm58svskvl"; + }) + (fetchpatch { + name = "sharutils-4.15.2-Do-not-include-lib-md5.c-into-src-shar.c.patch"; + url = "https://lists.gnu.org/archive/html/bug-gnu-utils/2020-01/txt5Z_KZup0yN.txt"; + sha256 = "0an8vfy3qj6sss9w0i4j8ilf7g5mbc7y13l644jy5bcm9przcjbd"; + }) ]; postPatch = let 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 6a34657d3d..3d7e436ac2 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "unionfs-fuse"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "rpodgorny"; repo = "unionfs-fuse"; rev = "v${version}"; - sha256 = "0bwx70x834qgqh53vqp18bhbxbsny80hz922rbgj8k9wj7cbfilm"; + sha256 = "sha256-EJryML6E0CW4kvsqMRqV3cq77j50HuylNzgaHD6CL/o="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wgpu/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix similarity index 77% rename from third_party/nixpkgs/pkgs/tools/graphics/wgpu/default.nix rename to third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix index 31933000bf..737f713221 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/wgpu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix @@ -1,17 +1,17 @@ { lib, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, vulkan-loader }: rustPlatform.buildRustPackage rec { - pname = "wgpu"; + pname = "wgpu-utils"; version = "0.10.0"; src = fetchFromGitHub { owner = "gfx-rs"; - repo = pname; - rev = "9da5c1d3a026c275feb57606b8c8d61f82b43386"; - sha256 = "sha256-DcIMP06tlMxI16jqpKqei32FY8h7z41Nvygap2MQC8A="; + repo = "wgpu"; + rev = "utils-${version}"; + sha256 = "sha256-bOUcLtT5iPZuUgor2d/pJQ4Y+I1LMzREgj1cwLAvd+s="; }; - cargoSha256 = "sha256-3gtIx337IP5t4nYGysOaU7SZRJrvVjYXN7mAqGbVlo8="; + cargoSha256 = "sha256-SSEG8JApQrgP7RWlXqb+xuy482oQZ5frE2IaVMruuG0="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 8568c6b488..415fed3317 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.3.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-hKWajx4cAs6rP536Xnz7zg2LPg36EwDDUBzpQkQLVoE="; + sha256 = "sha256-x5KqDVy+thIymZHsmyO+WsGq0IBb2cZxogKsjzunC2o="; }; - vendorSha256 = "sha256-ECdsuKvBVyzRo9XviVldHnD4nND9P1v4esLz0+L+c7o="; + vendorSha256 = "sha256-8NhJfA9q6di/IPL53U/dwGNAAdtuBX5Lf6fhTk4Mz0Q="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index fe7599ac81..f744c52b76 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.7.9"; + version = "1.8.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-rL2IJYTMs0Yzo/oqrcI56krmVnxxxRWCebSjjbjiP/k="; + sha256 = "sha256-JYE4ReFiYSDx/0dlA8OkQw3rEpUEQDguTWoHC1r1fUc="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/font-config-info/default.nix b/third_party/nixpkgs/pkgs/tools/misc/font-config-info/default.nix new file mode 100644 index 0000000000..89f0d90603 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/font-config-info/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, gtk3 +, xsettingsd +}: + +stdenv.mkDerivation rec { + pname = "font-config-info"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "derat"; + repo = pname; + rev = "v${version}"; + sha256 = "14z7hg9c7q8wliyqv68kp080mmk2rh6kpww6pn87hy7lwq20l2b7"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + gtk3 + xsettingsd + ]; + + postPatch = '' + substituteInPlace font-config-info.c --replace "dump_xsettings |" "${xsettingsd}/bin/dump_xsettings |" + ''; + + installPhase = '' + runHook preInstall + install -D -t $out/bin font-config-info + runHook postInstall + ''; + + meta = with lib; { + description = "Prints a Linux system's font configuration"; + homepage = "https://github.com/derat/font-config-info"; + license = with licenses; [ bsd3 ]; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix index 43dcbc4a74..a22e6eab06 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.9.6"; + version = "0.9.8"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-lcvpNhfSgr8ky03sTo7kjnaLUJeIrzFqpYUjvQpT1Po="; + sha256 = "sha256-8XS30fRxHPady/snr3gfo8Ryiw9O7EeDezcYYZjod1w="; }; - vendorSha256 = "sha256-TKs3xuZaO9PvlAcV5GDa3Jb36zeVWX3LcdcPxWR6KzE="; + vendorSha256 = "sha256-8r7v3526kY+rFHkl1+KEwNbFrSnXPlpZD6kiK4ea+Zg="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; @@ -18,9 +18,16 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; checkInputs = [ terraform ]; + # Short only runs the unit-tests tagged short + checkFlags = [ "-v" "-short" ]; checkPhase = '' runHook preCheck - make test + + # Remove tests that require networking + rm cmd/infracost/{breakdown_test,diff_test}.go + # ldflags are required for some of the version testing + go test ./... $checkFlags ''${ldflags:+-ldflags="$ldflags"} + runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix index bd955b8136..e800a93dd2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0sv1a2k5rcf4hl1w50mh041r3w3nir6avyl6xa3rlcc7cy19q21y"; - buildInputs = lib.optional stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "Kakoune Language Server Protocol Client"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix index da756f764d..db0789c112 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix @@ -1,41 +1,71 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib, perl }: + +let + # check if we can execute binaries for the host platform on the build platform + # even though the platforms aren't the same. mandoc can't be cross compiled + # (easily) because of its configurePhase, but we want to allow “native” cross + # such as pkgsLLVM and pkgsStatic. + executableCross = stdenv.hostPlatform.isCompatible stdenv.buildPlatform; + + # Name of an UTF-8 locale _always_ present at runtime, used for UTF-8 support + # (locale set by the user may differ). This would usually be C.UTF-8, but + # darwin has no such locale. + utf8Locale = + if stdenv.hostPlatform.isDarwin + then "en_US.UTF-8" + else "C.UTF-8"; +in + +assert executableCross || + throw "mandoc relies on executing compiled programs in configurePhase, can't cross compile"; stdenv.mkDerivation rec { pname = "mandoc"; - version = "1.14.5"; + version = "1.14.6"; src = fetchurl { url = "https://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz"; - sha256 = "1xyqllxpjj1kimlipx11pzyywf5c25i4wmv0lqm7ph3gnlnb86c2"; + sha256 = "8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c"; }; buildInputs = [ zlib ]; configureLocal = '' - HAVE_WCHAR=1 MANPATH_DEFAULT="/run/current-system/sw/share/man" + MANPATH_BASE="$MANPATH_DEFAULT" OSNAME="NixOS" PREFIX="$out" - HAVE_MANPATH=1 LD_OHASH="-lutil" - BUILD_DB=0 + # Use symlinks instead of hardlinks (more commonly used in nixpkgs) + LN="ln -sf" + # nixpkgs doesn't have sbin, install makewhatis to bin + SBINDIR="$PREFIX/bin" CC=${stdenv.cc.targetPrefix}cc + AR=${stdenv.cc.bintools.targetPrefix}ar + # Bypass the locale(1)-based check for UTF-8 support since it causes trouble: + # * We only have meaningful locale(1) implementations for glibc and macOS + # * NetBSD's locale(1) (used for macOS) depends on mandoc + # * Sandbox and locales cause all kinds of trouble + # * build and host libc (and thus locale handling) may differ + HAVE_WCHAR=1 + UTF8_LOCALE=${utf8Locale} ''; - patches = [ - ./remove-broken-cc-check.patch - ]; - preConfigure = '' - echo $configureLocal > configure.local + printf '%s' "$configureLocal" > configure.local ''; + doCheck = executableCross; + checkTarget = "regress"; + checkInputs = [ perl ]; + preCheck = "patchShebangs --build regress/regress.pl"; + meta = with lib; { homepage = "https://mandoc.bsd.lv/"; description = "suite of tools compiling mdoc and man"; downloadPage = "http://mandoc.bsd.lv/snapshots/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ bb010g ramkromberg ]; + maintainers = with maintainers; [ bb010g ramkromberg sternenseemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch b/third_party/nixpkgs/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch deleted file mode 100644 index 580226d165..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mandoc-1.14.4.org/configure 2018-08-08 15:51:51.000000000 +0100 -+++ mandoc-1.14.4/configure 2018-08-27 08:19:40.391912427 +0100 -@@ -40,7 +40,7 @@ - OSNAME= - UTF8_LOCALE= - --CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -` -+CC= - CFLAGS= - LDADD= - LDFLAGS= 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 38a43c7ac3..c4764923c7 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 = "2021.2"; + version = "2021.9"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-msu5LReTYupgoS6Rm2nrMz9jauciAD99hh+w8BhSYn4="; + sha256 = "sha256-DvATvvAliJhEItbOlK1CA/ibhzImw651pkplqpRG+OQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index cb3beca970..31d5712e5b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20210808"; + version = "20210917"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "sha256-pHre4R0zVML1Stp0H4E3ee9Xbb3KNLgZFWOJPC5KTA8="; + sha256 = "sha256-l8Wv15DLWRvJ+I6KeTNbIjp+S5EgoqhLOWd0wEyXckk="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcp/default.nix index 2a722d17c0..7df04ac0c8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dhcp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dhcp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, file, nettools, iputils, iproute2, makeWrapper +{ stdenv, fetchurl, fetchpatch, perl, file, nettools, iputils, iproute2, makeWrapper , coreutils, gnused, openldap ? null , buildPackages, lib }: @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { # patch, the hostname doesn't get set properly if the old # hostname (i.e. before reboot) is equal to the new hostname. ./set-hostname.patch + + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/6c7e61578b1b449272dbb40dd8b98d03dad8a57a.patch"; + sha256 = "1g37ix0yf9zza8ri8bg438ygcjviniblfyb20y4gzc8lysy28m8b"; + }) ]; nativeBuildInputs = [ perl makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplz/cargo-lock.patch b/third_party/nixpkgs/pkgs/tools/networking/httplz/cargo-lock.patch deleted file mode 100644 index 293d65f7a2..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/httplz/cargo-lock.patch +++ /dev/null @@ -1,1275 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..722bfbd ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,1269 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "adler32" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "antidote" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" -+ -+[[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 = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+ -+[[package]] -+name = "autocfg" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -+ -+[[package]] -+name = "base64" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+dependencies = [ -+ "byteorder", -+ "safemem", -+] -+ -+[[package]] -+name = "base64" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -+dependencies = [ -+ "byteorder", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "bitstring" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e54f7b7a46d7b183eb41e2d82965261fa8a1597c68b50aced268ee1fc70272d" -+ -+[[package]] -+name = "brotli-sys" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" -+dependencies = [ -+ "cc", -+ "libc", -+] -+ -+[[package]] -+name = "brotli2" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -+dependencies = [ -+ "brotli-sys", -+ "libc", -+] -+ -+[[package]] -+name = "byteorder" -+version = "1.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" -+ -+[[package]] -+name = "bzip2" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" -+dependencies = [ -+ "bzip2-sys", -+ "libc", -+] -+ -+[[package]] -+name = "bzip2-sys" -+version = "0.1.8+1.0.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05305b41c5034ff0e93937ac64133d109b5a2660114ec45e9760bc6816d83038" -+dependencies = [ -+ "cc", -+ "libc", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.52" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "cidr" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2da1cf0f275bb8dc1867a7f40cdb3b746951db73a183048e6e37fa89ed81bd01" -+dependencies = [ -+ "bitstring", -+] -+ -+[[package]] -+name = "clap" -+version = "2.33.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "cloudabi" -+version = "0.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "core-foundation" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" -+ -+[[package]] -+name = "crc32fast" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "ctrlc" -+version = "3.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a4ba686dff9fa4c1c9636ce1010b0cf98ceb421361b0bb3d6faeec43bd217a7" -+dependencies = [ -+ "nix", -+ "winapi", -+] -+ -+[[package]] -+name = "dtoa" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" -+ -+[[package]] -+name = "either" -+version = "1.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+ -+[[package]] -+name = "embed-resource" -+version = "1.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1f6b0b4403da80c2fd32333937dd468292c001d778c587ae759b75432772715d" -+dependencies = [ -+ "vswhom", -+ "winreg", -+] -+ -+[[package]] -+name = "flate2" -+version = "1.0.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" -+dependencies = [ -+ "cfg-if", -+ "crc32fast", -+ "libc", -+ "miniz_oxide", -+] -+ -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+dependencies = [ -+ "foreign-types-shared", -+] -+ -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ -+[[package]] -+name = "fuchsia-cprng" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+ -+[[package]] -+name = "gcc" -+version = "0.3.55" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -+ -+[[package]] -+name = "getrandom" -+version = "0.1.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "httparse" -+version = "1.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" -+ -+[[package]] -+name = "https" -+version = "1.9.2" -+dependencies = [ -+ "base64 0.10.1", -+ "brotli2", -+ "bzip2", -+ "cc", -+ "cidr", -+ "clap", -+ "ctrlc", -+ "embed-resource", -+ "flate2", -+ "hyper-native-tls", -+ "iron", -+ "itertools", -+ "lazy_static", -+ "lazysort", -+ "libc", -+ "md6", -+ "mime_guess", -+ "os-str-generic", -+ "percent-encoding 2.1.0", -+ "rand 0.7.3", -+ "regex", -+ "rfsapi", -+ "serde", -+ "serde_json", -+ "tabwriter", -+ "time", -+ "trivial_colours", -+ "unicase 2.6.0", -+ "walkdir", -+ "winapi", -+ "xml-rs", -+] -+ -+[[package]] -+name = "hyper" -+version = "0.10.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" -+dependencies = [ -+ "base64 0.9.3", -+ "httparse", -+ "language-tags", -+ "log 0.3.9", -+ "mime", -+ "num_cpus", -+ "time", -+ "traitobject", -+ "typeable", -+ "unicase 1.4.2", -+ "url", -+] -+ -+[[package]] -+name = "hyper-native-tls" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" -+dependencies = [ -+ "antidote", -+ "hyper", -+ "native-tls", -+] -+ -+[[package]] -+name = "idna" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+dependencies = [ -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "iron" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" -+dependencies = [ -+ "hyper", -+ "hyper-native-tls", -+ "log 0.3.9", -+ "mime_guess", -+ "modifier", -+ "num_cpus", -+ "plugin", -+ "typemap", -+ "url", -+] -+ -+[[package]] -+name = "itertools" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -+dependencies = [ -+ "either", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" -+ -+[[package]] -+name = "language-tags" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "lazysort" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" -+ -+[[package]] -+name = "libc" -+version = "0.2.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" -+ -+[[package]] -+name = "log" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+dependencies = [ -+ "log 0.4.8", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+ -+[[package]] -+name = "md6" -+version = "2.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "21baf112ff708069b0d0544843236583c9c18675cc1af78ba4ace0f60f63fb31" -+dependencies = [ -+ "gcc", -+ "libc", -+] -+ -+[[package]] -+name = "memchr" -+version = "2.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" -+ -+[[package]] -+name = "mime" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -+dependencies = [ -+ "log 0.3.9", -+] -+ -+[[package]] -+name = "mime_guess" -+version = "1.8.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3" -+dependencies = [ -+ "mime", -+ "phf", -+ "phf_codegen", -+ "unicase 1.4.2", -+] -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" -+dependencies = [ -+ "adler32", -+] -+ -+[[package]] -+name = "modifier" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" -+ -+[[package]] -+name = "native-tls" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" -+dependencies = [ -+ "lazy_static", -+ "libc", -+ "log 0.4.8", -+ "openssl", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "security-framework", -+ "security-framework-sys", -+ "tempfile", -+] -+ -+[[package]] -+name = "nix" -+version = "0.17.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" -+dependencies = [ -+ "bitflags", -+ "cc", -+ "cfg-if", -+ "libc", -+ "void", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.1.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+dependencies = [ -+ "num-traits 0.2.11", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" -+dependencies = [ -+ "autocfg 1.0.0", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "openssl" -+version = "0.10.29" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" -+dependencies = [ -+ "bitflags", -+ "cfg-if", -+ "foreign-types", -+ "lazy_static", -+ "libc", -+ "openssl-sys", -+] -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+ -+[[package]] -+name = "openssl-sys" -+version = "0.9.55" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" -+dependencies = [ -+ "autocfg 1.0.0", -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "os-str-generic" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78f3d620827b89763f54b7f1da3029bd4e0ca7eb1ae61a5c4d3b0bc0dca5157e" -+ -+[[package]] -+name = "percent-encoding" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -+ -+[[package]] -+name = "percent-encoding" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+ -+[[package]] -+name = "phf" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -+dependencies = [ -+ "phf_shared", -+] -+ -+[[package]] -+name = "phf_codegen" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -+dependencies = [ -+ "phf_generator", -+ "phf_shared", -+] -+ -+[[package]] -+name = "phf_generator" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -+dependencies = [ -+ "phf_shared", -+ "rand 0.6.5", -+] -+ -+[[package]] -+name = "phf_shared" -+version = "0.7.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+dependencies = [ -+ "siphasher", -+ "unicase 1.4.2", -+] -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -+ -+[[package]] -+name = "plugin" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" -+dependencies = [ -+ "typemap", -+] -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+ -+[[package]] -+name = "quote" -+version = "0.3.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+ -+[[package]] -+name = "rand" -+version = "0.6.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -+dependencies = [ -+ "autocfg 0.1.7", -+ "libc", -+ "rand_chacha 0.1.1", -+ "rand_core 0.4.2", -+ "rand_hc 0.1.0", -+ "rand_isaac", -+ "rand_jitter", -+ "rand_os", -+ "rand_pcg", -+ "rand_xorshift", -+ "winapi", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+dependencies = [ -+ "getrandom", -+ "libc", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", -+ "rand_hc 0.2.0", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -+dependencies = [ -+ "autocfg 0.1.7", -+ "rand_core 0.3.1", -+] -+ -+[[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_core" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+dependencies = [ -+ "rand_core 0.4.2", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[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_isaac" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "rand_jitter" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -+dependencies = [ -+ "libc", -+ "rand_core 0.4.2", -+ "winapi", -+] -+ -+[[package]] -+name = "rand_os" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -+dependencies = [ -+ "cloudabi", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.4.2", -+ "rdrand", -+ "winapi", -+] -+ -+[[package]] -+name = "rand_pcg" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -+dependencies = [ -+ "autocfg 0.1.7", -+ "rand_core 0.4.2", -+] -+ -+[[package]] -+name = "rand_xorshift" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "rdrand" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+dependencies = [ -+ "rand_core 0.3.1", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.56" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+ -+[[package]] -+name = "regex" -+version = "1.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+ "thread_local", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "rfsapi" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" -+dependencies = [ -+ "hyper", -+ "mime", -+ "serde", -+ "serde_derive", -+ "time", -+] -+ -+[[package]] -+name = "safemem" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -+ -+[[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.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" -+dependencies = [ -+ "lazy_static", -+ "winapi", -+] -+ -+[[package]] -+name = "security-framework" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620" -+dependencies = [ -+ "bitflags", -+ "core-foundation", -+ "core-foundation-sys", -+ "libc", -+ "security-framework-sys", -+] -+ -+[[package]] -+name = "security-framework-sys" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "serde" -+version = "0.9.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" -+ -+[[package]] -+name = "serde_codegen_internals" -+version = "0.14.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" -+dependencies = [ -+ "syn", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "0.9.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" -+dependencies = [ -+ "quote", -+ "serde_codegen_internals", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "0.9.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" -+dependencies = [ -+ "dtoa", -+ "itoa", -+ "num-traits 0.1.43", -+ "serde", -+] -+ -+[[package]] -+name = "siphasher" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+ -+[[package]] -+name = "smallvec" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+ -+[[package]] -+name = "syn" -+version = "0.11.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -+dependencies = [ -+ "quote", -+ "synom", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "synom" -+version = "0.11.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "tabwriter" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "rand 0.7.3", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "thread_local" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -+dependencies = [ -+ "lazy_static", -+] -+ -+[[package]] -+name = "time" -+version = "0.1.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -+dependencies = [ -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "traitobject" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" -+ -+[[package]] -+name = "trivial_colours" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" -+ -+[[package]] -+name = "typeable" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" -+ -+[[package]] -+name = "typemap" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -+dependencies = [ -+ "unsafe-any", -+] -+ -+[[package]] -+name = "unicase" -+version = "1.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -+dependencies = [ -+ "version_check 0.1.5", -+] -+ -+[[package]] -+name = "unicase" -+version = "2.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -+dependencies = [ -+ "version_check 0.9.1", -+] -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+dependencies = [ -+ "matches", -+] -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" -+dependencies = [ -+ "smallvec", -+] -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -+ -+[[package]] -+name = "unsafe-any" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -+dependencies = [ -+ "traitobject", -+] -+ -+[[package]] -+name = "url" -+version = "1.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+dependencies = [ -+ "idna", -+ "matches", -+ "percent-encoding 1.0.1", -+] -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+ -+[[package]] -+name = "version_check" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+ -+[[package]] -+name = "version_check" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" -+ -+[[package]] -+name = "void" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -+ -+[[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.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" -+dependencies = [ -+ "cc", -+ "libc", -+] -+ -+[[package]] -+name = "walkdir" -+version = "2.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -+dependencies = [ -+ "same-file", -+ "winapi", -+ "winapi-util", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.9.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+ -+[[package]] -+name = "winapi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+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.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+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 = "winreg" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "xml-rs" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bb76e5c421bbbeb8924c60c030331b345555024d56261dae8f3e786ed817c23" diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix index 2424018d88..52654a49d6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix @@ -1,27 +1,46 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, rustPlatform -, openssl, pkg-config, darwin, libiconv }: +{ lib +, rustPlatform +, fetchCrate +, installShellFiles +, makeWrapper +, pkg-config +, ronn +, openssl +, stdenv +, libiconv +, Security +}: rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.9.2"; + version = "1.12.1"; - src = fetchFromGitHub { - owner = "thecoshman"; - repo = "http"; - rev = "v${version}"; - sha256 = "154alxxclz78r29m656c8yahnzq0vd64s4sp19h0ca92dfw4s46y"; + src = fetchCrate { + inherit version; + pname = "https"; + sha256 = "sha256-vMhQHWzsZlqMVkEQHCZTB8T4ETTaf8iAS9QhgYdfcx0="; }; - nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - libiconv darwin.apple_sdk.frameworks.Security + cargoSha256 = "sha256-9gnKVZ3HQs3kNj4i1cgC+Jl3dhjx7QRaHSih1HOB3nI="; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ronn ]; - cargoBuildFlags = [ "--bin httplz" ]; - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0r33vg9431jv32r03ryxb3rc4mp6h1kc00d3h1knssfvkwsh31yn"; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; + + cargoBuildFlags = [ "--bin" "httplz" ]; postInstall = '' + sed -E 's/http(`| |\(|$)/httplz\1/g' http.md > httplz.1.ronn + RUBYOPT=-Eutf-8:utf-8 ronn --organization "http developers" -r httplz.1.ronn + installManPage httplz.1 wrapProgram $out/bin/httplz \ --prefix PATH : "${openssl}/bin" ''; @@ -30,6 +49,6 @@ rustPlatform.buildRustPackage rec { description = "A basic http server for hosting a folder fast and simply"; homepage = "https://github.com/thecoshman/http"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ figsoda ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix new file mode 100644 index 0000000000..652bdc3717 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/ligolo-ng/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ligolo-ng"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "tnpitsecurity"; + repo = "ligolo-ng"; + rev = "v${version}"; + sha256 = "sha256-Ipfp+Ke4iSJmvUtfNUt/XSPTSDSdeMs+Ss8acZHUYrE="; + }; + + postConfigure = '' + export CGO_ENABLED=0 + ''; + + ldflags = [ "-s" "-w" "-extldflags '-static'" ]; + + vendorSha256 = "sha256-axRCThmFavR+GTRWSgdAr2mbrp07hsFea0rKLQNIhgU="; + + doCheck = false; # tests require network access + + meta = with lib; { + homepage = "https://github.com/tnpitsecurity/ligolo-ng"; + description = "A tunneling/pivoting tool that uses a TUN interface"; + platforms = platforms.linux; + license = licenses.gpl3Only; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/mole/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mole/default.nix new file mode 100644 index 0000000000..da452b1bfa --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/mole/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "mole"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "davrodpin"; + repo = pname; + rev = "v${version}"; + sha256 = "11q48wfsr35xf2gmvh4biq4hlpba3fh6lrm3p9wni0rl1nxy40i7"; + }; + + vendorSha256 = "1qm328ldkaifj1vsrz025vsa2wqzii9rky00b6wh8jf31f4ljbzv"; + + ldflags = [ + "-s" + "-w" + "-X=github.com/davrodpin/mole/cmd.version=${version}" + ]; + + meta = with lib; { + description = "CLI application to create SSH tunnels"; + homepage = "https://github.com/davrodpin/mole"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix index 5d1966114b..090357fa6e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix @@ -3,32 +3,18 @@ , iptables, bash }: let - sshuttle-telepresence = - let - sshuttleTelepresenceRev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269"; - in - lib.overrideDerivation sshuttle (p: { - src = fetchFromGitHub { - owner = "datawire"; - repo = "sshuttle"; - rev = sshuttleTelepresenceRev; - sha256 = "1lp5b0h9v59igf8wybjn42w6ajw08blhiqmjwp4r7qnvmvmyaxhh"; - }; - - SETUPTOOLS_SCM_PRETEND_VERSION="${sshuttleTelepresenceRev}"; - - postPatch = "rm sshuttle/tests/client/test_methods_nat.py"; - postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence"; - }); + sshuttle-telepresence = lib.overrideDerivation sshuttle (p: { + postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence"; + }); in pythonPackages.buildPythonPackage rec { pname = "telepresence"; - version = "0.108"; + version = "0.109"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = version; - sha256 = "6V0sM0Z+2xNDgL0wIzJOdaUp2Ol4ejNTk9K/pllVa7g="; + sha256 = "1ccc8bzcdxp6rh6llk7grcnmyc05fq7dz5w0mifdzjv3a473hsky"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix index 3fe1e77fca..d645a4cdb0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "00fx1zlfz4gj46ahgvawc21rx6s49qrzd8am3p2yzmc12ibfqyhv"; + sha256 = "013dhw7kn1s3r6w7kfvhqh0l74kgijfni47l71p7wicg3hzhm3mr"; }; nativeBuildInputs = [ gettext ]; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix index ef5ddc528a..945809e7a7 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s"; }; - buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; cargoSha256 = "1nv6g8rmjjbwqmjkrpqncypqvx5c7xp2zlx5h6rw2j9d1wlys0v5"; 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 fd85cd2e72..c7b22d2d86 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -234,13 +234,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210922_${lib.substring 0 7 src.rev}"; + suffix = "pre20211001_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "bcd73ebf60bb9ba6cb09f8df4366d5474c16e4a4"; - sha256 = "sha256-wRbz8c22tlRn2/va/yOoLJijdJn+JJqLRDPRlifaEEA="; + rev = "4f496150eb4e0012914c11f0a3ff4df2412b1d09"; + sha256 = "00hxxk66f068588ymv60ygib6vgk7c97s9yia3qd561679rq3nsj"; }; boehmgc = boehmgc_nixUnstable; diff --git a/third_party/nixpkgs/pkgs/tools/security/apkleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/apkleaks/default.nix new file mode 100644 index 0000000000..133601e402 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/apkleaks/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, jadx +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "apkleaks"; + version = "2.6.1"; + + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "dwisiswant0"; + repo = pname; + rev = "v${version}"; + sha256 = "0ysciv643p8gkqw2wp7zy4n07hihdcyil8d20lj86cpgga71rd64"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + jadx + pyaxmlparser + setuptools + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "apkleaks" ]; + + meta = with lib; { + description = "Scanning APK file for URIs, endpoints and secrets"; + homepage = "https://github.com/dwisiswant0/apkleaks"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 492bfd63f4..486e483648 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub }: +{ stdenv, lib, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { pname = "exploitdb"; @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-gUjFFxzkHHhNMDAgFmmIAuEACSCn1YXuauvjGAkrK6k="; }; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' runHook preInstall - mkdir -p $out/bin - cp --recursive ./* $out/bin - cp ./.searchsploit_rc $out/bin + mkdir -p $out/bin $out/share + cp --recursive . $out/share/exploitdb + makeWrapper $out/share/exploitdb/searchsploit $out/bin/searchsploit runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/ghost/default.nix b/third_party/nixpkgs/pkgs/tools/security/ghost/default.nix new file mode 100644 index 0000000000..124caef45c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/ghost/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ghost"; + version = "8.0.0"; + + disabled = python3.pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "EntySec"; + repo = "Ghost"; + rev = version; + sha256 = "13p3inw7v55na8438awr692v9vb7zgf5ggxpha9r3m8vfm3sb4iz"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + adb-shell + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "ghost" ]; + + meta = with lib; { + description = "Android post-exploitation framework"; + homepage = "https://github.com/EntySec/ghost"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/spyre/default.nix b/third_party/nixpkgs/pkgs/tools/security/spyre/default.nix new file mode 100644 index 0000000000..112e0afd14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/spyre/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, yara +}: + +buildGoModule rec { + pname = "spyre"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "spyre-project"; + repo = pname; + rev = "v${version}"; + sha256 = "0iijvwcybp9z70jdh5mkaj7k3cw43r72wg3ayhnpyjmvgrwij43i"; + }; + + vendorSha256 = "1mssfiph4a6jqp2qlrksvzinh0h8qpwdaxa5zx7fsydmqvk93w0g"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + yara + ]; + + meta = with lib; { + description = "YARA-based IOC scanner"; + homepage = "https://github.com/spyre-project/spyre"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/usbrip/default.nix b/third_party/nixpkgs/pkgs/tools/security/usbrip/default.nix new file mode 100644 index 0000000000..aa09d759b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/usbrip/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "usbrip"; + version = "unstable-2021-07-02"; + + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "snovvcrash"; + repo = pname; + rev = "0f3701607ba13212ebefb4bbd9e68ec0e22d76ac"; + sha256 = "1vws8ybhv7szpqvlbmv0hrkys2fhhaa5bj9dywv3q2y1xmljl0py"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + termcolor + terminaltables + tqdm + ]; + + postPatch = '' + # Remove install helpers which we don't need + substituteInPlace setup.py \ + --replace "parse_requirements('requirements.txt')," "[]," \ + --replace "resolve('wheel')" "" \ + --replace "'install': LocalInstallCommand," "" + ''; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "usbrip" ]; + + meta = with lib; { + description = "Tool to track the history of USB events"; + homepage = "https://github.com/snovvcrash/usbrip"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/vault.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/vault.nix index 00ebe0767f..0d4070e47a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/vault.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vaultwarden-vault"; - version = "2.21.1"; + version = "2.22.3"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "sha256-hKHOnQiVq2uSqJmhTWPJXaz2F6GO9/bMy7G9BkZ2puI="; + sha256 = "sha256-cPyh6Hyvqw6ygmOP+qiyhSNAwdryC4nowm8n2ULOJxs="; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix index 350c20ae10..bc8dde743c 100644 --- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ++ optional systemdSupport systemd ; - configureFlags = [ "--enable-unicode" ] + configureFlags = [ "--enable-unicode" "--sysconfdir=/etc" ] ++ optional sensorsSupport "--with-sensors" ; diff --git a/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix b/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix index 9404dd26a9..ab4ea78049 100644 --- a/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix @@ -5,7 +5,7 @@ with skawarePackages; buildPackage { pname = "s6-rc"; version = "0.5.2.3"; - sha256 = "1f92dxw1n8r8avamixi9k0gqbnkpm0r3fmwzz7jd82g6bb2vsg5z"; + sha256 = "1xyaplwzvqnb53mg59a7jklakzwsiqivp6qggsry3sbaw4hf3d5j"; description = "A service manager for s6-based systems"; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/text/kakasi/default.nix b/third_party/nixpkgs/pkgs/tools/text/kakasi/default.nix index d2cf1f701e..fa509f1b4a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/kakasi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/kakasi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "kakasi"; version = "2.3.6"; - buildInputs = lib.optional stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { description = "Kanji Kana Simple Inverter"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index 6800e6bccd..bbdb9c9b14 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.8.6"; + version = "0.9.0"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "3lvy23zg0hpixrf06g8hh15h2c9wwa0wa95vh2hp924kdi2akqcp2i313chycx1cmmg379w4v80ha2726ala69zxzk42y6djc8vm3xd"; + sha512 = "0v3l70c9mal67i369bk3q67qyn07kmclybcd5lj5ibdrrccq1jzsxn2sy39ziy77in7cygcb1lgf9vzacx9rscw94i6259fy0dpnf0h"; }; nativeBuildInputs = [ which ] diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index d63dbdfa46..de1f397d89 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -373,7 +373,6 @@ mapAliases ({ jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 - kalk = kalker; # added 2021-06-03 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 kodiGBM = kodi-gbm; diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 0bff799cb4..9f47f9875b 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -143,7 +143,8 @@ with pkgs; autorestic = callPackage ../tools/backup/autorestic { }; - autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } + autoPatchelfHook = makeSetupHook + { name = "auto-patchelf-hook"; deps = [ bintools ]; } ../build-support/setup-hooks/auto-patchelf.sh; appimageTools = callPackage ../build-support/appimage { @@ -1170,6 +1171,8 @@ with pkgs; apkid = callPackage ../development/tools/apkid { }; + apkleaks = callPackage ../tools/security/apkleaks { }; + apksigcopier = callPackage ../development/tools/apksigcopier { }; apksigner = callPackage ../development/tools/apksigner { @@ -1286,6 +1289,8 @@ with pkgs; autospotting = callPackage ../applications/misc/autospotting { }; + autosuspend = callPackage ../os-specific/linux/autosuspend { }; + avfs = callPackage ../tools/filesystems/avfs { }; aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; @@ -1616,6 +1621,8 @@ with pkgs; flood = nodePackages.flood; + font-config-info = callPackage ../tools/misc/font-config-info { }; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; genann = callPackage ../development/libraries/genann { }; @@ -2880,6 +2887,7 @@ with pkgs; go-chromecast = callPackage ../applications/video/go-chromecast { }; go-containerregistry = callPackage ../development/tools/go-containerregistry { }; + inherit (go-containerregistry) crane gcrane; go-rice = callPackage ../tools/misc/go.rice {}; @@ -3829,7 +3837,7 @@ with pkgs; circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_21_08_0; + citrix_workspace = citrix_workspace_21_09_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_20_04_0 @@ -3841,6 +3849,7 @@ with pkgs; citrix_workspace_21_03_0 citrix_workspace_21_06_0 citrix_workspace_21_08_0 + citrix_workspace_21_09_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -5220,7 +5229,9 @@ with pkgs; fverb = callPackage ../applications/audio/fverb { }; - fwknop = callPackage ../tools/security/fwknop { }; + fwknop = callPackage ../tools/security/fwknop { + texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. + }; exfat = callPackage ../tools/filesystems/exfat { }; @@ -5310,6 +5321,8 @@ with pkgs; ghorg = callPackage ../applications/version-management/git-and-tools/ghorg { }; + ghost = callPackage ../tools/security/ghost { }; + ghostunnel = callPackage ../tools/networking/ghostunnel { }; ghq = callPackage ../applications/version-management/git-and-tools/ghq { }; @@ -6109,7 +6122,9 @@ with pkgs; httping = callPackage ../tools/networking/httping {}; - httplz = callPackage ../tools/networking/httplz { }; + httplz = callPackage ../tools/networking/httplz { + inherit (darwin.apple_sdk.frameworks) Security; + }; httpfs2 = callPackage ../tools/filesystems/httpfs { }; @@ -6516,7 +6531,9 @@ with pkgs; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - keystore-explorer = callPackage ../applications/misc/keystore-explorer { }; + keystore-explorer = callPackage ../applications/misc/keystore-explorer { + jdk = jdk11; + }; kfctl = callPackage ../applications/networking/cluster/kfctl { }; @@ -7409,6 +7426,8 @@ with pkgs; docbook-xsl = docbook_xsl; }; + mole = callPackage ../tools/networking/mole { }; + mosh = callPackage ../tools/networking/mosh { }; mpage = callPackage ../tools/text/mpage { }; @@ -9316,6 +9335,10 @@ with pkgs; sqls = callPackage ../applications/misc/sqls { }; + starsector = callPackage ../games/starsector { + openjdk = openjdk8; + }; + stdman = callPackage ../data/documentation/stdman { }; steck = callPackage ../servers/pinnwand/steck.nix { }; @@ -10498,7 +10521,7 @@ with pkgs; }); }; - wgpu = callPackage ../tools/graphics/wgpu { }; + wgpu-utils = callPackage ../tools/graphics/wgpu-utils { }; wg-bond = callPackage ../applications/networking/wg-bond { }; @@ -14767,6 +14790,9 @@ with pkgs; redo-sh = callPackage ../development/tools/build-managers/redo-sh { }; + regclient = callPackage ../development/tools/regclient { }; + inherit (regclient) regbot regctl regsync; + reno = callPackage ../development/tools/reno { }; re2c = callPackage ../development/tools/parsing/re2c { }; @@ -15000,8 +15026,8 @@ with pkgs; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro - texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; - texinfo6_8 = callPackage ../development/tools/misc/texinfo/6.8.nix { }; + texinfo6_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop + texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { }; texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } @@ -16084,6 +16110,7 @@ with pkgs; else if name == "newlib" && stdenv.targetPlatform.isVc4 then targetPackages.vc4-newlib or vc4-newlib else if name == "newlib" && stdenv.targetPlatform.isOr1k then targetPackages.or1k-newlib or or1k-newlib else if name == "newlib" then targetPackages.newlibCross or newlibCross + else if name == "newlib-nano" then targetPackages.newlib-nanoCross or newlib-nanoCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if name == "libSystem" then @@ -18088,6 +18115,8 @@ with pkgs; lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; + ligolo-ng = callPackage ../tools/networking/ligolo-ng { }; + linenoise = callPackage ../development/libraries/linenoise { }; linenoise-ng = callPackage ../development/libraries/linenoise-ng { }; @@ -18933,6 +18962,8 @@ with pkgs; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; + restinio = callPackage ../development/libraries/restinio {}; + rhino = callPackage ../development/libraries/java/rhino { javac = jdk8; jvm = jre8; @@ -19469,6 +19500,8 @@ with pkgs; usbredir = callPackage ../development/libraries/usbredir { }; + usbrip = callPackage ../tools/security/usbrip { }; + uthash = callPackage ../development/libraries/uthash { }; uthenticode = callPackage ../development/libraries/uthenticode { }; @@ -21261,6 +21294,7 @@ with pkgs; buildArmTrustedFirmware armTrustedFirmwareTools armTrustedFirmwareAllwinner + armTrustedFirmwareAllwinnerH616 armTrustedFirmwareQemu armTrustedFirmwareRK3328 armTrustedFirmwareRK3399 @@ -21314,6 +21348,8 @@ with pkgs; bolt = callPackage ../os-specific/linux/bolt { }; + bpfmon = callPackage ../os-specific/linux/bpfmon { }; + bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; busybox = callPackage ../os-specific/linux/busybox { }; @@ -21475,6 +21511,10 @@ with pkgs; gpm = callPackage ../servers/gpm { ncurses = null; # Keep curses disabled for lack of value + + # latest 6.8 mysteriously fails to parse '@headings single': + # https://lists.gnu.org/archive/html/bug-texinfo/2021-09/msg00011.html + texinfo = texinfo6_7; }; gpm-ncurses = gpm.override { inherit ncurses; }; @@ -22248,6 +22288,7 @@ with pkgs; ubootOrangePiPc ubootOrangePiZeroPlus2H5 ubootOrangePiZero + ubootOrangePiZero2 ubootPcduino3Nano ubootPine64 ubootPine64LTS @@ -22255,6 +22296,7 @@ with pkgs; ubootPinebookPro ubootQemuAarch64 ubootQemuArm + ubootQemuRiscv64Smode ubootRaspberryPi ubootRaspberryPi2 ubootRaspberryPi3_32bit @@ -23896,6 +23938,8 @@ with pkgs; buildGoPackage = buildGo115Package; }; + cozy-drive = callPackage ../applications/networking/cozy-drive {}; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; @@ -24093,6 +24137,8 @@ with pkgs; inherit (gnome2) libgnomeui; }; + dyff = callPackage ../development/tools/dyff {}; + dwl = callPackage ../applications/window-managers/dwl { }; dwm = callPackage ../applications/window-managers/dwm { @@ -25372,7 +25418,9 @@ with pkgs; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick; }; - iksemel = callPackage ../development/libraries/iksemel { }; + iksemel = callPackage ../development/libraries/iksemel { + texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. + }; imag = callPackage ../applications/misc/imag { inherit (darwin.apple_sdk.frameworks) Security; @@ -25424,6 +25472,7 @@ with pkgs; djvulibre = null; lcms2 = null; openexr = null; + libjxl = null; libpng = null; liblqr1 = null; librsvg = null; @@ -26760,9 +26809,7 @@ with pkgs; owamp = callPackage ../applications/networking/owamp { }; - vieb = callPackage ../applications/networking/browsers/vieb { - electron = electron_13; - }; + vieb = callPackage ../applications/networking/browsers/vieb { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; @@ -31320,6 +31367,8 @@ with pkgs; spyder = with python3.pkgs; toPythonApplication spyder; + spyre = callPackage ../tools/security/spyre { }; + openspace = callPackage ../applications/science/astronomy/openspace { }; stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; @@ -32970,7 +33019,15 @@ with pkgs; newlib = callPackage ../development/misc/newlib { }; newlibCross = callPackage ../development/misc/newlib { stdenv = crossLibcStdenv; - }; + }; + + newlib-nano = callPackage ../development/misc/newlib { + nanoizeNewlib = true; + }; + newlib-nanoCross = callPackage ../development/misc/newlib { + nanoizeNewlib = true; + stdenv = crossLibcStdenv; + }; omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { dotnet-sdk = dotnet-sdk_5; }; diff --git a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix index 3d8272633f..e1387e42b7 100644 --- a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix @@ -46,8 +46,8 @@ in # helper functions for dealing with LUA_PATH and LUA_CPATH lib = luaLib; - getLuaPath = drv: getPath drv (luaLib.luaPathList lua.luaversion) ; - getLuaCPath = drv: getPath drv (luaLib.luaCPathList lua.luaversion) ; + getLuaPath = drv: getPath drv luaLib.luaPathList; + getLuaCPath = drv: getPath drv luaLib.luaCPathList; inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib;}) lua-setup-hook; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 09253e5482..1a40d9b754 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -9262,10 +9262,10 @@ let GraphicsTIFF = buildPerlPackage { pname = "Graphics-TIFF"; - version = "9"; + version = "16"; src = fetchurl { url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-9.tar.gz"; - sha256 = "1n1r9r7f6hp2s6l361pyvb1i1pm9xqy0w9n3z5ygm7j64160kz9a"; + sha256 = "Kv0JTCBGnvp8+cMmDjzuqd4Qw9r+BjOo0eJC405OOdg="; }; buildInputs = [ pkgs.libtiff ExtUtilsDepends ExtUtilsPkgConfig ]; propagatedBuildInputs = [ Readonly ]; @@ -10454,10 +10454,10 @@ let ImagePNGLibpng = buildPerlPackage { pname = "Image-PNG-Libpng"; - version = "0.56"; + version = "0.57"; src = fetchurl { url = "mirror://cpan/authors/id/B/BK/BKB/Image-PNG-Libpng-0.56.tar.gz"; - sha256 = "1nf7qcql7b2w98i859f76q1vb4b2zd0k0ypjbsw7ngs2zzmvzyzs"; + sha256 = "+vu/6/9CP3u4XvJ6MEH7YpG1AzbHpYIiSlysQzHDx9k="; }; buildInputs = [ pkgs.libpng ]; meta = { @@ -17031,10 +17031,10 @@ let PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.038"; + version = "2.042"; src = fetchurl { url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.038.tar.gz"; - sha256 = "7447c4749b02a784f525d3c7ece99d34b0a10475db65096f6316748dd2f9bd09"; + sha256 = "dEfEdJsCp4T1JdPH7OmdNLChBHXbZQlvYxZ0jdL5vQk="; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -17046,10 +17046,10 @@ let PDFBuilder = buildPerlPackage { pname = "PDF-Builder"; - version = "3.022"; + version = "3.023"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.022.tar.gz"; - sha256 = "0cfafyci5xar567z82w0vcjrwa6inf1a9ydszgkz51bi1ilj8as8"; + sha256 = "SCskaQxxhfLn+7r5pIKz0SieJduAC/SPKVn1Epl3yjE="; }; checkInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index 039b921ee9..ad0b39b27a 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -36,6 +36,7 @@ mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + class-registry = phx-class-registry; # added 2021-10-05 ConfigArgParse = configargparse; # added 2021-03-18 dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 95af7eef4d..7f370f9473 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -1501,8 +1501,6 @@ in { ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; - class-registry = callPackage ../development/python-modules/class-registry { }; - claripy = callPackage ../development/python-modules/claripy { }; cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; @@ -9022,7 +9020,9 @@ in { thespian = callPackage ../development/python-modules/thespian { }; - thinc = callPackage ../development/python-modules/thinc { }; + thinc = callPackage ../development/python-modules/thinc { + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreFoundation CoreGraphics CoreVideo; + }; threadpool = callPackage ../development/python-modules/threadpool { }; diff --git a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix index 0c5cb66223..a5adec5d78 100644 --- a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -43,9 +43,17 @@ let }; in (lib.makeOverridable mkGear attrs); -in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { + plasmaMobileGear = let + mkPlamoGear = import ../applications/plasma-mobile; + attrs = { + inherit libsForQt5; + inherit (pkgs) lib fetchurl; + }; + in (lib.makeOverridable mkPlamoGear attrs); - inherit kdeFrameworks plasma5 kdeGear qt5; +in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { + + inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear qt5; # Alias for backwards compatibility. Added 2021-05-07. kdeApplications = kdeGear; @@ -88,6 +96,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; + kirigami-addons = libsForQt5.callPackage ../development/libraries/kirigami-addons { }; + kimageannotator = callPackage ../development/libraries/kimageannotator { }; kproperty = callPackage ../development/libraries/kproperty { }; @@ -120,6 +130,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { inherit (pkgs.darwin.apple_sdk.frameworks) AGL; }; + libqofono = callPackage ../development/libraries/libqofono { }; + libqtav = callPackage ../development/libraries/libqtav { }; kpmcore = callPackage ../development/libraries/kpmcore { };