diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md index b1b00106b6..e36724f295 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md @@ -6,7 +6,7 @@ When using Nix, you will frequently need to download source code and other files Because fixed output derivations are _identified_ by their hash, a common mistake is to update a fetcher's URL or a version parameter, without updating the hash. **This will cause the old contents to be used.** So remember to always invalidate the hash argument. -For those who develop and maintain fetcheres, a similar problem arises with changes to the implementation of a fetcher. These may cause a fixed output derivation to fail, but won't normally be caught by tests because the supposed output is already in the store or cache. For the purpose of testing, you can use a trick that is embodied by the [`invalidateFetcherByDrvHash`](#sec-pkgs-invalidateFetcherByDrvHash) function. It uses the derivation `name` to create a unique output path per fetcher implementation, defeating the caching precisely where it would be harmful. +For those who develop and maintain fetchers, a similar problem arises with changes to the implementation of a fetcher. These may cause a fixed output derivation to fail, but won't normally be caught by tests because the supposed output is already in the store or cache. For the purpose of testing, you can use a trick that is embodied by the [`invalidateFetcherByDrvHash`](#sec-pkgs-invalidateFetcherByDrvHash) function. It uses the derivation `name` to create a unique output path per fetcher implementation, defeating the caching precisely where it would be harmful. ## `fetchurl` and `fetchzip` {#fetchurl} diff --git a/third_party/nixpkgs/doc/languages-frameworks/r.section.md b/third_party/nixpkgs/doc/languages-frameworks/r.section.md index 56e3da64df..ad0fb10987 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/r.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/r.section.md @@ -96,6 +96,11 @@ re-enter the shell. ## Updating the package set {#updating-the-package-set} +There is a script and associated environment for regenerating the package +sets and synchronising the rPackages tree to the current CRAN and matching +BIOC release. These scripts are found in the `pkgs/development/r-modules` +directory and executed as follows: + ```bash nix-shell generate-shell.nix @@ -112,12 +117,11 @@ Rscript generate-r-packages.R bioc-experiment > bioc-experiment-packages.nix.new mv bioc-experiment-packages.nix.new bioc-experiment-packages.nix ``` -`generate-r-packages.R ` reads `-packages.nix`, therefor the renaming. +`generate-r-packages.R ` reads `-packages.nix`, therefore +the renaming. -## Testing if the Nix-expression could be evaluated {#testing-if-the-nix-expression-could-be-evaluated} - -```bash -nix-build test-evaluation.nix --dry-run -``` - -If this exits fine, the expression is ok. If not, you have to edit `default.nix` +Some packages require overrides to specify external dependencies or other +patches and special requirements. These overrides are specified in the +`pkgs/development/r-modules/default.nix` file. As the `*-packages.nix` +contents are automatically generated it should not be edited and broken +builds should be addressed using overrides. diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index 8cce4049e7..d4a5f83d01 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -68,7 +68,7 @@ luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn luuid,,,,,, -luv,,,,1.30.0-0,, +luv,,,,1.42.0-0,, lyaml,,,,,,lblasc markdown,,,,,, mediator_lua,,,,,, diff --git a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix index 3ad8d279a3..6e44a99aae 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix @@ -16,16 +16,67 @@ let lib.concatMapStrings (s: if lib.isList s then "-" else s) (builtins.split "[^a-zA-Z0-9_.\\-]+" name); - # Function to build "zfs allow" and "zfs unallow" commands for the - # filesystems we've delegated permissions to. - buildAllowCommand = zfsAction: permissions: dataset: lib.escapeShellArgs [ - # Here we explicitly use the booted system to guarantee the stable API needed by ZFS - "-+/run/booted-system/sw/bin/zfs" - zfsAction - cfg.user - (concatStringsSep "," permissions) - dataset - ]; + # Function to build "zfs allow" commands for the filesystems we've + # delegated permissions to. It also checks if the target dataset + # exists before delegating permissions, if it doesn't exist we + # delegate it to the parent dataset. This should solve the case of + # provisoning new datasets. + buildAllowCommand = permissions: dataset: ( + "-+${pkgs.writeShellScript "zfs-allow-${dataset}" '' + # Here we explicitly use the booted system to guarantee the stable API needed by ZFS + + # Run a ZFS list on the dataset to check if it exists + if ${lib.escapeShellArgs [ + "/run/booted-system/sw/bin/zfs" + "list" + dataset + ]} 2> /dev/null; then + ${lib.escapeShellArgs [ + "/run/booted-system/sw/bin/zfs" + "allow" + cfg.user + (concatStringsSep "," permissions) + dataset + ]} + else + ${lib.escapeShellArgs [ + "/run/booted-system/sw/bin/zfs" + "allow" + cfg.user + (concatStringsSep "," permissions) + # Remove the last part of the path + (builtins.dirOf dataset) + ]} + fi + ''}" + ); + + # Function to build "zfs unallow" commands for the filesystems we've + # delegated permissions to. Here we unallow both the target but also + # on the parent dataset because at this stage we have no way of + # knowing if the allow command did execute on the parent dataset or + # not in the pre-hook. We can't run the same if in the post hook + # since the dataset should have been created at this point. + buildUnallowCommand = permissions: dataset: ( + "-+${pkgs.writeShellScript "zfs-unallow-${dataset}" '' + # Here we explicitly use the booted system to guarantee the stable API needed by ZFS + ${lib.escapeShellArgs [ + "/run/booted-system/sw/bin/zfs" + "unallow" + cfg.user + (concatStringsSep "," permissions) + dataset + ]} + ${lib.escapeShellArgs [ + "/run/booted-system/sw/bin/zfs" + "unallow" + cfg.user + (concatStringsSep "," permissions) + # Remove the last part of the path + (builtins.dirOf dataset) + ]} + ''}" + ); in { @@ -274,11 +325,11 @@ in path = [ "/run/booted-system/sw/bin/" ]; serviceConfig = { ExecStartPre = - (map (buildAllowCommand "allow" c.localSourceAllow) (localDatasetName c.source)) ++ - (map (buildAllowCommand "allow" c.localTargetAllow) (localDatasetName c.target)); + (map (buildAllowCommand c.localSourceAllow) (localDatasetName c.source)) ++ + (map (buildAllowCommand c.localTargetAllow) (localDatasetName c.target)); ExecStopPost = - (map (buildAllowCommand "unallow" c.localSourceAllow) (localDatasetName c.source)) ++ - (map (buildAllowCommand "unallow" c.localTargetAllow) (localDatasetName c.target)); + (map (buildUnallowCommand c.localSourceAllow) (localDatasetName c.source)) ++ + (map (buildUnallowCommand c.localTargetAllow) (localDatasetName c.target)); ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/syncoid" ] ++ optionals c.useCommonArgs cfg.commonArgs ++ optional c.recursive "-r" diff --git a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix index 2b8edb9c51..da18fae4ca 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix @@ -544,7 +544,7 @@ in type = types.lines; default = ""; description = " - Entries for the virtual alias map, cf. man-page virtual(8). + Entries for the virtual alias map, cf. man-page virtual(5). "; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix b/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix index a821b9b6bf..7ab5e14733 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix @@ -9,6 +9,14 @@ in { options.services.snapper = { + snapshotRootOnBoot = mkOption { + type = types.bool; + default = false; + description = '' + Whether to snapshot root on boot + ''; + }; + snapshotInterval = mkOption { type = types.str; default = "hourly"; @@ -130,20 +138,22 @@ in Type = "dbus"; BusName = "org.opensuse.Snapper"; ExecStart = "${pkgs.snapper}/bin/snapperd"; + CapabilityBoundingSet = "CAP_DAC_OVERRIDE CAP_FOWNER CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_SYS_ADMIN CAP_SYS_MODULE CAP_IPC_LOCK CAP_SYS_NICE"; + LockPersonality = true; + NoNewPrivileges = false; + PrivateNetwork = true; + ProtectHostname = true; + RestrictAddressFamilies = "AF_UNIX"; + RestrictRealtime = true; }; }; systemd.services.snapper-timeline = { description = "Timeline of Snapper Snapshots"; inherit documentation; + requires = [ "local-fs.target" ]; serviceConfig.ExecStart = "${pkgs.snapper}/lib/snapper/systemd-helper --timeline"; - }; - - systemd.timers.snapper-timeline = { - description = "Timeline of Snapper Snapshots"; - inherit documentation; - wantedBy = [ "basic.target" ]; - timerConfig.OnCalendar = cfg.snapshotInterval; + startAt = cfg.snapshotInterval; }; systemd.services.snapper-cleanup = { @@ -155,10 +165,21 @@ in systemd.timers.snapper-cleanup = { description = "Cleanup of Snapper Snapshots"; inherit documentation; - wantedBy = [ "basic.target" ]; + wantedBy = [ "timers.target" ]; + requires = [ "local-fs.target" ]; timerConfig.OnBootSec = "10m"; timerConfig.OnUnitActiveSec = cfg.cleanupInterval; }; + + systemd.services.snapper-boot = lib.optionalAttrs cfg.snapshotRootOnBoot { + description = "Take snapper snapshot of root on boot"; + inherit documentation; + serviceConfig.ExecStart = "${pkgs.snapper}/bin/snapper --config root create --cleanup-algorithm number --description boot"; + serviceConfig.type = "oneshot"; + requires = [ "local-fs.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig.ConditionPathExists = "/etc/snapper/configs/root"; + }; + }); } - diff --git a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix index d9d34b7fac..378da7b874 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix @@ -366,5 +366,5 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ peterhoeg ]; + meta.maintainers = with lib.maintainers; [ ]; } 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 9182c2f2ed..83de9a3f5e 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -32,6 +32,7 @@ let "dnsmasq" "domain" "dovecot" + "fastly" "fritzbox" "influxdb" "json" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix new file mode 100644 index 0000000000..5b35bb29a3 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix @@ -0,0 +1,41 @@ +{ config, lib, pkgs, options }: + +with lib; + +let cfg = config.services.prometheus.exporters.fastly; +in +{ + port = 9118; + extraOpts = { + debug = mkEnableOption "Debug logging mode for fastly-exporter"; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a fastly-exporter configuration file. + Example one can be generated with fastly-exporter --config-file-example. + ''; + example = "./fastly-exporter-config.txt"; + }; + + tokenPath = mkOption { + type = types.nullOr types.path; + apply = final: if final == null then null else toString final; + description = '' + A run-time path to the token file, which is supposed to be provisioned + outside of Nix store. + ''; + }; + }; + serviceOpts = { + script = '' + ${optionalString (cfg.tokenPath != null) + "export FASTLY_API_TOKEN=$(cat ${toString cfg.tokenPath})"} + ${pkgs.fastly-exporter}/bin/fastly-exporter \ + -endpoint http://${cfg.listenAddress}:${cfg.port}/metrics + ${optionalString cfg.debug "-debug true"} \ + ${optionalString cfg.configFile "-config-file ${cfg.configFile}"} + ''; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix index 7a691aa789..05e897c8cc 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix @@ -38,10 +38,13 @@ let "mod_rrdtool" "mod_accesslog" # Remaining list of modules, order assumed to be unimportant. + "mod_authn_dbi" "mod_authn_file" "mod_authn_gssapi" "mod_authn_ldap" "mod_authn_mysql" + "mod_authn_pam" + "mod_authn_sasl" "mod_cml" "mod_deflate" "mod_evasive" @@ -132,6 +135,15 @@ in ''; }; + package = mkOption { + default = pkgs.lighttpd; + defaultText = "pkgs.lighttpd"; + type = types.package; + description = '' + lighttpd package to use. + ''; + }; + port = mkOption { default = 80; type = types.port; @@ -240,7 +252,7 @@ in description = "Lighttpd Web Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f ${configFile}"; + serviceConfig.ExecStart = "${cfg.package}/sbin/lighttpd -D -f ${configFile}"; # SIGINT => graceful shutdown serviceConfig.KillSignal = "SIGINT"; }; diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index b7a0627552..053496441d 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -2,6 +2,7 @@ use strict; use warnings; +use File::Path qw(make_path); use File::Basename; use File::Slurp; use Net::DBus; @@ -14,9 +15,17 @@ my $out = "@out@"; my $curSystemd = abs_path("/run/current-system/sw/bin"); # To be robust against interruption, record what units need to be started etc. -my $startListFile = "/run/systemd/start-list"; -my $restartListFile = "/run/systemd/restart-list"; -my $reloadListFile = "/run/systemd/reload-list"; +my $startListFile = "/run/nixos/start-list"; +my $restartListFile = "/run/nixos/restart-list"; +my $reloadListFile = "/run/nixos/reload-list"; + +# Parse restart/reload requests by the activation script +my $restartByActivationFile = "/run/nixos/activation-restart-list"; +my $reloadByActivationFile = "/run/nixos/activation-reload-list"; +my $dryRestartByActivationFile = "/run/nixos/dry-activation-restart-list"; +my $dryReloadByActivationFile = "/run/nixos/dry-activation-reload-list"; + +make_path("/run/nixos", { mode => 0755 }); my $action = shift @ARGV; @@ -150,7 +159,7 @@ $unitsToRestart{$_} = 1 foreach split('\n', read_file($restartListFile, err_mode => 'quiet') // ""); $unitsToReload{$_} = 1 foreach - split '\n', read_file($reloadListFile, err_mode => 'quiet') // ""; + split('\n', read_file($reloadListFile, err_mode => 'quiet') // ""); my $activePrev = getActiveUnits; while (my ($unit, $state) = each %{$activePrev}) { @@ -366,6 +375,12 @@ if ($action eq "dry-activate") { print STDERR "would activate the configuration...\n"; system("$out/dry-activate", "$out"); + $unitsToRestart{$_} = 1 foreach + split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // ""); + + $unitsToReload{$_} = 1 foreach + split('\n', read_file($dryReloadByActivationFile, err_mode => 'quiet') // ""); + print STDERR "would restart systemd\n" if $restartSystemd; print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" if scalar(keys %unitsToRestart) > 0; @@ -373,6 +388,8 @@ if ($action eq "dry-activate") { if scalar @unitsToStartFiltered; print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" if scalar(keys %unitsToReload) > 0; + unlink($dryRestartByActivationFile); + unlink($dryReloadByActivationFile); exit 0; } @@ -395,6 +412,15 @@ my $res = 0; print STDERR "activating the configuration...\n"; system("$out/activate", "$out") == 0 or $res = 2; +# Handle the activation script requesting the restart or reload of a unit. +# We can only restart and reload (not stop/start) because the units to be +# stopped are already stopped before the activation script is run. +$unitsToRestart{$_} = 1 foreach + split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // ""); + +$unitsToReload{$_} = 1 foreach + split('\n', read_file($reloadByActivationFile, err_mode => 'quiet') // ""); + # Restart systemd if necessary. Note that this is done using the # current version of systemd, just in case the new one has trouble # communicating with the running pid 1. @@ -434,6 +460,7 @@ if (scalar(keys %unitsToReload) > 0) { print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; unlink($reloadListFile); + unlink($reloadByActivationFile); } # Restart changed services (those that have to be restarted rather @@ -442,6 +469,7 @@ if (scalar(keys %unitsToRestart) > 0) { print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"; system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4; unlink($restartListFile); + unlink($restartByActivationFile); } # Start all active targets, as well as changed units we stopped above. diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 3f19aa397a..8d95df53a5 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -382,6 +382,7 @@ in radicale = handleTest ./radicale.nix {}; redis = handleTest ./redis.nix {}; redmine = handleTest ./redmine.nix {}; + restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; restic = handleTest ./restic.nix {}; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/restart-by-activation-script.nix b/third_party/nixpkgs/nixos/tests/restart-by-activation-script.nix new file mode 100644 index 0000000000..0eec292ea9 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/restart-by-activation-script.nix @@ -0,0 +1,73 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "restart-by-activation-script"; + meta = with pkgs.lib.maintainers; { + maintainers = [ das_j ]; + }; + + machine = { pkgs, ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + systemd.services.restart-me = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + }; + }; + + systemd.services.reload-me = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = rec { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = ExecStart; + }; + }; + + system.activationScripts.test = { + supportsDryActivation = true; + text = '' + if [ -e /test-the-activation-script ]; then + if [ "$NIXOS_ACTION" != dry-activate ]; then + touch /activation-was-run + echo restart-me.service > /run/nixos/activation-restart-list + echo reload-me.service > /run/nixos/activation-reload-list + else + echo restart-me.service > /run/nixos/dry-activation-restart-list + echo reload-me.service > /run/nixos/dry-activation-reload-list + fi + fi + ''; + }; + }; + + testScript = /* python */ '' + machine.wait_for_unit("multi-user.target") + + with subtest("nothing happens when the activation script does nothing"): + out = machine.succeed("/run/current-system/bin/switch-to-configuration dry-activate 2>&1") + assert 'restart' not in out + assert 'reload' not in out + out = machine.succeed("/run/current-system/bin/switch-to-configuration test") + assert 'restart' not in out + assert 'reload' not in out + + machine.succeed("touch /test-the-activation-script") + + with subtest("dry activation"): + out = machine.succeed("/run/current-system/bin/switch-to-configuration dry-activate 2>&1") + assert 'would restart the following units: restart-me.service' in out + assert 'would reload the following units: reload-me.service' in out + machine.fail("test -f /run/nixos/dry-activation-restart-list") + machine.fail("test -f /run/nixos/dry-activation-reload-list") + + with subtest("real activation"): + out = machine.succeed("/run/current-system/bin/switch-to-configuration test 2>&1") + assert 'restarting the following units: restart-me.service' in out + assert 'reloading the following units: reload-me.service' in out + machine.fail("test -f /run/nixos/activation-restart-list") + machine.fail("test -f /run/nixos/activation-reload-list") + ''; +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/ardour/5.nix b/third_party/nixpkgs/pkgs/applications/audio/ardour/5.nix deleted file mode 100644 index b25f9339da..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/ardour/5.nix +++ /dev/null @@ -1,161 +0,0 @@ -{ lib, stdenv -, fetchgit -, alsa-lib -, aubio -, boost -, cairomm -, curl -, doxygen -, fftwSinglePrec -, flac -, glibmm -, graphviz -, gtkmm2 -, libjack2 -, liblo -, libogg -, libsamplerate -, libsigcxx -, libsndfile -, libusb1 -, fluidsynth_1 -, hidapi -, libltc -, qm-dsp -, libxml2 -, lilv -, lrdf -, lv2 -, perl -, pkg-config -, itstool -, python2 -, rubberband -, serd -, sord -, sratom -, taglib -, vamp-plugin-sdk -, dbus -, fftw -, pango -, suil -, libarchive -, wafHook -}: -let - # Ardour git repo uses a mix of annotated and lightweight tags. Annotated - # tags are used for MAJOR.MINOR versioning, and lightweight tags are used - # in-between; MAJOR.MINOR.REV where REV is the number of commits since the - # last annotated tag. A slightly different version string format is needed - # for the 'revision' info that is built into the binary; it is the format of - # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. - - # Version to build. - tag = "5.12"; -in stdenv.mkDerivation rec { - pname = "ardour_5"; - version = "5.12"; - - src = fetchgit { - url = "git://git.ardour.org/ardour/ardour.git"; - rev = "ae0dcdc0c5d13483271065c360e378202d20170a"; - sha256 = "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr"; - }; - - nativeBuildInputs = [ - wafHook - pkg-config - itstool - doxygen - graphviz # for dot - perl - python2 - ]; - - buildInputs = [ - alsa-lib - aubio - boost - cairomm - curl - dbus - fftw - fftwSinglePrec - flac - glibmm - gtkmm2 - libjack2 - liblo - libogg - libsamplerate - libsigcxx - libsndfile - libusb1 - fluidsynth_1 - hidapi - libltc - qm-dsp - libxml2 - lilv - lrdf - lv2 - pango - rubberband - serd - sord - sratom - suil - taglib - vamp-plugin-sdk - libarchive - ]; - - wafConfigureFlags = [ - "--optimize" - "--docs" - "--use-external-libs" - "--freedesktop" - "--with-backends=jack,alsa,dummy" - ]; - - NIX_CFLAGS_COMPILE = "-I${qm-dsp}/include/qm-dsp"; - - # ardour's wscript has a "tarball" target but that required the git revision - # be available. Since this is an unzipped tarball fetched from github we - # have to do that ourself. - postPatch = '' - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc - patchShebangs ./tools/ - ''; - - postInstall = '' - # wscript does not install these for some reason - install -vDm 644 "build/gtk2_ardour/ardour.xml" \ - -t "$out/share/mime/packages" - install -vDm 644 "build/gtk2_ardour/ardour5.desktop" \ - -t "$out/share/applications" - for size in 16 22 32 48 256 512; do - install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \ - "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour5.png" - done - install -vDm 644 "ardour.1"* -t "$out/share/man/man1" - ''; - - meta = with lib; { - description = "Multi-track hard disk recording software"; - longDescription = '' - Ardour is a digital audio workstation (DAW), You can use it to - record, edit and mix multi-track audio and midi. Produce your - own CDs. Mix video soundtracks. Experiment with new ideas about - music and sound. - - Please consider supporting the ardour project financially: - https://community.ardour.org/donate - ''; - homepage = "https://ardour.org/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu fps ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix index 2859a2e942..1d9165af2b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { libpulseaudio ]; + # https://github.com/xou816/spot/issues/313 + mesonBuildType = "release"; + postPatch = '' chmod +x build-aux/cargo.sh patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py 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 a12eee62fe..24a6e4f344 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,13 +5,13 @@ trivialBuild { pname = "bqn-mode"; - version = "0.0.0+unstable=-2021-09-15"; + version = "0.0.0+unstable=2021-09-26"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "BQN"; - rev = "fb6ec1d8b083cd2b335828ae22e978b1b13986fa"; - hash = "sha256-57ryT5gb7hToAJOiGjjgU87rmlswjPK9tV1iQzJ4C0Y="; + rev = "97cbdc67fe6a9652c42daefadd658cc41c1e5ae3"; + sha256 = "09nmsl7gzyi56g0x459a6571c8nsafl0g350m0hk1vy2gpg6yq0p"; }; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix index e583671bcb..cf4a752b1b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix @@ -63,5 +63,6 @@ mkDerivation rec { longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; license = licenses.mit; maintainers = with maintainers; [ leonardoce ]; + mainProgram = "leo"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix index 9e5901cb94..8655235f29 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi"; + sha256 = "0b2gda9h14lvwahrr7kq3ix8wsw99g4ngy1grmhv5544n93ypcyk"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index bdd8ace1e3..70b5ffcc70 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,9 +1,42 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos -, xlibsWrapper, sqlite, gsl, qwt, fcgi, python3Packages, libspatialindex -, libspatialite, postgresql, txt2tags, openssl, libzip, hdf5, netcdf, exiv2 -, protobuf, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport -, qtxmlpatterns, withGrass ? true, grass, withWebKit ? true, qtwebkit }: -with lib; +{ lib +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, ninja +, flex +, bison +, proj +, geos +, xlibsWrapper +, sqlite +, gsl +, qwt +, fcgi +, python3Packages +, libspatialindex +, libspatialite +, postgresql +, txt2tags +, openssl +, libzip +, hdf5 +, netcdf +, exiv2 +, protobuf +, qtbase +, qtsensors +, qca-qt5 +, qtkeychain +, qscintilla +, qtserialport +, qtxmlpatterns +, withGrass ? true +, grass +, withWebKit ? true +, qtwebkit +}: + let pythonBuildInputs = with python3Packages; [ qscintilla-qt5 @@ -25,8 +58,7 @@ let ]; in mkDerivation rec { version = "3.16.10"; - pname = "qgis"; - name = "${pname}-unwrapped-${version}"; + pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; @@ -35,6 +67,13 @@ in mkDerivation rec { sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30="; }; + patches = [ + (fetchpatch { + url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch"; + sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy"; + }) + ]; + passthru = { inherit pythonBuildInputs; inherit python3Packages; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix index cd7b6e95d0..c279ccf3df 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-V6scph9XyWWVh4Bp9VDTb1GFMPiPoxt0zDnNc5+SWLY="; + sha256 = "sha256-hHGP0nIM9UDSRXaElP4OtOWY9Es54jJrrow2ioKcglg="; }; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/akregator.nix b/third_party/nixpkgs/pkgs/applications/kde/akregator.nix index 5cacfe0c04..9cb23ad35a 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/akregator.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/akregator.nix @@ -12,6 +12,8 @@ mkDerivation { pname = "akregator"; meta = { + homepage = "https://apps.kde.org/akregator/"; + description = "KDE feed reader"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix b/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix index ef27380a33..508f7e79f5 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix @@ -30,6 +30,7 @@ mkDerivation { qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath extraTools) ]; meta = with lib; { + homepage = "https://apps.kde.org/ark/"; description = "Graphical file compression/decompression utility"; license = with licenses; [ gpl2 lgpl3 ] ++ optional unfreeEnableUnrar unfree; maintainers = [ maintainers.ttuegel ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix b/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix index 83f698b897..92d256f477 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix @@ -11,6 +11,8 @@ mkDerivation { pname = "dolphin"; meta = { + homepage = "https://apps.kde.org/dolphin/"; + description = "KDE file manager"; license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; broken = lib.versionOlder qtbase.version "5.14"; diff --git a/third_party/nixpkgs/pkgs/applications/kde/dragon.nix b/third_party/nixpkgs/pkgs/applications/kde/dragon.nix index 0483d535c9..4fb5583a8f 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/dragon.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/dragon.nix @@ -10,6 +10,7 @@ mkDerivation { pname = "dragon"; meta = { + homepage = "https://apps.kde.org/dragonplayer/"; license = with lib.licenses; [ gpl2 fdl12 ]; description = "A simple media player for KDE"; maintainers = [ lib.maintainers.jonathanreeve ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/elisa.nix b/third_party/nixpkgs/pkgs/applications/kde/elisa.nix index 6252e53078..cdcca2cc9b 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/elisa.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/elisa.nix @@ -40,6 +40,7 @@ mkDerivation rec { ]; meta = with lib; { + homepage = "https://apps.kde.org/elisa/"; description = "A simple media player for KDE"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/filelight.nix b/third_party/nixpkgs/pkgs/applications/kde/filelight.nix index 95a89b01b8..64592ab994 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/filelight.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/filelight.nix @@ -7,6 +7,8 @@ mkDerivation { pname = "filelight"; meta = { + description = "Disk usage statistics"; + homepage = "https://apps.kde.org/filelight/"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh vcunat ]; broken = lib.versionOlder qtbase.version "5.13"; diff --git a/third_party/nixpkgs/pkgs/applications/kde/gwenview.nix b/third_party/nixpkgs/pkgs/applications/kde/gwenview.nix index 5fe126c04e..27d676303f 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/gwenview.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/gwenview.nix @@ -9,6 +9,8 @@ mkDerivation { pname = "gwenview"; meta = { + homepage = "https://apps.kde.org/gwenview/"; + description = "KDE image viewer"; license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/k3b.nix b/third_party/nixpkgs/pkgs/applications/kde/k3b.nix index eed3a4fac1..728260120a 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/k3b.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/k3b.nix @@ -10,6 +10,8 @@ mkDerivation { pname = "k3b"; meta = with lib; { + homepage = "https://apps.kde.org/k3b/"; + description = "Disk burning application"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ sander phreedom ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kaddressbook.nix b/third_party/nixpkgs/pkgs/applications/kde/kaddressbook.nix index 2672d815fb..7a2a319c65 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kaddressbook.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kaddressbook.nix @@ -10,6 +10,8 @@ mkDerivation { pname = "kaddressbook"; meta = { + homepage = "https://apps.kde.org/kaddressbook/"; + description = "KDE contact manager"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kalarm.nix b/third_party/nixpkgs/pkgs/applications/kde/kalarm.nix index 8239cdf086..869a0f6ac6 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kalarm.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kalarm.nix @@ -19,6 +19,8 @@ mkDerivation { pname = "kalarm"; meta = { + homepage = "https://apps.kde.org/kalarm/"; + description = "Personal alarm scheduler"; license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.rittelle ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kamoso.nix b/third_party/nixpkgs/pkgs/applications/kde/kamoso.nix index 3e5eb53858..9baa06275a 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kamoso.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kamoso.nix @@ -37,5 +37,9 @@ mkDerivation { "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPath "lib/gstreamer-1.0" gst}" ]; - meta.license = with lib.licenses; [ lgpl21Only gpl3Only ]; + meta = { + homepage = "https://apps.kde.org/kamoso/"; + description = "A simple and friendly program to use your camera"; + license = with lib.licenses; [ lgpl21Only gpl3Only ]; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kate.nix b/third_party/nixpkgs/pkgs/applications/kde/kate.nix index 1cc16496d1..713d7dbe83 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kate.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kate.nix @@ -10,6 +10,8 @@ mkDerivation { pname = "kate"; meta = { + homepage = "https://apps.kde.org/kate/"; + description = "Advanced text editor"; license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kbreakout.nix b/third_party/nixpkgs/pkgs/applications/kde/kbreakout.nix index cf60ada3c0..b29c83914c 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kbreakout.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kbreakout.nix @@ -11,7 +11,11 @@ mkDerivation { pname = "kbreakout"; - meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + meta = { + homepage = "KBreakOut"; + description = "Breakout-like game"; + license = with lib.licenses; [ lgpl21 gpl3 ]; + }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/third_party/nixpkgs/pkgs/applications/kde/kcachegrind.nix b/third_party/nixpkgs/pkgs/applications/kde/kcachegrind.nix index 5988885c47..61ff38f316 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kcachegrind.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kcachegrind.nix @@ -8,6 +8,8 @@ mkDerivation { pname = "kcachegrind"; meta = { + homepage = "https://apps.kde.org/kcachegrind/"; + description = "Profiler frontend"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ orivej ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kcalc.nix b/third_party/nixpkgs/pkgs/applications/kde/kcalc.nix index b24046df5f..20ae678dc0 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kcalc.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kcalc.nix @@ -8,6 +8,8 @@ mkDerivation { pname = "kcalc"; meta = { + homepage = "https://apps.kde.org/kcalc/"; + description = "Scientific calculator"; license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kcharselect.nix b/third_party/nixpkgs/pkgs/applications/kde/kcharselect.nix index d35ee5ee67..0bc76b4208 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kcharselect.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kcharselect.nix @@ -7,6 +7,7 @@ mkDerivation { pname = "kcharselect"; meta = { + homepage = "https://apps.kde.org/kcharselect/"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.schmittlauch ]; description = "A tool to select special characters from all installed fonts and copy them into the clipboard"; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kcolorchooser.nix b/third_party/nixpkgs/pkgs/applications/kde/kcolorchooser.nix index 87ab227156..26601bb37e 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kcolorchooser.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kcolorchooser.nix @@ -7,6 +7,8 @@ mkDerivation { pname = "kcolorchooser"; meta = { + homepage = "https://apps.kde.org/kcolorchooser/"; + description = "Color chooser"; license = with lib.licenses; [ mit ]; maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix b/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix index 7f24ec8e2f..e73f6f13ce 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix @@ -9,6 +9,8 @@ mkDerivation { pname = "kdebugsettings"; meta = { + homepage = "https://apps.kde.org/kdebugsettings/"; + description = "KDE debug settings"; license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.rittelle ]; broken = lib.versionOlder qtbase.version "5.13"; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix index 8ec2d2a81b..885b1c1d8c 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix @@ -101,6 +101,8 @@ mkDerivation { ''; meta = { + homepage = "https://apps.kde.org/kdenlive/"; + description = "Video editor"; license = with lib.licenses; [ gpl2Plus ]; maintainers = with lib.maintainers; [ turion ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdialog.nix b/third_party/nixpkgs/pkgs/applications/kde/kdialog.nix index 192bfda4c2..015c86bc7d 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdialog.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdialog.nix @@ -8,6 +8,8 @@ mkDerivation { pname = "kdialog"; meta = { + homepage = "https://apps.kde.org/kdialog/"; + description = "Display dialog boxes from shell scripts"; license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = with lib.maintainers; [ peterhoeg ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kfind.nix b/third_party/nixpkgs/pkgs/applications/kde/kfind.nix index fa0ef1c922..2c96b17dea 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kfind.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kfind.nix @@ -7,6 +7,8 @@ mkDerivation { pname = "kfind"; meta = { + homepage = "https://apps.kde.org/kfind/"; + description = "Find files/folders"; license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.iblech ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kgeography.nix b/third_party/nixpkgs/pkgs/applications/kde/kgeography.nix index 7a5d5516b5..b832ffcfa2 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kgeography.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kgeography.nix @@ -7,6 +7,8 @@ mkDerivation { pname = "kgeography"; meta = { + homepage = "https://apps.kde.org/kgeography/"; + description = "Geography trainer"; license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.globin ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kget.nix b/third_party/nixpkgs/pkgs/applications/kde/kget.nix index b03246eacd..2f59e3aaf9 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kget.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kget.nix @@ -16,6 +16,8 @@ mkDerivation { ]; meta = with lib; { + homepage = "https://apps.kde.org/kget/"; + description = "Download manager"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kgpg.nix b/third_party/nixpkgs/pkgs/applications/kde/kgpg.nix index 32ba95231c..1590887575 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kgpg.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kgpg.nix @@ -18,6 +18,8 @@ mkDerivation { wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg ]}" ''; meta = { + homepage = "https://apps.kde.org/kgpg/"; + description = "Encryption tool"; license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/khelpcenter.nix b/third_party/nixpkgs/pkgs/applications/kde/khelpcenter.nix index 0270118fc5..6f331dcf77 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/khelpcenter.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/khelpcenter.nix @@ -1,8 +1,7 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, ki18n, - kinit, khtml, kservice, xapian +{ lib, mkDerivation +, extra-cmake-modules, kdoctools +, grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, ki18n +, kinit, khtml, kservice, xapian }: mkDerivation { @@ -12,4 +11,9 @@ mkDerivation { grantlee kcmutils kconfig kcoreaddons kdbusaddons khtml ki18n kinit kservice xapian ]; + meta = with lib; { + homepage = "https://apps.kde.org/help/"; + description = "Help center"; + license = licenses.gpl2Plus; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kig.nix b/third_party/nixpkgs/pkgs/applications/kde/kig.nix index 1ca57d91c1..d04cc76fc2 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kig.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kig.nix @@ -8,6 +8,8 @@ mkDerivation { pname = "kig"; meta = { + homepage = "https://apps.kde.org/kig/"; + description = "Interactive geometry"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ raskin ]; }; @@ -16,4 +18,3 @@ mkDerivation { boost karchive kcrash kiconthemes kparts ktexteditor qtsvg qtxmlpatterns ]; } - diff --git a/third_party/nixpkgs/pkgs/applications/kde/kleopatra.nix b/third_party/nixpkgs/pkgs/applications/kde/kleopatra.nix index f1f8ae9b37..a640802fed 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kleopatra.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kleopatra.nix @@ -8,6 +8,8 @@ mkDerivation { pname = "kleopatra"; meta = { + homepage = "https://apps.kde.org/kleopatra/"; + description = "Certificate manager and unified crypto GUI"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmahjongg.nix b/third_party/nixpkgs/pkgs/applications/kde/kmahjongg.nix index 285cf8adff..a0c277ec09 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kmahjongg.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kmahjongg.nix @@ -13,6 +13,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ]; meta = { + description = "Mahjongg solitaire"; + homepage = "https://apps.kde.org/kmahjongg/"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmail.nix b/third_party/nixpkgs/pkgs/applications/kde/kmail.nix index 1a33eb2fe2..341d54a638 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kmail.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kmail.nix @@ -53,6 +53,8 @@ mkDerivation { pname = "kmail"; meta = { + homepage = "https://apps.kde.org/kmail2/"; + description = "Mail client"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmix.nix b/third_party/nixpkgs/pkgs/applications/kde/kmix.nix index a34f5a22d0..2f85454eb6 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kmix.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kmix.nix @@ -8,6 +8,8 @@ mkDerivation { pname = "kmix"; meta = { + homepage = "https://apps.kde.org/kmix/"; + description = "Sound mixer"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.rongcuid ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmplot.nix b/third_party/nixpkgs/pkgs/applications/kde/kmplot.nix index 04ccb809c7..a678498258 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kmplot.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kmplot.nix @@ -5,6 +5,8 @@ mkDerivation { pname = "kmplot"; meta = { + homepage = "https://apps.kde.org/kmplot/"; + description = "Mathematical function plotter"; license = with lib.licenses; [ gpl2Plus fdl12 ]; maintainers = [ lib.maintainers.orivej ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/knotes.nix b/third_party/nixpkgs/pkgs/applications/kde/knotes.nix index 1907a8fe91..a465b82041 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/knotes.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/knotes.nix @@ -1,14 +1,13 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, - kdbusaddons, kdnssd, kglobalaccel, kiconthemes, kitemmodels, - kitemviews, kcmutils, knewstuff, knotifications, knotifyconfig, - kparts, ktextwidgets, kwidgetsaddons, kwindowsystem, - grantlee, grantleetheme, qtx11extras, - akonadi, akonadi-notes, akonadi-search, kcalutils, - kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit, - kcalendarcore +{ lib, mkDerivation +, extra-cmake-modules, kdoctools +, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash +, kdbusaddons, kdnssd, kglobalaccel, kiconthemes, kitemmodels +, kitemviews, kcmutils, knewstuff, knotifications, knotifyconfig +, kparts, ktextwidgets, kwidgetsaddons, kwindowsystem +, grantlee, grantleetheme, qtx11extras +, akonadi, akonadi-notes, akonadi-search, kcalutils +, kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit +, kcalendarcore }: mkDerivation { @@ -25,4 +24,9 @@ mkDerivation { akonadi-search kcalendarcore ]; + meta = with lib; { + homepage = "https://apps.kde.org/knotes/"; + description = "Popup notes"; + license = licenses.gpl2Plus; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kolf.nix b/third_party/nixpkgs/pkgs/applications/kde/kolf.nix index 2f1189855b..5bcb9fb110 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kolf.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kolf.nix @@ -10,6 +10,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libkdegames kio ktextwidgets ]; meta = { + homepage = "https://apps.kde.org/kolf/"; + description = "Miniature golf"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ peterhoeg ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kolourpaint.nix b/third_party/nixpkgs/pkgs/applications/kde/kolourpaint.nix index cd703c49ee..b02c91e864 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kolourpaint.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kolourpaint.nix @@ -17,6 +17,8 @@ mkDerivation { kguiaddons kio ktextwidgets kwidgetsaddons kxmlgui libkexiv2 ]; meta = { + homepage = "https://apps.kde.org/kolourpaint/"; + description = "Paint program"; maintainers = [ lib.maintainers.fridh ]; license = with lib.licenses; [ gpl2 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kompare.nix b/third_party/nixpkgs/pkgs/applications/kde/kompare.nix index d4d49c6a94..eace8660c2 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kompare.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kompare.nix @@ -7,7 +7,11 @@ mkDerivation { pname = "kompare"; - meta = { license = with lib.licenses; [ gpl2 ]; }; + meta = { + homepage = "https://apps.kde.org/kompare/"; + description = "Diff/patch frontend"; + license = with lib.licenses; [ gpl2 ]; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2 diff --git a/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix b/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix index 781368a108..cf4002a8f6 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix @@ -22,6 +22,8 @@ mkDerivation { ''; meta = { + homepage = "https://apps.kde.org/konqueror/"; + description = "Web browser, file manager and viewer"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; broken = lib.versionOlder qtbase.version "5.13"; diff --git a/third_party/nixpkgs/pkgs/applications/kde/konquest.nix b/third_party/nixpkgs/pkgs/applications/kde/konquest.nix index 5957df4795..7c4ac20f4a 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/konquest.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/konquest.nix @@ -22,6 +22,8 @@ mkDerivation { qtquickcontrols ]; meta = { + homepage = "https://apps.kde.org/konquest/"; + description = "Galactic strategy game"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ lheckemann ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/konsole.nix b/third_party/nixpkgs/pkgs/applications/kde/konsole.nix index 18750d1f16..098001ef4c 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/konsole.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/konsole.nix @@ -10,6 +10,8 @@ mkDerivation { pname = "konsole"; meta = { + homepage = "https://apps.kde.org/konsole/"; + description = "KDE terminal emulator"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = with lib.maintainers; [ ttuegel turion ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kontact.nix b/third_party/nixpkgs/pkgs/applications/kde/kontact.nix index 801c6845e4..dbdc5ba474 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kontact.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kontact.nix @@ -10,6 +10,8 @@ mkDerivation { pname = "kontact"; meta = { + homepage = "https://apps.kde.org/kontact/"; + description = "Personal information manager"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/korganizer.nix b/third_party/nixpkgs/pkgs/applications/kde/korganizer.nix index 0f6689bb75..3eafd80cac 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/korganizer.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/korganizer.nix @@ -13,6 +13,8 @@ mkDerivation { pname = "korganizer"; meta = { + homepage = "https://apps.kde.org/korganizer/"; + description = "Personal organizer"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/krdc.nix b/third_party/nixpkgs/pkgs/applications/kde/krdc.nix index b0e79b0ff8..8049c6d11b 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/krdc.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/krdc.nix @@ -18,6 +18,7 @@ mkDerivation { ''; meta = with lib; { homepage = "http://www.kde.org"; + description = "Remote desktop client"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/kde/krfb.nix b/third_party/nixpkgs/pkgs/applications/kde/krfb.nix index 905c72b367..15835bc610 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/krfb.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/krfb.nix @@ -10,6 +10,8 @@ mkDerivation { pname = "krfb"; meta = { + homepage = "https://apps.kde.org/krfb/"; + description = "Desktop sharing (VNC)"; license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = with lib.maintainers; [ jerith666 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kruler.nix b/third_party/nixpkgs/pkgs/applications/kde/kruler.nix index 460675e8cb..918c0c55b6 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kruler.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kruler.nix @@ -7,6 +7,8 @@ mkDerivation { pname = "kruler"; meta = { + homepage = "https://apps.kde.org/kruler/"; + description = "Screen ruler"; license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.vandenoever ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/kspaceduel.nix b/third_party/nixpkgs/pkgs/applications/kde/kspaceduel.nix index 49ef76151e..bf174546f2 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kspaceduel.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kspaceduel.nix @@ -11,7 +11,11 @@ mkDerivation { pname = "kspaceduel"; - meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + meta = { + homepage = "https://apps.kde.org/kspaceduel/"; + description = "Space arcade game"; + license = with lib.licenses; [ lgpl21 gpl3 ]; + }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/third_party/nixpkgs/pkgs/applications/kde/ksudoku.nix b/third_party/nixpkgs/pkgs/applications/kde/ksudoku.nix index bf59c6e94c..1cfb3884ff 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/ksudoku.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/ksudoku.nix @@ -12,6 +12,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libGLU kdeclarative libkdegames ]; meta = { + homepage = "https://apps.kde.org/ksudoku/"; + description = "Suduko game"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/ksystemlog.nix b/third_party/nixpkgs/pkgs/applications/kde/ksystemlog.nix index 08f7ffb7e0..1b78c16b49 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/ksystemlog.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/ksystemlog.nix @@ -11,6 +11,8 @@ mkDerivation { propagatedBuildInputs = [ karchive kconfig kio ]; meta = with lib; { + homepage = "https://apps.kde.org/ksystemlog/"; + description = "System log viewer"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/ktouch.nix b/third_party/nixpkgs/pkgs/applications/kde/ktouch.nix index 9d31d4ec62..df727c43a1 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/ktouch.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/ktouch.nix @@ -7,22 +7,22 @@ , xorg }: +mkDerivation { + pname = "ktouch"; + meta = { + homepage = "https://apps.kde.org/ktouch/"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.schmittlauch ]; + description = "A touch typing tutor from the KDE software collection"; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools qtdeclarative ]; + buildInputs = [ + kconfig kconfigwidgets kcoreaddons kdeclarative ki18n + kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons + kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts + qtx11extras qtgraphicaleffects qtxmlpatterns qtquickcontrols2 + xorg.libxkbfile xorg.libxcb + ]; - mkDerivation { - pname = "ktouch"; - meta = { - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.schmittlauch ]; - description = "A touch typing tutor from the KDE software collection"; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools qtdeclarative ]; - buildInputs = [ - kconfig kconfigwidgets kcoreaddons kdeclarative ki18n - kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons - kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts - qtx11extras qtgraphicaleffects qtxmlpatterns qtquickcontrols2 - xorg.libxkbfile xorg.libxcb - ]; - - enableParallelBuilding = true; + enableParallelBuilding = true; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kwalletmanager.nix b/third_party/nixpkgs/pkgs/applications/kde/kwalletmanager.nix index 7f227f6d9e..8d56adc413 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kwalletmanager.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kwalletmanager.nix @@ -14,6 +14,9 @@ mkDerivation { pname = "kwalletmanager"; meta = { + homepage = "https://apps.kde.org/kwalletmanager5/"; + + description = "KDE wallet management tool"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/marble.nix b/third_party/nixpkgs/pkgs/applications/kde/marble.nix index 525289bdc3..7fe3aa529f 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/marble.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/marble.nix @@ -7,7 +7,11 @@ mkDerivation { pname = "marble"; - meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + meta = { + homepage = "https://apps.kde.org/marble/"; + description = "Virtual globe"; + license = with lib.licenses; [ lgpl21 gpl3 ]; + }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/kde/minuet.nix b/third_party/nixpkgs/pkgs/applications/kde/minuet.nix index cc7be0bf79..50a6a6f282 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/minuet.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/minuet.nix @@ -8,6 +8,8 @@ mkDerivation { pname = "minuet"; meta = with lib; { + homepage = "https://apps.kde.org/minuet/"; + description = "Music Education Software"; license = with licenses; [ lgpl21 gpl3 ]; maintainers = with maintainers; [ peterhoeg HaoZeke ]; broken = lib.versionOlder qtbase.version "5.14"; diff --git a/third_party/nixpkgs/pkgs/applications/kde/okular.nix b/third_party/nixpkgs/pkgs/applications/kde/okular.nix index 12537eba27..9962500d90 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/okular.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/okular.nix @@ -29,6 +29,7 @@ mkDerivation { meta = with lib; { homepage = "http://www.kde.org"; + description = "KDE document viewer"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = with maintainers; [ ttuegel turion ]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/kde/picmi.nix b/third_party/nixpkgs/pkgs/applications/kde/picmi.nix index 25734e318a..4358eb5ffa 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/picmi.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/picmi.nix @@ -6,6 +6,7 @@ mkDerivation { pname = "picmi"; meta = with lib; { + homepage = "https://apps.kde.org/picmi/"; description = "Nonogram game"; longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or leaving blank the cells in a grid according to numbers given at the side of the grid. diff --git a/third_party/nixpkgs/pkgs/applications/kde/pim-data-exporter.nix b/third_party/nixpkgs/pkgs/applications/kde/pim-data-exporter.nix index 746bb2aec2..f13e1f6679 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/pim-data-exporter.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/pim-data-exporter.nix @@ -10,6 +10,8 @@ mkDerivation { pname = "pim-data-exporter"; meta = { + homepage = "https://apps.kde.org/pimdataexporter/"; + description = "Saves and restores all data from PIM apps"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix index 587877ad7a..39e9f344c3 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix @@ -20,6 +20,8 @@ mkDerivation { ''; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; meta = with lib; { + homepage = "https://apps.kde.org/spectacle/"; + description = "Screenshot capture utility"; maintainers = with maintainers; [ ttuegel ]; broken = versionOlder qtbase.version "5.15"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix index b2ca9a0cab..92c517835d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , fetchzip +, addOpenGLRunpath , cmake , glibc_multi , glibc @@ -9,7 +10,6 @@ , pkg-config , cudatoolkit , withCuda ? false -, linuxPackages }: let @@ -60,13 +60,23 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake git pkg-config ]; + nativeBuildInputs = [ + cmake + git + pkg-config + ] ++ lib.optionals withCuda [ + addOpenGLRunpath + ]; buildInputs = [ hwloc ] ++ (if withCuda then - [ glibc_multi cudatoolkit linuxPackages.nvidia_x11 ] + [ glibc_multi cudatoolkit ] else [ glibc.static ]); + NIX_LDFLAGS = lib.optionals withCuda [ + "-L${cudatoolkit}/lib/stubs" + ]; + cmakeFlags = [ "-DFIRESTARTER_BUILD_HWLOC=OFF" "-DCMAKE_C_COMPILER_WORKS=1" @@ -76,8 +86,14 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out/bin cp src/FIRESTARTER${lib.optionalString withCuda "_CUDA"} $out/bin/ + runHook postInstall + ''; + + postFixup = lib.optionalString withCuda '' + addOpenGLRunpath $out/bin/FIRESTARTER_CUDA ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix index 03786a6299..f517bfe3f4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "kile-wl"; - version = "unstable-2021-08-03"; + version = "unstable-2021-09-02"; src = fetchFromGitLab { owner = "snakedye"; repo = "kile"; - rev = "7f0b1578352d935084d3d56ef42487d2a8cfbfe8"; - sha256 = "sha256-Ir9LNQt7/7TjhCJ69HYx1tBXeq/i7F3ydmenvchZgDI="; + rev = "acd61f7e59cc34091c976b0cdc3067dd35b53cae"; + sha256 = "sha256-O5sdPw9tR3GFPmJmb/QDmdBc7yeSGui4k+yn4Xo016A="; }; passthru.updateScript = unstableGitUpdater { url = "https://gitlab.com/snakedye/kile.git"; }; - cargoSha256 = "sha256-195rPxX3BTxJ0xLgye14aWuBd5OuJ30wyUa4wrbQ3Xo="; + cargoSha256 = "sha256-2QCv5fk0AH4sv0QJ/16zniHfg3HZLoHB7dl6vSfkxpE="; nativeBuildInputs = [ scdoc ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix index 4f2af99ab1..f9f880050e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } : +{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } : stdenv.mkDerivation rec { pname = "osm2xmap"; @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { makeFlags = [ "GIT_VERSION=${version}" "GIT_TIMESTAMP=" - "SHAREDIR=${placeholder "out"}/share/osm2xmap" + "SHAREDIR=${placeholder "out"}/share/osm2xmap/" "INSTALL_BINDIR=${placeholder "out"}/bin" "INSTALL_MANDIR=${placeholder "out"}/share/man/man1" ]; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - buildInputs = [ libroxml proj libyamlcpp boost ]; + buildInputs = [ libroxml proj_7 libyamlcpp boost ]; meta = with lib; { homepage = "https://github.com/sembruk/osm2xmap"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix b/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix index f6865f877d..2772309658 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix @@ -6,7 +6,7 @@ , wxGTK30-gtk3 , wxmac , ffmpeg -, proj +, proj_7 , perl532 , unscii , python @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ]; buildInputs = [ - libGL libGLU ffmpeg proj + libGL libGLU ffmpeg proj_7 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ wxmac Carbon Cocoa ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xygrib/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xygrib/default.nix index 864ea27ede..580faa3602 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xygrib/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xygrib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg }: +{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }: stdenv.mkDerivation rec { version = "1.2.6.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; - buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ]; + buildInputs = [ bzip2 qtbase libnova proj_7 openjpeg libpng ]; cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ] ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index d7f29c4fef..c789e04957 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "94.0.4606.54", - "sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83", - "sha256bin64": "0lq34l00zrr92g882xzqwq1lf2vf12x1mwidrr2qh6fz7v5418d3", + "version": "94.0.4606.61", + "sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4", + "sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz", "deps": { "gn": { "version": "2021-08-11", @@ -55,8 +55,8 @@ "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" }, "ungoogled-patches": { - "rev": "94.0.4606.54-1", - "sha256": "0phy87fiqdgikgl60yap7n1mvyvsidgznqp06j86287iihml3z2m" + "rev": "94.0.4606.61-1", + "sha256": "1sb6n3dnp8d1bzhyl9d8yc0x9imyccnwxf1fqzv7vs3fd6dgcprp" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 31b37fc2df..359c0fa7aa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,17 +1,27 @@ -{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake -, qtbase, qtquickcontrols, qtquickcontrols2, qtkeychain, qtmultimedia, qttools -, libquotient, libsecret +{ mkDerivation +, stdenv +, lib +, fetchFromGitHub +, cmake +, qtbase +, qtquickcontrols +, qtquickcontrols2 +, qtkeychain +, qtmultimedia +, qttools +, libquotient +, libsecret }: mkDerivation rec { pname = "quaternion"; - version = "0.0.9.5-beta2"; + version = "0.0.95"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = version; - sha256 = "sha256-K4SMB5kL0YO2OIeNUu4hWqU4E4n4vZDRRsJVYmCZqvM="; + sha256 = "sha256-WqhHqo4ySxufulC+TxS2ko2R5hUiORgdNAkp5Awdcw8="; }; buildInputs = [ @@ -26,14 +36,15 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools ]; - postInstall = if stdenv.isDarwin then '' - mkdir -p $out/Applications - mv $out/bin/quaternion.app $out/Applications - rmdir $out/bin || : - '' else '' - substituteInPlace $out/share/applications/com.github.quaternion.desktop \ - --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" - ''; + postInstall = + if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv $out/bin/quaternion.app $out/Applications + rmdir $out/bin || : + '' else '' + substituteInPlace $out/share/applications/com.github.quaternion.desktop \ + --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" + ''; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix index f83b670534..a3cf55d6a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -30,4 +30,6 @@ buffer_autoset = callPackage ./buffer_autoset { }; highmon = callPackage ./highmon { }; + + zncplayback = callPackage ./zncplayback { }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/zncplayback/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/zncplayback/default.nix new file mode 100644 index 0000000000..d15b130cae --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/zncplayback/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation { + pname = "weechat-zncplayback"; + version = "0.2.1"; + + src = fetchurl { + url = "https://github.com/weechat/scripts/raw/bcc9643136addd2cd68ac957dd64e336e4f88aa1/python/zncplayback.py"; + sha256 = "1k32p6naxg40g664ip48zvm61xza7l9az3v3rawmjw97i0mwz7y3"; + }; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/share + cp $src $out/share/zncplayback.py + ''; + + passthru = { + scripts = [ "zncplayback.py" ]; + }; + + meta = with lib; { + description = "Add support for the ZNC Playback module"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ qyliss ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/trebleshot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/trebleshot/default.nix deleted file mode 100644 index 82f91ddef8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/trebleshot/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ mkDerivation, lib, fetchFromGitHub -, cmake, qtbase, kdnssd -}: - -mkDerivation rec { - pname = "trebleshot"; - version = "0.1.0-alpha2-15-ga7ac23c"; - # name="${pname}-${version}"; - - src = fetchFromGitHub { - owner = "genonbeta"; - repo = "TrebleShot-Desktop"; - rev = version; - sha256 = "1k8wagw6arsi1lqkhn1nl6j11mb122vi1qs0q2np6nznwfy7pn1k"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qtbase kdnssd ]; - - meta = with lib; { - description = "Android file transferring tool for desktop"; - homepage = "https://github.com/genonbeta/TrebleShot-Desktop"; - license = licenses.gpl2; - - platforms = platforms.linux; - maintainers = with maintainers; [ woffs ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix b/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix index b266ce86e2..3519f015ff 100644 --- a/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix @@ -1,27 +1,31 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtwebengine }: +{ lib +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +, qtwebengine +}: -let - description = "A note-taking application that knows programmers and Markdown better"; -in mkDerivation rec { - version = "2.10"; +mkDerivation rec { pname = "vnote"; + version = "3.7.0"; src = fetchFromGitHub { - owner = "tamlok"; - repo = "vnote"; + owner = "vnotex"; + repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "EeeVGnKI0irLO1zJQxlVlIUhqG987JIgxNvKpUgLxUQ="; + sha256 = "sha256-D9/4BakXTComvGTV8F131G5PzA8LhWfNSZRBOMo5t5c="; }; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtwebengine ]; meta = with lib; { - inherit description; - homepage = "https://tamlok.github.io/vnote"; + homepage = "https://vnotex.github.io/vnote"; + description = "A pleasant note-taking platform"; license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; - maintainers = [ maintainers.kuznero ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index e9a15aaed1..fd742474ec 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "6.16.2"; + version = "6.16.3"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-wWGKJWd3JDaT0dDMUrxv9ShMVe+q4zvH8SjyKw7UIbo="; + sha256 = "sha256-qgFnl9IliKRI4TptpXyK9JHzpLEUQ7NZLIfc0AROCvA="; fetchSubmodules = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix index d0315d1596..67ab202160 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix @@ -1,31 +1,69 @@ -{ lib, stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal, cgal -, proj, boost, cmake, python2, doxygen, graphviz, gmp, mpfr }: +{ lib +, mkDerivation +, fetchurl +, cmake +, doxygen +, graphviz +, boost +, cgal_5 +, gdal +, glew +, gmp +, libGL +, libGLU +, mpfr +, proj +, python3 +, qtxmlpatterns +, qwt +}: -stdenv.mkDerivation rec { +let + python = python3.withPackages (ps: with ps; [ + numpy + ]); + boost' = boost.override { + enablePython = true; + inherit python; + }; + cgal = cgal_5.override { + boost = boost'; + }; +in mkDerivation rec { pname = "gplates"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2"; - sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b"; + name = "gplates_${version}_src.tar.bz2"; + url = "https://www.earthbyte.org/download/8421/?uid=b89bb31428"; + sha256 = "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ - qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2 - doxygen graphviz gmp mpfr - (boost.override { - enablePython = true; - python = python2; - }) + nativeBuildInputs = [ + cmake + doxygen + graphviz ]; - NIX_CFLAGS_LINK="-ldl -lpthread -lutil"; + buildInputs = [ + boost' + cgal + gdal + glew + gmp + libGL + libGLU + mpfr + proj + python + qtxmlpatterns + qwt + ]; meta = with lib; { description = "Desktop software for the interactive visualisation of plate-tectonics"; homepage = "https://www.gplates.org"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index 1821dba0f0..a431a50af3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pass-git-helper"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; rev = "v${version}"; - sha256 = "sha256-GdsFPpBdoEaOCmdKxw5xTuFOcGFH94w5q/lV891lCUs="; + sha256 = "sha256-HEdOR6jS16c4UIatlgB6HeBtyyxePSab+6e2hu85dsI="; }; propagatedBuildInputs = [ pyxdg ]; @@ -21,6 +21,6 @@ buildPythonApplication rec { homepage = "https://github.com/languitar/pass-git-helper"; description = "A git credential helper interfacing with pass, the standard unix password manager"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ vanzef ]; + maintainers = with maintainers; [ hmenke vanzef ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix index d8420b1cb3..0fd180c441 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -1,10 +1,10 @@ { lib , fetchFromGitHub -, crystal_0_33 +, crystal_1_0 }: let - crystal = crystal_0_33; + crystal = crystal_1_0; in crystal.buildCrystalPackage rec { pname = "thicket"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/shards.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/shards.nix index c8839651a2..1c035d332e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/shards.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/shards.nix @@ -2,7 +2,7 @@ ameba = { owner = "veelenga"; repo = "ameba"; - rev = "v0.10.0"; - sha256 = "1yjxzwdhigsyjn0qp362jkj85qvg4dsyzal00pgr1srnh2xry912"; + rev = "v0.14.3"; + sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix index 6ea41b4d92..3b6116d5a0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -25,13 +25,13 @@ assert lib.versionAtLeast mlt.version "6.24.0"; mkDerivation rec { pname = "shotcut"; - version = "21.03.21"; + version = "21.09.20"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk="; + sha256 = "1y46n5gmlayfl46l0vhg5g5dbbc0sg909mxb68sia0clkaas8xrh"; }; nativeBuildInputs = [ pkg-config qmake ]; @@ -57,7 +57,7 @@ mkDerivation rec { ]; prePatch = '' - sed 's_shotcutPath, "melt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp + sed 's_shotcutPath, "melt[^"]*"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp NICE=$(type -P nice) @@ -94,7 +94,7 @@ mkDerivation rec { please use the official build from shotcut.org instead. ''; homepage = "https://shotcut.org"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ goibhniu woffs peti ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix index 5c809097ee..24acb2664e 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-08-03"; + version = "unstable-2021-08-19"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; - rev = "2fc0875a3e17a0328d14d0c6323bd8022d5b15de"; - sha256 = "sha256-Cs9RRubxy0DY6ILRZY36HtcoqBvzbN7NEfpREq1KBBQ="; + rev = "e59c2a73d72853cb54f55eecc446f337c94cda24"; + sha256 = "sha256-R/Wg8KLh4v3ccX1Uh0Q+7026tRH7XLxHpX9/BgsGGdA="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix b/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix index d6f26fe908..50d83f2fff 100644 --- a/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix +++ b/third_party/nixpkgs/pkgs/build-support/skaware/build-skaware-package.nix @@ -22,7 +22,8 @@ , postInstall # : list Maintainer , maintainers ? [] - + # : passtrhu arguments (e.g. tests) +, passthru ? {} }: @@ -49,6 +50,8 @@ let "CHANGELOG" "README" "README.*" + "DCO" + "CONTRIBUTING" ]; in stdenv.mkDerivation { @@ -106,4 +109,6 @@ in stdenv.mkDerivation { [ pmahoney Profpatsch qyliss ] ++ maintainers; }; + inherit passthru; + } diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index ced17e2cc8..08c4a1b145 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index ce96f18337..0ce5212b13 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1730pcbxkcyzfw22hgqsv45sybd79pdsm7vb4l2gm9pfzasypjra"; - iosevka-aile = "1nm0s8zhmg5v181rik4d4nsygxrvfr9wdjwqz6gfl2dmg17r7cyi"; - iosevka-curly = "0kmvj1zhf0xs02rdf2x1f3lnahj36dpc91p6k4mbji5mn9klb547"; - iosevka-curly-slab = "0zklkypyh303gi5gqpdkwmj3g9m1f1xqda3ah232c3d6cfznbyqc"; - iosevka-etoile = "1nj0p25pbjkzc1lg8fp45zxj6r3q4k5yc882rra3jkjmlw2h65b7"; - iosevka-slab = "1vz9443swmxb27iqmimjyg3zs6q0pw7fpwiiaa7k1s7gc5xkyb5s"; - iosevka-ss01 = "1g2xxl9x5apyhhm7lsbmplh19c5aln3jwryzqvrqxpnsngkqmp0h"; - iosevka-ss02 = "1d2b8syvdx8i1dqw9k87yirkyg3wdvr7y2hy5c3nzj62sg7drfla"; - iosevka-ss03 = "0b4y1v6kri4d56h6m58qqmc50bh4r4151h72n1a2q0a0nwkgvlwm"; - iosevka-ss04 = "0fj7rj9xy9sfrzdhjqzv37v34lmkajz4d497i7lvdc2i0w4ia4gf"; - iosevka-ss05 = "0xncnrf8d78iqf3731z0midw4rlza8hdji0m3gvxnigbq3cqxhwd"; - iosevka-ss06 = "15vclj2m5brp1fnw82w5b53cwlwzzsr5hzxm6j2bj9bghc75cigm"; - iosevka-ss07 = "1hs7c5n5pcgmspwrhdxv69dc0wdycfcdfs1mxwbamnal77c9q0s8"; - iosevka-ss08 = "00fz1yb0g1rlzw3pxfpi88vh03k1q9nkzi8h6naqv0hngcbsz1ia"; - iosevka-ss09 = "1ig5lqpk86z7mwr45gqvsdxs00g7b0mvx1i8q8hx5x4pyr36y7yh"; - iosevka-ss10 = "12c50mh3xggz03lqqrkdcmdfvfq3m87x8xb9x0h8lwfslqaa0c0x"; - iosevka-ss11 = "1qvdsfviif8wyms0bkzm7vx0gf8vx5gic3ghincv4ignx8hmrbm9"; - iosevka-ss12 = "17qxrpmbrandlibhshycsgjlwspx7gz0x6mzhy1n8ccycrd7qlii"; - iosevka-ss13 = "07nz5wf99j6m72vkrnbhpr4yhn3pdgb898dinzi4n5k0rmky03zb"; - iosevka-ss14 = "1h9icwqz4qdzm99j17qxmrv1jvm3dzqrcghsffva9yvr32anc5y6"; - iosevka-ss15 = "06362h12vy48ib338dw7vjxx6vqpfzcc47f54f23pp1b73ygrkxp"; - iosevka-ss16 = "1sbby53vmjaq8h09a2izf4w5nha5knpgb0ljfyfd1wj1nnkdbisp"; - iosevka-ss17 = "13l3dindp0x76c3ddx7ibjins65f6xpv8zy7dfjyil8kg2570lfq"; - iosevka-ss18 = "1z0ypy19cj2hlg8qhvg0a54p0704f8szljf0lrrajprc8ws4cqy0"; - sgr-iosevka = "0cl08cxidpvrjy2ifhjb4cgrcjsldv86ipx4i8wh2kvs632hkz42"; - sgr-iosevka-aile = "01a7glrzrifwbfh05jynhmjd78cck4hw8aik3qf8pjr0lmyn8inz"; - sgr-iosevka-curly = "1wl80fn6zk1dvhqnfwxc74i2f925yf362s45d1bshi3n2qd7ixv4"; - sgr-iosevka-curly-slab = "18vvhkqhljnpv75v7cbw5z3d4xc418g0pgh39zyy1sdpq01h6ycj"; - sgr-iosevka-etoile = "0g7brirxpb2s0a94vc00jk8d45wafcimkd1dkilhpc5h862d7y3d"; - sgr-iosevka-fixed = "17g81448bjms88xph2h8cjfz2z2bhy4dc5ialy583zw9hafk0b6k"; - sgr-iosevka-fixed-curly = "18kfz4bdp81ylwjikdyj00m58bb5ykaxnxv288d9qr9r0wav14bf"; - sgr-iosevka-fixed-curly-slab = "1r1223m547ddpjrc0dpzkmkbw4851lvkc2g37yzd97i7g3da0q5g"; - sgr-iosevka-fixed-slab = "006d1cznz5ikclpz6kli69h5jnsr50yd08za3m6k07npnj4g9i9h"; - sgr-iosevka-fixed-ss01 = "0dxjmxvhq7dba7f4dcw2z85mgbx4qmy3w1nz99kbn729pjv3xbnr"; - sgr-iosevka-fixed-ss02 = "1ljq7dxj7dfg8bwmljykbl0lgkw4q9v5h41mflrvxhxkgblghji9"; - sgr-iosevka-fixed-ss03 = "14q5wi4af1mnm6g895zgpmf1qcnadv0mpiyydcizayqxnc015xr0"; - sgr-iosevka-fixed-ss04 = "0szy07dlv9ag7jqahlgyi9wgwpas73rg2vw74jg63fx06svwyx7z"; - sgr-iosevka-fixed-ss05 = "1bm6mqal8jni9za27dmbq9pdqs9j3x58w0cnzx7ma3gyaypfi5jc"; - sgr-iosevka-fixed-ss06 = "08a6mzrbx7wl4z147kv3289fbaccd7cs0r1gp3dnkkypsy4cw907"; - sgr-iosevka-fixed-ss07 = "05l0i4mblgx2zqfp5qvpwqp9671mkfj60i4pg0kznwd13j0ya8qs"; - sgr-iosevka-fixed-ss08 = "15ils79jpa1kibyh3ih5dkjk0qi0ppsy9iibyyl301c4vyhgypzb"; - sgr-iosevka-fixed-ss09 = "1s2m349m7560zz10r0w0nmgixxzn0ys4j8jwy3c1zxzphdq60a10"; - sgr-iosevka-fixed-ss10 = "1iby1afylism23cn70x0bb2qi8mdkf0ysgnmagdr47cgh6n8kgmy"; - sgr-iosevka-fixed-ss11 = "10zn26ijrdj2s0fzc1d1kyi0rpy6qw1bbp6qwf1x1mbhapj0mc8a"; - sgr-iosevka-fixed-ss12 = "1vdxn5qr1h192c1czxifvr4f2mv1jhkb20m5n3wgawyf75p7blcy"; - sgr-iosevka-fixed-ss13 = "1fdki2kf6xy2mvxnna1m77xgk5hm88i1g5ds8dzr6gc5mkm5mw8m"; - sgr-iosevka-fixed-ss14 = "1gaycm1zzm2qnriy76xnyy74rk9ccs54q71br2m55jlr4ifglanv"; - sgr-iosevka-fixed-ss15 = "07b9ss5a2vk4gndwc6zw8qwa4wgsrfnfq9cbrx9zlzj08143q9dr"; - sgr-iosevka-fixed-ss16 = "156yh0hbqqklhpf7czblk43nmq3cw0akgiy4z7jq0904b96v68zs"; - sgr-iosevka-fixed-ss17 = "0wj8j09wvf7m7m1ss47bqf6s0nvrn3vlzdhgnmzwc2jc4rkrvjpa"; - sgr-iosevka-fixed-ss18 = "0zsy2ql3r0419h6ganfdfhmwzn7lprypw26bq7iqzvld03vss45c"; - sgr-iosevka-slab = "10al24w3lglgdz9v86yx6q58mx4qyrxr8kffl0qvjiqvdcyyp460"; - sgr-iosevka-ss01 = "0ipwpjwg14wijzx0qb0zni8rzvw6wwfbwzqv8pzf2dmm6iwnmnqc"; - sgr-iosevka-ss02 = "0nfbw5smfarglma3cddzw397rjh72qjxqhz3g28l0sj26gk2bwma"; - sgr-iosevka-ss03 = "0cdvb5igir3c216niq3i0hbjvff1y9bnzf6fwny17303vjvfqg41"; - sgr-iosevka-ss04 = "0sj62id2ljwsms8xv17j474pdr881r6z8kb7a26gv48p08r225fq"; - sgr-iosevka-ss05 = "13pxfc2s2vxxkqp4jvzam6bx7ywn350phs5xhlzmcdk4sjgml9i2"; - sgr-iosevka-ss06 = "0xscng0a90vlr621pnl3hxpn2la862rgcx7xy8d1i6k47wpp1zbj"; - sgr-iosevka-ss07 = "0yj11jc8fzw9l2316y90mdj7hsqd46y5i1rckxlvih5nv300x1cp"; - sgr-iosevka-ss08 = "15jn1xjafawd5b4y2z4fkbaf22fgbvc861m3sjx4hib5vqjn41p3"; - sgr-iosevka-ss09 = "0kffxk8kr5giisfc10a5h889azgkqs4q9f0gggv8xlml4afdycd0"; - sgr-iosevka-ss10 = "1ldwpx2ysx0v79qfzhcqcc2cwylwnr6x81fy2yqqnv2319v1xrky"; - sgr-iosevka-ss11 = "1rd98yvky9wxgxcp4ps9p1k4ll8hnh9g9vgwf1r0bjlykhv7dhmf"; - sgr-iosevka-ss12 = "0439fg1pvxnv96v77rzrn0sbzna962ixgn8bx4ykpx0wkrigmyrk"; - sgr-iosevka-ss13 = "0qzbf4milkijhmxfkv3al2w5s2aa0a0aqqqxbv2wgza7g3i2glgv"; - sgr-iosevka-ss14 = "0vk8s71lyrdgngdbaasimdg0a5ygckciy7wxkkbixvxh18vi3mfr"; - sgr-iosevka-ss15 = "0c5sai8zbciwpkwrfliakf8091n5zcj7bilkbhzljpgfhalxg43v"; - sgr-iosevka-ss16 = "0a8q3ns3chw6kg77fxc03njlbr4slnq83381lwznhnsziyk7jb6r"; - sgr-iosevka-ss17 = "0bbfq7fjbr718fnmfy4nl7m9n7sjnra89chig9am7571ws66wbxc"; - sgr-iosevka-ss18 = "16sj1g5i75hfd07ghsm6zb655mypgwagxzpz5sk22dkrilxwrdix"; - sgr-iosevka-term = "1ncr05mprm8bar8v9saqsklgm36mymzhzw5x1viz04757s89cqnc"; - sgr-iosevka-term-curly = "0vwi4ccz0fnd7a3adfxffar5qxfzkx4pz23208kzc5zjidl9s9ka"; - sgr-iosevka-term-curly-slab = "0dwjcj8d4am5kqw35w68hm3qnxyk9w5k44z2n1mf9gsj411layi8"; - sgr-iosevka-term-slab = "1i7gp1lirdzzcmcv5lcrdf2mb2l9v3kjx1yhhdydfpapq85q5wma"; - sgr-iosevka-term-ss01 = "0zjx0r7sznzdw1diy88p6bkdki0ihqilvksil6qccbg4fn9f2swm"; - sgr-iosevka-term-ss02 = "1ma8366h42n5ij2czhkhmfyzmv23hmn165ihjxmwkxhg0c58l4jl"; - sgr-iosevka-term-ss03 = "0n23fy0ks0pid1m8z5vl9j7g607nl70h7bxfn015lryl7v8yj2dm"; - sgr-iosevka-term-ss04 = "1a7llxzf4cs9jr7ldnhxdc7r2jviaffq2kvhkj3spqan9bk6ymcx"; - sgr-iosevka-term-ss05 = "1d3sp99f6gycbmxk6z0raa7gk0is0m7bc7dqb4dy6zikra35kv4x"; - sgr-iosevka-term-ss06 = "1vjc785rzzrcbdbcp5j2dljk9flv9inmcjswyf7fyacn4ghszap6"; - sgr-iosevka-term-ss07 = "03pjbr7bp1av2pav1x913j1h18b4nhxvr7k62dg68b019rj1pvfg"; - sgr-iosevka-term-ss08 = "1b9qvkb4zpvwfygvh7i6b6dcwk8jk0y1kg078ma4vlpfag9ay4xb"; - sgr-iosevka-term-ss09 = "0zcg1b1j7113qp5q81s5dx34n1h3lmrshrx8xkvy6kn1n48b17b8"; - sgr-iosevka-term-ss10 = "1nrciywy8fr8x716w087pyyw0vkyd60j3lmxc7ixsr9yl3ff9bb0"; - sgr-iosevka-term-ss11 = "1k4xsl9x6195ap2zg0xxrla4svvzxhwas6xf0dbh7k2baiwyknb3"; - sgr-iosevka-term-ss12 = "16h0i0vj98l0l6hfyjsq4qy8mxkz5p8xpqxnpd56wxm7mnl2b7i9"; - sgr-iosevka-term-ss13 = "1i907injbdamdyfd1ydzdjsygn0b3syab0ahas7xmd438rfkcfj6"; - sgr-iosevka-term-ss14 = "1ypx059ws3pdhkn6lsc4cai4qhm8gzm9chmrsiqk2978yaf2z06c"; - sgr-iosevka-term-ss15 = "1nqbslx44ikj4wd3h1ycqsbk6sk72zz2n49pkn9r3khp9wwz7qwn"; - sgr-iosevka-term-ss16 = "1lpmph22gqzn3zf9zsr5hzb59573xkiz7yq9pfqg5bxnx248byr9"; - sgr-iosevka-term-ss17 = "02d3vs46cg4nbak1y64cw5jlhzgxmlxxkhlz3jzf5wzzb9kli4iv"; - sgr-iosevka-term-ss18 = "1z580s3icbzpivp766cqdc3j8ijgpp5f2yz9a4g4hpz3isa1lpy6"; + iosevka = "09fwk1sm2i0yf2qvwc99g46jhhi9jwmxrqm02m9n348gcsvml7k1"; + iosevka-aile = "07nykjvm5acnxc585y7qfs38d1mm4x654wykq24cwd0qdialz2yn"; + iosevka-curly = "1v9v5xhv4pdihb2q1hgzlw3z54vpg9lvjf753z95x97ah246kbyc"; + iosevka-curly-slab = "0av94y57pi9vy8skb96dbvlcbz7j6hz7cvhsrdpx50nbf9x2ya4b"; + iosevka-etoile = "0vinmfcxs16rx1i86sl7ig7hwwyfwv49vh12k6yx9gx56jyywj51"; + iosevka-slab = "18sjdj5gdg993a0mzvx43l3ll7q2l8w30j12934nlzlw5cadv8gf"; + iosevka-ss01 = "1k08nwzgdz78iiijd6bzfricjbwa23xmzjm6jq72q7cvcqrwpzfj"; + iosevka-ss02 = "139q7ps9y97qzmyqr45xqphw5szr4a119pm1jnwrc5scplnhiisb"; + iosevka-ss03 = "1rbsvrc11skznnk448nj0brfvj58zhgkczlq7skhb8rc3mznhgb8"; + iosevka-ss04 = "0rr7zy9n84lqxj7h0ljd091m8a5yjs0kzpyp3j68mvccsdwncqq4"; + iosevka-ss05 = "035rv0pq7741n6c7zkajjzis2rkdyb75z9zjzyiiylfx19j6d6a7"; + iosevka-ss06 = "0bvbl36zpk79f3h7svs51l0wbllmnnkgxmdk76ikfg4a490nz4g9"; + iosevka-ss07 = "061xngjvznr6syk1y996fmnjqpj0kvnnibibr46lgqcx5xb1w38x"; + iosevka-ss08 = "0szc3iydg3kkg6v42ym52b7nd6ljfwrfcw7n3j1av9vhf5gmn0rv"; + iosevka-ss09 = "1p0hsl6vihly2drh6yiniijcwvwjz35d34d6jfxavjhx028h92mw"; + iosevka-ss10 = "152asnmd7m7q1hligkv4ar8h71xn96586p9whplvmkgfrcr731p7"; + iosevka-ss11 = "0mf3gg1b9x3i1j8c3yqks7sc56j97fwx736pr01bf99lw4jchd2h"; + iosevka-ss12 = "136s3i5dwz0iv8mivq8fraadhbqzjjc5h2c5wqydvmw9i7rpyp2h"; + iosevka-ss13 = "0n9886kn9sr89rwnc0r0q9d2a16fykq5asd0cazrs95jbqq0acix"; + iosevka-ss14 = "128y8dgsawdz20lyjshdl7932222dph6qyiirim6rkh99bp2kdy6"; + iosevka-ss15 = "0h2ywzn2gmaj61n5gzdms7v3yqa3x474icdg10vqds7i86n6g8am"; + iosevka-ss16 = "1c1sr4lphwf8x5xdagciws8dr7ia8jh2cy3zv787g8dhflhzvc1i"; + iosevka-ss17 = "1gqbwx89hcnky7bi1xscz13ykh4srvycbfgf9z4b5j26wflfk2a9"; + iosevka-ss18 = "07h0zcf789g6qw5laznf5y67syh003lwhr6141ifz2zv2sgjl716"; + sgr-iosevka = "0h9yg63cjc0s4kbl5k9lpic48y5iz0hlm8bi7h2h850zhbj405fm"; + sgr-iosevka-aile = "1sv0lb2xb18skwvvw95qzdi9hqr1mr3gi2p4plqlbxq6bjpcvc57"; + sgr-iosevka-curly = "1irg71zrbqnw1r2ar5qkfzdjzb1ziwd22jyvm9g1gynjiwh1idaj"; + sgr-iosevka-curly-slab = "12lc9gqlbnp4crp9qrqf38dlzwaqanyj3l9xyasd96z33wmgnvcr"; + sgr-iosevka-etoile = "0j78cbrdsz9qnvs6y6vkv1ys2spfv9l207z20zkyw5m0i3yvhwi4"; + sgr-iosevka-fixed = "04lirldlmjlvz8q33xb2886d1jqaj1a7a94mnrm1ikw2gzbh7j1m"; + sgr-iosevka-fixed-curly = "1s4xyzlmg9s8jvpvc22bxqc6z9qn0bbgham9kp1w2nwlmlnhl712"; + sgr-iosevka-fixed-curly-slab = "01g6rk0n1xs0bv4vyqv9pwyndzk9k8cfhf0sd640zdkqi51p4raw"; + sgr-iosevka-fixed-slab = "1ipzwxs0jqk4cc8snyy9mxhak1zrj9qlicwwhhhv8pmxs2lcirgq"; + sgr-iosevka-fixed-ss01 = "1vpfgj496yzn5n8zb5hxzlx0kh0yfh27v2naz4zi4gci0k58mj4g"; + sgr-iosevka-fixed-ss02 = "122id78h9lvnm4abflng5572zjdn52wqci9jq88gh5iyk02kja6b"; + sgr-iosevka-fixed-ss03 = "0wa4q1zqp75ja5m34wy3zmx5in225ldr0ah23y7l9kh3x67lfykd"; + sgr-iosevka-fixed-ss04 = "11dxlc3r1gn3psf4bpsiwr283zjpc63d8fgswwbh5d6swk9nxm7v"; + sgr-iosevka-fixed-ss05 = "0jw57byz8rbdc5h1ig5d4kpjklqrm6880sx0z06gw97z3p4aqmb1"; + sgr-iosevka-fixed-ss06 = "0saxvswnrszi3kirv5j1pp96n9fhnqwrmsc8naqdgq342rcy13w5"; + sgr-iosevka-fixed-ss07 = "0bsrpfbcjf2g8vd6f6sv6yxvdi9s6wdjckbjb3m64mdgv25lpdwv"; + sgr-iosevka-fixed-ss08 = "1l5k2y0h4h3fsk2ac7akym4rash6bb63bj9vhh3f9igq062dk10a"; + sgr-iosevka-fixed-ss09 = "09s1x6q7lx4y0462m0ac3jp8jfy4x2sc2irfmxcz2rl5px2smgdg"; + sgr-iosevka-fixed-ss10 = "0j8h200gw60rzknxyg7nvcg9cw1nhvgy3n6n70lf3b8jnp5splzd"; + sgr-iosevka-fixed-ss11 = "0cgxy8gq5wak1a7z3j013l1kadph45ckl865dlkw5jnmndz7a684"; + sgr-iosevka-fixed-ss12 = "1y9grhh3ami6qwdm8a6r7m671n7c9bnxp7qgmk7qxgb8jax31qcp"; + sgr-iosevka-fixed-ss13 = "1a9in4ybl9vjyvxab0hdbjnq46rg3yx9gyalj6x8y3mxsfij0wh2"; + sgr-iosevka-fixed-ss14 = "0wc3yw6rf05wdh8kzz6af1apirvyspkb8bav4pbdxahsy1asij58"; + sgr-iosevka-fixed-ss15 = "1b7ns68lx267y9rwlv47yl0y48nvwyzqdpgpwdfwkmpl6vd9kmnn"; + sgr-iosevka-fixed-ss16 = "07h4zvcll7324r4l7kwwk13874hmjs7vdiiffbjwhi403vbiw1an"; + sgr-iosevka-fixed-ss17 = "1rjb0c3yvww8n3sam49ynj2f7h0xgbdsznk7xbj4sk5pkx3l5zr5"; + sgr-iosevka-fixed-ss18 = "0s39p9khjidasizg1ps3k87ldlkpy3cxy5l6r0c2bkvnfz63k66n"; + sgr-iosevka-slab = "10gx0hlr2iywj3nksc70idjha9wja3fw9fl8yvkmnpbqaxlrlzm8"; + sgr-iosevka-ss01 = "1fzxzx9ky4zrbv3zbjh7c57k8dm949xz356a4jk1lpbmwyd0gry4"; + sgr-iosevka-ss02 = "1qk9f257pq2r4jfilrh02viwgy80kqga4czpc1mvwwbqfalz2lg9"; + sgr-iosevka-ss03 = "0cj2xgpfcxdj4sh2sdp6cvbg08s6c8gvg0h01ylrqnazxddfv1xr"; + sgr-iosevka-ss04 = "02q2xqv1qvdijn53p3nbz2swn39yk2pp5ndq1wkakm5j3w5n52f9"; + sgr-iosevka-ss05 = "0y4f8zkzvxq512ns4qzbq5hnd6zzwdjlc1p2iify0f4m491msx5n"; + sgr-iosevka-ss06 = "154jzvb44h1njzkzsk9x6mk7g9sa5jr7kqjv26ylm0ax0i039ax2"; + sgr-iosevka-ss07 = "08025i39hkinrd0sq0yj3d9dc3fqhv5qfdvxaqg3wp89p5jz2q2q"; + sgr-iosevka-ss08 = "1hj80l9k1qi4cnw5dqfp431z3yiyqvrhby9f4ny84ppkpihp60xk"; + sgr-iosevka-ss09 = "0pl1fz70nx0ls0l4zr8j111flf2mh54miavb0422r2dzprvqaviq"; + sgr-iosevka-ss10 = "1wb03i26g36n6qgzkyza3sbdbgpari5sw0m4qm7yaz3c2f91ic69"; + sgr-iosevka-ss11 = "1mz1mg0pc3nidsl5pb6kvdmmga62fj8x77x0n1xjzcz2iwvdd616"; + sgr-iosevka-ss12 = "0g3i88rhax9am4nfjzq91kdkj1k6vzszia7g79hzsw8nfyrd1i52"; + sgr-iosevka-ss13 = "1jcg4y52xbig8npjd7jbjxqdr9nsbwh120mh9sjy9vvq3hxdsbqh"; + sgr-iosevka-ss14 = "1am7j9ymxgmyb50qziyd3xkal1f82cnx4m21gd2rqxijpa12x1r3"; + sgr-iosevka-ss15 = "0zpwz51xdbckldgycgbmrqf3g9wssanmb2z554n1vbmc5whhwkpp"; + sgr-iosevka-ss16 = "19jzkq3xj0cncs4mk11z8q8mmf6h75i0x2nj4ikcvk01mlrss6s8"; + sgr-iosevka-ss17 = "1zn0xh0h997afjsj6n97bmxanxk441iw6mcdliavfs9l6lj1zhns"; + sgr-iosevka-ss18 = "147w89y3p9s2qanm4wwxv3plpif50fs85hzhhdz23jin5zvh5lz2"; + sgr-iosevka-term = "01aqqniw3r2njv4fc114iymjzp9k5mdl7c5dyxypm71sdlpcjxqj"; + sgr-iosevka-term-curly = "0rh0k1svfsan04q50ihhf2xf2fa8isggpqmfps77q1xrbih9miyc"; + sgr-iosevka-term-curly-slab = "0ys2apprdz1awf6nad6phv2k2kf0qfigb22j930y1gya9vshxqx1"; + sgr-iosevka-term-slab = "0qbiwsllyim81ayh0whrkzc1nq06x9g7hnv8haxh91jg9nf327vw"; + sgr-iosevka-term-ss01 = "0mdgh9hdnz752d7sxv91ayi6lyp6czs6gq21dqigk3wmkgwaraz2"; + sgr-iosevka-term-ss02 = "0zxynyzbngng6ymajd7yf5pmagdzxnr19vnpbmqkvhjnsjmhqpcd"; + sgr-iosevka-term-ss03 = "192fjh0kc8jh0z8y7l74g41jvqfnax5p2shnn0ch1h824vraklvd"; + sgr-iosevka-term-ss04 = "0fjmy0wl8hh38gbhf5h6m064la1dp68lyfimmxvjpf1s2c3g5szd"; + sgr-iosevka-term-ss05 = "0w57k1kjn91srngy297fywi1wnc64bwyymclk0w704sqpx04jv4n"; + sgr-iosevka-term-ss06 = "0n2ifw444z606qm9w4il6inmf5zmbkhrk2wvldfx5bsgv2pfxnjd"; + sgr-iosevka-term-ss07 = "1wwky8pichvr467ypgxrxyfqgr27hqkpmx7c35fzka9c0kap483q"; + sgr-iosevka-term-ss08 = "117c54z898rmsclm23hn4x2wvhypc2vmncrq2mvkqck0wawkwaxw"; + sgr-iosevka-term-ss09 = "0lahhifnar8f716xq63xjhibay7cfqgaa7drxvz4pqxmzijv6r2r"; + sgr-iosevka-term-ss10 = "0fp149a4dn7wgdsms70k162g60jgdg5ric93rhxnkn83x3d5jam1"; + sgr-iosevka-term-ss11 = "16pvy63b194vig5vxy15ylmyl5422vrj9adqqwl82r0l9aqpkqlw"; + sgr-iosevka-term-ss12 = "1gldv3srnm7zx9gkyizi6gvf34b7z7xg17qk77882jczsv95hyh1"; + sgr-iosevka-term-ss13 = "0aznbica0yc4vhp4bp84dflfd6jhzw8lsakknfn8dz10kj1qq7vc"; + sgr-iosevka-term-ss14 = "0x73vwywxj7j6qg3armbhm6rjy308j1rk1fhjfriv51hnkm6ylz2"; + sgr-iosevka-term-ss15 = "0px9y25bx75ppsdaq0rfddd9ljxwa3fv5296kvvkw3mwd0ralflx"; + sgr-iosevka-term-ss16 = "1bmnf7z8v4mbcq97lj2qkf722ww1n500jgv2zgs36vxc22zjjrvk"; + sgr-iosevka-term-ss17 = "0lp5qz8j9xc8n959lm4sbfkjhm3ib79qnv69a57nkv5a10ddk20r"; + sgr-iosevka-term-ss18 = "0jkp6zjx9ih5m4pa95a2rn7j1wx4hvnxg2j24cib9dixr7sc81b6"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/ocr-a/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ocr-a/default.nix new file mode 100644 index 0000000000..216b960994 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/ocr-a/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "OCR-A"; + version = "1.0"; + + src = fetchurl { + url = "mirror://sourceforge/ocr-a-font/OCR-A/${version}/OCRA.ttf"; + sha256 = "0kpmjjxwzm84z8maz6lq9sk1b0xv1zkvl28lwj7i0m2xf04qixd0"; + }; + + dontUnpack = true; + + installPhase = '' + install -D -m 0644 $src $out/share/fonts/truetype/OCRA.ttf + ''; + + meta = with lib; { + description = "ANSI OCR font from the '60s. CYBER"; + homepage = "https://sourceforge.net/projects/ocr-a-font/"; + license = licenses.publicDomain; + maintainers = with maintainers; [ V ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/greybird/default.nix b/third_party/nixpkgs/pkgs/data/themes/greybird/default.nix index 202424eeb2..06496ea9be 100644 --- a/third_party/nixpkgs/pkgs/data/themes/greybird/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/greybird/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.14"; + version = "3.22.15"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "0b0axzrvdsv7aa029idz4rs1jm6df4ff3v4j4d5wf4yiypb48js9"; + sha256 = "1fk66fxy2lif9ngazlgkpsziw216i4b1ld2zm97cadf7n97376g9"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix index 3d88a78b39..4507e3c2f1 100644 --- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-08-23"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-gemDiGcr7xLv247w9J1CMOSKg2tWp8ADKpG16qa3hZQ="; + sha256 = "064x340z6fif59bbk1p7ryl6xfj8hlf42ld7h8prcjsyghpznw15"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix index 527696c995..bee7f51360 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,11 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.9.3"; + version = "0.9.4"; rev-prefix = ""; odd-unstable = false; - sha256 = "sha256-xoeqVsfvBH2zzQqDUJGiA47hgVvEkvVf9bNYQmyiytk="; + sha256 = "sha256-ZDrBLSfRBw5/nIs/x1jJQCVgNJer85b8Hm1kkX1Dk3s="; buildInputs = [ clutter diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix index 42c0f1ef67..2672da6ad3 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.16.9"; + version = "4.16.10"; - sha256 = "sha256-TpazNC4TwNhcEGQ4AQICxbmfZ1i4RE9vXkM9Zln80vE="; + sha256 = "sha256-BeEy8+zEsJ5fJAbvP37tfekqF5LTHil0RDcE5RY0f64="; nativeBuildInputs = [ docbook_xsl diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix index 67c8128f6b..2328e76ad7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix @@ -10,7 +10,7 @@ , format ? "make" , installManPages ? true # Specify binaries to build in the form { foo.src = "src/foo.cr"; } - # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; } + # The default `crystal build` options can be overridden with { foo.options = [ "--optionname" ]; } , crystalBinaries ? { } , ... }@args: @@ -32,8 +32,7 @@ let }) (import shardsFile)); - # we previously had --no-debug here but that is not recommended by upstream - defaultOptions = [ "--release" "--progress" "--verbose" ]; + defaultOptions = [ "--release" "--progress" "--verbose" "--no-debug" ]; buildDirectly = shardsFile == null || crystalBinaries != { }; @@ -120,7 +119,7 @@ stdenv.mkDerivation (mkDerivationArgs // { installCheckPhase = args.installCheckPhase or '' for f in $out/bin/*; do - $f --help + $f --help > /dev/null done ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index 8fc4a15efc..11bf1cc963 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -56,6 +56,7 @@ let buildCommand = '' mkdir -p $out tar --strip-components=1 -C $out -xf ${src} + patchShebangs $out/bin/crystal ''; }; @@ -93,6 +94,10 @@ let outputs = [ "out" "lib" "bin" ]; postPatch = '' + export TMP=$(mktemp -d) + export HOME=$TMP + mkdir -p $HOME/test + # Add dependency of crystal to docs to avoid issue on flag changes between releases # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782 substituteInPlace Makefile \ @@ -103,39 +108,35 @@ let ln -sf spec/compiler spec/std - # Dirty fix for when no sandboxing is enabled - rm -rf /tmp/crystal - mkdir -p /tmp/crystal + mkdir -p $TMP/crystal substituteInPlace spec/std/file_spec.cr \ --replace '/bin/ls' '${coreutils}/bin/ls' \ - --replace '/usr/share' '/tmp/crystal' \ - --replace '/usr' '/tmp' + --replace '/usr/share' "$TMP/crystal" \ + --replace '/usr' "$TMP" \ + --replace '/tmp' "$TMP" substituteInPlace spec/std/process_spec.cr \ --replace '/bin/cat' '${coreutils}/bin/cat' \ --replace '/bin/ls' '${coreutils}/bin/ls' \ --replace '/usr/bin/env' '${coreutils}/bin/env' \ --replace '"env"' '"${coreutils}/bin/env"' \ - --replace '"/usr"' '"/tmp"' - - substituteInPlace spec/std/socket/tcp_server_spec.cr \ - --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' + --replace '/usr' "$TMP" \ + --replace '/tmp' "$TMP" substituteInPlace spec/std/system_spec.cr \ --replace '`hostname`' '`${hostname}/bin/hostname`' - # See https://github.com/crystal-lang/crystal/pull/8640 - substituteInPlace spec/std/http/cookie_spec.cr \ - --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}' - # See https://github.com/crystal-lang/crystal/issues/8629 substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' + ''; - # See https://github.com/crystal-lang/crystal/pull/8699 - substituteInPlace spec/std/xml/xml_spec.cr \ - --replace 'it "handles errors"' 'pending "handles errors"' + # Defaults are 4 + preBuild = '' + export CRYSTAL_WORKERS=$NIX_BUILD_CORES + export threads=$NIX_BUILD_CORES + export CRYSTAL_CACHE_DIR=$TMP ''; buildInputs = commonBuildInputs extraBuildInputs; @@ -197,9 +198,6 @@ let checkTarget = "compiler_spec"; preCheck = '' - export HOME=/tmp - mkdir -p $HOME/test - export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH export PATH=${lib.makeBinPath checkInputs}:$PATH ''; @@ -214,60 +212,26 @@ let license = licenses.asl20; maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; platforms = builtins.attrNames archs; - # Error running at_exit handler: Nil assertion failed - broken = lib.versions.minor version == "32" && stdenv.isDarwin; + broken = lib.versionOlder version "0.36.1" && stdenv.isDarwin; }; }) ); in rec { - binaryCrystal_0_31 = genericBinary { - version = "0.31.1"; + binaryCrystal_0_36 = genericBinary { + version = "0.36.1"; sha256s = { - x86_64-linux = "0r8salf572xrnr4m6ll9q5hz6jj8q7ff1rljlhmqb1r26a8mi2ih"; - i686-linux = "0hridnis5vvrswflx0q67xfg5hryhz6ivlwrb9n4pryj5d1gwjrr"; - x86_64-darwin = "1dgxgv0s3swkc5cwawzgpbc6bcd2nx4hjxc7iw2h907y1vgmbipz"; + x86_64-linux = "065vzq34g7hgzl2mrzy9gwwsfikc78nj7xxsbrk67r6rz0a7bk1q"; + i686-linux = "18m4b1lnd682i5ygbg6cljqjny60nn2mlrzrk765h2ip6fljqbm1"; + x86_64-darwin = "0xggayk92zh64pb5sz77n12hkcd1hg8kw90z7gb18594q551sf1v"; }; }; - crystal_0_31 = generic { - version = "0.31.1"; - sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8"; - doCheck = false; # 5 checks are failing now - binary = binaryCrystal_0_31; - }; - - crystal_0_32 = generic { - version = "0.32.1"; - sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6"; - binary = crystal_0_31; - }; - - crystal_0_33 = generic { - version = "0.33.0"; - sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi"; - binary = crystal_0_32; - }; - - crystal_0_34 = generic { - version = "0.34.0"; - sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4"; - binary = crystal_0_33; - }; - - crystal_0_35 = generic { - version = "0.35.1"; - sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69"; - binary = crystal_0_34; - # Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789 - extraBuildInputs = [ git ]; - }; - crystal_0_36 = generic { version = "0.36.1"; sha256 = "sha256-5rjrvwZKM4lHpmxLyUVbi0Zw98xT+iJKonxwfUwS/Wk="; - binary = crystal_0_35; + binary = binaryCrystal_0_36; }; crystal_1_0 = generic { diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix index f7dc6f8e87..940b379173 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -4,18 +4,32 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "2.2.1"; + version = "2.5.1"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; -in -{ + + # Decouples flutter derivation from dart derivation, + # use specific dart version to not need to bump dart derivation when bumping flutter. + dartVersion = "2.14.2"; + dartSourceBase = "https://storage.googleapis.com/dart-archive/channels"; + dartForFlutter = dart.override { + version = dartVersion; + sources = { + "${dartVersion}-x86_64-linux" = fetchurl { + url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; + sha256 = "1gr2dr683kz0a0k6rcn4jcbxf9fr2xlzi5fcgn1lzrrxvys2lddx"; + }; + }; + }; +in { mkFlutter = mkFlutter; stable = mkFlutter rec { - inherit dart version; + inherit version; + dart = dartForFlutter; pname = "flutter"; src = fetchurl { - url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; - sha256 = "009pwk2casz10gibgjpz08102wxmkq9iq3994b3c2q342g6526g0"; + url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}"; + sha256 = "12ycz7iasrc9p9c6zr95l6llyji3za43gsx8cmr2kjfiv23bcrv2"; }; patches = getPatches ./patches; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix index 5cab3b929f..e0ede49b09 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix @@ -8,12 +8,10 @@ { bash , buildFHSUserEnv , cacert -, coreutils , git , runCommand , stdenv , lib -, fetchurl , alsa-lib , dbus , expat @@ -33,6 +31,7 @@ , nspr , nss , systemd +, which }: let drvName = "flutter-${version}"; @@ -74,10 +73,27 @@ let ''; installPhase = '' + runHook preInstall + mkdir -p $out cp -r . $out mkdir -p $out/bin/cache/ ln -sf ${dart} $out/bin/cache/dart-sdk + + runHook postInstall + ''; + + doInstallCheck = true; + installCheckInputs = [ which ]; + installCheckPhase = '' + runHook preInstallCheck + + export HOME="$(mktemp -d)" + $out/bin/flutter config --android-studio-dir $HOME + $out/bin/flutter config --android-sdk $HOME + $out/bin/flutter --version | fgrep -q '${version}' + + runHook postInstallCheck ''; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix index d864022851..ad6083a1ea 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.6.2"; + version = "1.6.3"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "0h1jh8gbvxb0pl1an0fbbg4lbd0sa24yj2f4yqwavw8dbdvvbd1y"; + sha256 = "0jrijj9snfx70692z2301rjassvwjcsjbxdsjyif9hyp9hrrqif7"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { patches = [ # Source release Nix patch(es) relevant for binary releases as well. ./patches/1.6-bin/0002-nix-Skip-tempname-test-broken-in-sandbox.patch - ./patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch ./patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch deleted file mode 100644 index e63c88c8fe..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.6-bin/0003-nix-Skip-chown-tests-broken-in-sandbox.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b20357fb1044d2c100172b1d5cbdf6c6d9bd3590 Mon Sep 17 00:00:00 2001 -From: Pontus Stenetorp -Date: Thu, 8 Apr 2021 05:10:39 +0000 -Subject: [PATCH 3/6] nix: Skip `chown` tests broken in sandbox - ---- - test/file.jl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/file.jl b/test/file.jl -index bd4dd78f62..06fd4e49da 100644 ---- a/test/file.jl -+++ b/test/file.jl -@@ -503,8 +503,8 @@ if !Sys.iswindows() - @test stat(file).gid == 0 - @test stat(file).uid == 0 - else -- @test_throws Base._UVError("chown($(repr(file)), -2, -1)", Base.UV_EPERM) chown(file, -2, -1) # Non-root user cannot change ownership to another user -- @test_throws Base._UVError("chown($(repr(file)), -1, -2)", Base.UV_EPERM) chown(file, -1, -2) # Non-root user cannot change group to a group they are not a member of (eg: nogroup) -+ @test_skip @test_throws Base._UVError("chown($(repr(file)), -2, -1)", Base.UV_EPERM) chown(file, -2, -1) # Non-root user cannot change ownership to another user -+ @test_skip @test_throws Base._UVError("chown($(repr(file)), -1, -2)", Base.UV_EPERM) chown(file, -1, -2) # Non-root user cannot change group to a group they are not a member of (eg: nogroup) - end - else - # test that chown doesn't cause any errors for Windows --- -2.29.3 - diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index 809e81ae54..013b024f3b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -100,7 +100,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ] ++ teams.pantheon.members; + maintainers = with maintainers; [ antono jtojnar maxeaubrey ] ++ teams.pantheon.members; }; }); diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index 3d5c692930..f4f7d64835 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -84,9 +84,13 @@ let in stdenv.mkDerivation ({ - name = "${baseName}-${version}" - + optionalString javacSupport "-javac" - + optionalString odbcSupport "-odbc"; + # name is used instead of pname to + # - not have to pass pnames as argument + # - have a separate pname for erlang (main module) + name = "${baseName}" + + optionalString javacSupport "_javac" + + optionalString odbcSupport "_odbc" + + "-${version}"; inherit src version; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix index 64e872ad5f..e74649cab4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -82,66 +82,25 @@ let # configured trees) luarocks_config = "luarocks-config.lua"; luarocks_content = let - extraVariablesStr = lib.concatStringsSep "\n " - (lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables); - in '' - local_cache = "" - -- To prevent collisions when creating environments, we install the rock - -- files into per-package subdirectories - rocks_subdir = '${rocksSubdir}' - -- Then we need to tell luarocks where to find the rock files per - -- dependency - rocks_trees = { - ${lib.concatStringsSep "\n, " rocksTrees} - } - '' + lib.optionalString lua.pkgs.isLuaJIT '' - -- Luajit provides some additional functionality built-in; this exposes - -- that to luarock's dependency system - rocks_provided = { - jit='${lua.luaversion}-1'; - ffi='${lua.luaversion}-1'; - luaffi='${lua.luaversion}-1'; - bit='${lua.luaversion}-1'; - } - '' + '' - -- For single-output external dependencies - external_deps_dirs = { - ${lib.concatStringsSep "\n, " externalDepsDirs} - } - variables = { - -- Some needed machinery to handle multiple-output external dependencies, - -- as per https://github.com/luarocks/luarocks/issues/766 - ${lib.optionalString (lib.length depVariables > 0) '' - ${lib.concatStringsSep "\n " depVariables}''} - ${extraVariablesStr} - } - ${extraConfig} - ''; + generatedConfig = lua.pkgs.lib.generateLuarocksConfig { + inherit externalDeps; + inherit extraVariables; + inherit rocksSubdir; + inherit requiredLuaRocks; + }; + in + '' + ${generatedConfig} + ${extraConfig} + ''; rocksSubdir = "${attrs.pname}-${version}-rocks"; - externalDepsDirs = map - (x: "'${builtins.toString x}'") - (lib.filter (lib.isDerivation) externalDeps); - - rocksTrees = lib.imap0 - (i: dep: "{ name = [[dep-${toString i}]], root = '${dep}', rocks_dir = '${dep}/${dep.rocksSubdir}' }") - requiredLuaRocks; - # Filter out the lua derivation itself from the Lua module dependency # closure, as it doesn't have a rock tree :) requiredLuaRocks = lib.filter (d: d ? luaModule) (lua.pkgs.requiredLuaModules propagatedBuildInputs); - # Explicitly point luarocks to the relevant locations for multiple-output - # derivations that are external dependencies, to work around an issue it has - # (https://github.com/luarocks/luarocks/issues/766) - depVariables = lib.concatMap ({name, dep}: [ - "${name}_INCDIR='${lib.getDev dep}/include';" - "${name}_LIBDIR='${lib.getLib dep}/lib';" - "${name}_BINDIR='${lib.getBin dep}/bin';" - ]) externalDeps'; - # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps; in diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix new file mode 100644 index 0000000000..8fd725a9b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix @@ -0,0 +1,27 @@ +# Hooks for building lua packages. +{ lua +, lib +, makeSetupHook +, findutils +, runCommand +}: + +let + callPackage = lua.pkgs.callPackage; + luaInterpreter = lua.interpreter; +in { + + lua-setup-hook = LuaPathSearchPaths: LuaCPathSearchPaths: + let + hook = ./setup-hook.sh; + in runCommand "lua-setup-hook.sh" { + # hum doesn't seem to like caps !! BUG ? + luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths; + luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths; + } '' + cp ${hook} hook.sh + substituteAllInPlace hook.sh + mv hook.sh $out + ''; + +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh similarity index 100% rename from third_party/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.sh rename to third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.nix index 62caffd8d8..e69de29bb2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/setup-hook.nix @@ -1,15 +0,0 @@ -{ runCommand, lib, }: - -LuaPathSearchPaths: LuaCPathSearchPaths: - -let - hook = ./setup-hook.sh; -in runCommand "lua-setup-hook.sh" { - # hum doesn't seem to like caps !! BUG ? - luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths; - luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths; -} '' - cp ${hook} hook.sh - substituteAllInPlace hook.sh - mv hook.sh $out -'' diff --git a/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix index 3e5a22bf4c..713a49dbaa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, capnproto, cmake }: stdenv.mkDerivation rec { pname = "capnproto"; @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-soBUp6K/6kK/w5LI0AljDZTXLozoaiOtbxi15yV0Bk8="; }; + nativeBuildInputs = [ cmake ] + ++ lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) capnproto; + + cmakeFlags = lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) "-DEXTERNAL_CAPNP"; + meta = with lib; { homepage = "https://capnproto.org/"; description = "Cap'n Proto cerealization protocol"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libarchive-qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libarchive-qt/default.nix index 920cc7efa0..62b425bba0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libarchive-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libarchive-qt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libarchive-qt"; - version = "2.0.4"; + version = "2.0.6"; src = fetchFromGitLab { owner = "marcusbritanicus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-onTV9dgk6Yl9H35EvA6/8vk1IrYH8vg9OQNVgzkt4q4"; + sha256 = "sha256-Z+2zjQolV1Ncr6v9r7fGrc/fEMt0iMtGwv9eZ2Tu2cA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix index e46e255933..72d2876132 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -35,6 +35,8 @@ in stdenv.mkDerivation (rec { ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabi.h '' + lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl) '' ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h + '' + lib.optionalString (stdenv.hostPlatform.isi686 && stdenv.hostPlatform.isMusl) '' + ln -s lock-obj-pub.i686-unknown-linux-gnu.h src/syscfg/lock-obj-pub.linux-musl.h '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h diff --git a/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix index c2556a428a..6fff0c1e1b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix @@ -96,5 +96,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ hrdinka ]; license = licenses.lgpl21; platforms = platforms.all; + # https://github.com/mapnik/mapnik/issues/4232 + broken = lib.versionAtLeast proj.version "8.0.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix index 1591988e0c..dd654deb88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix @@ -10,14 +10,14 @@ mkDerivation rec { pname = "mauikit-filebrowsing"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit-filebrowsing"; rev = "v${version}"; - sha256 = "sha256-hiR0RbZTduH0noyzpewsNJAtSdCtiSmTP8SLMBgK3uA="; + sha256 = "sha256-mpO61VOYTBlAjtIa1gEYChREV2jjd/WG+rbZcJnbM+Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix index 2575e2566a..f730d848df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix @@ -9,18 +9,19 @@ , knotifications , qtbase , qtquickcontrols2 +, qtx11extras }: mkDerivation rec { pname = "mauikit"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit"; rev = "v${version}"; - sha256 = "sha256-qz/MePMvyGR8lzR2xB2f9QENx04UHu0Xef7v0xcKovo="; + sha256 = "sha256-skukb9M6jhijCTb+tMIz/3vUCAvVJw+4zTFv9Z7HqWk="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ mkDerivation rec { ki18n knotifications qtquickcontrols2 + qtx11extras ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/nsss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nsss/default.nix index 527e7d4898..9fee8333fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nsss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.1.0.1"; - sha256 = "1nair10m7fddp50mpqnwj0qiggnh5qmnffmyzxis5l1ixcav1ir0"; + version = "0.2.0.0"; + sha256 = "0zg0lwkvx9ch4a6h9ryc73nqfz733v2pv4gbf65qzpz7ccniwagi"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix b/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix new file mode 100644 index 0000000000..3eb4789939 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, sqlite +, libtiff +, curl +, gtest +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "proj"; + version = "7.2.1"; + + src = fetchFromGitHub { + owner = "OSGeo"; + repo = "PROJ"; + rev = version; + sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9"; + }; + + patches = [ + (fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557 + name = "gie_self_tests-fail.diff"; # included in >= 8.0.1 + url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff"; + sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf"; + }) + ]; + + postPatch = lib.optionalString (version == "7.2.1") '' + substituteInPlace CMakeLists.txt \ + --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1" + ''; + + outputs = [ "out" "dev"]; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ sqlite libtiff curl ]; + + checkInputs = [ gtest ]; + + cmakeFlags = [ + "-DUSE_EXTERNAL_GTEST=ON" + ]; + + doCheck = true; + + meta = with lib; { + description = "Cartographic Projections Library"; + homepage = "https://proj4.org"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix index f22878ec82..caa270bcf6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -7,33 +7,19 @@ , libtiff , curl , gtest -, fetchpatch }: stdenv.mkDerivation rec { pname = "proj"; - version = "7.2.1"; + version = "8.1.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9"; + sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w="; }; - patches = [ - (fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557 - name = "gie_self_tests-fail.diff"; # included in >= 8.0.1 - url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff"; - sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf"; - }) - ]; - - postPatch = lib.optionalString (version == "7.2.1") '' - substituteInPlace CMakeLists.txt \ - --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1" - ''; - outputs = [ "out" "dev"]; nativeBuildInputs = [ cmake pkg-config ]; @@ -44,17 +30,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" + "-DRUN_NETWORK_DEPENDENT_TESTS=OFF" ]; - doCheck = stdenv.is64bit; - - preCheck = '' - export HOME=$TMPDIR - ''; + doCheck = true; meta = with lib; { description = "Cartographic Projections Library"; - homepage = "https://proj4.org"; + homepage = "https://proj.org/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ vbgl dotlambda ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix index d42026c13c..b57d119193 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , addOpenGLRunpath -, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 +, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn }: with lib; @@ -17,7 +17,7 @@ let platform = "x86_64"; rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] - ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); + ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn ]); packages = import ./binary-hashes.nix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/skalibs/2_10.nix b/third_party/nixpkgs/pkgs/development/libraries/skalibs/2_10.nix new file mode 100644 index 0000000000..af4c04dab1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/skalibs/2_10.nix @@ -0,0 +1,31 @@ +{ skawarePackages }: + +skawarePackages.buildPackage { + pname = "skalibs"; + version = "2.10.0.3"; + sha256 = "0ka6n5rnxd5sn5lycarf596d5wlak5s535zqqlz0rnhdcnpb105p"; + + description = "A set of general-purpose C programming libraries"; + + outputs = [ "lib" "dev" "doc" "out" ]; + + configureFlags = [ + # assume /dev/random works + "--enable-force-devr" + "--libdir=\${lib}/lib" + "--dynlibdir=\${lib}/lib" + "--includedir=\${dev}/include" + "--sysdepdir=\${lib}/lib/skalibs/sysdeps" + # Empty the default path, which would be "/usr/bin:bin". + # It would be set when PATH is empty. This hurts hermeticity. + "--with-default-path=" + ]; + + postInstall = '' + rm -rf sysdeps.cfg + rm libskarnet.* + + mv doc $doc/share/doc/skalibs/html + ''; + +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix index 09530db053..7e3e457d50 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix @@ -1,11 +1,11 @@ -{ skawarePackages }: +{ skawarePackages, pkgs }: with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.10.0.3"; - sha256 = "0ka6n5rnxd5sn5lycarf596d5wlak5s535zqqlz0rnhdcnpb105p"; + version = "2.11.0.0"; + sha256 = "1n9l7mb54dlb0iijjaf446jba6nmq1ql9n39s095ngrk5ahcipwq"; description = "A set of general-purpose C programming libraries"; @@ -30,4 +30,10 @@ buildPackage { mv doc $doc/share/doc/skalibs/html ''; + passthru.tests = { + # fdtools is one of the few non-skalib packages that depends on skalibs + # and might break if skalibs gets an breaking update. + fdtools = pkgs.fdtools; + }; + } diff --git a/third_party/nixpkgs/pkgs/development/libraries/utmps/default.nix b/third_party/nixpkgs/pkgs/development/libraries/utmps/default.nix index be74748cb3..fcf032b265 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/utmps/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.1.0.2"; - sha256 = "1vjza7m65ziq54q0sv46kb3lss9cmxkkv0n9h3i8505x0h2hlvlb"; + version = "0.1.0.3"; + sha256 = "0npgg90lzxmhld6hp296gbnrsixip28s7axirc2g6yjpjz2bvcan"; description = "A secure utmpx and wtmp implementation"; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index 0602055151..441f83d10c 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -23,6 +23,7 @@ alt-getopt = buildLuarocksPackage { "date": "2017-01-06T13:50:55+03:00", "path": "/nix/store/z72v77cw9188408ynsppwhlzii2dr740-lua-alt-getopt", "sha256": "1kq7r5668045diavsqd1j6i9hxdpsk99w8q4zr8cby9y3ws4q6rv", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -50,6 +51,7 @@ argparse = buildLuarocksPackage { "date": "2020-07-08T11:17:50+10:00", "path": "/nix/store/vjm6c826hgvj7h7vqlbgkfpvijsd8yaf-argparse", "sha256": "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -119,6 +121,7 @@ bit32 = buildLuarocksPackage { "date": "2015-02-17T10:44:04+01:00", "path": "/nix/store/9kz7kgjmq0w9plrpha866bmwsgp4rfhn-lua-compat-5.2", "sha256": "1ipqlbvb5w394qwhm2f3w6pdrgy8v4q8sps5hh3pqz14dcqwakhj", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -171,7 +174,8 @@ cassowary = buildLuarocksPackage { "date": "2021-07-19T14:37:34+03:00", "path": "/nix/store/rzsbr6gqg8vhchl24ma3p1h4slhk0xp7-cassowary.lua", "sha256": "1r668qcvd2a1rx17xp7ajp5wjhyvh2fwn0c60xmw0mnarjb5w1pq", - "fetchSubmodules": false, + "fetchLFS": false, + "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } @@ -179,10 +183,6 @@ cassowary = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; - checkInputs = [ busted ]; - # Avoid circular dependency issue with busted / penlight, see: - # https://github.com/NixOS/nixpkgs/pull/136453/files#r700982255 - doCheck = false; meta = { homepage = "https://github.com/sile-typesetter/cassowary.lua"; @@ -196,7 +196,7 @@ compat53 = buildLuarocksPackage { pname = "compat53"; version = "0.7-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/compat53-0.7-1.rockspec"; + url = "https://luafr.org/luarocks/compat53-0.7-1.rockspec"; sha256 = "1r7a3q1cjrcmdycrv2ikgl83irjhxs53sa88v2fdpr9aaamlb101"; }).outPath; src = fetchurl { @@ -228,6 +228,7 @@ cosmo = buildLuarocksPackage { "date": "2016-06-17T05:39:58-07:00", "path": "/nix/store/k3p4xc4cfihp4h8aj6vacr25rpcsjd96-cosmo", "sha256": "03b5gwsgxd777970d2h6rx86p7ivqx7bry8xmx2r396g3w85qy2p", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -257,6 +258,7 @@ coxpcall = buildLuarocksPackage { "date": "2018-02-26T19:53:11-03:00", "path": "/nix/store/1q4p5qvr6rlwisyarlgnmk4dx6vp8xdl-coxpcall", "sha256": "1k3q1rr2kavkscf99b5njxhibhp6iwhclrjk6nnnp233iwc2jvqi", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -304,6 +306,7 @@ cyrussasl = buildLuarocksPackage { "date": "2015-08-21T18:24:54-04:00", "path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl", "sha256": "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -326,10 +329,11 @@ digestif = buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/astoff/digestif", - "rev": "3a9076f76d8121526adcdbb9303d04dd3c721a34", - "date": "2021-06-24T16:18:41+02:00", - "path": "/nix/store/alzrvcxdmdfqqmm0diaxfljyr3jz1zk3-digestif", - "sha256": "110vsqyyp2pvn6nk492a9r56iyzymy0w1f2hvx26pv5x01mxm20x", + "rev": "9f8f299cf7094d72edbd32a455869751246028b7", + "date": "2021-09-25T14:32:42+02:00", + "path": "/nix/store/ln1zx9cw2b7q4x5vzd6hv5nd01c1gsy3-digestif", + "sha256": "1cf14m03jvfs1mwaywfgv759jh0ha3pxrnyj7jxjxlsj6cim89v0", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -395,10 +399,11 @@ gitsigns-nvim = buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "daa233aabb4dbc7c870ea7300bcfeef96d49c2a3", - "date": "2021-08-29T23:08:52+01:00", - "path": "/nix/store/4685c871dzh0kqf3fs5iqmaysag4m9nx-gitsigns.nvim", - "sha256": "0y0il8v0g8kvsyzir4hbkwvzv9wk2iqs1apxlvijk9ccfdk9ya0p", + "rev": "7e5c1a831f555dc398dd1564489e2b8a5c867754", + "date": "2021-09-25T16:49:34+01:00", + "path": "/nix/store/a1h8xxb9w4kvvmq7q30m1ny2pq3zbmin-gitsigns.nvim", + "sha256": "02kssw0lpprf9k3il6gfd00gj9fbjbksipa4f6xqkgfdq5c9l9fr", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -419,7 +424,7 @@ http = buildLuarocksPackage { pname = "http"; version = "0.3-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/http-0.3-0.rockspec"; + url = "https://luafr.org/luarocks/http-0.3-0.rockspec"; sha256 = "0fn3irkf5nnmfc83alc40b316hs8l7zdq2xlaiaa65sjd8acfvia"; }).outPath; src = fetchurl { @@ -442,7 +447,7 @@ inspect = buildLuarocksPackage { pname = "inspect"; version = "3.1.1-0"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/inspect-3.1.1-0.rockspec"; + url = "https://luarocks.org/inspect-3.1.1-0.rockspec"; sha256 = "00spibq2h4an8v0204vr1hny4vv6za720c37ipsahpjk198ayf1p"; }).outPath; src = fetchurl { @@ -473,6 +478,7 @@ ldbus = buildLuarocksPackage { "date": "2019-08-16T14:26:05+10:00", "path": "/nix/store/gg4zldd6kx048d6p65b9cimg3arma8yh-ldbus", "sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -499,6 +505,7 @@ ldoc = buildLuarocksPackage { "date": "2021-06-24T13:07:51+02:00", "path": "/nix/store/pzk1qi4fdviz2pq5bg3q91jmrg8wziqx-LDoc", "sha256": "05wd5m5v3gv777kgikj46216slxyf1zdbzl4idara9lcfw3mfyyw", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -527,6 +534,7 @@ lgi = buildLuarocksPackage { "date": "2017-10-09T20:55:55+02:00", "path": "/nix/store/vh82n8pc8dy5c8nph0vssk99vv7q4qg2-lgi", "sha256": "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -655,7 +663,7 @@ lpty = buildLuarocksPackage { pname = "lpty"; version = "1.2.2-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lpty-1.2.2-1.rockspec"; + url = "https://luafr.org/luarocks/lpty-1.2.2-1.rockspec"; sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg"; }).outPath; src = fetchurl { @@ -677,7 +685,7 @@ lrexlib-gnu = buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.1-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lrexlib-gnu-2.9.1-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.1-1.rockspec"; sha256 = "1jfjxh26iwsavipkwmscwv52l77qxzvibfmlvpskcpawyii7xcw8"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -686,6 +694,7 @@ lrexlib-gnu = buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -715,6 +724,7 @@ lrexlib-pcre = buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -736,7 +746,7 @@ lrexlib-posix = buildLuarocksPackage { pname = "lrexlib-posix"; version = "2.9.1-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-posix-2.9.1-1.rockspec"; + url = "https://luafr.org/luarocks/lrexlib-posix-2.9.1-1.rockspec"; sha256 = "1zxrx9yifm9ry4wbjgv86rlvq3ff6qivldvib3ha4767azla0j0r"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -745,6 +755,7 @@ lrexlib-posix = buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -774,6 +785,7 @@ lua-cjson = buildLuarocksPackage { "date": "2018-04-19T12:03:43-07:00", "path": "/nix/store/qdpqx2g0xi1c9fknzxx280mcdq6fi8rw-lua-cjson", "sha256": "0i2sjsi6flax1k0bm647yijgmc02jznq9bn88mj71pgii79pfjhw", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -803,6 +815,7 @@ lua-cmsgpack = buildLuarocksPackage { "date": "2015-06-03T08:39:04+02:00", "path": "/nix/store/ksqvl7hbd5s7nb6hjffyic1shldac4z2-lua-cmsgpack", "sha256": "0j0ahc9rprgl6dqxybaxggjam2r5i2wqqsd6764n0d7fdpj9fqm0", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -854,6 +867,7 @@ lua-lsp = buildLuarocksPackage { "date": "2020-10-17T15:07:11-04:00", "path": "/nix/store/qn9syhm875k1qardhhsp025cm3dbnqvm-lua-lsp", "sha256": "17k3jq61jz6j9bz4vc3hmsfx1s26cfgq1acja8fqyixljklmsbqp", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -905,6 +919,7 @@ lua-resty-http = buildLuarocksPackage { "date": "2021-04-09T17:11:35+01:00", "path": "/nix/store/zzd1xj4r0iy3srs2hgv4mlm6wflmk24x-lua-resty-http", "sha256": "1whwn2fwm8c9jda4z1sb5636sfy4pfgjdxw0grcgmf6451xi57nw", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -934,6 +949,7 @@ lua-resty-jwt = buildLuarocksPackage { "date": "2021-01-20T16:53:57-05:00", "path": "/nix/store/z4a8ffxj2i3gbjp0f8r377cdp88lkzl4-lua-resty-jwt", "sha256": "07w8r8gqbby06x493qzislig7a3giw0anqr4ivp3g2ms8v9fnng6", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -954,7 +970,7 @@ lua-resty-openidc = buildLuarocksPackage { pname = "lua-resty-openidc"; version = "1.7.4-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-resty-openidc-1.7.4-1.rockspec"; + url = "https://luarocks.org/lua-resty-openidc-1.7.4-1.rockspec"; sha256 = "12r03pzx1lpaxzy71iqh0kf1zs6gx1k89vpxc5va9r7nr47a56vy"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -963,6 +979,7 @@ lua-resty-openidc = buildLuarocksPackage { "date": "2020-11-17T17:42:16+01:00", "path": "/nix/store/240kss5xx1br5n3qz6djw21cs1fj4pfg-lua-resty-openidc", "sha256": "1gw71av1r0c6v4f1h0bj0l6way2hmipic6wmipnavr17bz7m1q7z", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -981,17 +998,18 @@ lua-resty-openidc = buildLuarocksPackage { lua-resty-openssl = buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "0.7.4-1"; + version = "0.7.5-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lua-resty-openssl-0.7.4-1.rockspec"; - sha256 = "1h87nc8rnay2h0hcc9rylkdzrssibjs6whyim53k647wqkm3fslm"; + url = "https://luafr.org/luarocks/lua-resty-openssl-0.7.5-1.rockspec"; + sha256 = "13v14in9cgmjgarmy6br9629ns1qlhw7a30c061y6gncjannnv6y"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/fffonion/lua-resty-openssl.git", - "rev": "5b113a6059e63dbcf7c6fa95a149a9381b904219", - "date": "2021-08-02T18:09:14+08:00", - "path": "/nix/store/qk6fcp5hwqsm4mday34l1mdkx0ba76bx-lua-resty-openssl", - "sha256": "1iar6znh0i45zkx03n8vrkwhx732158hmxfmfjgbpv547mh30ly6", + "rev": "6a7f4a1649da7e0499b542b73c61e8dbdf91f57e", + "date": "2021-09-18T06:15:54+08:00", + "path": "/nix/store/01bninsbgix30zl97lk0p10ycqkc37kx-lua-resty-openssl", + "sha256": "1ypji678lna9z3a48lhxs7wrw8d1prln7yfvqfm96lbmfvr5wfxw", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1019,6 +1037,7 @@ lua-resty-session = buildLuarocksPackage { "date": "2021-01-04T14:02:41+02:00", "path": "/nix/store/jqc8arr46mx1xbmrsw503zza1kmz7mcv-lua-resty-session", "sha256": "09q8xbxkr431i2k21vdyx740rv325v0zmnx0qa3q9x15kcfsd2fm", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1068,6 +1087,7 @@ lua-toml = buildLuarocksPackage { "date": "2017-12-08T16:30:50-08:00", "path": "/nix/store/cnpflpyj441c65jhb68hjr2bcvnj9han-lua-toml", "sha256": "0lklhgs4n7gbgva5frs39240da1y4nwlx6yxaj3ix6r5lp9sh07b", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1097,6 +1117,7 @@ lua-yajl = buildLuarocksPackage { "date": "2020-11-12T06:22:23-08:00", "path": "/nix/store/9acgxpqk52kwn03m5xasn4f6mmsby2r9-lua-yajl", "sha256": "1frry90y7vqnw1rd1dfnksilynh0n24gfhkmjd6wwba73prrg0pf", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1118,7 +1139,7 @@ lua-zlib = buildLuarocksPackage { pname = "lua-zlib"; version = "1.2-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/lua-zlib-1.2-1.rockspec"; + url = "https://luafr.org/luarocks/lua-zlib-1.2-1.rockspec"; sha256 = "18rpbg9b4vsnh3svapiqrvwwshw1abb5l5fd7441byx1nm3fjq9w"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -1127,6 +1148,7 @@ lua-zlib = buildLuarocksPackage { "date": "2017-10-07T08:26:37-07:00", "path": "/nix/store/6hjfczd3xkilkdxidgqzdrwmaiwnlf05-lua-zlib", "sha256": "1cv12s5c5lihmf3hb0rz05qf13yihy1bjpb7448v8mkiss6y1s5c", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1173,6 +1195,7 @@ luabitop = buildLuarocksPackage { "date": "2021-08-30T10:14:03+02:00", "path": "/nix/store/sdnza0zpmlkz9jppnysasbvqy29f4zia-luabitop", "sha256": "1b57f99lrjbwsi4m23cq5kpj0dbpxh3xwr0mxs2rzykr2ijpgwrw", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1202,6 +1225,7 @@ luacheck = buildLuarocksPackage { "date": "2020-08-20T19:21:52-03:00", "path": "/nix/store/8r4x8snxp0kjabn9bsxwh62pfczd8wma-luacheck", "sha256": "08jsqibksdvpl6mvf8d6rlh5pii78hqm3fkhbkgzrs6k8kk5a7lf", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1222,7 +1246,7 @@ luacov = buildLuarocksPackage { pname = "luacov"; version = "0.15.0-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luacov-0.15.0-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luacov-0.15.0-1.rockspec"; sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -1231,6 +1255,7 @@ luacov = buildLuarocksPackage { "date": "2021-02-15T18:47:58-03:00", "path": "/nix/store/9vm38il9knzx2m66m250qj1fzdfzqg0y-luacov", "sha256": "08550nna6qcb5jn6ds1hjm6010y8973wx4qbf9vrvrcn1k2yr6ki", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1260,6 +1285,7 @@ luadbi = buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1280,7 +1306,7 @@ luadbi-mysql = buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.2-1"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luadbi-mysql-0.7.2-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-mysql-0.7.2-1.rockspec"; sha256 = "0gnyqnvcfif06rzzrdw6w6hchp4jrjiwm0rmfx2r8ljchj2bvml5"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -1289,6 +1315,7 @@ luadbi-mysql = buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1318,6 +1345,7 @@ luadbi-postgresql = buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1347,6 +1375,7 @@ luadbi-sqlite3 = buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1367,7 +1396,7 @@ luaepnf = buildLuarocksPackage { pname = "luaepnf"; version = "0.3-2"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaepnf-0.3-2.rockspec"; + url = "https://luafr.org/luarocks/luaepnf-0.3-2.rockspec"; sha256 = "0kqmnj11wmfpc9mz04zzq8ab4mnbkrhcgc525wrq6pgl3p5li8aa"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ @@ -1376,6 +1405,7 @@ luaepnf = buildLuarocksPackage { "date": "2015-01-15T16:54:10+01:00", "path": "/nix/store/n7gb0z26sl7dzdyy3bx1y3cz3npsna7d-lua-luaepnf", "sha256": "1lvsi3fklhvz671jgg0iqn0xbkzn9qjcbf2ks41xxjz3lapjr6c9", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1450,6 +1480,7 @@ luaffi = buildLuarocksPackage { "date": "2021-03-01T11:46:30-05:00", "path": "/nix/store/6dwfn64p3clcsxkq41b307q8izi0fvji-luaffifb", "sha256": "0nj76fw3yi57vfn35yvbdmpdbg9gmn5j1gw84ajs9w1j86sc0661", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1479,6 +1510,7 @@ luafilesystem = buildLuarocksPackage { "date": "2017-09-15T20:07:33-03:00", "path": "/nix/store/20xm4942kvnb8kypg76jl7zrym5cz03c-luafilesystem", "sha256": "0zmprgkm9zawdf9wnw0v3w6ibaj442wlc6alp39hmw610fl4vghi", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1509,6 +1541,7 @@ lualogging = buildLuarocksPackage { "date": "2021-08-12T19:29:39+02:00", "path": "/nix/store/q1v28n04hh3r7aw37cxakzksfa3kw5qa-lualogging", "sha256": "0nj0ik91lgl9rwgizdkn7vy9brddsz1kxfn70c01x861vaxi63iz", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1603,6 +1636,7 @@ luasec = buildLuarocksPackage { "date": "2021-08-14T10:28:09-03:00", "path": "/nix/store/jk2npg54asnmj5fnpldn8dxym9gx8x4g-luasec", "sha256": "14hx72qw3gjgz12v5bwpz3irgbf69f8584z8y7lglccbyydp4jla", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1655,6 +1689,7 @@ luasql-sqlite3 = buildLuarocksPackage { "date": "2021-08-27T15:17:22-03:00", "path": "/nix/store/2374agarn72cnlnk2vripfy1zz2y50la-luasql", "sha256": "13xs1g67d2p69x4wzxk1h97xh25388h0kkh9bjgw3l1yss9zlxhx", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1720,7 +1755,7 @@ luautf8 = buildLuarocksPackage { pname = "luautf8"; version = "0.1.3-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luautf8-0.1.3-1.rockspec"; + url = "https://luarocks.org/luautf8-0.1.3-1.rockspec"; sha256 = "16i9wfgd0f299g1afgjp0hhczlrk5g8i0kq3ka0f8bwj3mp2wmcp"; }).outPath; src = fetchurl { @@ -1752,6 +1787,7 @@ luazip = buildLuarocksPackage { "date": "2017-09-05T14:02:52+03:00", "path": "/nix/store/idllj442c0iwnx1cpkrifx2afb7vh821-luazip", "sha256": "1jlqzqlds3aa3hnp737fm2awcx0hzmwyd87klv0cv13ny5v9f2x4", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1792,14 +1828,14 @@ luuid = buildLuarocksPackage { luv = buildLuarocksPackage { pname = "luv"; - version = "1.30.0-0"; + version = "1.42.0-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luv-1.30.0-0.rockspec"; - sha256 = "05j231z6vpfjbxxmsizbigrsr80bk2dg48fcz12isj668lhia32h"; + url = "https://luarocks.org/luv-1.42.0-0.rockspec"; + sha256 = "0pr2gjjnm60w0csb0dacrjalan7ifsfw4lki4ykxx1f4m5snam09"; }).outPath; src = fetchurl { - url = "https://github.com/luvit/luv/releases/download/1.30.0-0/luv-1.30.0-0.tar.gz"; - sha256 = "1vxmxgdjk2bdnm8d9n3z5lfg6x34cx97j5nh8camm6ps5c0mmisw"; + url = "https://github.com/luvit/luv/releases/download/1.42.0-0/luv-1.42.0-0.tar.gz"; + sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm"; }; disabled = (luaOlder "5.1"); @@ -1848,6 +1884,7 @@ markdown = buildLuarocksPackage { "date": "2015-09-27T17:49:28+03:00", "path": "/nix/store/akl80hh077hm20bdqj1lksy0fn2285b5-markdown", "sha256": "019bk2qprszqncnm8zy6ns6709iq1nwkf7i86nr38f035j4lc11y", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1899,6 +1936,7 @@ moonscript = buildLuarocksPackage { "date": "2021-03-18T11:51:52-07:00", "path": "/nix/store/xijbk0bgjpxjgmvscbqnghj4r3zdzgxl-moonscript", "sha256": "14xx6pij0djblfv3g2hi0xlljh7h0yrbb03f4x90q5j66v693gx7", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -1957,18 +1995,16 @@ nvim-client = buildLuarocksPackage { penlight = buildLuarocksPackage { pname = "penlight"; - version = "1.11.0-1"; - knownRockspec = (fetchurl { - url = "https://luarocks.org/penlight-1.11.0-1.rockspec"; - sha256 = "1sjhnywvamyi9fadhra5pw2an1rhy2hk2byfxmr3n5wi0xrqv004"; - }).outPath; + version = "dev-1"; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/penlight.git", - "rev": "e3712f00fae09a166dd62540b677600165d5bcd7", - "date": "2021-08-18T21:37:47+02:00", - "path": "/nix/store/i70ndw8qhvcm828ifb3vyj08y22xp0ka-penlight", - "sha256": "19n9xqkb4hlak0k7hamk4ixwjvyxslsnyh1zjazdzrl8n736xhkl", - "fetchSubmodules": false, + "rev": "0653cdb05591454a9804a7fee8c873b8f06b0b8f", + "date": "2021-08-31T23:42:29+02:00", + "path": "/nix/store/zf3k6z36bxsrbxkkmsa4w6m7vxvlpfgn-penlight", + "sha256": "0l1819dyr9hzmimnjjg99fad6k3ksmlm77hgvdybgz8558lj4g1i", + "fetchLFS": false, + "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } @@ -1976,7 +2012,7 @@ penlight = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; - checkInputs = [ busted ]; + checkInputs = [ busted busted ]; doCheck = false; meta = { @@ -1993,10 +2029,11 @@ plenary-nvim = buildLuarocksPackage { src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "15c3cb9e6311dc1a875eacb9fc8df69ca48d7402", - "date": "2021-08-19T19:04:12+02:00", - "path": "/nix/store/fjj6gs1yc9gw3qh3xabf7mra4dlyac5a-plenary.nvim", - "sha256": "0gdysws82vdcyfsfpkpg9wqw223vg6hh74pf821wxh8p6qg3r26m", + "rev": "8c6cc07a68b65eb707be44598f0084647d495978", + "date": "2021-09-26T16:13:25+02:00", + "path": "/nix/store/j8hmr48blm4brq8rqv7b9m08vmalg8sp-plenary.nvim", + "sha256": "05h5n7jj33y9vs6gc8hqlfd628j6i33s3c8fmfl6ahxwfygx2wpd", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -2023,6 +2060,7 @@ rapidjson = buildLuarocksPackage { "date": "2021-04-09T19:59:20+08:00", "path": "/nix/store/65l71ph27pmipgrq8j4whg6n8h2avvs4-lua-rapidjson", "sha256": "1a6srvximxlh6gjkaj5y86d1kf06pc4gby2r6wpdw2pdac8k7xyb", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -2090,6 +2128,7 @@ std-_debug = buildLuarocksPackage { "date": "2020-04-15T16:34:01-07:00", "path": "/nix/store/rgbn0nn7glm7s52d90ds87j10bx20nij-_debug", "sha256": "0p6jz6syh2r8qfk08jf2hp4p902rkamjzpzl8xhkpzf8rdzs937w", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -2116,6 +2155,7 @@ std-normalize = buildLuarocksPackage { "date": "2020-04-15T17:16:16-07:00", "path": "/nix/store/jr4agcn13fk56b8105p6yr9gn767fkds-normalize", "sha256": "0jiykdjxc4b5my12fnzrw3bxracjgxc265xrn8kfx95350kvbzl1", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false @@ -2165,6 +2205,7 @@ vstruct = buildLuarocksPackage { "date": "2020-05-06T23:13:06-04:00", "path": "/nix/store/a4i9k5hx9xiz38bij4hb505dg088jkss-vstruct", "sha256": "0sl9v874mckhh6jbxsan48s5xajzx193k4qlphw69sdbf8kr3p57", + "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix b/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix index 9c31f9a5c5..0d429b3ba6 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix @@ -60,4 +60,72 @@ rec { requiredLuaModules = requiredLuaModules drv.propagatedBuildInputs; }; }); + + /* generate luarocks config + + generateLuarocksConfig { + externalDeps = [ { name = "CRYPTO"; dep = pkgs.openssl; } ]; + rocksSubdir = "subdir"; + }; + */ + generateLuarocksConfig = { + externalDeps + , requiredLuaRocks + , extraVariables ? {} + , rocksSubdir + }: let + rocksTrees = lib.imap0 + (i: dep: "{ name = [[dep-${toString i}]], root = '${dep}', rocks_dir = '${dep}/${dep.rocksSubdir}' }") + requiredLuaRocks; + + # Explicitly point luarocks to the relevant locations for multiple-output + # derivations that are external dependencies, to work around an issue it has + # (https://github.com/luarocks/luarocks/issues/766) + depVariables = lib.concatMap ({name, dep}: [ + "${name}_INCDIR='${lib.getDev dep}/include';" + "${name}_LIBDIR='${lib.getLib dep}/lib';" + "${name}_BINDIR='${lib.getBin dep}/bin';" + ]) externalDeps'; + + # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] + externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps; + + externalDepsDirs = map + (x: "'${builtins.toString x}'") + (lib.filter (lib.isDerivation) externalDeps); + + extraVariablesStr = lib.concatStringsSep "\n " + (lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables); + in '' + local_cache = "" + -- To prevent collisions when creating environments, we install the rock + -- files into per-package subdirectories + rocks_subdir = '${rocksSubdir}' + -- Then we need to tell luarocks where to find the rock files per + -- dependency + rocks_trees = { + ${lib.concatStringsSep "\n, " rocksTrees} + } + '' + lib.optionalString lua.pkgs.isLuaJIT '' + -- Luajit provides some additional functionality built-in; this exposes + -- that to luarock's dependency system + rocks_provided = { + jit='${lua.luaversion}-1'; + ffi='${lua.luaversion}-1'; + luaffi='${lua.luaversion}-1'; + bit='${lua.luaversion}-1'; + } + '' + '' + -- For single-output external dependencies + external_deps_dirs = { + ${lib.concatStringsSep "\n, " externalDepsDirs} + } + variables = { + -- Some needed machinery to handle multiple-output external dependencies, + -- as per https://github.com/luarocks/luarocks/issues/766 + ${lib.optionalString (lib.length depVariables > 0) '' + ${lib.concatStringsSep "\n " depVariables}''} + ${extraVariablesStr} + } + ''; } diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix index 247cf89f39..399dbd8269 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -300,7 +300,7 @@ with super; preBuild = self.luv.preBuild + '' sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt - sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt + sed -i 's,${"\${.*INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt ''; nativeBuildInputs = [ pkgs.fixDarwinDylibNames ]; diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/README.md b/third_party/nixpkgs/pkgs/development/misc/resholve/README.md index 024465f306..0b4bcb371a 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/README.md +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/README.md @@ -2,7 +2,8 @@ resholve converts bare executable references in shell scripts to absolute paths. This will hopefully make its way into the Nixpkgs manual soon, but -until then I'll outline how to use the `resholvePackage` function. +until then I'll outline how to use the `resholvePackage`, `resholveScript`, +and `resholveScriptBin` functions. > Fair warning: resholve does *not* aspire to resolving all valid Shell > scripts. It depends on the OSH/Oil parser, which aims to support most (but @@ -21,7 +22,10 @@ Each "solution" (k=v pair) in this attrset describes one resholve invocation. > - Packages with scripts that require conflicting directives can use multiple > solutions to resolve the scripts separately, but produce a single package. -## Basic Example +The `resholveScript` and `resholveScriptBin` functions support a _single_ +`solution` attrset. This is basically the same as any single solution in `resholvePackage`, except that it doesn't need a `scripts` attr (it is automatically added). + +## Basic `resholvePackage` Example Here's a simple example from one of my own projects, with annotations: