diff --git a/third_party/nixpkgs/doc/builders/packages/eclipse.section.md b/third_party/nixpkgs/doc/builders/packages/eclipse.section.md new file mode 100644 index 0000000000..faabb18845 --- /dev/null +++ b/third_party/nixpkgs/doc/builders/packages/eclipse.section.md @@ -0,0 +1,64 @@ +# Eclipse {#sec-eclipse} + +The Nix expressions related to the Eclipse platform and IDE are in [`pkgs/applications/editors/eclipse`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse). + +Nixpkgs provides a number of packages that will install Eclipse in its various forms. These range from the bare-bones Eclipse Platform to the more fully featured Eclipse SDK or Scala-IDE packages and multiple version are often available. It is possible to list available Eclipse packages by issuing the command: + +```ShellSession +$ nix-env -f '' -qaP -A eclipses --description +``` + +Once an Eclipse variant is installed it can be run using the `eclipse` command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse. + +If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add + +```nix +packageOverrides = pkgs: { + myEclipse = with pkgs.eclipses; eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ plugins.color-theme ]; + }; +} +``` + +to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running + +```ShellSession +$ nix-env -f '' -qaP -A eclipses.plugins --description +``` + +If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively. + +Expanding the previous example with two plugins using the above functions we have + +```nix +packageOverrides = pkgs: { + myEclipse = with pkgs.eclipses; eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ + plugins.color-theme + (plugins.buildEclipsePlugin { + name = "myplugin1-1.0"; + srcFeature = fetchurl { + url = "http://…/features/myplugin1.jar"; + sha256 = "123…"; + }; + srcPlugin = fetchurl { + url = "http://…/plugins/myplugin1.jar"; + sha256 = "123…"; + }; + }); + (plugins.buildEclipseUpdateSite { + name = "myplugin2-1.0"; + src = fetchurl { + stripRoot = false; + url = "http://…/myplugin2.zip"; + sha256 = "123…"; + }; + }); + ]; + }; +} +``` diff --git a/third_party/nixpkgs/doc/builders/packages/eclipse.xml b/third_party/nixpkgs/doc/builders/packages/eclipse.xml deleted file mode 100644 index fc5094ed8f..0000000000 --- a/third_party/nixpkgs/doc/builders/packages/eclipse.xml +++ /dev/null @@ -1,72 +0,0 @@ -
- Eclipse - - - The Nix expressions related to the Eclipse platform and IDE are in pkgs/applications/editors/eclipse. - - - - Nixpkgs provides a number of packages that will install Eclipse in its various forms. These range from the bare-bones Eclipse Platform to the more fully featured Eclipse SDK or Scala-IDE packages and multiple version are often available. It is possible to list available Eclipse packages by issuing the command: - -$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description - - Once an Eclipse variant is installed it can be run using the eclipse command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse. - - - - If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an Eclipse environment. This type of environment is created using the function eclipseWithPlugins found inside the nixpkgs.eclipses attribute set. This function takes as argument { eclipse, plugins ? [], jvmArgs ? [] } where eclipse is a one of the Eclipse packages described above, plugins is a list of plugin derivations, and jvmArgs is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add - -packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ plugins.color-theme ]; - }; -} - - to your Nixpkgs configuration (~/.config/nixpkgs/config.nix) and install it by running nix-env -f '<nixpkgs>' -iA myEclipse and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using eclipseWithPlugins by running - -$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description - - - - - If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the buildEclipseUpdateSite and buildEclipsePlugin functions found in the nixpkgs.eclipses.plugins attribute set. Use the buildEclipseUpdateSite function to install a plugin distributed as an Eclipse update site. This function takes { name, src } as argument where src indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the buildEclipsePlugin function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument { name, srcFeature, srcPlugin } where srcFeature and srcPlugin are the feature and plugin JARs, respectively. - - - - Expanding the previous example with two plugins using the above functions we have - -packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ - plugins.color-theme - (plugins.buildEclipsePlugin { - name = "myplugin1-1.0"; - srcFeature = fetchurl { - url = "http://…/features/myplugin1.jar"; - sha256 = "123…"; - }; - srcPlugin = fetchurl { - url = "http://…/plugins/myplugin1.jar"; - sha256 = "123…"; - }; - }); - (plugins.buildEclipseUpdateSite { - name = "myplugin2-1.0"; - src = fetchurl { - stripRoot = false; - url = "http://…/myplugin2.zip"; - sha256 = "123…"; - }; - }); - ]; - }; -} - - -
diff --git a/third_party/nixpkgs/doc/builders/packages/index.xml b/third_party/nixpkgs/doc/builders/packages/index.xml index e4f8a1d312..fac82180b2 100644 --- a/third_party/nixpkgs/doc/builders/packages/index.xml +++ b/third_party/nixpkgs/doc/builders/packages/index.xml @@ -7,7 +7,7 @@ - + diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index f46e36c989..b166e7bf01 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -768,6 +768,12 @@ githubId = 3965744; name = "Arthur Lee"; }; + arthurteisseire = { + email = "arthurteisseire33@gmail.com"; + github = "arthurteisseire"; + githubId = 37193992; + name = "Arthur Teisseire"; + }; arturcygan = { email = "arczicygan@gmail.com"; github = "arcz"; @@ -3499,6 +3505,12 @@ githubId = 6893840; name = "Yacine Hmito"; }; + graham33 = { + email = "graham@grahambennett.org"; + github = "graham33"; + githubId = 10908649; + name = "Graham Bennett"; + }; grahamc = { email = "graham@grahamc.com"; github = "grahamc"; @@ -3581,6 +3593,12 @@ githubId = 443978; name = "Gabriel Volpe"; }; + gytis-ivaskevicius = { + name = "Gytis Ivaskevicius"; + email = "me@gytis.io"; + github = "gytis-ivaskevicius"; + githubId = 23264966; + }; hakuch = { email = "hakuch@gmail.com"; github = "hakuch"; @@ -9363,6 +9381,16 @@ githubId = 1391883; name = "Tom Hall"; }; + Thunderbottom = { + email = "chinmaydpai@gmail.com"; + github = "Thunderbottom"; + githubId = 11243138; + name = "Chinmay D. Pai"; + keys = [{ + longkeyid = "rsa4096/0x75507BE256F40CED"; + fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; + }]; + }; tiagolobocastro = { email = "tiagolobocastro@gmail.com"; github = "tiagolobocastro"; diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl index 6e3ddb875e..7bc55e6713 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl @@ -585,6 +585,22 @@ EOF return $config; } +sub generateXserverConfig { + my $xserverEnabled = "@xserverEnabled@"; + + my $config = ""; + if ($xserverEnabled eq "1") { + $config = <nixos-generate-config saves to /etc/nixos/configuration.nix. @@ -136,6 +137,8 @@ in # keyMap = "us"; # }; + $xserverConfig + $desktopConfiguration # Configure keymap in X11 # services.xserver.layout = "us"; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index c7e83a95de..3055459e78 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -321,7 +321,8 @@ ./services/desktops/gsignond.nix ./services/desktops/gvfs.nix ./services/desktops/malcontent.nix - ./services/desktops/pipewire.nix + ./services/desktops/pipewire/pipewire.nix + ./services/desktops/pipewire/pipewire-media-session.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome3/evolution-data-server.nix diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix deleted file mode 100644 index 134becf6b0..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix +++ /dev/null @@ -1,183 +0,0 @@ -# pipewire service. -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.pipewire; - enable32BitAlsaPlugins = cfg.alsa.support32Bit - && pkgs.stdenv.isx86_64 - && pkgs.pkgsi686Linux.pipewire != null; - - # The package doesn't output to $out/lib/pipewire directly so that the - # overlays can use the outputs to replace the originals in FHS environments. - # - # This doesn't work in general because of missing development information. - jack-libs = pkgs.runCommand "jack-libs" {} '' - mkdir -p "$out/lib" - ln -s "${cfg.package.jack}/lib" "$out/lib/pipewire" - ''; -in { - - meta = { - maintainers = teams.freedesktop.members; - }; - - ###### interface - options = { - services.pipewire = { - enable = mkEnableOption "pipewire service"; - - package = mkOption { - type = types.package; - default = pkgs.pipewire; - defaultText = "pkgs.pipewire"; - example = literalExample "pkgs.pipewire"; - description = '' - The pipewire derivation to use. - ''; - }; - - socketActivation = mkOption { - default = true; - type = types.bool; - description = '' - Automatically run pipewire when connections are made to the pipewire socket. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Literal string to append to /etc/pipewire/pipewire.conf. - ''; - }; - - sessionManager = mkOption { - type = types.nullOr types.string; - default = null; - example = literalExample ''"''${pipewire}/bin/pipewire-media-session"''; - description = '' - Path to the pipewire session manager executable. - ''; - }; - - sessionManagerArguments = mkOption { - type = types.listOf types.string; - default = []; - example = literalExample ''[ "-p" "bluez5.msbc-support=true" ]''; - description = '' - Arguments passed to the pipewire session manager. - ''; - }; - - alsa = { - enable = mkEnableOption "ALSA support"; - support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems"; - }; - - jack = { - enable = mkEnableOption "JACK audio emulation"; - }; - - pulse = { - enable = mkEnableOption "PulseAudio server emulation"; - }; - }; - }; - - - ###### implementation - config = mkIf cfg.enable { - assertions = [ - { - assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable; - message = "PipeWire based PulseAudio server emulation replaces PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false"; - } - { - assertion = cfg.jack.enable -> !config.services.jack.jackd.enable; - message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false"; - } - ]; - - services.pipewire.sessionManager = mkDefault "${cfg.package}/bin/pipewire-media-session"; - - environment.systemPackages = [ cfg.package ] - ++ lib.optional cfg.jack.enable jack-libs; - - systemd.packages = [ cfg.package ] - ++ lib.optional cfg.pulse.enable cfg.package.pulse; - - # PipeWire depends on DBUS but doesn't list it. Without this booting - # into a terminal results in the service crashing with an error. - systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; - systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf (cfg.socketActivation && cfg.pulse.enable) ["sockets.target"]; - systemd.user.services.pipewire.bindsTo = [ "dbus.service" ]; - services.udev.packages = [ cfg.package ]; - - # If any paths are updated here they must also be updated in the package test. - environment.etc."alsa/conf.d/49-pipewire-modules.conf" = mkIf cfg.alsa.enable { - text = '' - pcm_type.pipewire { - libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ; - ${optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"} - } - ctl_type.pipewire { - libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ; - ${optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;"} - } - ''; - }; - environment.etc."alsa/conf.d/50-pipewire.conf" = mkIf cfg.alsa.enable { - source = "${cfg.package}/share/alsa/alsa.conf.d/50-pipewire.conf"; - }; - environment.etc."alsa/conf.d/99-pipewire-default.conf" = mkIf cfg.alsa.enable { - source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf"; - }; - environment.sessionVariables.LD_LIBRARY_PATH = - lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire"; - - environment.etc."pipewire/pipewire.conf" = { - # Adapted from src/daemon/pipewire.conf.in - text = '' - set-prop link.max-buffers 16 # version < 3 clients can't handle more - - add-spa-lib audio.convert* audioconvert/libspa-audioconvert - add-spa-lib api.alsa.* alsa/libspa-alsa - add-spa-lib api.v4l2.* v4l2/libspa-v4l2 - add-spa-lib api.libcamera.* libcamera/libspa-libcamera - add-spa-lib api.bluez5.* bluez5/libspa-bluez5 - add-spa-lib api.vulkan.* vulkan/libspa-vulkan - add-spa-lib api.jack.* jack/libspa-jack - add-spa-lib support.* support/libspa-support - - load-module libpipewire-module-rtkit # rt.prio=20 rt.time.soft=200000 rt.time.hard=200000 - load-module libpipewire-module-protocol-native - load-module libpipewire-module-profiler - load-module libpipewire-module-metadata - load-module libpipewire-module-spa-device-factory - load-module libpipewire-module-spa-node-factory - load-module libpipewire-module-client-node - load-module libpipewire-module-client-device - load-module libpipewire-module-portal - load-module libpipewire-module-access - load-module libpipewire-module-adapter - load-module libpipewire-module-link-factory - load-module libpipewire-module-session-manager - - create-object spa-node-factory factory.name=support.node.driver node.name=Dummy priority.driver=8000 - - exec ${cfg.sessionManager} ${lib.concatStringsSep " " cfg.sessionManagerArguments} - - ${cfg.extraConfig} - ''; - }; - - environment.etc."pipewire/media-session.d/with-alsa" = mkIf cfg.alsa.enable { text = ""; }; - environment.etc."pipewire/media-session.d/with-pulseaudio" = mkIf cfg.pulse.enable { text = ""; }; - environment.etc."pipewire/media-session.d/with-jack" = mkIf cfg.jack.enable { text = ""; }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix new file mode 100644 index 0000000000..168cf13a88 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -0,0 +1,340 @@ +# pipewire example session manager. +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.pipewire.media-session; + enable32BitAlsaPlugins = cfg.alsa.support32Bit + && pkgs.stdenv.isx86_64 + && pkgs.pkgsi686Linux.pipewire != null; + + # Helpers for generating the pipewire JSON config file + mkSPAValueString = v: + if builtins.isList v then "[${lib.concatMapStringsSep " " mkSPAValueString v}]" + else if lib.types.attrs.check v then + "{${lib.concatStringsSep " " (mkSPAKeyValue v)}}" + else lib.generators.mkValueStringDefault { } v; + + mkSPAKeyValue = attrs: map (def: def.content) ( + lib.sortProperties + ( + lib.mapAttrsToList + (k: v: lib.mkOrder (v._priority or 1000) "${lib.escape [ "=" ] k} = ${mkSPAValueString (v._content or v)}") + attrs + ) + ); + + toSPAJSON = attrs: lib.concatStringsSep "\n" (mkSPAKeyValue attrs); +in { + + meta = { + maintainers = teams.freedesktop.members; + }; + + ###### interface + options = { + services.pipewire.media-session = { + enable = mkOption { + type = types.bool; + default = true; + description = "Example pipewire session manager"; + }; + + package = mkOption { + type = types.package; + default = pkgs.pipewire.mediaSession; + example = literalExample "pkgs.pipewire.mediaSession"; + description = '' + The pipewire-media-session derivation to use. + ''; + }; + + config = mkOption { + type = types.attrs; + description = '' + Configuration for the media session core. + ''; + default = { + # media-session config file + properties = { + # Properties to configure the session and some + # modules + #mem.mlock-all = false; + #context.profile.modules = "default,rtkit"; + }; + + spa-libs = { + # Mapping from factory name to library. + "api.bluez5.*" = "bluez5/libspa-bluez5"; + "api.alsa.*" = "alsa/libspa-alsa"; + "api.v4l2.*" = "v4l2/libspa-v4l2"; + "api.libcamera.*" = "libcamera/libspa-libcamera"; + }; + + modules = { + # These are the modules that are enabled when a file with + # the key name is found in the media-session.d config directory. + # the default bundle is always enabled. + + default = [ + "flatpak" # manages flatpak access + "portal" # manage portal permissions + "v4l2" # video for linux udev detection + #"libcamera" # libcamera udev detection + "suspend-node" # suspend inactive nodes + "policy-node" # configure and link nodes + #"metadata" # export metadata API + #"default-nodes" # restore default nodes + #"default-profile" # restore default profiles + #"default-routes" # restore default route + #"streams-follow-default" # move streams when default changes + #"alsa-seq" # alsa seq midi support + #"alsa-monitor" # alsa udev detection + #"bluez5" # bluetooth support + #"restore-stream" # restore stream settings + ]; + "with-audio" = [ + "metadata" + "default-nodes" + "default-profile" + "default-routes" + "alsa-seq" + "alsa-monitor" + ]; + "with-alsa" = [ + "with-audio" + ]; + "with-jack" = [ + "with-audio" + ]; + "with-pulseaudio" = [ + "with-audio" + "bluez5" + "restore-stream" + "streams-follow-default" + ]; + }; + }; + }; + + alsaMonitorConfig = mkOption { + type = types.attrs; + description = '' + Configuration for the alsa monitor. + ''; + default = { + # alsa-monitor config file + properties = { + #alsa.jack-device = true + }; + + rules = [ + # an array of matches/actions to evaluate + { + # rules for matching a device or node. It is an array of + # properties that all need to match the regexp. If any of the + # matches work, the actions are executed for the object. + matches = [ + { + # this matches all cards + device.name = "~alsa_card.*"; + } + ]; + actions = { + # actions can update properties on the matched object. + update-props = { + api.alsa.use-acp = true; + #api.alsa.use-ucm = true; + #api.alsa.soft-mixer = false; + #api.alsa.ignore-dB = false; + #device.profile-set = "profileset-name"; + #device.profile = "default profile name"; + api.acp.auto-profile = false; + api.acp.auto-port = false; + #device.nick = "My Device"; + }; + }; + } + { + matches = [ + { + # matches all sinks + node.name = "~alsa_input.*"; + } + { + # matches all sources + node.name = "~alsa_output.*"; + } + ]; + actions = { + update-props = { + #node.nick = "My Node"; + #node.nick = null; + #priority.driver = 100; + #priority.session = 100; + #node.pause-on-idle = false; + #resample.quality = 4; + #channelmix.normalize = false; + #channelmix.mix-lfe = false; + #audio.channels = 2; + #audio.format = "S16LE"; + #audio.rate = 44100; + #audio.position = "FL,FR"; + #api.alsa.period-size = 1024; + #api.alsa.headroom = 0; + #api.alsa.disable-mmap = false; + #api.alsa.disable-batch = false; + }; + }; + } + ]; + }; + }; + + bluezMonitorConfig = mkOption { + type = types.attrs; + description = '' + Configuration for the bluez5 monitor. + ''; + default = { + # bluez-monitor config file + properties = { + # msbc is not expected to work on all headset + adapter combinations. + #bluez5.msbc-support = true; + #bluez5.sbc-xq-support = true; + + # Enabled headset roles (default: [ hsp_hs hfp_ag ]), this + # property only applies to native backend. Currently some headsets + # (Sony WH-1000XM3) are not working with both hsp_ag and hfp_ag + # enabled, disable either hsp_ag or hfp_ag to work around it. + # + # Supported headset roles: hsp_hs (HSP Headset), + # hsp_ag (HSP Audio Gateway), + # hfp_ag (HFP Audio Gateway) + #bluez5.headset-roles = [ "hsp_hs" "hsp_ag" "hfp_ag" ]; + + # Enabled A2DP codecs (default: all) + #bluez5.codecs = [ "sbc" "aac" "ldac" "aptx" "aptx_hd" ]; + }; + + rules = [ + # an array of matches/actions to evaluate + { + # rules for matching a device or node. It is an array of + # properties that all need to match the regexp. If any of the + # matches work, the actions are executed for the object. + matches = [ + { + # this matches all cards + device.name = "~bluez_card.*"; + } + ]; + actions = { + # actions can update properties on the matched object. + update-props = { + #device.nick = "My Device"; + }; + }; + } + { + matches = [ + { + # matches all sinks + node.name = "~bluez_input.*"; + } + { + # matches all sources + node.name = "~bluez_output.*"; + } + ]; + actions = { + update-props = { + #node.nick = "My Node" + #node.nick = null; + #priority.driver = 100; + #priority.session = 100; + #node.pause-on-idle = false; + #resample.quality = 4; + #channelmix.normalize = false; + #channelmix.mix-lfe = false; + }; + }; + } + ]; + }; + }; + + v4l2MonitorConfig = mkOption { + type = types.attrs; + description = '' + Configuration for the V4L2 monitor. + ''; + default = { + # v4l2-monitor config file + properties = { + }; + + rules = [ + # an array of matches/actions to evaluate + { + # rules for matching a device or node. It is an array of + # properties that all need to match the regexp. If any of the + # matches work, the actions are executed for the object. + matches = [ + { + # this matches all devices + device.name = "~v4l2_device.*"; + } + ]; + actions = { + # actions can update properties on the matched object. + update-props = { + #device.nick = "My Device"; + }; + }; + } + { + matches = [ + { + # matches all sinks + node.name = "~v4l2_input.*"; + } + { + # matches all sources + node.name = "~v4l2_output.*"; + } + ]; + actions = { + update-props = { + #node.nick = "My Node"; + #node.nick = null; + #priority.driver = 100; + #priority.session = 100; + #node.pause-on-idle = true; + }; + }; + } + ]; + }; + }; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.pipewire.sessionManagerExecutable = "${cfg.package}/bin/pipewire-media-session"; + + environment.etc."pipewire/media-session.d/media-session.conf" = { text = toSPAJSON cfg.config; }; + environment.etc."pipewire/media-session.d/v4l2-monitor.conf" = { text = toSPAJSON cfg.v4l2MonitorConfig; }; + + environment.etc."pipewire/media-session.d/with-alsa" = mkIf config.services.pipewire.alsa.enable { text = ""; }; + environment.etc."pipewire/media-session.d/alsa-monitor.conf" = mkIf config.services.pipewire.alsa.enable { text = toSPAJSON cfg.alsaMonitorConfig; }; + + environment.etc."pipewire/media-session.d/with-pulseaudio" = mkIf config.services.pipewire.pulse.enable { text = ""; }; + environment.etc."pipewire/media-session.d/bluez-monitor.conf" = mkIf config.services.pipewire.pulse.enable { text = toSPAJSON cfg.bluezMonitorConfig; }; + + environment.etc."pipewire/media-session.d/with-jack" = mkIf config.services.pipewire.jack.enable { text = ""; }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix new file mode 100644 index 0000000000..044120de7c --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -0,0 +1,265 @@ +# pipewire service. +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.pipewire; + enable32BitAlsaPlugins = cfg.alsa.support32Bit + && pkgs.stdenv.isx86_64 + && pkgs.pkgsi686Linux.pipewire != null; + + # The package doesn't output to $out/lib/pipewire directly so that the + # overlays can use the outputs to replace the originals in FHS environments. + # + # This doesn't work in general because of missing development information. + jack-libs = pkgs.runCommand "jack-libs" {} '' + mkdir -p "$out/lib" + ln -s "${cfg.package.jack}/lib" "$out/lib/pipewire" + ''; + + # Helpers for generating the pipewire JSON config file + mkSPAValueString = v: + if builtins.isList v then "[${lib.concatMapStringsSep " " mkSPAValueString v}]" + else if lib.types.attrs.check v then + "{${lib.concatStringsSep " " (mkSPAKeyValue v)}}" + else lib.generators.mkValueStringDefault { } v; + + mkSPAKeyValue = attrs: map (def: def.content) ( + lib.sortProperties + ( + lib.mapAttrsToList + (k: v: lib.mkOrder (v._priority or 1000) "${lib.escape [ "=" ] k} = ${mkSPAValueString (v._content or v)}") + attrs + ) + ); + + toSPAJSON = attrs: lib.concatStringsSep "\n" (mkSPAKeyValue attrs); +in { + + meta = { + maintainers = teams.freedesktop.members; + }; + + ###### interface + options = { + services.pipewire = { + enable = mkEnableOption "pipewire service"; + + package = mkOption { + type = types.package; + default = pkgs.pipewire; + defaultText = "pkgs.pipewire"; + example = literalExample "pkgs.pipewire"; + description = '' + The pipewire derivation to use. + ''; + }; + + socketActivation = mkOption { + default = true; + type = types.bool; + description = '' + Automatically run pipewire when connections are made to the pipewire socket. + ''; + }; + + config = mkOption { + type = types.attrs; + description = '' + Configuration for the pipewire daemon. + ''; + default = { + properties = { + ## set-prop is used to configure properties in the system + # + # "library.name.system" = "support/libspa-support"; + # "context.data-loop.library.name.system" = "support/libspa-support"; + "link.max-buffers" = 16; # version < 3 clients can't handle more than 16 + #"mem.allow-mlock" = false; + #"mem.mlock-all" = true; + ## https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/pipewire.h#L93 + #"log.level" = 2; # 5 is trace, which is verbose as hell, default is 2 which is warnings, 4 is debug output, 3 is info + + ## Properties for the DSP configuration + # + #"default.clock.rate" = 48000; + #"default.clock.quantum" = 1024; + #"default.clock.min-quantum" = 32; + #"default.clock.max-quantum" = 8192; + #"default.video.width" = 640; + #"default.video.height" = 480; + #"default.video.rate.num" = 25; + #"default.video.rate.denom" = 1; + }; + + spa-libs = { + ## add-spa-lib + # + # used to find spa factory names. It maps an spa factory name + # regular expression to a library name that should contain + # that factory. + # + "audio.convert*" = "audioconvert/libspa-audioconvert"; + "api.alsa.*" = "alsa/libspa-alsa"; + "api.v4l2.*" = "v4l2/libspa-v4l2"; + "api.libcamera.*" = "libcamera/libspa-libcamera"; + "api.bluez5.*" = "bluez5/libspa-bluez5"; + "api.vulkan.*" = "vulkan/libspa-vulkan"; + "api.jack.*" = "jack/libspa-jack"; + "support.*" = "support/libspa-support"; + # "videotestsrc" = "videotestsrc/libspa-videotestsrc"; + # "audiotestsrc" = "audiotestsrc/libspa-audiotestsrc"; + }; + + modules = { + ## = { [args = "= ..."] + # [flags = ifexists] } + # [flags = [ifexists]|[nofail]} + # + # Loads a module with the given parameters. + # If ifexists is given, the module is ignoed when it is not found. + # If nofail is given, module initialization failures are ignored. + # + libpipewire-module-rtkit = { + args = { + #rt.prio = 20; + #rt.time.soft = 200000; + #rt.time.hard = 200000; + #nice.level = -11; + }; + flags = "ifexists|nofail"; + }; + libpipewire-module-protocol-native = { _priority = -100; _content = "null"; }; + libpipewire-module-profiler = "null"; + libpipewire-module-metadata = "null"; + libpipewire-module-spa-device-factory = "null"; + libpipewire-module-spa-node-factory = "null"; + libpipewire-module-client-node = "null"; + libpipewire-module-client-device = "null"; + libpipewire-module-portal = "null"; + libpipewire-module-access = { + args.access = { + allowed = ["${builtins.unsafeDiscardStringContext cfg.sessionManagerExecutable}"]; + rejected = []; + restricted = []; + force = "flatpak"; + }; + }; + libpipewire-module-adapter = "null"; + libpipewire-module-link-factory = "null"; + libpipewire-module-session-manager = "null"; + }; + + objects = { + ## create-object [-nofail] [= ...] + # + # Creates an object from a PipeWire factory with the given parameters. + # If -nofail is given, errors are ignored (and no object is created) + # + }; + + + exec = { + ## exec + # + # Execute the given program. This is usually used to start the + # session manager. run the session manager with -h for options + # + "${builtins.unsafeDiscardStringContext cfg.sessionManagerExecutable}" = { args = "\"${lib.concatStringsSep " " cfg.sessionManagerArguments}\""; }; + }; + }; + }; + + sessionManagerExecutable = mkOption { + type = types.str; + default = ""; + example = literalExample ''${pkgs.pipewire.mediaSession}/bin/pipewire-media-session''; + description = '' + Path to the session manager executable. + ''; + }; + + sessionManagerArguments = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample ''["-p" "bluez5.msbc-support=true"]''; + description = '' + Arguments passed to the pipewire session manager. + ''; + }; + + alsa = { + enable = mkEnableOption "ALSA support"; + support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems"; + }; + + jack = { + enable = mkEnableOption "JACK audio emulation"; + }; + + pulse = { + enable = mkEnableOption "PulseAudio server emulation"; + }; + }; + }; + + + ###### implementation + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable; + message = "PipeWire based PulseAudio server emulation replaces PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false"; + } + { + assertion = cfg.jack.enable -> !config.services.jack.jackd.enable; + message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false"; + } + ]; + + environment.systemPackages = [ cfg.package ] + ++ lib.optional cfg.jack.enable jack-libs; + + systemd.packages = [ cfg.package ] + ++ lib.optional cfg.pulse.enable cfg.package.pulse; + + # PipeWire depends on DBUS but doesn't list it. Without this booting + # into a terminal results in the service crashing with an error. + systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; + systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf (cfg.socketActivation && cfg.pulse.enable) ["sockets.target"]; + systemd.user.services.pipewire.bindsTo = [ "dbus.service" ]; + services.udev.packages = [ cfg.package ]; + + # If any paths are updated here they must also be updated in the package test. + environment.etc."alsa/conf.d/49-pipewire-modules.conf" = mkIf cfg.alsa.enable { + text = '' + pcm_type.pipewire { + libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ; + ${optionalString enable32BitAlsaPlugins + "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"} + } + ctl_type.pipewire { + libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ; + ${optionalString enable32BitAlsaPlugins + "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;"} + } + ''; + }; + environment.etc."alsa/conf.d/50-pipewire.conf" = mkIf cfg.alsa.enable { + source = "${cfg.package}/share/alsa/alsa.conf.d/50-pipewire.conf"; + }; + environment.etc."alsa/conf.d/99-pipewire-default.conf" = mkIf cfg.alsa.enable { + source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf"; + }; + + environment.sessionVariables.LD_LIBRARY_PATH = + lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire"; + + # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/464#note_723554 + systemd.user.services.pipewire.environment = { + "PIPEWIRE_LINK_PASSIVE" = "1"; + "PIPEWIRE_CONFIG_FILE" = pkgs.writeText "pipewire.conf" (toSPAJSON cfg.config); + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix b/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix index 6f5a6d3bf2..da36ae68b3 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix @@ -1,12 +1,39 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.hardware.bluetooth; - bluez-bluetooth = cfg.package; + package = cfg.package; -in { + inherit (lib) + mkDefault mkEnableOption mkIf mkOption + mkRenamedOptionModule mkRemovedOptionModule + concatStringsSep escapeShellArgs + optional optionals optionalAttrs recursiveUpdate types; + + cfgFmt = pkgs.formats.ini { }; + + # bluez will complain if some of the sections are not found, so just make them + # empty (but present in the file) for now + defaults = { + General.ControllerMode = "dual"; + Controller = { }; + GATT = { }; + Policy.AutoEnable = cfg.powerOnBoot; + }; + + hasDisabledPlugins = builtins.length cfg.disabledPlugins > 0; + +in +{ + imports = [ + (mkRenamedOptionModule [ "hardware" "bluetooth" "config" ] [ "hardware" "bluetooth" "settings" ]) + (mkRemovedOptionModule [ "hardware" "bluetooth" "extraConfig" ] '' + Use hardware.bluetooth.settings instead. + + This is part of the general move to use structured settings instead of raw + text for config as introduced by RFC0042: + https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md + '') + ]; ###### interface @@ -18,7 +45,7 @@ in { hsphfpd.enable = mkEnableOption "support for hsphfpd[-prototype] implementation"; powerOnBoot = mkOption { - type = types.bool; + type = types.bool; default = true; description = "Whether to power up the default Bluetooth controller on boot."; }; @@ -38,8 +65,15 @@ in { ''; }; - config = mkOption { - type = with types; attrsOf (attrsOf (oneOf [ bool int str ])); + disabledPlugins = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Built-in plugins to disable"; + }; + + settings = mkOption { + type = cfgFmt.type; + default = { }; example = { General = { ControllerMode = "bredr"; @@ -47,79 +81,65 @@ in { }; description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; }; - - extraConfig = mkOption { - type = with types; nullOr lines; - default = null; - example = '' - [General] - ControllerMode = bredr - ''; - description = '' - Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf). - ''; - }; }; - }; ###### implementation config = mkIf cfg.enable { - warnings = optional (cfg.extraConfig != null) "hardware.bluetooth.`extraConfig` is deprecated, please use hardware.bluetooth.`config`."; + environment.systemPackages = [ package ] + ++ optional cfg.hsphfpd.enable pkgs.hsphfpd; - hardware.bluetooth.config = { - Policy = { - AutoEnable = mkDefault cfg.powerOnBoot; - }; - }; - - environment.systemPackages = [ bluez-bluetooth ] - ++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ]; - - environment.etc."bluetooth/main.conf"= { - source = pkgs.writeText "main.conf" - (generators.toINI { } cfg.config + optionalString (cfg.extraConfig != null) cfg.extraConfig); - }; - - services.udev.packages = [ bluez-bluetooth ]; - services.dbus.packages = [ bluez-bluetooth ] - ++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ]; - systemd.packages = [ bluez-bluetooth ]; + environment.etc."bluetooth/main.conf".source = + cfgFmt.generate "main.conf" (recursiveUpdate defaults cfg.settings); + services.udev.packages = [ package ]; + services.dbus.packages = [ package ] + ++ optional cfg.hsphfpd.enable pkgs.hsphfpd; + systemd.packages = [ package ]; systemd.services = { - bluetooth = { - wantedBy = [ "bluetooth.target" ]; - aliases = [ "dbus-org.bluez.service" ]; - # restarting can leave people without a mouse/keyboard - unitConfig.X-RestartIfChanged = false; - }; - } - // (optionalAttrs cfg.hsphfpd.enable { - hsphfpd = { - after = [ "bluetooth.service" ]; - requires = [ "bluetooth.service" ]; - wantedBy = [ "multi-user.target" ]; - - description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices"; - serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl"; + bluetooth = + let + # `man bluetoothd` will refer to main.conf in the nix store but bluez + # will in fact load the configuration file at /etc/bluetooth/main.conf + # so force it here to avoid any ambiguity and things suddenly breaking + # if/when the bluez derivation is changed. + args = [ "-f /etc/bluetooth/main.conf" ] + ++ optional hasDisabledPlugins + "--noplugin=${concatStringsSep "," cfg.disabledPlugins}"; + in + { + wantedBy = [ "bluetooth.target" ]; + aliases = [ "dbus-org.bluez.service" ]; + serviceConfig.ExecStart = [ + "" + "${package}/libexec/bluetooth/bluetoothd ${escapeShellArgs args}" + ]; + # restarting can leave people without a mouse/keyboard + unitConfig.X-RestartIfChanged = false; }; - }) - ; + } + // (optionalAttrs cfg.hsphfpd.enable { + hsphfpd = { + after = [ "bluetooth.service" ]; + requires = [ "bluetooth.service" ]; + wantedBy = [ "bluetooth.target" ]; + + description = "A prototype implementation used for connecting HSP/HFP Bluetooth devices"; + serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/hsphfpd.pl"; + }; + }); systemd.user.services = { obex.aliases = [ "dbus-org.bluez.obex.service" ]; } - // (optionalAttrs cfg.hsphfpd.enable { - telephony_client = { - wantedBy = [ "default.target"]; - - description = "telephony_client for hsphfpd"; - serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl"; - }; - }) - ; + // optionalAttrs cfg.hsphfpd.enable { + telephony_client = { + wantedBy = [ "default.target" ]; + description = "telephony_client for hsphfpd"; + serviceConfig.ExecStart = "${pkgs.hsphfpd}/bin/telephony_client.pl"; + }; + }; }; - } diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mlmmj.nix b/third_party/nixpkgs/nixos/modules/services/mail/mlmmj.nix index d58d93c421..fd74f2dc5f 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/mlmmj.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/mlmmj.nix @@ -16,7 +16,14 @@ let alias = domain: list: "${list}: \"|${pkgs.mlmmj}/bin/mlmmj-receive -L ${listDir domain list}/\""; subjectPrefix = list: "[${list}]"; listAddress = domain: list: "${list}@${domain}"; - customHeaders = domain: list: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ]; + customHeaders = domain: list: [ + "List-Id: ${list}" + "Reply-To: ${list}@${domain}" + "List-Post: " + "List-Help: " + "List-Subscribe: " + "List-Unsubscribe: " + ]; footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}"; createList = d: l: let ctlDir = listCtl d l; in @@ -110,17 +117,29 @@ in services.postfix = { enable = true; recipientDelimiter= "+"; - extraMasterConf = '' - mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nexthop - ''; + masterConfig.mlmmj = { + type = "unix"; + private = true; + privileged = true; + chroot = false; + wakeup = 0; + command = "pipe"; + args = [ + "flags=ORhu" + "user=mlmmj" + "argv=${pkgs.mlmmj}/bin/mlmmj-receive" + "-F" + "-L" + "${spoolDir}/$nexthop" + ]; + }; extraAliases = concatMapLines (alias cfg.listDomain) cfg.mailLists; - extraConfig = '' - transport_maps = hash:${stateDir}/transports - virtual_alias_maps = hash:${stateDir}/virtuals - propagate_unmatched_extensions = virtual - ''; + extraConfig = "propagate_unmatched_extensions = virtual"; + + virtual = concatMapLines (virtual cfg.listDomain) cfg.mailLists; + transport = concatMapLines (transport cfg.listDomain) cfg.mailLists; }; environment.systemPackages = [ pkgs.mlmmj ]; @@ -129,10 +148,8 @@ in ${pkgs.coreutils}/bin/mkdir -p ${stateDir} ${spoolDir}/${cfg.listDomain} ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} ${spoolDir} ${concatMapLines (createList cfg.listDomain) cfg.mailLists} - echo "${concatMapLines (virtual cfg.listDomain) cfg.mailLists}" > ${stateDir}/virtuals - echo "${concatMapLines (transport cfg.listDomain) cfg.mailLists}" > ${stateDir}/transports - ${pkgs.postfix}/bin/postmap ${stateDir}/virtuals - ${pkgs.postfix}/bin/postmap ${stateDir}/transports + ${pkgs.postfix}/bin/postmap /etc/postfix/virtual + ${pkgs.postfix}/bin/postmap /etc/postfix/transport ''; systemd.services.mlmmj-maintd = { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix index 24aea356de..ea7aebc3b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix @@ -111,7 +111,6 @@ in { group = lib.mkOption { description = '' Group under which mastodon runs. - If it is set to "mastodon", a group will be created. ''; type = lib.types.str; default = "mastodon"; @@ -555,10 +554,9 @@ in { }; }) (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package mastodonEnv ]) - (lib.mkIf cfg.configureNginx {${config.services.nginx.user}.extraGroups = [ cfg.user ];}) ]; - users.groups.mastodon = lib.mkIf (cfg.group == "mastodon") { }; + users.groups.${cfg.group}.members = lib.optional cfg.configureNginx config.services.nginx.user; }; meta.maintainers = with lib.maintainers; [ happy-river erictapen ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 23ebbdb7f7..de1c67235f 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -602,6 +602,7 @@ in { "^~ /.well-known" = { priority = 210; extraConfig = '' + absolute_redirect off; location = /.well-known/carddav { return 301 /remote.php/dav; } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix index 671301246a..99e6edfba2 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -197,12 +197,11 @@ in config = mkMerge [ (mkIf (cfg.enable || flashbackEnabled) { # Seed our configuration into nixos-generate-config - system.nixos-generate-config.desktopConfiguration = '' + system.nixos-generate-config.desktopConfiguration = ['' # Enable the GNOME 3 Desktop Environment. - services.xserver.enable = true; services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome3.enable = true; - ''; + '']; services.gnome3.core-os-services.enable = true; services.gnome3.core-shell.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index d6cf86d3a2..44ee079b81 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -184,12 +184,11 @@ in config = mkMerge [ (mkIf cfg.enable { # Seed our configuration into nixos-generate-config - system.nixos-generate-config.desktopConfiguration = '' + system.nixos-generate-config.desktopConfiguration = ['' # Enable the Plasma 5 Desktop Environment. - services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; - ''; + '']; services.xserver.desktopManager.session = singleton { name = "plasma5"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-guest.nix index adc2810a99..105224b896 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-guest.nix @@ -31,6 +31,8 @@ in { "hv_balloon" "hv_netvsc" "hv_storvsc" "hv_utils" "hv_vmbus" ]; + initrd.availableKernelModules = [ "hyperv_keyboard" ]; + kernelParams = [ "video=hyperv_fb:${cfg.videoMode} elevator=noop" ]; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 530847575b..9d7ba4e454 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -333,7 +333,6 @@ in redis = handleTest ./redis.nix {}; redmine = handleTest ./redmine.nix {}; restic = handleTest ./restic.nix {}; - ripgrep = handleTest ./ripgrep.nix {}; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rspamd = handleTest ./rspamd.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix b/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix index 5daa55a8ab..7bf8d4da7b 100644 --- a/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix +++ b/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix @@ -11,12 +11,11 @@ import ./make-test-python.nix ({ lib, ... } : { } ''; - system.nixos-generate-config.desktopConfiguration = '' + system.nixos-generate-config.desktopConfiguration = ['' # DESKTOP - # services.xserver.enable = true; - # services.xserver.displayManager.gdm.enable = true; - # services.xserver.desktopManager.gnome3.enable = true; - ''; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome3.enable = true; + '']; }; testScript = '' start_all() diff --git a/third_party/nixpkgs/nixos/tests/ripgrep.nix b/third_party/nixpkgs/nixos/tests/ripgrep.nix deleted file mode 100644 index 3ff3bf4be1..0000000000 --- a/third_party/nixpkgs/nixos/tests/ripgrep.nix +++ /dev/null @@ -1,13 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ... }: { - name = "ripgrep"; - meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; - - nodes.ripgrep = { pkgs, ... }: { environment.systemPackages = [ pkgs.ripgrep ]; }; - - testScript = '' - ripgrep.succeed('echo "abc\nbcd\ncde" > /tmp/foo') - assert "bcd" in ripgrep.succeed("rg -N 'bcd' /tmp/foo") - assert "bcd\ncde" in ripgrep.succeed("rg -N 'cd' /tmp/foo") - assert "ripgrep ${pkgs.ripgrep.version}" in ripgrep.succeed("rg --version | head -1") - ''; -}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index 5d89813216..ac405cde64 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -1,7 +1,7 @@ { mkDerivation , lib -, stdenv , fetchFromGitHub +, fetchpatch , qmake , pkg-config , qttools @@ -21,10 +21,15 @@ mkDerivation rec { sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc"; }; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace BambooTracker/BambooTracker.pro \ - --replace '# Temporary known-error downgrades here' 'CPP_WARNING_FLAGS += -Wno-missing-braces' - ''; + # TODO Remove when updating past 0.4.6 + # Fixes build failure on darwin + patches = [ + (fetchpatch { + name = "bambootracker-Add_braces_in_initialization_of_std-array.patch"; + url = "https://github.com/rerrahkr/BambooTracker/commit/0fc96c60c7ae6c2504ee696bb7dec979ac19717d.patch"; + sha256 = "1z28af46mqrgnyrr4i8883gp3wablkk8rijnj0jvpq01s4m2sfjn"; + }) + ]; nativeBuildInputs = [ qmake qttools pkg-config ]; @@ -40,6 +45,5 @@ mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix b/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix new file mode 100644 index 0000000000..436afac7df --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, rustPlatform +, pkg-config, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "muso"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "quebin31"; + repo = pname; + rev = "68cc90869bcc0f202830a318fbfd6bb9bdb75a39"; + sha256 = "1dnfslliss173igympl7h1zc0qz0g10kf96dwrcj6aglmvvw426p"; + }; + + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + + preConfigure = '' + substituteInPlace lib/utils.rs \ + --replace "/usr/share/muso" "$out/share/muso" + ''; + + postInstall = '' + mkdir -p $out/share/muso + cp share/* $out/share/muso/ + ''; + + cargoSha256 = "06jgk54r3f8gq6iylv5rgsawss3hc5kmvk02y4gl8iwfnw4xrvmg"; + + meta = with lib; { + description = "An automatic music sorter (based on ID3 tags)"; + homepage = "https://github.com/quebin31/muso"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ bloomvdomino ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix index 8f4cfb499f..d207d26972 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix @@ -56,7 +56,7 @@ mkDerivation rec { description = "Cross-platform Milkdrop-compatible music visualizer"; license = lib.licenses.lgpl21; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ajs124 ]; + maintainers = with lib.maintainers; [ ]; longDescription = '' The open-source project that reimplements the esteemed Winamp Milkdrop by Geiss in a more modern, cross-platform reusable library. Read an audio input and produces mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations. diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index 3958a44cda..52914c1128 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.0.5.9"; + version = "1.0.6.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "011pp94i49fx587ng16m6ml63vwiysjvpkijihrk6xamz78zddgx"; + sha256 = "1znmix9w7ahzyb933lxzqv6j8j5qycknq3gmnkakj749ksshql1b"; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index 5ee5e26121..9065ff49cf 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -1,8 +1,13 @@ { fetchNuGet }: [ + (fetchNuGet { + name = "AngleSharp.Css"; + version = "0.14.2"; + sha256 = "1d34a8ab5dri4wlw07jvk7b1z0d0zizwihwpdfva3sxhb4279ahd"; + }) (fetchNuGet { name = "AngleSharp"; - version = "0.9.11"; - sha256 = "17vf1bizskkxr8pf547lk2b48m12wv3si83gxk145i73bf9gi64a"; + version = "0.14.0"; + sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) (fetchNuGet { name = "AWSSDK.Core"; @@ -136,8 +141,18 @@ }) (fetchNuGet { name = "HtmlSanitizer"; - version = "4.0.217"; - sha256 = "0szay9mf5mmrp1hx0yc175aaalv76qg0j515lfs133j1d95lj26d"; + version = "5.0.372"; + sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; + }) + (fetchNuGet { + name = "McMaster.NETCore.Plugins.Mvc"; + version = "1.3.1"; + sha256 = "1dh58ijwn6q6id0jpzr4hpfl0y4ak43zq4m8rsi5j2qv8vasq1mi"; + }) + (fetchNuGet { + name = "McMaster.NETCore.Plugins"; + version = "1.3.1"; + sha256 = "0jrp7sshnvg7jcb52gfhwmg1jy31k9dxdf4061yggwcgpfskyg7n"; }) (fetchNuGet { name = "Microsoft.AspNet.SignalR.Client"; @@ -209,11 +224,6 @@ version = "3.1.1"; sha256 = "0arqmy04dd0r4wm2fin66gxxwj2kirbgxyf3w7kq6f73lrnazhq0"; }) - (fetchNuGet { - name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.1.0"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; - }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; @@ -294,26 +304,21 @@ version = "2.0.4"; sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; }) + (fetchNuGet { + name = "Microsoft.DotNet.PlatformAbstractions"; + version = "3.1.0"; + sha256 = "1fg1zggza45pa8zlcf8llqh6v47fqi44azsia68kmsg2q9r1r4mq"; + }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.4"; sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia"; }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "3.1.0"; - sha256 = "1bd6hilnwp47z3l14qspdxi5f5nhv6rivarc6w8wil425bq0h3pd"; - }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; version = "3.1.4"; sha256 = "07l7137pzwh0k4m53ji5j6a2zmbbzrl164p18wxcri77ds5is4g7"; }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "3.1.0"; - sha256 = "1pjn4wwhxgsiap7byld114kx6m0nm6696r8drspqic7lskm4y305"; - }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Analyzers"; version = "3.1.4"; @@ -344,31 +349,16 @@ version = "3.1.4"; sha256 = "009mcmakw0p7k8xrz920a8qc0rjv361awiz8jia5i5a8p5ihgkbx"; }) - (fetchNuGet { - name = "Microsoft.EntityFrameworkCore"; - version = "3.1.0"; - sha256 = "1l12lsk1xfrv5pjnm0b9w9kncgdh0pcjcbxl4zrsg82s7bs7dhda"; - }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; version = "3.1.4"; sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Abstractions"; - version = "3.1.0"; - sha256 = "0j5m2a48rwyzzvbz0hpr2md35iv78b86zyqjnrjq0y4vb7sairc0"; - }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "3.1.4"; sha256 = "09f96pvpyzylpdaiw3lsvr7p6rs4i21mmhsxl6pkivg5lpfb79sk"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Caching.Memory"; - version = "3.1.0"; - sha256 = "1hi61647apn25kqjcb37nqafp8fikymdrk43j3kxjbwwwx507jy1"; - }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; version = "3.1.4"; @@ -389,11 +379,6 @@ version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.0"; - sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.4"; @@ -404,11 +389,6 @@ version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.0"; - sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.4"; @@ -439,11 +419,6 @@ version = "2.1.0"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "3.1.0"; - sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; - }) (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "3.1.4"; @@ -459,11 +434,6 @@ version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.0"; - sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; - }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.4"; @@ -474,11 +444,6 @@ version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.0"; - sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; - }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "3.1.4"; @@ -489,6 +454,11 @@ version = "2.0.4"; sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyModel"; + version = "3.1.0"; + sha256 = "12nrdw3q9wl5zry8gb3sw003a0iyk2gvps2ij813l7lim38wy1mi"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "3.1.1"; @@ -559,11 +529,6 @@ version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.0"; - sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; - }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.4"; @@ -579,11 +544,6 @@ version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "3.1.0"; - sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; - }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "3.1.4"; @@ -599,11 +559,6 @@ version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "3.1.0"; - sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; - }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "3.1.4"; @@ -629,11 +584,6 @@ version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "3.1.0"; - sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; - }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.1.4"; @@ -669,6 +619,11 @@ version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.0.1"; @@ -699,6 +654,11 @@ version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { + name = "Microsoft.Win32.SystemEvents"; + version = "4.7.0"; + sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; + }) (fetchNuGet { name = "MySqlConnector"; version = "0.61.0"; @@ -729,6 +689,11 @@ version = "5.0.60"; sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.68"; + sha256 = "0k275mbp9wannm10pqj4nv8agjc1f6hsrfhl0m6ax1apv81sfxcd"; + }) (fetchNuGet { name = "NBitpayClient"; version = "1.0.0.39"; @@ -849,6 +814,11 @@ version = "1.8.1.3"; sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g"; }) + (fetchNuGet { + name = "QRCoder"; + version = "1.4.1"; + sha256 = "1xgwhpqrm4ycnj8nk4ibxfwkmkiwc5i15l1za3ci5alghlpcb6ch"; + }) (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; @@ -869,11 +839,6 @@ version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; - }) (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; @@ -949,10 +914,15 @@ version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { + name = "Selenium.Support"; + version = "3.141.0"; + sha256 = "1gqwzbfq7i9jz830b0jibsis0qfxs8sl10n1nja02c6s637cwzib"; + }) (fetchNuGet { name = "Selenium.WebDriver.ChromeDriver"; - version = "85.0.4183.8700"; - sha256 = "0klyqmwa6yc0ibbmci51mzb2vl6n13qlk06chc9w78i0a43fs382"; + version = "87.0.4280.8800"; + sha256 = "1zrizydlhjv81r1fa5g8wzxrx1cxly3ip7pargj48hdx419iblfr"; }) (fetchNuGet { name = "Selenium.WebDriver"; @@ -1064,11 +1034,6 @@ version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.7.0"; - sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx"; - }) (fetchNuGet { name = "System.Collections.Immutable"; version = "1.7.1"; @@ -1134,21 +1099,11 @@ version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; - }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.7.0"; - sha256 = "0cr0v5dz8l5ackxv6b772fjcyj2nimqmrmzanjs4cw2668v568n1"; - }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.7.1"; @@ -1179,6 +1134,11 @@ version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { + name = "System.Drawing.Common"; + version = "4.7.0"; + sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; + }) (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.0.11"; @@ -1189,21 +1149,11 @@ version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }) (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.0.1"; - sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; - }) (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; @@ -1299,11 +1249,6 @@ version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; - }) (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; @@ -1329,11 +1274,6 @@ version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { - name = "System.Net.Requests"; - version = "4.0.11"; - sha256 = "13mka55sa6dg6nw4zdrih44gnp8hnj5azynz47ljsh2791lz3d9h"; - }) (fetchNuGet { name = "System.Net.Security"; version = "4.3.0"; @@ -1349,11 +1289,6 @@ version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { - name = "System.Net.WebHeaderCollection"; - version = "4.0.1"; - sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; - }) (fetchNuGet { name = "System.Net.WebHeaderCollection"; version = "4.3.0"; @@ -1594,21 +1529,11 @@ version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; @@ -1624,11 +1549,6 @@ version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; @@ -1649,11 +1569,6 @@ version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; @@ -1689,6 +1604,11 @@ version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.5.0"; + sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; + }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.5.1"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index 45143a797e..ffa061edc7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.46"; + version = "2.1.49"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "1aph7yiwmch7s7x1qkzqv1shs3v6kg8i2s7266la0yp9ksf3w35p"; + sha256 = "0xg5gbq6rbzgsbgwf94qcy2b0m5kdspi6hc5a64smaj9i7i0136l"; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix index 85d395089d..b0bf85f623 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -181,23 +181,18 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.21"; - sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1"; + version = "2.0.28"; + sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.12"; - sha256 = "1d6lmymc9x3p74c8hc2x3m61ncnkqqgrddw9cw2m0zkvilkncsns"; + version = "2.0.21"; + sha256 = "1k26fkss6d7x2yqlid31z5i04b5dmlbbbwijg9c8i3d996i1z7sq"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.58"; - sha256 = "0qim9xbbj380254iyi1jsh2gnr90ddwd2593jw9a8bjwnlk7qr2c"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.60"; - sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; + version = "5.0.73"; + sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -221,8 +216,8 @@ }) (fetchNuGet { name = "Newtonsoft.Json"; - version = "11.0.1"; - sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + version = "11.0.2"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) (fetchNuGet { name = "Newtonsoft.Json"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix index 62f1178866..635a8dbf46 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix @@ -3,7 +3,7 @@ , vmopts ? null }: -{ name, product, version, src, wmClass, jdk, meta }: +{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }: with lib; @@ -72,11 +72,11 @@ with stdenv; lib.makeOverridable mkDerivation rec { makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret libnotify - ]}" \ + ] ++ extraLdPath)}" \ --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index c2415cf4f2..7d030c8445 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -12,7 +12,7 @@ let # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "CLion"; meta = with lib; { @@ -25,7 +25,7 @@ let maintainers = with maintainers; [ edwtjo mic92 ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' ( cd $out/clion-${version} @@ -97,7 +97,7 @@ let }); buildGoland = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Goland"; meta = with lib; { @@ -112,7 +112,7 @@ let maintainers = [ maintainers.miltador ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv @@ -125,6 +125,7 @@ let (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "IDEA"; + extraLdPath = [ zlib ]; meta = with lib; { homepage = "https://www.jetbrains.com/idea/"; inherit description license; @@ -134,8 +135,8 @@ let with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ. ''; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ edwtjo gytis-ivaskevicius ]; + platforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" ]; }; }); @@ -202,7 +203,7 @@ let }; buildRider = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Rider"; meta = with lib; { @@ -219,7 +220,7 @@ let maintainers = [ maintainers.miltador ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' rm -rf lib/ReSharperHost/linux-x64/dotnet mkdir -p lib/ReSharperHost/linux-x64/dotnet/ @@ -241,7 +242,7 @@ let }); buildWebStorm = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; meta = with lib; { @@ -255,7 +256,7 @@ let maintainers = with maintainers; [ abaldeau ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' # Webstorm tries to use bundled jre if available. # Lets prevent this for the moment diff --git a/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix index 71833be330..337a46c0ec 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix @@ -5,15 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "kibi"; - version = "0.2.1"; + version = "0.2.2"; - cargoSha256 = "1cbiidq0w5f9ynb09b6828p7p7y5xhpgz47n2jsl8mp96ydhy5lv"; + cargoSha256 = "sha256-8iEUOLFwHBLS0HQL/oLnv6lcV3V9Hm4jMqXkqPvIF9E="; src = fetchFromGitHub { owner = "ilai-deutel"; repo = "kibi"; rev = "v${version}"; - sha256 = "1x5bvvq33380k2qhs1bwz3f9zl5q1sl7iic47pxfkzv24bpjnypb"; + sha256 = "sha256-ox1qKWxJlUIFzEqeyzG2kqZix3AHnOKFrlpf6O5QM+k="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/qemacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/qemacs/default.nix new file mode 100644 index 0000000000..065dccb2b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/qemacs/default.nix @@ -0,0 +1,24 @@ +{ fetchurl, lib, stdenv, xlibsWrapper, libXv, libpng }: + +stdenv.mkDerivation rec { + pname = "qemacs"; + version = "0.3.3"; + + src = fetchurl { + url = "https://bellard.org/${pname}/${pname}-${version}.tar.gz"; + sha256 = "156z4wpj49i6j388yjird5qvrph7hz0grb4r44l4jf3q8imadyrg"; + }; + + buildInputs = [ xlibsWrapper libpng libXv ]; + + preInstall = '' + mkdir -p $out/bin $out/man + ''; + + meta = with lib; { + homepage = "https://bellard.org/qemacs/"; + description = "Very small but powerful UNIX editor"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ iblech ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/spacevim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/spacevim/default.nix index 2193d0ea5b..c32130986b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/spacevim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/spacevim/default.nix @@ -1,6 +1,6 @@ -{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir -, lib, stdenv, runCommandNoCC, remarshal, formats, spacevim_config ? import ./init.nix }: -with stdenv; +{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub +, lib, stdenv, formats, spacevim_config ? import ./init.nix }: + let format = formats.toml {}; vim-customized = vim_configurable.customize { @@ -11,7 +11,7 @@ let vimrcConfig.packages.myVimPackage = with vimPlugins; { start = [ ]; }; }; spacevimdir = format.generate "init.toml" spacevim_config; -in mkDerivation rec { +in stdenv.mkDerivation rec { pname = "spacevim"; version = "1.5.0"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix index 8cb87274c1..3db4872c0e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -1,6 +1,6 @@ { lib - , mkDerivation +, nix-update-script , fetchFromGitHub , substituteAll , cmake @@ -37,22 +37,28 @@ let rev = "1.4.1"; sha256 = "1c6a8mdxms5vh8l7shi2kqdhafbzm50pbz6g1hhgg6qslla0vfn0"; }; + circleflags = fetchFromGitHub { + owner = "HatScripts"; + repo = "circle-flags"; + rev = "v2.0.0"; + sha256 = "1xz5b6nhcxxzalcgwnw36npap71i70s50g6b63avjgjkwz1ys5j4"; + }; in mkDerivation rec { pname = "crow-translate"; - version = "2.6.2"; + version = "2.7.1"; src = fetchFromGitHub { owner = "crow-translate"; repo = "crow-translate"; rev = version; - sha256 = "1jgpqynmxmh6mrknpk5fh96lbdg799axp4cyn5rvalg3sdxajmqc"; + sha256 = "sha256-YOsp/noGsYthre18fMyBj9s+YFzdHJfIJzJSm43wiZ0="; }; patches = [ (substituteAll { src = ./dont-fetch-external-libs.patch; - inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator; + inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags; }) (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 @@ -61,10 +67,23 @@ mkDerivation rec { }) ]; + postPatch = "cp -r ${circleflags}/flags/* data/icons"; + nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ]; + postInstall = '' + substituteInPlace $out/share/applications/io.crow_translate.CrowTranslate.desktop \ + --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; homepage = "https://crow-translate.github.io/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch index b5f8d4606a..eff303a852 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch @@ -1,8 +1,26 @@ +diff --git i/CMakeLists.txt w/CMakeLists.txt +index 2576203..26162a0 100644 +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -91,12 +91,11 @@ qt5_add_translation(QM_FILES + ) + + configure_file(src/cmake.h.in cmake.h) +-configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY) + + add_executable(${PROJECT_NAME} + ${QM_FILES} + data/icons/engines/engines.qrc +- ${CircleFlags_SOURCE_DIR}/flags/flags.qrc ++ data/icons/flags.qrc + src/addlanguagedialog.cpp + src/addlanguagedialog.ui + src/cli.cpp diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake -index d8c88ae..47a12c0 100644 +index 21eba0a..b613d3e 100644 --- i/cmake/ExternalLibraries.cmake +++ w/cmake/ExternalLibraries.cmake -@@ -2,24 +2,20 @@ include(FetchContent) +@@ -2,29 +2,24 @@ include(FetchContent) set(QAPPLICATION_CLASS QApplication) FetchContent_Declare(SingleApplication @@ -30,4 +48,10 @@ index d8c88ae..47a12c0 100644 + SOURCE_DIR @qonlinetranslator@ ) - FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator) + FetchContent_Declare(CircleFlags +- GIT_REPOSITORY https://github.com/HatScripts/circle-flags +- GIT_TAG v2.0.0 ++ SOURCE_DIR @circleflags@ + ) + + FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags) diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch index 816b6c5188..9e0f587ec7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch @@ -1,13 +1,13 @@ -diff --git i/src/settings/appsettings.cpp w/src/settings/appsettings.cpp -index 7be4573..e65994e 100644 ---- i/src/settings/appsettings.cpp -+++ w/src/settings/appsettings.cpp -@@ -82,7 +82,7 @@ void AppSettings::applyLanguage(QLocale::Language lang) - QLocale::setDefault(QLocale(lang)); +diff --git c/src/settings/appsettings.cpp i/src/settings/appsettings.cpp +index ff99f64..fa929ae 100644 +--- c/src/settings/appsettings.cpp ++++ i/src/settings/appsettings.cpp +@@ -80,7 +80,7 @@ void AppSettings::applyLanguage(QLocale::Language lang) + QLocale::setDefault(locale); - s_appTranslator.load(QLocale(), QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("translations"), QStandardPaths::LocateDirectory)); -- s_qtTranslator.load(QLocale(), QStringLiteral("qt"), QStringLiteral("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ s_qtTranslator.load(QLocale(), QStringLiteral("qt"), QStringLiteral("_"), QLatin1String("@qttranslations@/translations")); + s_appTranslator.load(locale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("translations"), QStandardPaths::LocateDirectory)); +- s_qtTranslator.load(locale, QStringLiteral("qtbase"), QStringLiteral("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ s_qtTranslator.load(locale, QStringLiteral("qtbase"), QStringLiteral("_"), QLatin1String("@qttranslations@/translations")); } QLocale::Language AppSettings::defaultLanguage() diff --git a/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix index 2cc20b424b..aaaab255c7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which -, IOKit ? null }: +, IOKit, copyDesktopItems, makeDesktopItem, wrapGAppsHook +}: with lib; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; - nativeBuildInputs = [ pkg-config which ]; + nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ]; buildInputs = [gettext glib gtk2 libX11 libSM libICE] ++ optionals stdenv.isDarwin [ IOKit ]; @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { # Makefiles are patched to fix references to `/usr/X11R6' and to add # `-lX11' to make sure libX11's store path is in the RPATH. - patchPhase = '' + postPatch = '' echo "patching makefiles..." for i in Makefile src/Makefile server/Makefile do @@ -30,6 +31,23 @@ stdenv.mkDerivation rec { makeFlags = [ "STRIP=-s" ]; installFlags = [ "DESTDIR=$(out)" ]; + # This icon is used by the desktop file. + postInstall = '' + install -Dm444 -T src/icon.xpm $out/share/pixmaps/gkrellm.xpm + ''; + + desktopItems = [ + (makeDesktopItem { + name = "gkrellm"; + exec = "gkrellm"; + icon = "gkrellm"; + desktopName = "GKrellM"; + genericName = "System monitor"; + comment = "The GNU Krell Monitors"; + categories = "System;Monitor;"; + }) + ]; + meta = { description = "Themeable process stack of system monitors"; longDescription = '' @@ -40,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "http://gkrellm.srcbox.net"; license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with maintainers; [ khumba ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/default.nix deleted file mode 100644 index 0235c8af7c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{stdenv, fetchurl, -zlib, libpng, libjpeg, perl, expat, qt3, -libX11, libXext, libSM, libICE, -}: - -stdenv.mkDerivation rec { - name = "taskjuggler-2.4.3"; - src = fetchurl { - url = "http://www.taskjuggler.org/download/${name}.tar.bz2"; - sha256 = "14gkxa2vwfih5z7fffbavps7m44z5bq950qndigw2icam5ks83jl"; - }; - - buildInputs = - [zlib libpng libX11 libXext libSM libICE perl expat libjpeg] - ; - - patches = [ ./timezone-glibc.patch ]; - - preConfigure = '' - for i in $(grep -R "/bin/bash" . | sed 's/:.*//'); do - substituteInPlace $i --replace /bin/bash $(type -Pp bash) - done - for i in $(grep -R "/usr/bin/perl" . | sed 's/:.*//'); do - substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl - done - - # Fix install - for i in docs/en/Makefile.in Examples/BigProject/Common/Makefile.in Examples/BigProject/Makefile.in Examples/BigProject/Project1/Makefile.in Examples/BigProject/Project2/Makefile.in Examples/FirstProject/Makefile.in Examples/ShiftSchedule/Makefile.in; do - # Do not use variable substitution because there is some text after the last '@' - substituteInPlace $i --replace 'docprefix = @PACKAGES_DIR@' 'docprefix = $(docdir)/' - done - - # Comment because the ical export need the KDE support. - for i in Examples/FirstProject/AccountingSoftware.tjp; do - substituteInPlace $i --replace "icalreport" "# icalreport" - done - - for i in TestSuite/testdir TestSuite/createrefs \ - TestSuite/Scheduler/Correct/Expression.sh; do - substituteInPlace $i --replace '/bin/rm' 'rm' - done - - # Some tests require writing at $HOME - HOME=$TMPDIR - ''; - - configureFlags = [ - "--without-arts" "--disable-docs" - "--x-includes=${libX11.dev}/include" - "--x-libraries=${libX11.out}/lib" - "--with-qt-dir=${qt3}" - ]; - - preInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/ - ''; - - # kde_locale is not defined when installing without kde. - installFlags = [ "kde_locale=\${out}/share/locale" ]; - - meta = { - homepage = "http://www.taskjuggler.org"; - license = lib.licenses.gpl2; - description = "Project management tool"; - longDescription = '' - TaskJuggler is a modern and powerful, Open Source project management - tool. Its new approach to project planing and tracking is more - flexible and superior to the commonly used Gantt chart editing - tools. It has already been successfully used in many projects and - scales easily to projects with hundreds of resources and thousands of - tasks. - ''; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch deleted file mode 100644 index f599e8a173..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From the discussion in http://groups.google.com/group/taskjuggler-users/browse_thread/thread/f65a3efd4dcae2fc/a44c711a9d28ebee?show_docid=a44c711a9d28ebee - -From: Chris Schlaeger -Date: Sat, 27 Feb 2010 06:33:35 +0000 (+0100) -Subject: Try to fix time zone check for glibc 2.11. -X-Git-Url: http://www.taskjuggler.org/cgi-bin/gitweb.cgi?p=taskjuggler.git;a=commitdiff_plain;h=2382ed54f90c3c899badb3f56aaa2b3b5dba361e;hp=c666c5068312fec7db75e17d1c567d94127d1dda - -Try to fix time zone check for glibc 2.11. - -Reported-by: Lee ---- - -diff --git a/taskjuggler/Utility.cpp b/taskjuggler/Utility.cpp -index 5e2bf21..9b7fce2 100644 ---- a/taskjuggler/Utility.cpp -+++ b/taskjuggler/Utility.cpp -@@ -206,16 +206,28 @@ setTimezone(const char* tZone) - - /* To validate the tZone value we call tzset(). It will convert the zone - * into a three-letter acronym in case the tZone value is good. If not, it -- * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back -- * to UTC. */ -+ * will -+ * - copy the wrong value to tzname[0] (glibc < 2.5) -+ * - or fall back to UTC (glibc >= 2.5 && < 2.11) -+ * - copy the part before the '/' to tzname[0] (glibc >= 2.11). -+ */ - tzset(); -+ char* region = new(char[strlen(tZone) + 1]); -+ region[0] = 0; -+ if (strchr(tZone, '/')) -+ { -+ strcpy(region, tZone); -+ *strchr(region, '/') = 0; -+ } - if (timezone2tz(tZone) == 0 && -- (strcmp(tzname[0], tZone) == 0 || -+ (strcmp(tzname[0], tZone) == 0 || strcmp(tzname[0], region) == 0 || - (strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0))) - { - UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone); -+ delete region; - return false; - } -+ delete region; - - if (!LtHashTab) - return true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix index d49c622190..b9fd02650a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kX5Vp+yNlzBj1ewm7zNtpmbk5B2OQi0nrUNV7l6XUH0="; + sha256 = "sha256-Hx/9WW94rDAjlSZoUz5/43MQ6830OELLogRvHTbmWv0="; }; - cargoSha256 = "sha256-X7ULfb2+9l8ik12SwWCTdUfki6xbk8pCnFaiEvCwYGw="; + cargoSha256 = "sha256-TYDNx1TNGcREaeHXaejTeMDEITTTUrHCrExZYa+MSHg="; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xygrib/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xygrib/default.nix index 68adc2abbf..864ea27ede 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, libpng, openjpeg }: stdenv.mkDerivation rec { version = "1.2.6.1"; @@ -13,26 +13,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ]; - cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ] + cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ] ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; - postInstall = if stdenv.isDarwin then '' - mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" - cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns" - mv $out/XyGrib/XyGrib.app $out/Applications - wrapQtApp "$out/Applications/XyGrib.app/Contents/MacOS/XyGrib" - '' else '' - wrapQtApp $out/XyGrib/XyGrib - mkdir -p $out/bin - ln -s $out/XyGrib/XyGrib $out/bin/xygrib - ''; + postInstall = + if stdenv.isDarwin then '' + mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" + cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns" + mv $out/XyGrib/XyGrib.app $out/Applications + wrapQtApp "$out/Applications/XyGrib.app/Contents/MacOS/XyGrib" + '' else '' + wrapQtApp $out/XyGrib/XyGrib + mkdir -p $out/bin + ln -s $out/XyGrib/XyGrib $out/bin/xygrib + ''; meta = with lib; { homepage = "https://opengribs.org"; description = "Weather Forecast Visualization"; - longDescription = ''XyGrib is a leading opensource weather visualization package. - It interacts with OpenGribs's Grib server providing a choice - of global and large area atmospheric and wave models.''; + longDescription = '' + XyGrib is a leading opensource weather visualization package. + It interacts with OpenGribs's Grib server providing a choice + of global and large area atmospheric and wave models. + ''; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ j03 SuperSandro2000 ]; 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 38d1d53507..4a408ad208 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 @@ -1,8 +1,8 @@ { "stable": { - "version": "88.0.4324.150", - "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", - "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", + "version": "88.0.4324.182", + "sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h", + "sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b", "deps": { "gn": { "version": "2020-11-05", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix index ebf3cb417d..453c1406fd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix @@ -1,38 +1,53 @@ -{ lib, stdenv, fetchurl }: -let - version = "0.16.3"; +{ lib, stdenv, fetchzip }: - system = stdenv.hostPlatform.system; +let + inherit (stdenv.hostPlatform) system; suffix = { x86_64-linux = "Linux-64bit"; aarch64-linux = "Linux-arm64"; x86_64-darwin = "macOS-64bit"; }."${system}" or (throw "Unsupported system: ${system}"); - baseurl = "https://github.com/vmware-tanzu/octant/releases/download"; - fetchsrc = sha256: fetchurl { - url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz"; - sha256 = sha256."${system}"; - }; + fetchsrc = version: sha256: fetchzip { + url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz"; + sha256 = sha256."${system}"; + }; in stdenv.mkDerivation rec { pname = "octant"; - inherit version; + version = "0.17.0"; - src = fetchsrc { - x86_64-linux = "1c6v7d8i494k32b0zrjn4fn1idza95r6h99c33c5za4hi7gqvy0x"; - aarch64-linux = "153jd4wsq8qc598w7y4d30dy20ljyhrl68cc3pig1p712l5258zs"; - x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz"; + src = fetchsrc version { + x86_64-linux = "sha256-kYS8o97HBjNgwmrG4fjsqFWxZy6ATFOhxt6j3KMZbEc="; + aarch64-linux = "sha256-/Tpna2Y8+PQt+SeOJ9NDweRWGiQXU/sN+Wh/vLYQPwM="; + x86_64-darwin = "sha256-aOUmnD+l/Cc5qTiHxFLBjCatszmPdUc4YYZ6Oy5DT3U="; }; - doCheck = false; + dontConfigure = true; + dontBuild = true; installPhase = '' - mkdir -p "$out/bin" - mv octant $out/bin + runHook preInstall + install -D octant $out/bin/octant + runHook postInstall ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/octant --help + $out/bin/octant version | grep "${version}" + runHook postInstallCheck + ''; + + dontPatchELF = true; + dontPatchShebangs = true; + + passthru.updateScript = ./update.sh; + meta = with lib; { + homepage = "https://octant.dev/"; + changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md"; description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters."; longDescription = '' Octant is a tool for developers to understand how applications run on a Kubernetes cluster. @@ -40,9 +55,8 @@ stdenv.mkDerivation rec { Octant offers a combination of introspective tooling, cluster navigation, and object management along with a plugin system to further extend its capabilities. ''; - homepage = "https://octant.dev/"; license = licenses.asl20; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ jk ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index e956715d9b..988b2d02df 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u+yxAGVVFsZpiexToNDUfQATsYOkKWHkYF9roK0OInY="; + sha256 = "sha256-wis2ECCVXQeD7GiCMJQai+wDM8QJ1j5dPnE5O/I3wpM="; }; - vendorSha256 = "sha256-c5sel3xs4npTENqRQu8d9hUOK1OFQodF3M0ZpUpr1po="; + vendorSha256 = "sha256-T0wDbAl5GXphZIBrM36OwRCojnJ/cbXNqsjtCzUDZ6s="; buildFlagsArray = [ "-ldflags=" "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh new file mode 100755 index 0000000000..4ffe4aefb3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused gawk nix-prefetch + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/default.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find default.nix in $ROOT" + exit 1 +fi + +fetch_arch() { + VER="$1"; ARCH="$2" + URL="https://github.com/vmware-tanzu/octant/releases/download/v${VER}/octant_${VER}_${ARCH}.tar.gz" + nix-prefetch "{ stdenv, fetchzip }: +stdenv.mkDerivation rec { + pname = \"octant\"; version = \"${VER}\"; + src = fetchzip { url = \"$URL\"; }; +} +" +} + +replace_sha() { + sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" +} + +OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') + +OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit") +OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64") +OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit") + +sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV" + +replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256" +replace_sha "x86_64-darwin" "$OCTANT_LINUX_AARCH64_SHA256" +replace_sha "aarch64-linux" "$OCTANT_DARWIN_X64_SHA256" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 9e2b9709af..21777252f3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.4"; + version = "0.28.5"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LilIwg3Zu7Zi7AhJeW0j2qUmSOGy1HHjvvB07FUcEeI="; + sha256 = "sha256-LSUWEgCajIBgRPiuvGJ9I3tJLXk1JrVDDsgS7lpbVYk="; }; vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index 415a895e52..7f7f34d1cb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.8"; + version = "0.18.9"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ICJrY4XUrxVeZlMx69SB/ounfIwLFSguf9bhLOpYP3E="; + sha256 = "sha256-bsLqTpBhYeDMAv8vmnbjz+bmkyGqX3V7OkOwCprftC0="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 55a16f42f1..2af3e8fe56 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -15,6 +15,8 @@ buildGoModule rec { subPackages = [ "." ]; + buildFlagsArray = [ "-ldflags=-s -w" ]; + meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://stackexchange.github.io/dnscontrol/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix index 1fa9c66c8f..9a2bd563fc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , fetchFromGitHub , gettext , xorg # for lndir @@ -24,13 +23,13 @@ python3Packages.buildPythonApplication rec { pname = "mailnag"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "pulb"; repo = "mailnag"; rev = "v${version}"; - sha256 = "08jqs3v01a9gkjca9xgjidhdgvnlm4541z9bwh9m3k5p2g76sz96"; + sha256 = "0m1cyzwzm7z4p2v31dx098a1iar7dbilwyjcxiqnjx05nlmiqvgf"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/casync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/casync/default.nix index 0e82aa2dd8..5bc29832c5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/casync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/casync/default.nix @@ -1,27 +1,40 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, python3, sphinx -, acl, curl, fuse, libselinux, udev, xz, zstd +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, python3 +, sphinx +, acl +, curl +, fuse +, libselinux +, udev +, xz +, zstd , fuseSupport ? true , selinuxSupport ? true , udevSupport ? true -, glibcLocales, rsync +, glibcLocales +, rsync }: stdenv.mkDerivation { pname = "casync"; - version = "2-219-ga8f6c84"; + version = "2-226-gbd8898e"; src = fetchFromGitHub { - owner = "systemd"; - repo = "casync"; - rev = "a8f6c841ccfe59ca8c68aad64df170b64042dce8"; - sha256 = "1i3c9wmpabpmx2wfbcyabmwfa66vz92iq5dlbm89v5mvgavz7bws"; + owner = "systemd"; + repo = "casync"; + rev = "bd8898ed92685e12022dd33a04c87786b5262344"; + sha256 = "04ibglizjzyd7ih13q6m7ic78n0mzw9nfmb3zd1fcm9j62qlq11i"; }; buildInputs = [ acl curl xz zstd ] - ++ lib.optionals (fuseSupport) [ fuse ] - ++ lib.optionals (selinuxSupport) [ libselinux ] - ++ lib.optionals (udevSupport) [ udev ]; + ++ lib.optionals (fuseSupport) [ fuse ] + ++ lib.optionals (selinuxSupport) [ libselinux ] + ++ lib.optionals (udevSupport) [ udev ]; nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ]; checkInputs = [ glibcLocales rsync ]; @@ -34,8 +47,8 @@ stdenv.mkDerivation { PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; mesonFlags = lib.optionals (!fuseSupport) [ "-Dfuse=false" ] - ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] - ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; + ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; doCheck = true; preCheck = '' @@ -44,9 +57,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Content-Addressable Data Synchronizer"; - homepage = "https://github.com/systemd/casync"; - license = licenses.lgpl21; - platforms = platforms.linux; + homepage = "https://github.com/systemd/casync"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; maintainers = with maintainers; [ flokli ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix b/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix index 7f543c9bbc..5478382cbd 100644 --- a/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/ledger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python +{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3 , texinfo, gnused, usePython ? true }: stdenv.mkDerivation rec { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ - (boost.override { enablePython = usePython; }) - gmp mpfr libedit python gnused + (boost.override { enablePython = usePython; python = python3; }) + gmp mpfr libedit python3 gnused ]; nativeBuildInputs = [ cmake texinfo ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # however, that would write to a different nixstore path, pass our own sitePackages location prePatch = lib.optionalString usePython '' substituteInPlace src/CMakeLists.txt \ - --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${python.sitePackages}"' + --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${python3.sitePackages}"' ''; installTargets = [ "doc" "install" ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix b/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix index b4307eb286..ebc93edba6 100644 --- a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix @@ -1,13 +1,10 @@ { lib , python3Packages , wrapGAppsHook -, xvfb_run , gtk3 , gobject-introspection , libcanberra-gtk3 -, dbus , poppler_gi -, python3 }: python3Packages.buildPythonApplication rec { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 2c5ee674a2..e84e9b7400 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook -, fmt, graphviz, llvmPackages ? null +, fmt, graphviz, llvmPackages, z3 }: stdenv.mkDerivation rec { - version = "3.1.9"; + version = "3.2.5"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; rev = "v${version}"; - sha256 = "0yvvlx0hq73x20va4csa8kyx3x4z648s6l6qqirzjpmxa1w91xc6"; + sha256 = "0hc10wbngh4gfiiy9ndkf1y6dclcgy38x1n9k5wpvmf13vdah3zy"; }; # make sure bundled dependencies don't get in the way - install also otherwise # copies them in full to the output, bloating the package @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ] + buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook z3 ] ++ (with python3Packages; [ python pybind11 ]) ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix index 433e5c3061..82286289fb 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "terminator"; - version = "1.92"; + version = "2.1.0"; src = fetchFromGitHub { owner = "gnome-terminator"; repo = "terminator"; rev = "v${version}"; - sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh"; + sha256 = "sha256-Rd5XieB7K2BkSzrAr6Kmoa30xuwvsGKpPrsG2wrU1o8="; }; nativeBuildInputs = [ @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { intltool gobject-introspection wrapGAppsHook + python3.pkgs.pytestrunner ]; buildInputs = [ @@ -47,19 +48,13 @@ python3.pkgs.buildPythonApplication rec { ]; postPatch = '' - patchShebangs run_tests tests po + patchShebangs tests po # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains. # The wrapped terminator has the correct path added, so ignore this. substituteInPlace setup.py --replace "'dbus-python'," "" ''; - checkPhase = '' - runHook preCheck - - ./run_tests - - runHook postCheck - ''; + doCheck = false; meta = with lib; { description = "Terminal emulator with support for tiling and tabs"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix index 3e89fe0a4d..7fb26476d8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , buildGoModule , srht, redis, celery, pyyaml, markdown }: diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix index ea3f58e389..5ce140273e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, pyyaml, PyGithub }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix index 8966cbe080..a25a14f610 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , buildGoModule , srht, minio, pygit2, scmsrht }: diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix index fae311831f..c8fa64c8b4 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,5 +1,4 @@ { lib, fetchhg, buildPythonPackage -, python , srht, hglib, scmsrht, unidiff }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix index 99b5663a9b..8b6d920199 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix index 25d22dede3..98191f564e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, asyncpg, aiosmtpd, pygit2, emailthreads }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix index 24a31a3ef1..e3751a6d5c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, pygit2 }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix index d07bd29357..b5b15520d2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , buildGoModule , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache , sshpubkeys, weasyprint }: diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix index 12747f9810..dab518e70a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix @@ -1,5 +1,4 @@ { lib, fetchgit, buildPythonPackage -, python , srht, pyyaml }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix index 85ae3b2cf1..5e75efb088 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,7 +1,6 @@ { lib, fetchgit, buildPythonPackage -, python , srht, redis, alembic, pystache -, pytest, factory_boy, writeText }: +, pytest, factory_boy }: buildPythonPackage rec { pname = "todosrht"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix index 14d8d0c13f..aed59e05a9 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, edk2, util-linux, nasm, iasl , csmSupport ? false, seabios ? null , secureBoot ? false +, httpSupport ? false }: assert csmSupport -> seabios != null; @@ -30,7 +31,8 @@ edk2.mkDerivation projectDscPath { buildFlags = lib.optional secureBoot "-DSECURE_BOOT_ENABLE=TRUE" - ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ]; + ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] + ++ lib.optionals httpSupport [ "-DNETWORK_HTTP_ENABLE=TRUE" "-DNETWORK_HTTP_BOOT_ENABLE=TRUE" ]; postPatch = lib.optionalString csmSupport '' cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix index 4a1a305d12..31828bad0a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.38.1"; + version = "3.38.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "APbWaJzCLePABb2H1MLr9yAGTLjcahiHgW+LfggrLmM="; + sha256 = "J9QZ1f7WMF4HRijtz94MtzT//aIF1jysMjORwEkDvZQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index db7a6ba092..0ea59c3fc4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.2.4"; + version = "0.3.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a"; + sha256 = "0ssqckfkyldwld88zizy446y2359rg40lnrcm3sjpjhc2b015hgj"; }; passthru = { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; description = "Library to integrate compressed files management with GNOME"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix index c8213482d7..23e225bd74 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix @@ -5,7 +5,7 @@ kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage, kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, - solid + solid, systemsettings }: mkDerivation { @@ -15,6 +15,11 @@ mkDerivation { buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kdelibs4support ki18n kiconthemes kio kirigami2 kpackage - kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid + kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid systemsettings ]; + preFixup = '' + # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in the same directory, + # while it is actually located in a completely different store path + ln -sf ${lib.getBin systemsettings}/bin/systemsettings5 $out/bin/kinfocenter + ''; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix index 4257feb87b..9423f5e15d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { stripRoot = false; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; nativeBuildInputs = [ unzip bison flex gperf ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix new file mode 100644 index 0000000000..15e1279eba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix @@ -0,0 +1,267 @@ +{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation, xcbuild +, mailcap, runtimeShell +, buildPackages +, pkgsBuildTarget +, fetchpatch +, callPackage +}: + +let + + inherit (lib) optionals optionalString; + + go_bootstrap = callPackage ./bootstrap.nix { + inherit Security; + }; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "1.16"; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "0nn98xiw8zrvxf9f36p8dzc7ihrrkakr0g9jiy4haqb5alyhd23n"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkg-config patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + propagatedBuildInputs = optionals stdenv.isDarwin [ xcbuild ]; + + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Fails on aarch64 + sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go + # Skip this test since ssl patches mess it up. + sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # Disable another PIE test which breaks. + sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go + # Disable the BuildModePie test + sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.16.patch + ./remove-test-pie-1.15.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests-1.16.patch + ./skip-nohup-tests.patch + ./skip-cgo-tests-1.15.patch + ./go_no_vendor_checks-1.16.patch + ] ++ [ + # breaks under load: https://github.com/golang/go/issues/25628 + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32-1.14.patch + else ./skip-test-extra-files-on-386-1.14.patch) + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + meta = with lib; { + homepage = "http://golang.org/"; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch b/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch new file mode 100644 index 0000000000..9edf6efa85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go +index d8fd91f1fe..8bc08e6fed 100644 +--- a/src/cmd/go/internal/modload/vendor.go ++++ b/src/cmd/go/internal/modload/vendor.go +@@ -133,7 +133,7 @@ func checkVendorConsistency() { + readVendorList() + + pre114 := false +- if semver.Compare(index.goVersionV, "v1.14") < 0 { ++ if semver.Compare(index.goVersionV, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch b/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch new file mode 100644 index 0000000000..8f1eb6be7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch @@ -0,0 +1,33 @@ +diff --git a/src/internal/testenv/testenv.go b/src/internal/testenv/testenv.go +index c902b1404f..66016088a2 100644 +--- a/src/internal/testenv/testenv.go ++++ b/src/internal/testenv/testenv.go +@@ -163,13 +163,15 @@ func MustHaveExecPath(t testing.TB, path string) { + // HasExternalNetwork reports whether the current system can use + // external (non-localhost) networks. + func HasExternalNetwork() bool { +- return !testing.Short() && runtime.GOOS != "js" ++ // Nix sandbox does not external network in sandbox ++ return false + } + + // MustHaveExternalNetwork checks that the current system can use + // external (non-localhost) networks. + // If not, MustHaveExternalNetwork calls t.Skip with an explanation. + func MustHaveExternalNetwork(t testing.TB) { ++ t.Skipf("Nix sandbox does not have networking") + if runtime.GOOS == "js" { + t.Skipf("skipping test: no external network on %s", runtime.GOOS) + } +diff --git a/src/net/dial_test.go b/src/net/dial_test.go +index 57cf5554ad..d00be53b2c 100644 +--- a/src/net/dial_test.go ++++ b/src/net/dial_test.go +@@ -990,6 +990,7 @@ func TestDialerControl(t *testing.T) { + // except that it won't skip testing on non-mobile builders. + func mustHaveExternalNetwork(t *testing.T) { + t.Helper() ++ t.Skipf("Nix sandbox does not have networking") + mobile := runtime.GOOS == "android" || runtime.GOOS == "ios" + if testenv.Builder() == "" || mobile { + testenv.MustHaveExternalNetwork(t) diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.16.patch b/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.16.patch new file mode 100644 index 0000000000..f4bc16e5b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.16.patch @@ -0,0 +1,34 @@ +diff --git a/src/crypto/x509/root.go b/src/crypto/x509/root.go +index ac92915128..fb1d70c735 100644 +--- a/src/crypto/x509/root.go ++++ b/src/crypto/x509/root.go +@@ -6,7 +6,11 @@ package x509 + + //go:generate go run root_ios_gen.go -version 55161.140.3 + +-import "sync" ++import ( ++ "io/ioutil" ++ "os" ++ "sync" ++) + + var ( + once sync.Once +@@ -20,6 +24,16 @@ func systemRootsPool() *CertPool { + } + + func initSystemRoots() { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ systemRoots = roots ++ return ++ } ++ } ++ + systemRoots, systemRootsErr = loadSystemRoots() + if systemRootsErr != nil { + systemRoots = nil diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix index f3a03b3647..96ba9afc23 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix @@ -7,45 +7,45 @@ let javaVersionPlatform = "${javaVersion}-${platform}"; graalvmXXX-ce = stdenv.mkDerivation rec { pname = "graalvm${javaVersion}-ce"; - version = "20.3.0"; + version = "21.0.0"; srcs = [ (fetchurl { - sha256 = { "8-linux-amd64" = "195b20ivvv8ipjn3qq2313j8qf96ji93pqm99nvn20bq23wasp25"; - "11-linux-amd64" = "1mdk1zhazvvh1fa01bzi5v5fxhvx592xmbakx0y1137vykbayyjm"; - "8-darwin-amd64" = "1rrs471204p71knyxpjxymdi8ws98ph2kf5j0knk529g0d24rs01"; - "11-darwin-amd64" = "008dl8dbf37mv4wahb9hbd6jp8svvmpy1rgsiqkn3i4hypxnkf12"; + sha256 = { "8-linux-amd64" = "18q1plrpclp02rlwn3vvv2fcyspvqv2gkzn14f0b59pnladmlv1j"; + "11-linux-amd64" = "1g1xjbr693rimdy2cy6jvz4vgnbnw76wa87xcmaszka206fmpnsc"; + "8-darwin-amd64" = "0giv8f7ybdykadzmxjy91i6njbdx6dclyx7g6vyhwk2l1cvxi4li"; + "11-darwin-amd64" = "1a8gjp6fp11ms05pd62h1x1ifkkr3wv0hrxic670v90bbps9lsqf"; }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersionPlatform}-${version}.tar.gz"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "1rzbhllz28x5ps8n304v998hykr4m8z1gfg53ybi6laxhkbx3i13"; - "11-linux-amd64" = "09ipdl1489xnbckwl6sl9y7zy7kp5qf5fgf3kgz5d69jrk2z6rvf"; - "8-darwin-amd64" = "1iy2943jbrarh8bm9wy15xk7prnskqwik2ham07a6ybp4j4b81xi"; - "11-darwin-amd64" = "0vk2grlirghzc78kvwg66w0xriy5p8qkcp7qx83i62d7sj0kvwnf"; + sha256 = { "8-linux-amd64" = "0hpq2g9hc8b7j4d8a08kq1mnl6pl7a4kwaj0a3gka3d4m6r7cscg"; + "11-linux-amd64" = "0z3hb2bf0lqzw760civ3h1wvx22a75n7baxc0l2i9h5wxas002y7"; + "8-darwin-amd64" = "1izbgl4hjg5jyi422xnkx006qnw163r1i1djf76q1plms40y01ph"; + "11-darwin-amd64" = "1d9z75gil0if74ndla9yw3xx9i2bfbcs32qa0z6wi5if66cmknb8"; }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "0v98v44vblhyi3jhrngmvrkb3a6d607x4fpmrb4mrrsg75vbvc6d"; - "11-linux-amd64" = "0kb9472ilwqg40gyw1c4lmzkd9s763raw560sw80ljm3p75k4sc7"; - "8-darwin-amd64" = "192n9ckr4p8qirpxr67ji3wzxpng33yfr7kxynlrcp7b3ghfic6p"; - "11-darwin-amd64" = "1wqdk8wphywa00kl3xikiskclb84rx3nw5a4vi5y2n060kclcp22"; + sha256 = { "8-linux-amd64" = "122p8psgmzhqnjb2fy1lwghg0kw5qa8xkzgyjp682lwg4j8brz43"; + "11-linux-amd64" = "1vdc90m6s013cbhmj58nb4vyxllbxirw0idlgv0iv9cyhx90hzgz"; + "8-darwin-amd64" = "04q0s9xsaskqn9kbhz0mgdk28j2qnxrzqfmw6jn2znr8s8jsc6yp"; + "11-darwin-amd64" = "1pw4xd8g5cc9bm52awmm1zxs96ijws43vws7y10wxa6a0nhv7z5f"; }.${javaVersionPlatform}; url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "1iskmkhrrwlhcq92g1ljvsfi9q403xxkwgzn9m282z5llh2fxv74"; - "11-linux-amd64" = "13bg2gs22rzbngnbw8j68jqgcknbiw30kpxac5jjcn55rf2ymvkz"; - "8-darwin-amd64" = "08pib13q7s5wymnbykkyif66ll146vznxw4yz12qwhb419882jc7"; - "11-darwin-amd64" = "0cb9lhc21yr2dnrm4kwa68laaczvsdnzpcbl2qix50d0v84xl602"; + sha256 = { "8-linux-amd64" = "19m7n4f5jrmsfvgv903sarkcjh55l0nlnw99lvjlcafw5hqzyb91"; + "11-linux-amd64" = "18ibb7l7b4hmbnvyr8j7mrs11mvlsf2j0c8rdd2s93x2114f26ba"; + "8-darwin-amd64" = "1zlzi00339kvg4ym2j75ypfkzn8zbwdpriqmkaz4fh28qjmc1dwq"; + "11-darwin-amd64" = "0x301i1fimakhi2x29ldr0fsqkb3qs0g9jsmjv27d62dpqx8kgc8"; }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) (fetchurl { - sha256 = { "8-linux-amd64" = "12lvcl1vmc35wh3xw5dqca7yiijsd432x4lim3knzppipy7fmflq"; - "11-linux-amd64" = "1s8zfgjyyw6w53974h9a2ig8a1bvc97aplyrdziywfrijgp6zkqk"; - "8-darwin-amd64" = "06i1n42hkhcf1pfb2bly22ws4a09xgydsgh8b0kvjmb1fapd4paq"; - "11-darwin-amd64" = "1r2bqhfxnw09izxlsc562znlp3m9c1isqzhlki083h3vp548vv9s"; + sha256 = { "8-linux-amd64" = "0dlgbg6kri89r9zbk6n0ch3g8356j1g35bwjng87c2y5y0vcw0b5"; + "11-linux-amd64" = "1yby65hww6zmd2g5pjwbq5pv3iv4gfv060b8fq75fjhwrisyj5gd"; + "8-darwin-amd64" = "1smdj491g23i3z7p5rybid18nnz8bphrqjkv0lg2ffyrpn8k6g93"; + "11-darwin-amd64" = "056zyn0lpd7741k1szzjwwacka0g7rn0j4ypfmav4h1245mjg8lx"; }.${javaVersionPlatform}; url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) @@ -146,8 +146,8 @@ let ''; postFixup = '' - rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64"; - "11" = "$out/lib/jli:$out/lib/server:$out/lib"; + rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64:$out/jre/languages/ruby/lib/cext"; + "11" = "$out/lib/jli:$out/lib/server:$out/lib:$out/languages/ruby/lib/cext"; }.${javaVersion} }:${ lib.makeLibraryPath [ @@ -204,11 +204,13 @@ let echo '1 + 1' | $out/bin/graalpython - # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL - # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even - # though `openssl` is in `propagatedBuildInputs`. For more details see: - # https://github.com/NixOS/nixpkgs/pull/105815 - # echo '1 + 1' | $out/bin/irb + ${lib.optionalString stdenv.isLinux '' + # TODO: `irb` on MacOS gives an error saying "Could not find OpenSSL + # headers, install via Homebrew or MacPorts or set OPENSSL_PREFIX", even + # though `openssl` is in `propagatedBuildInputs`. For more details see: + # https://github.com/NixOS/nixpkgs/pull/105815 + echo '1 + 1' | $out/bin/irb + ''} echo '1 + 1' | $out/bin/node -i ${lib.optionalString (javaVersion == "11") '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/microscheme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/microscheme/default.nix index ee2de8518f..1f3a98de82 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/microscheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/microscheme/default.nix @@ -1,21 +1,24 @@ -{ lib, stdenv, fetchzip, vim, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, unixtools }: stdenv.mkDerivation rec { pname = "microscheme"; version = "0.9.3"; - src = fetchzip { - name = "${pname}-${version}-src"; - url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz"; - sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976"; + src = fetchFromGitHub { + owner = "ryansuchocki"; + repo = "microscheme"; + rev = "v${version}"; + sha256 = "5qTWsBCfj5DCZ3f9W1bdo6WAc1DZqVxg8D7pwC95duQ="; }; - buildInputs = [ makeWrapper vim ]; - - installPhase = '' - make install PREFIX=$out + postPatch = '' + substituteInPlace makefile --replace gcc ${stdenv.cc.targetPrefix}cc ''; + nativeBuildInputs = [ makeWrapper unixtools.xxd ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + meta = with lib; { homepage = "http://microscheme.org"; description = "A Scheme subset for Atmel microcontrollers"; @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { microcontrollers, especially as found on Arduino boards. ''; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ ardumont ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix b/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix index 298cb5e21e..ab34f833d7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" "CFLAGS=-O2" "PREFIX=${placeholder "out"}" ]; @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs quotehostinfo + substituteInPlace Makefile --replace strip '${stdenv.cc.targetPrefix}strip' ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix index 3a2e3c4b94..9fc8188daa 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll, +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, openssl, libxml2, cmake, z3, substituteAll, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation (rec { pname = "ponyc"; - version = "0.38.1"; + version = "0.38.3"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "1hk810k9h3bl641pgw91y4x2qw67rvbapx6p2pk9qz5p7nfcn7qh"; + sha256 = "14kivmyphi7gbd7mgd4cnsiwl4cl7wih8kwzh7n79s2s4c5hj4ak"; # Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched # LLVM. (The submodule is a specific tag in the LLVM source tree). @@ -24,7 +24,7 @@ stdenv.mkDerivation (rec { }; ponygbenchmark = fetchurl { - url = https://github.com/google/benchmark/archive/v1.5.0.tar.gz; + url = "https://github.com/google/benchmark/archive/v1.5.0.tar.gz"; sha256 = "06i2cr4rj126m1zfz0x1rbxv1mw1l7a11mzal5kqk56cdrdicsiw"; name = "v1.5.0.tar.gz"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation (rec { (substituteAll { src = ./make-safe-for-sandbox.patch; googletest = fetchurl { - url = https://github.com/google/googletest/archive/release-1.8.1.tar.gz; + url = "https://github.com/google/googletest/archive/release-1.8.1.tar.gz"; sha256 = "17147961i01fl099ygxjx4asvjanwdd446nwbq9v8156h98zxwcv"; name = "release-1.8.1.tar.gz"; }; @@ -95,7 +95,7 @@ stdenv.mkDerivation (rec { wrapProgram $out/bin/ponyc \ --prefix PATH ":" "${stdenv.cc}/bin" \ --set-default CC "$CC" \ - --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}" + --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" ''; # Stripping breaks linking for ponyc diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix index ada098ec18..80b30ec87f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix @@ -1,114 +1,4 @@ -{ lib, stdenv, fetchurl, writeText, sbclBootstrap -, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" -, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system) -, disableImmobileSpace ? false - # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. - # Note that the created binaries still need `patchelf --set-interpreter ...` - # to get rid of ${glibc} dependency. -, purgeNixReferences ? false -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "sbcl"; +import ./common.nix { version = "2.0.9"; - - src = fetchurl { - url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - sha256 = "sha256:17wvrcwgp45z9b6arik31fjnz7908qhr5ackxq1y0gqi1hsh1xy4"; - }; - - buildInputs = [texinfo]; - - patchPhase = '' - echo '"${version}.nixos"' > version.lisp-expr - - pwd - - # SBCL checks whether files are up-to-date in many places.. - # Unfortunately, same timestamp is not good enough - sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # Fix the tests - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp - sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - - # Use whatever `cc` the stdenv provides - substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc - - substituteInPlace src/runtime/Config.x86-64-darwin \ - --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 - '' - + (if purgeNixReferences - then - # This is the default location to look for the core; by default in $out/lib/sbcl - '' - sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ - -i src/runtime/runtime.c - '' - else - # Fix software version retrieval - '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ - src/code/run-program.lisp - '' - ); - - - preBuild = '' - export INSTALL_ROOT=$out - mkdir -p test-home - export HOME=$PWD/test-home - ''; - - enableFeatures = with lib; - optional threadSupport "sb-thread" ++ - optional stdenv.isAarch32 "arm"; - - disableFeatures = with lib; - optional (!threadSupport) "sb-thread" ++ - optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; - - buildPhase = '' - sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${ - lib.concatStringsSep " " - (builtins.map (x: "--with-${x}") enableFeatures ++ - builtins.map (x: "--without-${x}") disableFeatures) - } - (cd doc/manual ; make info) - ''; - - installPhase = '' - INSTALL_ROOT=$out sh install.sh - '' - + lib.optionalString (!purgeNixReferences) '' - cp -r src $out/lib/sbcl - cp -r contrib $out/lib/sbcl - cat >$out/lib/sbcl/sbclrc < version.lisp-expr - - pwd - - # SBCL checks whether files are up-to-date in many places.. - # Unfortunately, same timestamp is not good enough - sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # Fix the tests - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp - sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - - # Use whatever `cc` the stdenv provides - substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc - - substituteInPlace src/runtime/Config.x86-64-darwin \ - --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 - '' - + (if purgeNixReferences - then - # This is the default location to look for the core; by default in $out/lib/sbcl - '' - sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ - -i src/runtime/runtime.c - '' - else - # Fix software version retrieval - '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ - src/code/run-program.lisp - '' - ); - - - preBuild = '' - export INSTALL_ROOT=$out - mkdir -p test-home - export HOME=$PWD/test-home - ''; - - enableFeatures = with lib; - optional threadSupport "sb-thread" ++ - optional stdenv.isAarch32 "arm"; - - disableFeatures = with lib; - optional (!threadSupport) "sb-thread" ++ - optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; - - buildPhase = '' - sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${ - lib.concatStringsSep " " - (builtins.map (x: "--with-${x}") enableFeatures ++ - builtins.map (x: "--without-${x}") disableFeatures) - } - (cd doc/manual ; make info) - ''; - - installPhase = '' - INSTALL_ROOT=$out sh install.sh - '' - + lib.optionalString (!purgeNixReferences) '' - cp -r src $out/lib/sbcl - cp -r contrib $out/lib/sbcl - cat >$out/lib/sbcl/sbclrc < version.lisp-expr + + pwd + + # SBCL checks whether files are up-to-date in many places.. + # Unfortunately, same timestamp is not good enough + sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp + #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp + sed -i src/cold/slam.lisp -e \ + '/file-write-date input/a)' + sed -i src/cold/slam.lisp -e \ + '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' + sed -i src/code/target-load.lisp -e \ + '/date defaulted-fasl/a)' + sed -i src/code/target-load.lisp -e \ + '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' + + # Fix the tests + sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp + sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp + + # Use whatever `cc` the stdenv provides + substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc + + substituteInPlace src/runtime/Config.x86-64-darwin \ + --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 + '' + + (if purgeNixReferences + then + # This is the default location to look for the core; by default in $out/lib/sbcl + '' + sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ + -i src/runtime/runtime.c + '' + else + # Fix software version retrieval + '' + sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ + src/code/run-program.lisp + '' + ); + + + preBuild = '' + export INSTALL_ROOT=$out + mkdir -p test-home + export HOME=$PWD/test-home + ''; + + enableFeatures = with lib; + optional threadSupport "sb-thread" ++ + optional stdenv.isAarch32 "arm"; + + disableFeatures = with lib; + optional (!threadSupport) "sb-thread" ++ + optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; + + buildPhase = '' + sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${ + lib.concatStringsSep " " + (builtins.map (x: "--with-${x}") enableFeatures ++ + builtins.map (x: "--without-${x}") disableFeatures) + } + (cd doc/manual ; make info) + ''; + + installPhase = '' + INSTALL_ROOT=$out sh install.sh + '' + + lib.optionalString (!purgeNixReferences) '' + cp -r src $out/lib/sbcl + cp -r contrib $out/lib/sbcl + cat >$out/lib/sbcl/sbclrc < version.lisp-expr - - pwd - - # SBCL checks whether files are up-to-date in many places.. - # Unfortunately, same timestamp is not good enough - sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # Fix the tests - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp - sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - - # Use whatever `cc` the stdenv provides - substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc - - substituteInPlace src/runtime/Config.x86-64-darwin \ - --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 - '' - + (if purgeNixReferences - then - # This is the default location to look for the core; by default in $out/lib/sbcl - '' - sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ - -i src/runtime/runtime.c - '' - else - # Fix software version retrieval - '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ - src/code/run-program.lisp - '' - ); - - - preBuild = '' - export INSTALL_ROOT=$out - mkdir -p test-home - export HOME=$PWD/test-home - ''; - - enableFeatures = with lib; - optional threadSupport "sb-thread" ++ - optional stdenv.isAarch32 "arm"; - - disableFeatures = with lib; - optional (!threadSupport) "sb-thread" ++ - optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; - - buildPhase = '' - sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${ - lib.concatStringsSep " " - (builtins.map (x: "--with-${x}") enableFeatures ++ - builtins.map (x: "--without-${x}") disableFeatures) - } - (cd doc/manual ; make info) - ''; - - installPhase = '' - INSTALL_ROOT=$out sh install.sh - '' - + lib.optionalString (!purgeNixReferences) '' - cp -r src $out/lib/sbcl - cp -r contrib $out/lib/sbcl - cat >$out/lib/sbcl/sbclrc <hsts.json + popd + patchShebangs src/hsts-make-dafsa + ''; + + nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config python3 ]; + + outputs = [ "out" "dev" ]; + + meta = with lib; { + description = "Library to easily check a domain against the Chromium HSTS Preload list"; + homepage = "https://gitlab.com/rockdaboot/libhsts"; + license = with licenses; [ mit bsd3 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhsts/update.sh b/third_party/nixpkgs/pkgs/development/libraries/libhsts/update.sh new file mode 100755 index 0000000000..f80966e08c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libhsts/update.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq + +set -euo pipefail -x + +cd "$(dirname "$0")" + +chromium_version=$(curl -s "https://api.github.com/repos/chromium/chromium/tags" | jq -r 'map(select(.prerelease | not)) | .[1].name') +sha256=$(nix-prefetch-url "https://raw.github.com/chromium/chromium/$chromium_version/net/http/transport_security_state_static.json") + +sed -e "0,/chromium_version/s/chromium_version = \".*\"/chromium_version = \"$chromium_version\"/" \ + -e "0,/sha256/s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ + --in-place ./default.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix index 3989cc59e4..caf0369601 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblinear/default.nix @@ -13,6 +13,12 @@ in stdenv.mkDerivation rec { sha256 = "0p0hpjajfkskhd7jiv5zwhfa8hi49q3mgifjlkqvy99xspv98ijj"; }; + postPatch = '' + substituteInPlace blas/Makefile \ + --replace "ar rcv" "${stdenv.cc.targetPrefix}ar rcv" \ + --replace "ranlib" "${stdenv.cc.targetPrefix}ranlib" + ''; + outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix index ef6b254b8a..4d3036d4cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/muparserx/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; + # selftest fails + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix index 58e5e40135..f9ae9d5ffe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuraft"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "eBay"; repo = "NuRaft"; rev = "v${version}"; - sha256 = "sha256-l6rG8f+JAWfAJxEZPKRHZo2k8x9WbtSJC3gGCSMHYfs="; + sha256 = "sha256-1k+AWmpAiHcQVEB5kUaMtNWhOnTBnmJiNU8zL1J/PEk="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix b/third_party/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix index 17a3af68a8..9ba581e3a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osm-gps-map"; - version = "1.1.0"; + version = "1.2.0"; src = fetchzip { url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz"; - sha256 = "0fal3mqcf3yypir4f7njz0dm5wr7lqwpimjx28wz9imh48cqx9n9"; + sha256 = "sha256-ciw28YXhR+GC6B2VPC+ZxjyhadOk3zYGuOssSgqjwH0="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index fdd45b4bb0..fc566d91e9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -19,13 +19,16 @@ , libsndfile , vulkan-headers , vulkan-loader +, ncurses , makeFontsConf , callPackage , nixosTests +, withMediaSession ? true , gstreamerSupport ? true, gst_all_1 ? null , ffmpegSupport ? true, ffmpeg ? null -, bluezSupport ? true, bluez ? null, sbc ? null, libopenaptx ? null, ldacbt ? null +, bluezSupport ? true, bluez ? null, sbc ? null, libopenaptx ? null, ldacbt ? null, fdk_aac ? null , nativeHspSupport ? true +, nativeHfpSupport ? true , ofonoSupport ? true , hsphfpdSupport ? true }: @@ -36,111 +39,117 @@ let }; mesonBool = b: if b then "true" else "false"; -in -stdenv.mkDerivation rec { - pname = "pipewire"; - version = "0.3.18"; - outputs = [ - "out" - "lib" - "pulse" - "jack" - "dev" - "doc" - "installedTests" - ]; + self = stdenv.mkDerivation rec { + pname = "pipewire"; + version = "0.3.21"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pipewire"; - repo = "pipewire"; - rev = version; - sha256 = "1yghhgs18yqrnd0b2r75l5n8yng962r1wszbsi01v6i9zib3jc9g"; - }; + outputs = [ + "out" + "lib" + "pulse" + "jack" + "dev" + "doc" + "mediaSession" + "installedTests" + ]; - patches = [ - # Break up a dependency cycle between outputs. - ./alsa-profiles-use-libdir.patch - # Move installed tests into their own output. - ./installed-tests-path.patch - # Change the path of the pipewire-pulse binary in the service definition. - ./pipewire-pulse-path.patch - # Add flag to specify configuration directory (different from the installation directory). - ./pipewire-config-dir.patch - ]; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "pipewire"; + rev = version; + hash = "sha256:2YJzPTMPIoQQeNja3F53SD4gtpdSlbD/i77hBWiQfuQ="; + }; - nativeBuildInputs = [ - doxygen - graphviz - meson - ninja - pkg-config - ]; + patches = [ + # Break up a dependency cycle between outputs. + ./alsa-profiles-use-libdir.patch + # Move installed tests into their own output. + ./installed-tests-path.patch + # Change the path of the pipewire-pulse binary in the service definition. + ./pipewire-pulse-path.patch + # Add flag to specify configuration directory (different from the installation directory). + ./pipewire-config-dir.patch + ]; - buildInputs = [ - alsaLib - dbus - glib - libjack2 - libsndfile - udev - vulkan-headers - vulkan-loader - valgrind - systemd - ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] - ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc ]; + nativeBuildInputs = [ + doxygen + graphviz + meson + ninja + pkg-config + ]; - mesonFlags = [ - "-Ddocs=true" - "-Dman=false" # we don't have xmltoman - "-Dexamples=true" # only needed for `pipewire-media-session` - "-Dudevrulesdir=lib/udev/rules.d" - "-Dinstalled_tests=true" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Dpipewire_pulse_prefix=${placeholder "pulse"}" - "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dgstreamer=${mesonBool gstreamerSupport}" - "-Dffmpeg=${mesonBool ffmpegSupport}" - "-Dbluez5=${mesonBool bluezSupport}" - "-Dbluez5-backend-native=${mesonBool nativeHspSupport}" - "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}" - "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}" - "-Dpipewire_config_dir=/etc/pipewire" - ]; + buildInputs = [ + alsaLib + dbus + glib + libjack2 + libsndfile + ncurses + udev + vulkan-headers + vulkan-loader + valgrind + systemd + ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ]; - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + mesonFlags = [ + "-Ddocs=true" + "-Dman=false" # we don't have xmltoman + "-Dexamples=${mesonBool withMediaSession}" # only needed for `pipewire-media-session` + "-Dudevrulesdir=lib/udev/rules.d" + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Dpipewire_pulse_prefix=${placeholder "pulse"}" + "-Dlibjack-path=${placeholder "jack"}/lib" + "-Dgstreamer=${mesonBool gstreamerSupport}" + "-Dffmpeg=${mesonBool ffmpegSupport}" + "-Dbluez5=${mesonBool bluezSupport}" + "-Dbluez5-backend-hsp-native=${mesonBool nativeHspSupport}" + "-Dbluez5-backend-hfp-native=${mesonBool nativeHfpSupport}" + "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}" + "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}" + "-Dpipewire_config_dir=/etc/pipewire" + ]; - doCheck = true; + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file - postInstall = '' - moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "bin/pipewire-pulse" "$pulse" - ''; + doCheck = true; - passthru.tests = { - installedTests = nixosTests.installed-tests.pipewire; + postInstall = '' + moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" + moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" + moveToOutput "bin/pipewire-pulse" "$pulse" + moveToOutput "bin/pipewire-media-session" "$mediaSession" + ''; - # This ensures that all the paths used by the NixOS module are found. - test-paths = callPackage ./test-paths.nix { - paths-out = [ - "share/alsa/alsa.conf.d/50-pipewire.conf" - ]; - paths-lib = [ - "lib/alsa-lib/libasound_module_pcm_pipewire.so" - "share/alsa-card-profile/mixer" - ]; + passthru.tests = { + installedTests = nixosTests.installed-tests.pipewire; + + # This ensures that all the paths used by the NixOS module are found. + test-paths = callPackage ./test-paths.nix { + paths-out = [ + "share/alsa/alsa.conf.d/50-pipewire.conf" + ]; + paths-lib = [ + "lib/alsa-lib/libasound_module_pcm_pipewire.so" + "share/alsa-card-profile/mixer" + ]; + }; + }; + + meta = with lib; { + description = "Server and user space API to deal with multimedia pipelines"; + homepage = "https://pipewire.org/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ jtojnar ]; }; }; - meta = with lib; { - description = "Server and user space API to deal with multimedia pipelines"; - homepage = "https://pipewire.org/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ jtojnar ]; - }; -} +in self diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch index 6ac86b111e..99782e1bb2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch @@ -1,19 +1,22 @@ diff --git a/meson_options.txt b/meson_options.txt -index 4b9e46b8..9d73ed06 100644 +index 050a4c31..c481e76c 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -147,3 +147,6 @@ option('pw-cat', +@@ -148,6 +148,9 @@ option('udev', option('udevrulesdir', type : 'string', description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') +option('pipewire_pulse_prefix', + type : 'string', + description : 'Install directory for the pipewire-pulse daemon') + option('systemd-user-unit-dir', + type : 'string', + description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)') diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index 29fc93d4..f78946f2 100644 +index 46dfbbc8..0d975cec 100644 --- a/src/daemon/systemd/user/meson.build +++ b/src/daemon/systemd/user/meson.build -@@ -6,7 +6,7 @@ install_data( +@@ -9,7 +9,7 @@ install_data( systemd_config = configuration_data() systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire')) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-3/builder.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-3/builder.sh deleted file mode 100644 index 460ae17766..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-3/builder.sh +++ /dev/null @@ -1,38 +0,0 @@ -source $stdenv/setup - - -preConfigure() { - - # Patch some of the configure files a bit to get of global paths. - # (Buildings using stuff in those paths will fail anyway, but it - # will cause ./configure misdetections). - for i in config.tests/unix/checkavail config.tests/*/*.test mkspecs/*/qmake.conf; do - echo "patching $i..." - substituteInPlace "$i" \ - --replace " /lib" " /FOO" \ - --replace "/usr" "/FOO" - done -} - - -# !!! TODO: -system-libmng -configureFlags="-prefix $out $configureFlags" -dontAddPrefix=1 - -configureScript=configureScript -configureScript() { - echo yes | ./configure $configureFlags - export LD_LIBRARY_PATH=$(pwd)/lib -} - - -postInstall() { - # Qt's `make install' is broken; it copies ./bin/qmake, which - # is a symlink to ./qmake/qmake. So we end up with a dangling - # symlink. - rm $out/bin/qmake - cp -p qmake/qmake $out/bin -} - - -genericBuild diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-3/default.nix deleted file mode 100644 index b2d818a297..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-3/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv, fetchurl -, xftSupport ? true, libXft ? null -, xrenderSupport ? true, libXrender ? null -, xrandrSupport ? true, libXrandr ? null -, xineramaSupport ? true, libXinerama ? null -, cursorSupport ? true, libXcursor ? null -, threadSupport ? true -, mysqlSupport ? false, libmysqlclient ? null -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, libGL ? null, libGLU ? null, libXmu ? null -, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which -}: - -assert xftSupport -> libXft != null; -assert xrenderSupport -> xftSupport && libXrender != null; -assert xrandrSupport -> libXrandr != null; -assert cursorSupport -> libXcursor != null; -assert mysqlSupport -> libmysqlclient != null; -assert openglSupport -> libGL != null && libGLU != null && libXmu != null; - -stdenv.mkDerivation { - name = "qt-3.3.8"; - - builder = ./builder.sh; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = "http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2"; - sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8"; - }; - - nativeBuildInputs = [ which ]; - propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg]; - - hardeningDisable = [ "format" ]; - - configureFlags = let - mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}"; - in [ - "-v" - "-system-zlib" "-system-libpng" "-system-libjpeg" - "-qt-gif" - "-I${xorgproto}/include" - (mk threadSupport "thread") - (mk xrenderSupport "xrender") - (mk xrandrSupport "xrandr") - (mk xineramaSupport "xinerama") - (mk xrandrSupport "xrandr") - (mk xftSupport "xft") - ] ++ lib.optionals openglSupport [ - "-dlopen-opengl" - "-L${libGL}/lib" "-I${libGLU}/include" - "-L${libXmu.out}/lib" "-I${libXmu.dev}/include" - ] ++ lib.optionals xrenderSupport [ - "-L${libXrender.out}/lib" "-I${libXrender.dev}/include" - ] ++ lib.optionals xrandrSupport [ - "-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include" - ] ++ lib.optionals xineramaSupport [ - "-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include" - ] ++ lib.optionals cursorSupport [ - "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" - ] ++ lib.optionals mysqlSupport [ - "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" - ] ++ lib.optionals xftSupport [ - "-L${libXft.out}/lib" "-I${libXft.dev}/include" - "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include" - "-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include" - ]; - - patches = [ - # Don't strip everything so we can get useful backtraces. - ./strip.patch - - # Build on NixOS. - ./qt-pwd.patch - - # randr.h and Xrandr.h need not be in the same prefix. - ./xrandr.patch - - # Make it build with gcc 4.6.0 - ./qt3-gcc4.6.0.patch - ]; - - passthru = {inherit mysqlSupport;}; - - meta = with lib; { - license = with licenses; [ gpl2 qpl ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch deleted file mode 100644 index 763f785726..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN qt-x11-free-3.3.3/configure qt-x11-free-3.3.3.new/configure ---- qt-x11-free-3.3.3/configure 2004-06-14 11:18:55.000000000 +0200 -+++ qt-x11-free-3.3.3.new/configure 2005-11-12 19:39:43.000000000 +0100 -@@ -16,9 +16,9 @@ - relconf=`basename $0` - # the directory of this script is the "source tree" - relpath=`dirname $0` --relpath=`(cd $relpath; /bin/pwd)` -+relpath=`(cd $relpath; pwd)` - # the current directory is the "build tree" or "object tree" --outpath=`/bin/pwd` -+outpath=`pwd` - - # later cache the command line in config.status - OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"` diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch deleted file mode 100644 index c1a903c130..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -I picked it here: -https://bugs.archlinux.org/task/23915 - ---- qt-x11-free-3.3.8b/src/tools/qmap.h~ 2008-01-15 19:09:13.000000000 +0000 -+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-04-11 00:16:04.000000000 +0100 -@@ -50,6 +50,7 @@ - #endif // QT_H - - #ifndef QT_NO_STL -+#include - #include - #include - #endif ---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h~ 2008-01-15 19:09:13.000000000 +0000 -+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-04-11 00:16:49.000000000 +0100 -@@ -48,6 +48,7 @@ - #endif // QT_H - - #ifndef QT_NO_STL -+#include - #include - #include - #endif diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh deleted file mode 100644 index db1a2529ff..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export QTDIR=@out@ diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-3/strip.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-3/strip.patch deleted file mode 100644 index a0c9fa7388..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-3/strip.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -rc qt-x11-free-3.3.3-orig/mkspecs/linux-g++/qmake.conf qt-x11-free-3.3.3/mkspecs/linux-g++/qmake.conf -*** qt-x11-free-3.3.3-orig/mkspecs/linux-g++/qmake.conf 2004-08-05 16:42:57.000000000 +0200 ---- qt-x11-free-3.3.3/mkspecs/linux-g++/qmake.conf 2005-03-02 12:25:55.000000000 +0100 -*************** -*** 85,90 **** - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir - QMAKE_STRIP = strip -! QMAKE_STRIPFLAGS_LIB += --strip-unneeded - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- 85,90 ---- - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir - QMAKE_STRIP = strip -! QMAKE_STRIPFLAGS_LIB += --strip-debug - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch deleted file mode 100644 index 0389c7fdd0..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -rc qt-x11-free-3.3.6-orig/config.tests/x11/xrandr.test qt-x11-free-3.3.6/config.tests/x11/xrandr.test -*** qt-x11-free-3.3.6-orig/config.tests/x11/xrandr.test 2006-09-14 14:00:08.000000000 +0200 ---- qt-x11-free-3.3.6/config.tests/x11/xrandr.test 2006-09-14 14:10:39.000000000 +0200 -*************** -*** 52,69 **** - INCDIRS="$IN_INCDIRS $XDIRS /FOO/include /include" - F= - for INCDIR in $INCDIRS; do -! if [ -f $INCDIR/$INC -a -f $INCDIR/$INC2 ]; then - F=yes -! XRANDR_H=$INCDIR/$INC - RANDR_H=$INCDIR/$INC2 -! [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR" - break - fi - done - if [ -z "$F" ] - then - XRANDR=no -! [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" - fi - fi - ---- 52,69 ---- - INCDIRS="$IN_INCDIRS $XDIRS /FOO/include /include" - F= - for INCDIR in $INCDIRS; do -! if [ -f $INCDIR/$INC2 ]; then - F=yes -! # XRANDR_H=$INCDIR/$INC - RANDR_H=$INCDIR/$INC2 -! [ "$VERBOSE" = "yes" ] && echo " Found $INC2 in $INCDIR" - break - fi - done - if [ -z "$F" ] - then - XRANDR=no -! [ "$VERBOSE" = "yes" ] && echo " Could not find $INC2 anywhere in $INCDIRS" - fi - fi - diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 7e5582cca4..9613eed287 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -229,6 +229,8 @@ qtModule { description = "A web engine based on the Chromium web browser"; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; + # This build takes a long time; particularly on slow architectures + timeout = 24 * 3600; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index 9631f3931c..72c4e5ac1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -8,10 +8,16 @@ , fixDarwinDylibNames , cudaSupport -, nvidia_x11 +, cudatoolkit_10_2 +, cudnn_cudatoolkit_10_2 }: let + # The binary libtorch distribution statically links the CUDA + # toolkit. This means that we do not need to provide CUDA to + # this derivation. However, we should ensure on version bumps + # that the CUDA toolkit for `passthru.tests` is still + # up-to-date. version = "1.7.1"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; @@ -24,12 +30,7 @@ in stdenv.mkDerivation { nativeBuildInputs = if stdenv.isDarwin then [ fixDarwinDylibNames ] - else [ addOpenGLRunpath patchelf ] - ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; - - buildInputs = [ - stdenv.cc.cc - ] ++ lib.optionals cudaSupport [ nvidia_x11 ]; + else [ patchelf ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; dontBuild = true; dontConfigure = true; @@ -56,9 +57,7 @@ in stdenv.mkDerivation { ''; postFixup = let - libPaths = [ stdenv.cc.cc.lib ] - ++ lib.optionals cudaSupport [ nvidia_x11 ]; - rpath = lib.makeLibraryPath libPaths; + rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; in lib.optionalString stdenv.isLinux '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." @@ -108,12 +107,17 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - passthru.tests.cmake = callPackage ./test { }; + passthru.tests.cmake = callPackage ./test { + inherit cudaSupport; + cudatoolkit = cudatoolkit_10_2; + cudnn = cudnn_cudatoolkit_10_2; + }; meta = with lib; { description = "C++ API of the PyTorch machine learning framework"; homepage = "https://pytorch.org/"; license = licenses.unfree; # Includes CUDA and Intel MKL. + maintainers = with maintainers; [ danieldk ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix index e69807871f..60f9b5ad88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -1,6 +1,28 @@ -{ stdenv, cmake, libtorch-bin, symlinkJoin }: +{ lib +, stdenv +, cmake +, libtorch-bin +, linkFarm +, symlinkJoin -stdenv.mkDerivation { +, cudaSupport +, cudatoolkit +, cudnn +}: +let + cudatoolkit_joined = symlinkJoin { + name = "${cudatoolkit.name}-unsplit"; + paths = [ cudatoolkit.out cudatoolkit.lib ]; + }; + + # We do not have access to /run/opengl-driver/lib in the sandbox, + # so use a stub instead. + cudaStub = linkFarm "cuda-stub" [{ + name = "libcuda.so.1"; + path = "${cudatoolkit}/lib/stubs/libcuda.so"; + }]; + +in stdenv.mkDerivation { pname = "libtorch-test"; version = libtorch-bin.version; @@ -8,7 +30,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - buildInputs = [ libtorch-bin ]; + buildInputs = [ libtorch-bin ] ++ + lib.optionals cudaSupport [ cudnn ]; + + cmakeFlags = lib.optionals cudaSupport + [ "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit_joined}" ]; doCheck = true; @@ -17,6 +43,7 @@ stdenv.mkDerivation { ''; checkPhase = '' - ./test + LD_LIBRARY_PATH=${cudaStub}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH \ + ./test ''; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix index de0bc13e28..efb7f41b95 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix @@ -1,20 +1,21 @@ -{ lib, fetchurl, buildDunePackage, alcotest, bos, dune-configurator }: +{ lib, fetchurl, buildDunePackage, ocaml, alcotest, bos, rresult }: buildDunePackage rec { pname = "base64"; - version = "3.4.0"; + version = "3.5.0"; + + minimumOCamlVersion = "4.03"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz"; - sha256 = "0d0n5gd4nkdsz14jnxq13f1f7rzxmndg5xql039a8wfppmazd70w"; + sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q="; }; - buildInputs = [ bos dune-configurator ]; - - doCheck = true; - checkInputs = [ alcotest ]; + # otherwise fmt breaks evaluation + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest bos rresult ]; meta = { homepage = "https://github.com/mirage/ocaml-base64"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index 29b18e0bf9..5632cfbb7c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -533,6 +533,14 @@ rec { propagatedBuildInputs = [ ppxlib ]; }; + ppx_log = janePackage { + pname = "ppx_log"; + hash = "10hnr5lpww3fw0bnidzngalbgy0j1wvz1g5ki9c9h558pnpvsazr"; + minimumOCamlVersion = "4.08.0"; + meta.description = "Ppx_sexp_message-like extension nodes for lazily rendering log messages"; + propagatedBuildInputs = [ async_unix ppx_jane sexplib ]; + }; + ppx_module_timer = janePackage { pname = "ppx_module_timer"; hash = "163q1rpblwv82fxwyf0p4j9zpsj0jzvkfmzb03r0l49gqhn89mp6"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix new file mode 100644 index 0000000000..a506e6795f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchurl +, buildDunePackage +, ounit +}: + +buildDunePackage rec { + pname = "sha"; + version = "1.13"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "00z2s4fsv9i1h09rj5dy3nd9hhcn79b75sn2ljj5wihlf4y4g304"; + }; + + doCheck = true; + checkInputs = [ ounit ]; + + meta = with lib; { + description = "Binding for SHA interface code in OCaml"; + maintainers = [ maintainers.arthurteisseire ]; + homepage = "https://github.com/djs55/ocaml-${pname}"; + license = licenses.isc; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix index 020b256c72..bb70ff6a4b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,12 +1,16 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, uunf, uucd }: let pname = "uucp"; - version = "11.0.0"; + version = "13.0.0"; webpage = "https://erratique.ch/software/${pname}"; + minimumOCamlVersion = "4.03"; + doCheck = true; in -assert lib.versionAtLeast ocaml.version "4.01"; +if !(lib.versionAtLeast ocaml.version minimumOCamlVersion) +then builtins.throw "${pname} needs at least OCaml ${minimumOCamlVersion}" +else stdenv.mkDerivation { @@ -14,17 +18,29 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0pidg2pmqsifmk4xx9cc5p5jprhg26xb68g1xddjm7sjzbdzhlm4"; + sha256 = "sha256-OPpHbCOC/vMFdyHwyhCSisUv2PyO8xbeY2oq1a9HbqY="; }; buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ]; propagatedBuildInputs = [ uchar ]; - buildPhase = "${topkg.buildPhase} --with-cmdliner false"; + buildPhase = '' + runHook preBuild + ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString doCheck} + runHook postBuild + ''; inherit (topkg) installPhase; + inherit doCheck; + checkPhase = '' + runHook preCheck + ${topkg.run} test + runHook postCheck + ''; + checkInputs = [ uucd ]; + meta = with lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; homepage = webpage; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix index 86fb75f145..62ea5546ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix @@ -1,8 +1,14 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, flit -, lxml, httpx -, pytest, pytestcov, pytest-asyncio, pytest-mock, aresponses +{ lib +, buildPythonPackage +, fetchFromGitHub , pythonOlder +, flit +, async-timeout +, lxml +, httpx +, pytestCheckHook +, pytest-asyncio +, pytest-httpx }: buildPythonPackage rec { @@ -23,24 +29,18 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + async-timeout httpx lxml ]; - # requires pytest-httpx - doCheck = false; + pythonImportsCheck = [ "RMVtransport" ]; checkInputs = [ - pytest - pytestcov + pytestCheckHook pytest-asyncio - pytest-mock - # pytest-httpx is missing - aresponses + pytest-httpx ]; - checkPhase = '' - pytest --cov=RMVtransport tests - ''; meta = with lib; { homepage = "https://github.com/cgtobi/PyRMVtransport"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index cc8ee94625..1b68cc7bb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Wd8Qq/jE/C/zx1CRuKLt5Tz8VHY/4bwUa229aDcCFjk="; + sha256 = "sha256-JcqDuTzR2sffEbmhJHRPJggLruc9lKQ4aO/Ab88yo/I="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix index a0a3d74e57..9c67765055 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy27 , pygments -, pytest +, pytestCheckHook , pytestcov , uvloop }: @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook pytestcov uvloop ]; @@ -37,9 +37,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "aiorun" ]; meta = with lib; { description = "Boilerplate for asyncio applications"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index 826ee6103f..e2f2f24278 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -1,4 +1,4 @@ -{ lib, isPy3k, fetchPypi, fetchpatch, buildPythonPackage +{ lib, isPy3k, fetchPypi, buildPythonPackage , uvloop, postgresql }: buildPythonPackage rec { @@ -16,6 +16,8 @@ buildPythonPackage rec { postgresql ]; + pythonImportsCheck = [ "asyncpg" ]; + meta = with lib; { homepage = "https://github.com/MagicStack/asyncpg"; description = "An asyncio PosgtreSQL driver"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix index ce4c6f7892..efe4780c0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; propagatedBuildInputs = [ botocore lxml requests requests-kerberos click configparser fido2 ]; + pythonImportsCheck = [ "aws_adfs" ]; + meta = with lib; { description = "Command line tool to ease aws cli authentication against ADFS"; homepage = "https://github.com/venth/aws-adfs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index f4c5bfb162..6b27e8e5d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, - python, twisted, jinja2, zope_interface, future, sqlalchemy, + python, twisted, jinja2, zope_interface, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix index ebc0eb51df..16c61f2e89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , freezegun , google-api-core , matplotlib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix index 85ed160413..3226e3854c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix @@ -46,11 +46,6 @@ buildPythonPackage rec { ipython ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'numba==0.43'" "'numba'" - ''; - # avoid collecting local files preCheck = '' cd clifford/test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix index 92af67fa18..5baa28e4bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , fetchpatch , rPackages -, rWrapper , buildPythonPackage , biopython , numpy @@ -55,11 +54,6 @@ buildPythonPackage rec { rPackages.DNAcopy ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pandas >= 0.20.1, < 0.25.0" "pandas" - ''; - checkInputs = [ R ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix index e1aa8252d1..7427d391c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/codespell/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell" ''; - # tries to run not rully installed script + # tries to run not fully installed script disabledTests = [ "test_command" ]; pythonImportsCheck = [ "codespell_lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix index d1dcce9699..9b6e5da626 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix @@ -1,20 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "ConfigArgParse"; - version = "1.2.3"; + version = "1.3"; - src = fetchPypi { - inherit pname version; - sha256 = "1p1pzpf5qpf80bfxsx1mbw9blyhhypjvhl3i60pbmhfmhvlpplgd"; + src = fetchFromGitHub { + owner = "bw2"; + repo = pname; + rev = version; + sha256 = "147x781lgahn9r3gbhayhx1pf0iysf7q1hnr3kypy3p2k9v7a9mh"; }; - # no tests in tarball - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "configargparse" ]; meta = with lib; { description = "A drop-in replacement for argparse"; - homepage = "https://github.com/zorro3/ConfigArgParse"; + homepage = "https://github.com/bw2/ConfigArgParse"; license = licenses.mit; maintainers = [ maintainers.willibutz ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix index 6c488a271e..fc470e012f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { # tests not packaged with pypi release doCheck = false; + pythonImportsCheck = [ "cornice" ]; meta = with lib; { homepage = "https://github.com/mozilla-services/cornice"; @@ -27,5 +28,4 @@ buildPythonPackage rec { license = licenses.mpl20; maintainers = [ maintainers.costrouc ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix index 4105d98138..ea32471f09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -2,13 +2,12 @@ , buildPythonPackage , fetchFromGitHub , isPy3k -, pytestrunner , click , dateparser , pandas , py-lru-cache , six -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -23,11 +22,6 @@ buildPythonPackage rec { sha256 = "0p99cg76d3s7jxvigh5ad04dzhmr6g62qzzh4i6h7x9aiyvdhvk4"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace pandas~=0.25.0 pandas - ''; - propagatedBuildInputs = [ click dateparser @@ -37,13 +31,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - pytest - ''; - meta = with lib; { description = "Convert CSV files into a SQLite database"; homepage = "https://github.com/simonw/csvs-to-sqlite"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix index 4c2db1f521..42f1d77b12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi , chart-studio , colorlover , ipython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix index a3cc7b6afd..a68c86538e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , dask , numpy, toolz # dask[array] , scipy @@ -38,6 +37,7 @@ buildPythonPackage rec { checkPhase = '' pytest --ignore=tests/test_dask_image/ ''; + pythonImportsCheck = [ "dask_image" ]; meta = with lib; { homepage = "https://github.com/dask/dask-image"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix index 737def7b9a..4f4b7b705c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix @@ -12,10 +12,6 @@ , six , multipledispatch , packaging -, pytest -, xgboost -, tensorflow -, joblib , distributed }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix index 1bec4c8287..d656b055d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix @@ -4,8 +4,6 @@ , dask , distributed , mpi4py -, pytest -, requests }: buildPythonPackage rec { @@ -17,15 +15,11 @@ buildPythonPackage rec { sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7"; }; - checkInputs = [ pytest requests ]; propagatedBuildInputs = [ dask distributed mpi4py ]; - checkPhase = '' - py.test dask_mpi - ''; - # hardcoded mpirun path in tests doCheck = false; + pythonImportsCheck = [ "dask_mpi" ]; meta = with lib; { homepage = "https://github.com/dask/dask-mpi"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix index 4e64b8c9f0..eb18ac31fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix @@ -4,8 +4,6 @@ , xgboost , dask , distributed -, pytest -, scikitlearn }: buildPythonPackage rec { @@ -17,19 +15,17 @@ buildPythonPackage rec { sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c"; }; - checkInputs = [ pytest scikitlearn ]; propagatedBuildInputs = [ xgboost dask distributed ]; - checkPhase = '' - py.test dask_xgboost/tests/test_core.py - ''; - doCheck = false; + pythonImportsCheck = [ "dask_xdgboost" ]; meta = with lib; { homepage = "https://github.com/dask/dask-xgboost"; description = "Interactions between Dask and XGBoost"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + # TypeError: __init__() got an unexpected keyword argument 'iid' + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix index 534cc816de..2b11b1ea27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { # dask doesn't do well with large core counts checkPhase = '' - pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array' + pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested' ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dftfit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dftfit/default.nix index 0f0563e3ba..73791bdaa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dftfit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dftfit/default.nix @@ -12,11 +12,7 @@ , lammps-cython , pymatgen-lammps , pytestrunner -, pytest -, pytestcov -, pytest-benchmark , isPy3k -, openssh }: buildPythonPackage rec { @@ -25,18 +21,27 @@ buildPythonPackage rec { disabled = (!isPy3k); src = fetchPypi { - inherit pname version; - sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; + inherit pname version; + sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; }; buildInputs = [ pytestrunner ]; - checkInputs = [ pytest pytestcov pytest-benchmark openssh ]; - propagatedBuildInputs = [ pymatgen marshmallow pyyaml pygmo - pandas scipy numpy scikitlearn - lammps-cython pymatgen-lammps ]; + propagatedBuildInputs = [ + pymatgen + marshmallow + pyyaml + pygmo + pandas + scipy + numpy + scikitlearn + lammps-cython + pymatgen-lammps + ]; # tests require git lfs download. and is quite large so skip tests doCheck = false; + pythonImportsCheck = [ "dftfit" ]; meta = { description = "Ab-Initio Molecular Dynamics Potential Development"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix index f4be407fad..372b931bca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -1,11 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pytest -, pytest-repeat -, pytest-timeout -, mock -, joblib , click , cloudpickle , dask @@ -18,9 +13,6 @@ , tornado , zict , pyyaml -, isPy3k -, futures -, singledispatch , mpi4py , bokeh , pythonOlder @@ -29,6 +21,7 @@ buildPythonPackage rec { pname = "distributed"; version = "2.30.1"; + disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { @@ -36,23 +29,14 @@ buildPythonPackage rec { sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e"; }; - disabled = pythonOlder "3.6"; - - checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh ]; - # tests take about 10-15 minutes - # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses - # these tests are not critical to the library (only the cli) - checkPhase = '' - py.test distributed -m "not avoid-travis" -r s --timeout-method=thread --timeout=0 --durations=20 --ignore="distributed/cli/tests" - ''; - # when tested random tests would fail and not repeatably doCheck = false; + pythonImportsCheck = [ "distributed" ]; meta = { description = "Distributed computation in Python."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix index 0fa202addb..54af81d5d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.19.202"; + version = "2.20.204"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "2b606dc645f99feae67dfc528620dddc773ecef5d59bcaeae68bba601f25162b"; + sha256 = "sha256-JNjD9UtLHsMGwTuXydZ+L5+pPQ2eobkr26Yt9pgs1qA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index ea6dfe32fd..56fb450b3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -6,7 +6,7 @@ , pybind11 , setuptools_scm , pytestrunner -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -31,18 +31,10 @@ buildPythonPackage rec { pytestrunner ]; - checkInputs = [ - pytest - ]; + propagatedBuildInputs = [ numpy pandas ]; - propagatedBuildInputs = [ - numpy - pandas - ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "duckdb" ]; meta = with lib; { description = "DuckDB is an embeddable SQL OLAP Database Management System"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easywatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easywatch/default.nix index a56ffb9528..36f3ea0de6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easywatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easywatch/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { # There are no tests doCheck = false; + pythonImportsCheck = [ "easywatch" ]; meta = with lib; { description = "Dead-simple way to watch a directory"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix index 07922ee19e..dc25759afe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner, -thrift, pytest, python-snappy, lz4, zstd }: +{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner +, thrift, pytestCheckHook, python-snappy, lz4, zstandard, zstd }: buildPythonPackage rec { pname = "fastparquet"; @@ -12,15 +12,13 @@ buildPythonPackage rec { sha256 = "17i091kky34m2xivk29fqsyxxxa7v4352n79w01n7ni93za6wana"; }; - postPatch = '' - # FIXME: package zstandard - # removing the test dependency for now - substituteInPlace setup.py --replace "'zstandard'," "" - ''; - nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ numba numpy pandas thrift ]; - checkInputs = [ pytest python-snappy lz4 zstd ]; + checkInputs = [ pytestCheckHook python-snappy lz4 zstandard zstd ]; + + # E ModuleNotFoundError: No module named 'fastparquet.speedups' + doCheck = false; + pythonImportsCheck = [ "fastparquet" ]; meta = with lib; { description = "A python implementation of the parquet format"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix index 96019f61ca..ac8e912ba3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { checkInputs = [ mock pyfakefs ]; + pythonImportsCheck = [ "fido2" ]; + meta = with lib; { description = "Provides library functionality for FIDO 2.0, including communication with a device over USB."; homepage = "https://github.com/Yubico/python-fido2"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix index a5525d97f6..1349e10c53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi, isPy27 +{ lib, buildPythonPackage, fetchPypi, isPy27 , numpy , scipy , tables diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index 75f4908b63..d0ad132991 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.19.1"; + version = "4.20.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "16jz3g4jzfdc43hs33b59vzd9m233qgflvy3ycdynifqk16lqsp2"; + sha256 = "0yj83vsjh23g7gkmq6svbgc898x3qgygkhvpcbpycvmpwxxqxh1v"; }; # all dependencies are optional, but diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix index 50ed257f57..9a0b1b09db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , numpy -, setuptools , python , scikitimage , openjpeg diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix index 590962590e..53ce654e41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix @@ -1,8 +1,9 @@ -{ buildPythonPackage, fetchPypi, lib, requests, pytestCheckHook, mock }: +{ buildPythonPackage, fetchPypi, pythonAtLeast, lib, requests, pytestCheckHook, mock }: buildPythonPackage rec { pname = "google-i18n-address"; version = "2.4.0"; + disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; @@ -15,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google's i18n address data packaged for Python"; - homepage = "https://pypi.org/project/google-i18n-address/"; + homepage = "https://github.com/mirumee/google-i18n-address"; maintainers = with maintainers; [ SuperSandro2000 ]; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix index 4fd6ccf19c..b4e8803784 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; checkInputs = [ pytestCheckHook pytestcov ]; - pytestFlagsArray = [ "tests" "--ignore=docs" ]; + pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ]; disabledTests = [ "gridplot_outputs" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index 7562e36e4d..d01fd38976 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.12.22"; + version = "2021.2.1"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "1jzcw4clmpbyw67pzskms5rq5b7285iwh42jzc4ly6jz9amggdzc"; + sha256 = "sha256-R6tqGxGd6JymFgQX+deDPOtlKlwUjL7uf+zGdNxUW/s="; }; # tests require network connection @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Chromium HSTS Preload list as a Python package and updated daily"; homepage = "https://github.com/sethmlarson/hstspreload"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix index 1fe5ab7153..27e308ee44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix @@ -1,5 +1,10 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, watchdog, mock +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pytest-cov +, watchdog }: buildPythonPackage rec { @@ -11,11 +16,14 @@ buildPythonPackage rec { sha256 = "3818f53dabc24da66f65cf4878c1c7a9b5df0c46b813e014abdd7c569eb9a02a"; }; - checkPhase = '' - py.test - ''; - # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - checkInputs = [ pytest pytestcov mock ] ++ lib.optional (!stdenv.isDarwin) watchdog; + checkInputs = [ pytestCheckHook pytest-cov ] ++ lib.optional (!stdenv.isDarwin) watchdog; + + meta = with lib; { + description = "in-process file monitor / reloader for reloading your code automatically during development"; + homepage = "https://github.com/Pylons/hupper"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/image-match/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/image-match/default.nix index 7464f3c899..ed5179d6db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/image-match/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/image-match/default.nix @@ -24,6 +24,7 @@ buildPythonPackage { # tests cannot work without elasticsearch doCheck = false; + pythonImportsCheck = [ "image_match" ]; meta = with lib; { homepage = "https://github.com/ascribe/image-match"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix index 8d2b7fd8da..ee1df820a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix @@ -26,6 +26,9 @@ buildPythonPackage rec { opencv3 ]; + doCheck = false; + pythonImportsCheck = [ "imagecorruptions" ]; + meta = with lib; { homepage = "https://github.com/bethgelab/imagecorruptions"; description = "This package provides a set of image corruptions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index e0c2adb8e8..3805b55bcf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -3,7 +3,6 @@ , pandas , pytestCheckHook , scikitlearn -, tensorflow }: buildPythonPackage rec { @@ -37,6 +36,7 @@ buildPythonPackage rec { "_generator" "show_versions" "test_make_imbalanced_iris" + "test_rusboost[SAMME.R]" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix index 922d543fd1..f3f8c96a6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -64,14 +64,17 @@ buildPythonPackage rec { PATH=$out/bin:$PATH ''; - # disable tests which touch network - disabledTests = '' + disabledTests = [ + # disable tests which touch network "test_discover" "test_filtered_compressed_cache" "test_get_dir" "test_remote_cat" "http" - ''; + + # broken test + "test_read_pattern_with" + ]; meta = with lib; { description = "Data load and catalog system"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix index 0634e91902..e5b0cc6fbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix @@ -1,25 +1,23 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch +, pytestCheckHook }: buildPythonPackage rec { pname = "intelhex"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780"; + sha256 = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM="; }; - patches = [ - # patch the tests to check for the correct version string (2.2.1) - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/bialix/intelhex/pull/26.patch"; - sha256 = "1f3f2cyf9ipb9zdifmjs8rqhg028dhy91vabxxn3l7br657s8r2l"; - }) - ]; + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "intelhex/test.py" ]; + + pythonImportsCheck = [ "intelhex" ]; meta = { homepage = "https://github.com/bialix/intelhex"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch new file mode 100644 index 0000000000..d3e3082b35 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch @@ -0,0 +1,33 @@ +From 75baa1751973378cb96fb204b0a18a74e5caa2d1 Mon Sep 17 00:00:00 2001 +From: Rouven Czerwinski +Date: Wed, 17 Feb 2021 14:03:20 +0100 +Subject: [PATCH] serialdriver: remove pyserial version check + +This check isn't required on NixOS, since pyserial within NixOS already +contains the patches. + +Signed-off-by: Rouven Czerwinski +--- + labgrid/driver/serialdriver.py | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/labgrid/driver/serialdriver.py b/labgrid/driver/serialdriver.py +index 126f674e..59a92269 100644 +--- a/labgrid/driver/serialdriver.py ++++ b/labgrid/driver/serialdriver.py +@@ -27,12 +27,6 @@ class SerialDriver(ConsoleExpectMixin, Driver, ConsoleProtocol): + bindings = {"port": "SerialPort", } + else: + bindings = {"port": {"SerialPort", "NetworkSerialPort"}, } +- if version.parse(serial.__version__) != version.Version('3.4.0.1'): +- message = ("The installed pyserial version does not contain important RFC2217 fixes.\n" +- "You can install the labgrid fork via:\n" +- "pip uninstall pyserial\n" +- "pip install https://github.com/labgrid-project/pyserial/archive/v3.4.0.1.zip#egg=pyserial\n") # pylint: disable=line-too-long +- warnings.warn(message) + + txdelay = attr.ib(default=0.0, validator=attr.validators.instance_of(float)) + timeout = attr.ib(default=3.0, validator=attr.validators.instance_of(float)) +-- +2.30.0 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix new file mode 100644 index 0000000000..9d42d97e0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix @@ -0,0 +1,78 @@ +{ ansicolors +, attrs +, autobahn +, buildPythonPackage +, fetchFromGitHub +, jinja2 +, lib +, mock +, pexpect +, psutil +, pyserial +, pytestCheckHook +, pytest-dependency +, pytest-mock +, pyudev +, pyusb +, pyyaml +, requests +, setuptools-scm +, xmodem +}: + +buildPythonPackage rec { + pname = "labgrid"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "labgrid-project"; + repo = "labgrid"; + rev = "v${version}"; + sha256 = "15298prs2f4wiyn8lf475qicp3y22lcjdcpwp2fmrya642vnr6w5"; + }; + + patches = [ + ./0001-serialdriver-remove-pyserial-version-check.patch + ]; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ + ansicolors + attrs + autobahn + jinja2 + pexpect + pyserial + pyudev + pyusb + pyyaml + requests + xmodem + ]; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" + ''; + + checkInputs = [ + mock + psutil + pytestCheckHook + pytest-mock + pytest-dependency + ]; + + disabledTests = [ + "docker" + "sshmanager" + ]; + + meta = with lib; { + description = "Embedded control & testing library"; + homepage = "https://labgrid.org"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix index 4c16010f4a..609d7a410c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix @@ -9,10 +9,7 @@ , pymatgen , ase , pytestrunner -, pytest_4 -, pytestcov , isPy3k -, openssh }: buildPythonPackage rec { @@ -26,7 +23,6 @@ buildPythonPackage rec { }; buildInputs = [ cython pytestrunner ]; - checkInputs = [ pytest_4 pytestcov openssh ]; propagatedBuildInputs = [ mpi4py pymatgen ase numpy ]; preBuild = '' @@ -44,6 +40,8 @@ buildPythonPackage rec { EOF ''; + pythonImportsCheck = [ "lammps" ]; + meta = { description = "Pythonic Wrapper to LAMMPS using cython"; homepage = "https://gitlab.com/costrouc/lammps-cython"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix index 844e28aa07..febb1b1f0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix @@ -12,8 +12,8 @@ , flask , pyopenssl , ndg-httpsclient -, pytest -, pytestcov +, pytestCheckHook +, pytest-cov , pytest-mock , pytest-pylint , pytest-click @@ -39,13 +39,9 @@ buildPythonPackage rec { ] ++ lib.optionals isPy27 [ functools32 ]; checkInputs = [ - pytest pytestcov pytest-mock pytest-pylint pytest-click + pytestCheckHook pytest-cov pytest-mock pytest-pylint pytest-click ]; - checkPhase = '' - pytest - ''; - # many errors -- tests assume inside of git repo, linting errors 13/317 fail doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix index 2406738cf1..f8cb85ab41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix @@ -1,33 +1,41 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, libsodium +, pytestCheckHook +}: buildPythonPackage rec { pname = "libnacl"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "saltstack"; repo = pname; rev = "v${version}"; - sha256 = "10rpim9lf0qd861a3miq8iqg8w87slqwqni7nq66h72jdk130axg"; + sha256 = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc="; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ libsodium ]; + buildInputs = [ libsodium ]; postPatch = - let soext = stdenv.hostPlatform.extensions.sharedLibrary; in '' - substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium${soext}')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" - ''; + let soext = stdenv.hostPlatform.extensions.sharedLibrary; in + '' + substituteInPlace "./libnacl/__init__.py" --replace \ + "ctypes.cdll.LoadLibrary('libsodium${soext}')" \ + "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" + ''; - checkPhase = '' - py.test - ''; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "libnacl" ]; meta = with lib; { - maintainers = with maintainers; [ xvapx ]; description = "Python bindings for libsodium based on ctypes"; - homepage = "https://pypi.python.org/pypi/libnacl"; + homepage = "https://libnacl.readthedocs.io/"; license = licenses.asl20; platforms = platforms.unix; + maintainers = with maintainers; [ xvapx ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix index 35f55bb279..44402b36ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix @@ -45,5 +45,7 @@ buildPythonPackage rec { license= licenses.bsd3; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; + # incompatible with nixpkgs scikitlearn version + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix index 66fe63e3da..acf8ee4c11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix @@ -24,9 +24,11 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "modeled" ]; + meta = with lib; { description = "Universal data modeling for Python"; - homepage = "https://bitbucket.org/userzimmermann/python-modeled"; + homepage = "https://github.com/modeled/modeled"; license = licenses.lgpl3Only; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix index b7ddf35cae..86c5afd8c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { # tests not included with pypi release doCheck = false; + pythonImportsCheck = [ "nbsmoke" ]; meta = with lib; { description = "Basic notebook checks and linting"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix index e1c22ddbfa..3cd420c749 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy -, pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}: +, pandas, requests, Rtree, shapely, folium, scikitlearn, scipy}: buildPythonPackage rec { pname = "osmnx"; @@ -14,14 +14,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; - checkInputs = [ coverage pytest coveralls ]; - #Fails when using sandboxing as it requires internet connection, works fine without it + # requires network doCheck = false; - - #Check phase for the record - #checkPhase = '' - # coverage run --source osmnx -m pytest --verbose - #''; + pythonImportsCheck = [ "osmnx" ]; meta = with lib; { description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix index ea0ba44e99..d4aa1551be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , isPy27 , pandas , lxml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix index ab70a7782a..7ef78f9dfb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -20,7 +20,6 @@ # Test Inputs , glibcLocales , hypothesis -, moto , pytestCheckHook # Darwin inputs , runtimeShell @@ -54,7 +53,7 @@ buildPythonPackage rec { xlwt ]; - checkInputs = [ pytestCheckHook glibcLocales moto hypothesis ]; + checkInputs = [ pytestCheckHook glibcLocales hypothesis ]; # doesn't work with -Werror,-Wunused-command-line-argument # https://github.com/NixOS/nixpkgs/issues/39687 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix index bfe4e2b9ea..2f9fbdccd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { # not everything packaged with pypi release doCheck = false; + pythonImportsCheck = [ "pims" ]; meta = with lib; { homepage = "https://github.com/soft-matter/pims"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index b9c84c484d..a38d5df50d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { python3 = python; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix index 9cca6cf57e..034bdb6363 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , lib , fetchPypi -, isPy27 , click , num2words , numpy @@ -11,8 +10,7 @@ , patsy , bids-validator , sqlalchemy -, pytest -, pathlib +, pytestCheckHook }: buildPythonPackage rec { @@ -36,11 +34,8 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ pytest ] ++ lib.optionals isPy27 [ pathlib ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "bids" ]; meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index 64ec58487c..8ba9b3fc46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,13 +1,19 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "4.3.2"; + version = "4.3.3"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "dfeed4715e2056e3e56b9c5f51a679ce2934897eef926f3d14e5364e43f19070"; + sha256 = "sha256-/7KrJkoLg69Uii2wxQl5jiCDYd85YBuomK5lzs+1nLs="; }; postPatch = '' @@ -17,28 +23,22 @@ buildPythonPackage rec { substituteInPlace pyfakefs/tests/fake_os_test.py \ --replace "test_path_links_not_resolved" "notest_path_links_not_resolved" \ --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows" - substituteInPlace pyfakefs/tests/fake_filesystem_unittest_test.py \ - --replace "test_copy_real_file" "notest_copy_real_file" '' + (lib.optionalString stdenv.isDarwin '' # this test fails on darwin due to case-insensitive file system substituteInPlace pyfakefs/tests/fake_os_test.py \ --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" ''); - checkInputs = [ pytest glibcLocales ]; - - checkPhase = '' - export LC_ALL=en_US.UTF-8 - ${python.interpreter} -m pyfakefs.tests.all_tests - ${python.interpreter} -m pyfakefs.tests.all_tests_without_extra_packages - ${python.interpreter} -m pytest pyfakefs/pytest_tests/pytest_plugin_test.py - ''; + checkInputs = [ pytestCheckHook ]; + # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) + disabledTests = [ "test_open_existing_pipe" ]; + pythonImportsCheck = [ "pyfakefs" ]; meta = with lib; { description = "Fake file system that mocks the Python file system modules"; - license = licenses.asl20; - homepage = "http://pyfakefs.org/"; - changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md"; + homepage = "http://pyfakefs.org/"; + changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md"; + license = licenses.asl20; maintainers = with maintainers; [ gebner ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix index 155254a6af..96e807f8eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix @@ -10,20 +10,18 @@ buildPythonPackage rec { sha256 = "60988e823ca75808a26fd79d88dbae1de3699e72a293f812aa4534f8a0a58cb0"; }; + preConfigure = '' + export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib" + export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include" + ''; + buildInputs = [ fftw fftwFloat fftwLongDouble]; propagatedBuildInputs = [ numpy scipy cython dask ]; # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; - - preConfigure = '' - export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib" - export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include" - ''; - #+ optionalString isDarwin '' - # export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib" - #''; + pythonImportsCheck = [ "pyfftw" ]; meta = with lib; { description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 102619b2b3..19ffb6419d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.6.0"; + version = "2.6.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "bb4a908c9dadbc3aac18860550e870f58e1a02c9f2c204fdf5693d73be061210"; + sha256 = "sha256-cYt0eG6n7QeqDFi/VyFU1Geflg0m6WQcwd4gSjC4f8k="; }; nativeBuildInputs = [ pytestrunner installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix index c80472a673..72f362f85c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -3,14 +3,14 @@ , buildPythonPackage , pymatgen , pytestrunner -, pytest +, pytestCheckHook , isPy3k }: buildPythonPackage rec { pname = "pymatgen-lammps"; version = "0.4.5"; - disabled = (!isPy3k); + disabled = !isPy3k; src = fetchurl { url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; @@ -18,13 +18,17 @@ buildPythonPackage rec { }; buildInputs = [ pytestrunner ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ pymatgen ]; + pythonImportsCheck = [ "pmg_lammps" ]; + meta = { description = "A LAMMPS wrapper using pymatgen"; homepage = "https://gitlab.com/costrouc/pymatgen-lammps"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; + # not compatible with recent versions of pymatgen + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix index bae7a56132..448b4c3c33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { # No tests in pypi tarball. doCheck = false; + pythonImportsCheck = [ "pymatgen" ]; meta = with lib; { description = "A robust materials analysis code that defines core object representations for structures and molecules"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix index 22ac89cf6a..4e2bf164a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose +{ lib, buildPythonPackage, fetchPypi, six, chardet, nose , django, jinja2, tornado, pyramid, pyramid_mako, Mako }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index 44ac5a9221..a26eff37ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -33,6 +33,8 @@ buildPythonPackage rec { # https://github.com/Pylons/pyramid/issues/1899 doCheck = !isPy35; + pythonImportsCheck = [ "pyramid" ]; + meta = with lib; { description = "The Pyramid Web Framework, a Pylons project"; homepage = "https://trypyramid.com/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix index 5c4e7c104b..9a529214c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ beaker pyramid ]; meta = with lib; { + description = "Beaker session factory backend for Pyramid"; + homepage = "https://docs.pylonsproject.org/projects/pyramid_beaker/en/latest/"; + # idk, see https://github.com/Pylons/pyramid_beaker/blob/master/LICENSE.txt + # license = licenses.mpl20; maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix index d3388fdff3..377317049d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -23,11 +23,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ chameleon pyramid zope_interface setuptools ]; + pythonImportsCheck = [ "pyramid_chameleon" ]; + meta = with lib; { description = "Chameleon template compiler for pyramid"; homepage = "https://github.com/Pylons/pyramid_chameleon"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix index 55da77f496..96570fce88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -15,6 +15,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid ]; + pythonImportsCheck = [ "pyramid_exclog" ]; + meta = with lib; { description = "A package which logs to a Python logger when an exception is raised by a Pyramid application"; homepage = "https://docs.pylonsproject.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix index f2f156e98b..c2e17f8add 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -21,10 +21,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid hawkauthlib tokenlib ]; buildInputs = [ webtest ]; + pythonImportsCheck = [ "pyramid_hawkauth" ]; + meta = with lib; { homepage = "https://github.com/mozilla-services/pyramid_hawkauth"; description = "A Pyramid authentication plugin for HAWK"; license = licenses.mpl20; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix index 464d8d209b..d1eaf49e6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -18,11 +18,12 @@ buildPythonPackage rec { buildInputs = [ webtest ]; propagatedBuildInputs = [ jinja2 pyramid ]; + pythonImportsCheck = [ "pyramid_jinja2" ]; + meta = with lib; { description = "Jinja2 template bindings for the Pyramid web framework"; homepage = "https://github.com/Pylons/pyramid_jinja2"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix index 2f8c5e1e07..47aa1deb5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { homepage = "https://github.com/Pylons/pyramid_mako"; description = "Mako template bindings for the Pyramid web framework"; license = licenses.bsd0; + maintainers = with maintainers; []; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix index 545883a25c..859d4c3b43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; homepage = "https://github.com/mozilla-services/pyramid_multiauth"; license = licenses.mpl20; + maintainers = with maintainers; []; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyserial/001-rfc2217-only-negotiate-on-value-change.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyserial/001-rfc2217-only-negotiate-on-value-change.patch new file mode 100644 index 0000000000..6bd40bd935 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyserial/001-rfc2217-only-negotiate-on-value-change.patch @@ -0,0 +1,42 @@ +From c8b35f4b871d00e3020f525425517548bed9f6ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Sun, 9 Sep 2018 20:13:27 +0200 +Subject: [PATCH] serial/rfc2217: only subnegotiate on value change +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This was suggested and is a direct copy of Uwe Kleine König's patch +from [1]. + +[1]: https://github.com/pyserial/pyserial/issues/376#issuecomment-418885211 +Signed-off-by: Rouven Czerwinski +--- + serial/rfc2217.py | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/serial/rfc2217.py b/serial/rfc2217.py +index d962c1e8..2148512d 100644 +--- a/serial/rfc2217.py ++++ b/serial/rfc2217.py +@@ -330,11 +330,15 @@ def set(self, value): + the client needs to know if the change is performed he has to check the + state of this object. + """ +- self.value = value +- self.state = REQUESTED +- self.connection.rfc2217_send_subnegotiation(self.option, self.value) +- if self.connection.logger: +- self.connection.logger.debug("SB Requesting {} -> {!r}".format(self.name, self.value)) ++ if value != self.value: ++ self.value = value ++ self.state = REQUESTED ++ self.connection.rfc2217_send_subnegotiation(self.option, self.value) ++ if self.connection.logger: ++ self.connection.logger.debug("SB Requesting {} -> {!r}".format(self.name, self.value)) ++ else: ++ if self.connection.logger: ++ self.connection.logger.debug("SB Requesting {} -> {!r} (skipped)".format(self.name, self.value)) + + def is_ready(self): + """\ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyserial/002-rfc2217-timeout-setter-for-rfc2217.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyserial/002-rfc2217-timeout-setter-for-rfc2217.patch new file mode 100644 index 0000000000..39410dee16 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyserial/002-rfc2217-timeout-setter-for-rfc2217.patch @@ -0,0 +1,42 @@ +From a3698dc952fce0d07628133e987b7b43ed6e1157 Mon Sep 17 00:00:00 2001 +From: Rouven Czerwinski +Date: Sun, 9 Sep 2018 20:08:40 +0200 +Subject: [PATCH] serial/rfc2217: add timeout.setter for rfc2217 + +Add a new setter method for the timeout property which does not invoke +the port reconfiguration. +This is a direct copy of the SerialBase timeout property without the port +reconfiguration. + +Signed-off-by: Rouven Czerwinski +--- + serial/rfc2217.py | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/serial/rfc2217.py b/serial/rfc2217.py +index d962c1e8..12615cf3 100644 +--- a/serial/rfc2217.py ++++ b/serial/rfc2217.py +@@ -722,5 +722,22 @@ def cd(self): + raise portNotOpenError + return bool(self.get_modem_state() & MODEMSTATE_MASK_CD) + ++ @property ++ def timeout(self): ++ """Get the current timeout setting.""" ++ return self._timeout ++ ++ @timeout.setter ++ def timeout(self, timeout): ++ """Change timeout setting.""" ++ if timeout is not None: ++ try: ++ timeout + 1 # test if it's a number, will throw a TypeError if not... ++ except TypeError: ++ raise ValueError("Not a valid timeout: {!r}".format(timeout)) ++ if timeout < 0: ++ raise ValueError("Not a valid timeout: {!r}".format(timeout)) ++ self._timeout = timeout ++ + # - - - platform specific - - - + # None so far diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyserial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyserial/default.nix index 239568f64b..b45b031fb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyserial/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyserial/default.nix @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "1nyd4m4mnrz8scbfqn4zpq8gnbl4x42w5zz62vcgpzqd2waf0xrw"; }; + patches = [ + ./001-rfc2217-only-negotiate-on-value-change.patch + ./002-rfc2217-timeout-setter-for-rfc2217.patch + ]; + checkPhase = "python -m unittest discover -s test"; doCheck = !stdenv.hostPlatform.isDarwin; # broken on darwin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix new file mode 100644 index 0000000000..d3b6654931 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, httpx, pytest }: + +buildPythonPackage rec { + pname = "pytest-httpx"; + version = "0.10.1"; + + src = fetchPypi { + inherit version; + pname = "pytest_httpx"; + extension = "tar.gz"; + sha256 = "13ld6nnsc3f7i4zl4qm1jh358z0awr6xfk05azwgngmjb7jmcz0a"; + }; + + propagatedBuildInputs = [ httpx pytest ]; + + # not in pypi tarball + doCheck = false; + pythonImportsCheck = [ "pytest_httpx" ]; + + meta = with lib; { + description = "Send responses to httpx"; + homepage = "https://github.com/Colin-b/pytest_httpx"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix index 12b06c2e1b..0088bf45e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-watch/default.nix @@ -16,10 +16,11 @@ buildPythonPackage rec { sha256 = "06136f03d5b361718b8d0d234042f7b2f203910d8568f63df2f866b547b3d4b9"; }; + propagatedBuildInputs = [ pytest colorama docopt watchdog ]; + # No Tests doCheck = false; - - propagatedBuildInputs = [ pytest colorama docopt watchdog ]; + pythonImportsCheck = [ "pytest_watch" ]; meta = with lib; { homepage = "https://github.com/joeyespo/pytest-watch"; @@ -28,4 +29,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ dmvianna ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix new file mode 100644 index 0000000000..e4c71782f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, eventlet +, iana-etc +, libredirect +, mock +, requests +, six +, tornado +, websocket_client +, websockets +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-engineio"; + version = "3.14.2"; + + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "python-engineio"; + rev = "v${version}"; + sha256 = "1r3gvizrknbv036pvxid1l726wkb0l43bdaz5y879s7j3ipyb464"; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + aiohttp + eventlet + mock + requests + tornado + websocket_client + websockets + pytestCheckHook + ]; + + preCheck = lib.optionalString stdenv.isLinux '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so + ''; + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD + ''; + + # somehow effective log level does not change? + disabledTests = [ "test_logger" ]; + pythonImportsCheck = [ "engineio" ]; + + meta = with lib; { + description = "Python based Engine.IO client and server v3.x"; + longDescription = '' + Engine.IO is a lightweight transport protocol that enables real-time + bidirectional event-based communication between clients and a server. + ''; + homepage = "https://github.com/miguelgrinberg/python-engineio/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/4.nix new file mode 100644 index 0000000000..3a6f5d87fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/4.nix @@ -0,0 +1,47 @@ +{ lib +, bidict +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, python-engineio_3 +}: + +buildPythonPackage rec { + pname = "python-socketio"; + version = "4.6.1"; + + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = "python-socketio"; + rev = "v${version}"; + sha256 = "14dijag17v84v0pp9qi89h5awb4h4i9rj0ppkixqv6is9z9lflw5"; + }; + + propagatedBuildInputs = [ + bidict + python-engineio_3 + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "socketio" ]; + + # pytestCheckHook seems to change the default log level to WARNING, but the + # tests assert it is ERROR + disabledTests = [ "test_logger" ]; + + meta = with lib; { + description = "Python Socket.IO server and client 4.x"; + longDescription = '' + Socket.IO is a lightweight transport protocol that enables real-time + bidirectional event-based communication between clients and a server. + ''; + homepage = "https://github.com/miguelgrinberg/python-socketio/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index e9c2ae146b..8eb58b244e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { Socket.IO is a lightweight transport protocol that enables real-time bidirectional event-based communication between clients and a server. ''; - homepage = "https://github.com/miguelgrinberg/python-engineio/"; + homepage = "https://github.com/miguelgrinberg/python-socketio/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix index 1ffda5c86b..0571269fa8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix @@ -5,7 +5,6 @@ , isPy38 , isPy39 , python -, nvidia_x11 , addOpenGLRunpath , future , numpy @@ -52,7 +51,7 @@ in buildPythonPackage { ''; postFixup = let - rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ]; + rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; in '' find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytrends/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytrends/default.nix index 3ce1e70e82..20dbe0ba31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytrends/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytrends/default.nix @@ -17,10 +17,11 @@ buildPythonPackage rec { sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa"; }; - doCheck = false; - propagatedBuildInputs = [ requests lxml pandas ]; + doCheck = false; + pythonImportsCheck = [ "pytrends" ]; + meta = with lib; { description = "Pseudo API for Google Trends"; homepage = "https://github.com/GeneralMills/pytrends"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix index c703a8fe30..281511192f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest six mock pyfakefs unittest2 ]; + checkInputs = [ pytest mock pyfakefs unittest2 ]; checkPhase = '' pytest pyu2f/tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix index e5eb877b6b..062aeeb97f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix @@ -2,11 +2,11 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub -, fetchpatch # C Inputs , blas , catch2 , cmake +, conan , cython , fmt , muparserx @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.7.1"; + version = "0.7.4"; disabled = pythonOlder "3.6"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "07l0wavdknx0y4vy0hwgw24365sg4nb6ygl3lpa098np85qgyn4y"; + sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo="; }; nativeBuildInputs = [ @@ -61,10 +61,13 @@ buildPythonPackage rec { pybind11 ]; - patches = [ - # TODO: remove in favor of qiskit-aer PR #877 patch once accepted/stable - ./remove-conan-install.patch - ]; + postPatch = '' + substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," "" + ''; + + preBuild = '' + export DISABLE_CONAN=1 + ''; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch deleted file mode 100644 index 1c5ae87b08..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index efeacfc..77bd6bd 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -121,7 +121,11 @@ endif() - # Looking for external libraries - # - --setup_conan() -+find_package(muparserx REQUIRED) -+find_package(nlohmann_json REQUIRED) -+find_package(spdlog REQUIRED) -+# for tests only -+find_package(catch2) - - # If we do not set them with a space CMake fails afterwards if nothing is set for this vars! - set(AER_LINKER_FLAGS " ") -@@ -269,16 +273,16 @@ endif() - set(AER_LIBRARIES - ${AER_LIBRARIES} - ${BLAS_LIBRARIES} -- CONAN_PKG::nlohmann_json -+ nlohmann_json - Threads::Threads -- CONAN_PKG::spdlog -+ spdlog - ${DL_LIB} - ${THRUST_DEPENDANT_LIBS}) - - set(AER_COMPILER_DEFINITIONS ${AER_COMPILER_DEFINITIONS} ${CONAN_DEFINES}) - # Cython build is only enabled if building through scikit-build. - if(SKBUILD) # Terra Addon build -- set(AER_LIBRARIES ${AER_LIBRARIES} CONAN_PKG::muparserx) -+ set(AER_LIBRARIES ${AER_LIBRARIES} muparserx) - add_subdirectory(qiskit/providers/aer/pulse/qutip_extra_lite/cy) - add_subdirectory(qiskit/providers/aer/backends/wrappers) - add_subdirectory(src/open_pulse) -diff --git a/setup.py b/setup.py -index fd71e9f..1561cc4 100644 ---- a/setup.py -+++ b/setup.py -@@ -11,12 +11,6 @@ import inspect - - PACKAGE_NAME = os.getenv('QISKIT_AER_PACKAGE_NAME', 'qiskit-aer') - --try: -- from conans import client --except ImportError: -- subprocess.call([sys.executable, '-m', 'pip', 'install', 'conan']) -- from conans import client -- - try: - from skbuild import setup - except ImportError: -@@ -46,8 +40,6 @@ common_requirements = [ - - setup_requirements = common_requirements + [ - 'scikit-build', -- 'cmake!=3.17,!=3.17.0', -- 'conan>=1.22.2' - ] - - requirements = common_requirements + ['qiskit-terra>=0.12.0'] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix index 11274c525f..0e6e8e25b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.8.1"; + version = "0.8.2"; disabled = pythonOlder "3.6"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "11qyya3vyq50wpzrzzl8v46yx5p72rhpqhybwn47qgazxgg82r1b"; + sha256 = "sha256-ybf8bXqsVk6quYi0vrfo/Mplk7Nr7tQS7cevXxI9khw="; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. @@ -73,13 +73,8 @@ buildPythonPackage rec { # It can also be installed at runtime from the pip wheel. # We disable appropriate tests below to allow building without pyscf installed - # NOTE: we remove cplex b/c we can't build pythonPackages.cplex. - # cplex is only distributed in manylinux1 wheel (no source), and Nix python is not manylinux1 compatible - postPatch = '' - substituteInPlace setup.py \ - --replace "pyscf; sys_platform != 'win32'" "" \ - --replace "cplex; python_version >= '3.6' and python_version < '3.8'" "" + substituteInPlace setup.py --replace "docplex==2.15.194" "docplex" # Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix index b5295dbd04..f73b46a520 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -2,7 +2,6 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub -, fetchpatch , python , numpy , qiskit-terra @@ -24,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.6"; @@ -33,11 +32,11 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - sha256 = "17kplmi17axcbbgw35dzfr3d5bzfymxfni9sf6v14223c5674p4y"; + sha256 = "sha256-Kl3tnoamZrCxwoDdu8betG6Lf3CC3D8R2TYiq8Zl3Aw="; }; # hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532. - # TODO: remove on qiskit-ignis v0.5.1 + # TODO: remove on qiskit-ignis v0.5.2 postPatch = '' substituteInPlace qiskit/ignis/mitigation/expval/base_meas_mitigator.py --replace "plt.axes" "'plt.axes'" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix index 89d39b718c..ff51e82e35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix @@ -56,7 +56,7 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.16.1"; + version = "0.16.4"; disabled = pythonOlder "3.6"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0007glsbrvq9swamvz8r76z9nzh46b388y0ds1dypczxpwlp9xcq"; + sha256 = "sha256-/rWlPfpAHoMedKG42jfUYt0Ezq7i+9dkyPllavkg4cc="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix index 7c79d517ce..3c7a004420 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.23.1"; + version = "0.23.5"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "0x4cqx1wqqj7h5g3vdag694qjzsmvhpw25yrlcs70mh5ywdp28x1"; + sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix index 56b80a4676..0247d20ec7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix @@ -46,6 +46,8 @@ buildPythonPackage rec { importlib-metadata ]; + pythonImportsCheck = [ "quandl" ]; + meta = with lib; { description = "Quandl Python client library"; homepage = "https://github.com/quandl/quandl-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix index 61e2016a49..68da058194 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix @@ -1,5 +1,4 @@ { lib -, attrs , buildPythonPackage , fetchFromGitHub , httpcore @@ -8,7 +7,6 @@ , pytest-cov , pytestCheckHook , trio -, xmltodict }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix index 9b90b25bfb..5e8ca33fff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix @@ -8,7 +8,7 @@ , six , zetup , modeled -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -20,9 +20,7 @@ buildPythonPackage rec { sha256 = "0377ikajf6c3zcy3lc0kh4w9zmlqyplk2c2hb0yyc7h3jnfnya96"; }; - nativeBuildInputs = [ - zetup - ]; + nativeBuildInputs = [ zetup ]; propagatedBuildInputs = [ robotframework @@ -32,19 +30,21 @@ buildPythonPackage rec { modeled ]; - checkInputs = [ - pytest - ]; - - checkPhase = '' - # tests require network - pytest test --ignore test/remote/test_remote.py + postPatch = '' + # Remove upstream's selfmade approach to collect the dependencies + # https://github.com/userzimmermann/robotframework-tools/issues/1 + substituteInPlace setup.py --replace \ + "setup_requires=SETUP_REQUIRES + (zfg.SETUP_REQUIRES or [])," "" ''; + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "test" ]; + pythonImportsCheck = [ "robottools" ]; + meta = with lib; { description = "Python Tools for Robot Framework and Test Libraries"; - homepage = "https://bitbucket.org/userzimmermann/robotframework-tools"; - license = licenses.gpl3; + homepage = "https://github.com/userzimmermann/robotframework-tools"; + license = licenses.gpl3Plus; maintainers = [ maintainers.costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index 0b042288fb..cae84f8cbe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -1,8 +1,6 @@ { stdenv , lib -, python , buildPythonPackage -, fetchpatch , fetchPypi , isPyPy , R diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index f14c4d82f4..f13fecc085 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -32,12 +32,6 @@ buildPythonPackage rec { checkInputs = [ coverage ]; propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ]; - # remove on when version > 0.5.4 - postPatch = '' - sed -i "s/numpy >= 1.9.2, < 1.14.0/numpy/" setup.py - sed -i "s/pandas >= 0.19.2, < 0.23.0/pandas/" setup.py - ''; - # cython package not included for tests doCheck = false; @@ -45,6 +39,8 @@ buildPythonPackage rec { ${python.interpreter} -m skbio.test ''; + pythonImportsCheck = [ "skbio" ]; + meta = with lib; { homepage = "http://scikit-bio.org/"; description = "Data structures, algorithms and educational resources for bioinformatics"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix index b3bf8fce0f..8c771ea286 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { # Computationally very demanding tests doCheck = false; + pythonImportsCheck= [ "seaborn" ]; meta = { description = "Statisitical data visualization"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix index bb41f61517..fd161ecd75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix @@ -26,10 +26,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; - # on CPU, these expect artifacts from previous GPU run disabledTests = [ + # on CPU, these expect artifacts from previous GPU run "test_load_cuda_params_to_cpu" + # failing tests "test_pickle_load" + "test_grid_search_with_slds_" + "test_grid_search_with_dict_works" ]; meta = with lib; { @@ -38,5 +41,7 @@ buildPythonPackage rec { changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; + # TypeError: __init__() got an unexpected keyword argument 'iid' + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix index 0ce6e338e6..7254664200 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solo-python/default.nix @@ -1,9 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, click, ecdsa, fido2, intelhex, pyserial, pyusb, requests}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, click +, cryptography +, ecdsa +, fido2 +, intelhex +, pyserial +, pyusb +, requests +}: buildPythonPackage rec { pname = "solo-python"; - version = "0.0.26"; + version = "0.0.27"; format = "flit"; disabled = pythonOlder "3.6"; # only python>=3.6 is supported @@ -11,7 +22,7 @@ owner = "solokeys"; repo = pname; rev = version; - sha256 = "05rwqrhr1as6zqhg63d6wga7l42jm2azbav5w6ih8mx5zbxf61yz"; + sha256 = "sha256-OCiKa6mnqJGoNCC4KqI+hMw22tzhdN63x9/KujNJqcE="; }; # replaced pinned fido, with unrestricted fido version @@ -21,6 +32,7 @@ propagatedBuildInputs = [ click + cryptography ecdsa fido2 intelhex diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix index a760033c91..43a2f5b460 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/0.x.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { "test_turtle_launc" "test_umr_skip_cython" "test_umr_pathlist" + "test_user_sitepackages_in_pathlist" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/3.nix index 0fb98fa38e..2618ccfcd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/3.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" ''; + pythonImportsCheck = [ "spyder" ]; + meta = with lib; { description = "Library providing a scientific python development environment"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix index d17aed6ae4..3a62dd4ecf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi , confluent-kafka , distributed , flaky diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix index 88adbe4f7d..80eefc0a63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k, callPackage +{ lib, buildPythonPackage, fetchPypi, isPy3k , opencv3 , pyqt5 , pyqtgraph @@ -19,7 +19,7 @@ , imageio-ffmpeg , av , nose -, pytest +, pytestCheckHook , pyserial , arrayqueues , colorspacious @@ -37,14 +37,18 @@ buildPythonPackage rec { inherit pname version; sha256 = "aab9d07575ef599a9c0ae505656e3c03ec753462df3c15742f1f768f2b578f0a"; }; - doCheck = false; + + # crashes python + preCheck = '' + rm stytra/tests/test_z_experiments.py + ''; + checkInputs = [ nose - pytest + pytestCheckHook pyserial ]; - propagatedBuildInputs = [ opencv3 pyqt5 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix index d5379b849a..ddfa83e30f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix @@ -81,6 +81,7 @@ buildPythonPackage rec { homepage = "https://github.com/TileDB-Inc/TileDB-Py"; license = licenses.mit; maintainers = with maintainers; [ fridh ]; + # tiledb/core.cc:556:30: error: ‘struct std::array’ has no member named ‘second’ + broken = true; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix index 6e621ee8b6..dbfad336d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytest , pytestrunner , pytestCheckHook , pytorch @@ -23,12 +22,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytorch ]; - checkInputs = [ pytest pytestrunner pytestCheckHook ]; - disabledTests = [ "test_inplace_on_requires_grad" ]; - # seems like a harmless failure: - ## AssertionError: - ## Pattern 'a leaf Variable that requires grad has been used in an in-place operation.' - ## does not match 'a leaf Variable that requires grad is being used in an in-place operation.' + checkInputs = [ pytestrunner pytestCheckHook ]; + disabledTests = [ + "test_inplace_on_requires_grad" + "test_input_requiring_grad" + ]; meta = with lib; { description = "GPipe implemented in Pytorch and optimized for CUDA rather than TPU"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index 79f6a19ffc..3575921518 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "PyTorch vision library"; homepage = "https://pytorch.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ericsagnes SuperSandro2000 ]; + maintainers = with maintainers; [ ericsagnes ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix index 2c8f6dd803..290892672e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix @@ -3,10 +3,9 @@ , fetchFromGitHub , fetchpatch , isPy27 -, pytest +, pytestCheckHook , nose , numpy -, scipy , pandas , xarray , traitlets @@ -35,7 +34,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ traitlets ]; - checkInputs = [ numpy pandas xarray nose pytest ]; + checkInputs = [ numpy pandas xarray nose pytestCheckHook ]; + pythonImportsCheck = [ "traittypes" ]; meta = with lib; { description = "Trait types for NumPy, SciPy, XArray, and Pandas"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix new file mode 100644 index 0000000000..235540209e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, typing-extensions +, requests +, yarl +}: + +buildPythonPackage rec { + pname = "transmission-rpc"; + version = "3.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1y5048109j6z4smzwysvdjfn6cj9698dsxfim9i4nqam4nmw2wi7"; + }; + + propagatedBuildInputs = [ + six + typing-extensions + requests + yarl + ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "transmission_rpc" ]; + + meta = with lib; { + description = "Python module that implements the Transmission bittorent client RPC protocol"; + homepage = "https://pypi.python.org/project/transmission-rpc/"; + license = licenses.mit; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix deleted file mode 100644 index a9f3042fb3..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, six -}: - -buildPythonPackage rec { - pname = "transmissionrpc"; - version = "0.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60"; - }; - - propagatedBuildInputs = [ six ]; - - # no tests - doCheck = false; - - meta = with lib; { - description = "Python implementation of the Transmission bittorent client RPC protocol"; - homepage = "https://pypi.python.org/pypi/transmissionrpc/"; - license = licenses.mit; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix index 21fe31630d..aca6095d33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot3-methods/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { # No tests on PyPi doCheck = false; + pythonImportsCheck = [ "uproot3_methods" ]; meta = with lib; { homepage = "https://github.com/scikit-hep/uproot3-methods"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot3/default.nix index 1150c76d2b..c692377342 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot3/default.nix @@ -1,21 +1,24 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy27 , awkward0, backports_lzma, cachetools, lz4, pandas -, pytestCheckHook, pytestrunner, pkgconfig, mock +, pytestCheckHook, pkgconfig, mock , numpy, requests, uproot3-methods, xxhash, zstandard }: buildPythonPackage rec { pname = "uproot3"; - version = "3.14.2"; + version = "3.14.4"; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot3"; rev = version; - sha256 = "sha256-6/e+qMgwyFUo8MRRTAaGp9WLPxE2fqMEK4paq26Epzc="; + sha256 = "sha256-hVJpKdYvyoCPyqgZzKYp30SvkYm+HWSNBdd9bYCYACE="; }; - nativeBuildInputs = [ pytestrunner ]; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + ''; propagatedBuildInputs = [ awkward0 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index 27f7b68fe8..1bc73a3773 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.15.0"; + version = "0.15.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0rfhr84km8k5gj0036b2pznwmc8macx56vkxc3aksvns95dksl0s"; + sha256 = "1p33xfzcy60qqca3rplzbh8h4x7x9l77vi6zbyy9md5z2a0q4ikq"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix index 083aa63020..04c38838a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage , fetchPypi, pythonOlder -, pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }: +, jupyter_core, pandas, ipywidgets, jupyter }: buildPythonPackage rec { pname = "vega"; @@ -11,12 +11,11 @@ buildPythonPackage rec { sha256 = "f343ceb11add58d24cd320d69e410b111a56c98c9069ebb4ef89c608c4c1950d"; }; - buildInputs = [ pytest ]; propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; # currently, recommonmark is broken on python3 doCheck = false; - checkInputs = [ altair ]; + pythonImportsCheck = [ "vega" ]; meta = with lib; { description = "An IPython/Jupyter widget for Vega and Vega-Lite"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vidstab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vidstab/default.nix index 4119b26259..7137205b35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vidstab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vidstab/default.nix @@ -6,7 +6,6 @@ , imutils , progress , matplotlib -, pytest }: buildPythonPackage rec { @@ -18,11 +17,11 @@ buildPythonPackage rec { sha256 = "649a77a0c1b670d13a1bf411451945d7da439364dc0c33ee3636a23f1d82b456"; }; - checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ]; # tests not packaged with pypi doCheck = false; + pythonImportsCheck = [ "vidstab" ]; meta = with lib; { homepage = "https://github.com/AdamSpannbauer/python_video_stab"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix index 85e950b830..3862a8e757 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix @@ -1,6 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi -, setuptools_scm, pathpy, nbconvert -, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, nbconvert +, pathpy +, pytestCheckHook +, setuptools-scm +}: buildPythonPackage rec { pname = "zetup"; @@ -11,18 +16,25 @@ buildPythonPackage rec { sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d"; }; - # Python 3.8 compatibility + # Python > 3.7 compatibility postPatch = '' substituteInPlace zetup/zetup_config.py \ - --replace "'3.7']" "'3.7', '3.8']" + --replace "'3.7']" "'3.7', '3.8', '3.9', '3.10']" ''; checkPhase = '' py.test test -k "not TestObject" --deselect=test/test_zetup_config.py::test_classifiers ''; - checkInputs = [ pytest pathpy nbconvert ]; - propagatedBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ setuptools-scm ]; + + checkInputs = [ + pathpy + nbconvert + pytestCheckHook + ]; + + pythonImportsCheck = [ "zetup" ]; meta = with lib; { description = "Zimmermann's Extensible Tools for Unified Project setups"; diff --git a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 0859ed5132..1429fcab4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,5 +1,4 @@ -{ fetchFromGitHub -, lib +{ lib , python3 , enableTelemetry ? false }: diff --git a/third_party/nixpkgs/pkgs/development/tools/chefdk/Gemfile b/third_party/nixpkgs/pkgs/development/tools/chefdk/Gemfile index 47451c66d2..0717cd3223 100644 --- a/third_party/nixpkgs/pkgs/development/tools/chefdk/Gemfile +++ b/third_party/nixpkgs/pkgs/development/tools/chefdk/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'chef-dk', '4.7.73' +gem 'chef-dk', '4.13.3' gem 'pry' gem 'test-kitchen' gem 'inspec' diff --git a/third_party/nixpkgs/pkgs/development/tools/chefdk/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/chefdk/Gemfile.lock index ce23018bd7..1f71a4a713 100644 --- a/third_party/nixpkgs/pkgs/development/tools/chefdk/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/chefdk/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.1) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -9,166 +9,213 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) app_conf (0.4.2) - ast (2.4.0) - aws-eventstream (1.0.3) - aws-partitions (1.275.0) - aws-sdk-apigateway (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + ast (2.4.2) + aws-eventstream (1.1.0) + aws-partitions (1.426.0) + aws-sdk-apigateway (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.15.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-apigatewayv2 (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.22.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-applicationautoscaling (1.49.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-autoscaling (1.22.0) - aws-sdk-core (~> 3, >= 3.52.1) + aws-sdk-athena (1.35.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.27.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-autoscaling (1.53.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-batch (1.43.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.19.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-budgets (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.20.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudformation (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.20.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudfront (1.48.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.32.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudhsm (1.28.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.28.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudhsmv2 (1.32.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudtrail (1.33.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.27.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatch (1.49.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.28.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatchevents (1.40.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.40.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatchlogs (1.39.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.90.1) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-sdk-codecommit (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-codedeploy (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-codepipeline (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentity (1.29.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentityprovider (1.48.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-configservice (1.56.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.112.0) + aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.18.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-costandusagereportservice (1.29.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.43.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-databasemigrationservice (1.50.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.144.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-dynamodb (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.25.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ec2 (1.224.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.57.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ecr (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.31.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ecs (1.74.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.29.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-efs (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.26.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-eks (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.19.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticache (1.53.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.39.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticbeanstalk (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticloadbalancing (1.30.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.24.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticloadbalancingv2 (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.33.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticsearchservice (1.48.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.17.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-firehose (1.36.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.20.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-glue (1.82.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.29.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-guardduty (1.44.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-iam (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-organizations (1.17.0) - aws-sdk-core (~> 3, >= 3.39.0) - aws-sigv4 (~> 1.0) - aws-sdk-rds (1.78.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kafka (1.34.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.37.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kinesis (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kms (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.18.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-lambda (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.11.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-organizations (1.55.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.60.2) - aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-ram (1.22.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-rds (1.112.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-redshift (1.54.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53 (1.46.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53domains (1.29.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53resolver (1.23.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.88.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.18.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-secretsmanager (1.43.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.27.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-securityhub (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.17.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-servicecatalog (1.57.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.21.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ses (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.23.1) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-shield (1.34.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.71.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-sms (1.28.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) - aws-eventstream (~> 1.0, >= 1.0.2) - azure_graph_rbac (0.17.1) - ms_rest_azure (~> 0.11.0) - azure_mgmt_key_vault (0.17.5) - ms_rest_azure (~> 0.11.1) - azure_mgmt_resources (0.17.8) - ms_rest_azure (~> 0.11.1) - azure_mgmt_security (0.18.0) - ms_rest_azure (~> 0.11.1) - azure_mgmt_storage (0.19.2) - ms_rest_azure (~> 0.11.1) - backports (3.16.1) - bcrypt_pbkdf (1.0.1) - berkshelf (7.0.9) - chef (>= 13.6.52) + aws-sdk-sns (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-sqs (1.36.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ssm (1.104.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-states (1.37.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-transfer (1.29.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) + azure_graph_rbac (0.17.2) + ms_rest_azure (~> 0.12.0) + azure_mgmt_key_vault (0.17.7) + ms_rest_azure (~> 0.12.0) + azure_mgmt_resources (0.18.1) + ms_rest_azure (~> 0.12.0) + azure_mgmt_security (0.19.0) + ms_rest_azure (~> 0.12.0) + azure_mgmt_storage (0.22.0) + ms_rest_azure (~> 0.12.0) + bcrypt_pbkdf (1.1.0) + berkshelf (7.1.0) + chef (>= 15.7.32) chef-config cleanroom (~> 1.0) concurrent-ruby (~> 1.0) @@ -181,18 +228,18 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (15.8.23) + chef (15.15.0) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.8.23) - chef-utils (= 15.8.23) + chef-config (= 15.15.0) + chef-utils (= 15.15.0) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) erubis (~> 2.7) ffi (~> 1.9, >= 1.9.25) - ffi-libarchive + ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) highline (>= 1.6.9, < 2) iniparse (~> 1.4) @@ -202,37 +249,37 @@ GEM mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.0.3, < 4.0) - net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 4.2, < 6) + net-sftp (>= 2.1.2, < 4.0) + net-ssh (>= 4.2, < 7) net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 15.0) plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) - train-core (~> 3.1) + train-core (~> 3.2, >= 3.2.28) train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef-cli (2.0.0) - addressable (>= 2.3.5, < 2.6) - chef (>= 14.0) + chef-cli (3.1.1) + addressable (>= 2.3.5, < 2.8) + chef (>= 15.0) cookbook-omnifetch (~> 0.5) - diff-lcs (~> 1.0) + diff-lcs (>= 1.0, < 1.4) ffi-yajl (>= 1.0, < 3.0) - license-acceptance (~> 1.0, >= 1.0.11) + license-acceptance (>= 1.0.11, < 3) minitar (~> 0.6) mixlib-cli (>= 1.7, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - paint (~> 1.0) + pastel (~> 0.7) solve (> 2.0, < 5.0) - chef-config (15.8.23) + chef-config (15.15.0) addressable - chef-utils (= 15.8.23) + chef-utils (= 15.15.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-dk (4.7.73) + chef-dk (4.13.3) addressable (>= 2.3.5, < 2.6) chef (~> 15.0) cookbook-omnifetch (~> 0.5) @@ -254,13 +301,12 @@ GEM winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.0) - chef-telemetry (1.0.3) + chef-telemetry (1.0.14) chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - http (~> 2.2) - chef-utils (15.8.23) - chef-vault (4.0.1) + chef-utils (15.15.0) + chef-vault (4.1.0) chef-zero (14.0.17) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) @@ -270,51 +316,47 @@ GEM cheffish (14.0.13) chef-zero (~> 14.0) net-ssh - chefspec (9.1.0) + chefspec (9.2.1) chef (>= 14) chef-cli fauxhai-ng (>= 7.5) rspec (~> 3.0) cleanroom (1.0.0) - coderay (1.1.2) - concurrent-ruby (1.1.6) - cookbook-omnifetch (0.9.1) + coderay (1.1.3) + concurrent-ruby (1.1.8) + cookbook-omnifetch (0.11.1) mixlib-archive (>= 0.4, < 2.0) - cucumber-core (3.2.1) - backports (>= 3.8.0) - cucumber-tag_expressions (~> 1.1.0) - gherkin (~> 5.0) - cucumber-tag_expressions (1.1.1) - declarative (0.0.10) + declarative (0.0.20) declarative-option (0.1.0) diff-lcs (1.3) - diffy (3.3.0) - docker-api (1.34.2) + diffy (3.4.0) + docker-api (2.0.0) excon (>= 0.47.0) multi_json domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) - equatable (0.6.1) - erubi (1.9.0) + erubi (1.10.0) erubis (2.7.0) - excon (0.72.0) - faraday (0.17.3) + excon (0.79.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) + ruby2_keywords + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) - fauxhai-ng (7.6.0) + faraday-net_http (1.0.1) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fauxhai-ng (8.7.0) net-ssh - ffi (1.12.2) - ffi-libarchive (1.0.0) + ffi (1.14.2) + ffi-libarchive (1.0.17) ffi (~> 1.0) - ffi-yajl (2.3.3) + ffi-yajl (2.3.4) libyajl2 (~> 1.2) - foodcritic (16.2.0) - cucumber-core (>= 1.3, < 4.0) + foodcritic (16.3.0) erubis ffi-yajl (~> 2.0) nokogiri (>= 1.5, < 2.0) @@ -322,138 +364,124 @@ GEM rufus-lru (~> 1.0) treetop (~> 1.4) fuzzyurl (0.9.0) - gherkin (5.1.0) - git (1.6.0) + git (1.8.1) rchardet (~> 1.8) - google-api-client (0.34.1) + google-api-client (0.52.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) + rexml signet (~> 0.12) - googleauth (0.10.0) - faraday (~> 0.12) + googleauth (0.14.0) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.12) - gssapi (1.3.0) + signet (~> 0.14) + gssapi (1.3.1) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) hashie (3.6.0) highline (1.7.10) - htmlentities (4.3.4) - http (2.2.2) - addressable (~> 2.3) - http-cookie (~> 1.0) - http-form_data (~> 1.0.1) - http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) - http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.8.2) + i18n (1.8.8) concurrent-ruby (~> 1.0) inifile (3.0.0) - iniparse (1.4.4) - inspec (4.18.85) - faraday_middleware (~> 0.12.2) - inspec-core (= 4.18.85) + iniparse (1.5.0) + inspec (4.26.4) + faraday_middleware (>= 0.12.2, < 1.1) + inspec-core (= 4.26.4) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.18.85) + inspec-core (4.26.4) addressable (~> 2.4) chef-telemetry (~> 1.0) - faraday (>= 0.9.0) - hashie (~> 3.4) - htmlentities (~> 4.3) - json-schema (~> 2.8) - license-acceptance (>= 0.2.13, < 2.0) - method_source (~> 0.8) + faraday (>= 0.9.0, < 1.4) + faraday_middleware (~> 1.0) + hashie (>= 3.4, < 5.0) + license-acceptance (>= 0.2.13, < 3.0) + method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) multipart-post (~> 2.0) parallel (~> 1.9) - parslet (~> 1.5) - pry (~> 0) - rspec (~> 3.9) + parslet (>= 1.5, < 2.0) + pry (~> 0.13) + rspec (>= 3.9, < 3.11) rspec-its (~> 1.2) - rubyzip (~> 1.2, >= 1.2.2) + rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) sslshake (~> 1.2) - term-ansicolor (~> 1.7) thor (>= 0.20, < 2.0) - tomlrb (~> 1.2) + tomlrb (>= 1.2, < 2.1) train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) ipaddress (0.8.3) - jaro_winkler (1.5.4) jmespath (1.4.0) - json (2.3.0) - json-schema (2.8.1) - addressable (>= 2.4) - jwt (2.2.1) - kitchen-inspec (1.3.1) - hashie (~> 3.4) - inspec (>= 1.47, < 5.0) - test-kitchen (>= 1.6, < 3) - kitchen-vagrant (1.6.1) + json (2.5.1) + jwt (2.2.2) + kitchen-inspec (2.3.0) + hashie (>= 3.4, <= 5.0) + inspec (>= 2.2.64, < 5.0) + test-kitchen (>= 2.7, < 3) + kitchen-vagrant (1.8.0) test-kitchen (>= 1.4, < 3) - knife-spork (1.7.2) + knife-spork (1.7.3) app_conf (>= 0.4.0) chef (>= 11.0.0) diffy (>= 3.0.1) git (>= 1.2.5) libyajl2 (1.2.0) - license-acceptance (1.0.13) + license-acceptance (1.0.19) pastel (~> 0.7) tomlrb (~> 1.2) tty-box (~> 0.3) tty-prompt (~> 0.18) little-plugger (1.1.4) - logging (2.2.2) + logging (2.3.0) little-plugger (~> 1.1) - multi_json (~> 1.10) + multi_json (~> 1.14) memoist (0.16.2) - method_source (0.9.2) + method_source (1.0.0) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitar (0.9) - minitest (5.14.0) - mixlib-archive (1.0.5) + minitest (5.14.3) + mixlib-archive (1.1.4) mixlib-log - mixlib-authentication (3.0.6) - mixlib-cli (2.1.5) - mixlib-config (3.0.6) + mixlib-authentication (3.0.7) + mixlib-cli (2.1.8) + mixlib-config (3.0.9) tomlrb - mixlib-install (3.11.26) + mixlib-install (3.12.5) mixlib-shellout mixlib-versioning thor - mixlib-log (3.0.8) - mixlib-shellout (3.0.9) + mixlib-log (3.0.9) + mixlib-shellout (3.2.2) + chef-utils mixlib-versioning (1.2.12) - molinillo (0.6.6) - ms_rest (0.7.5) + molinillo (0.7.0) + ms_rest (0.7.6) concurrent-ruby (~> 1.0) - faraday (~> 0.9) + faraday (>= 0.9, < 2.0.0) timeliness (~> 0.3.10) - ms_rest_azure (0.11.1) + ms_rest_azure (0.12.0) concurrent-ruby (~> 1.0) - faraday (~> 0.9) + faraday (>= 0.9, < 2.0.0) faraday-cookie_jar (~> 0.0.6) - ms_rest (~> 0.7.4) - unf_ext (= 0.0.7.2) - multi_json (1.14.1) + ms_rest (~> 0.7.6) + multi_json (1.15.0) multipart-post (2.1.1) - necromancer (0.5.1) net-scp (1.2.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -464,13 +492,14 @@ GEM net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) - nokogiri (1.10.8) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nori (2.6.0) - octokit (4.16.0) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (15.7.4) + ohai (15.12.0) chef-config (>= 12.8, < 16) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -482,26 +511,27 @@ GEM plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - os (1.0.1) + os (1.1.1) paint (1.0.1) - parallel (1.19.1) - parser (2.7.0.2) - ast (~> 2.4.0) + parallel (1.20.1) + parser (3.0.0.0) + ast (~> 2.4.1) parslet (1.8.2) - pastel (0.7.3) - equatable (~> 0.6) + pastel (0.8.0) tty-color (~> 0.5) - plist (3.5.0) + plist (3.6.0) polyglot (0.3.5) proxifier (1.0.3) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) + pry (0.14.0) + coderay (~> 1.1) + method_source (~> 1.0) public_suffix (3.1.1) - rack (2.2.2) + racc (1.5.2) + rack (2.2.3) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rchardet (1.8.0) + regexp_parser (2.0.3) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -509,110 +539,118 @@ GEM retriable (3.1.2) retryable (3.0.5) rexml (3.2.4) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.0) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.10.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.9.1) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.2) - rubocop (0.80.0) - jaro_winkler (~> 1.5.1) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) + rubocop (1.9.1) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) rexml + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - ruby-progressbar (1.10.1) - rubyntlm (0.6.2) - rubyzip (1.3.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) + parser (>= 2.7.1.5) + ruby-progressbar (1.11.0) + ruby2_keywords (0.0.4) + rubyntlm (0.6.3) + rubyzip (2.3.0) rufus-lru (1.1.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) semverse (3.0.0) - signet (0.12.0) + signet (0.14.1) addressable (~> 2.3) - faraday (~> 0.9) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - solve (4.0.3) + solve (4.0.4) molinillo (~> 0.6) semverse (>= 1.1, < 4.0) - sslshake (1.3.0) - strings (0.1.8) - strings-ansi (~> 0.1) + sslshake (1.3.1) + strings (0.2.0) + strings-ansi (~> 0.2) unicode-display_width (~> 1.5) unicode_utils (~> 1.4) strings-ansi (0.2.0) - sync (0.5.0) syslog-logger (1.6.8) systemu (2.6.5) - term-ansicolor (1.7.1) - tins (~> 1.0) - test-kitchen (2.3.4) + test-kitchen (2.10.0) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) - license-acceptance (~> 1.0, >= 1.0.11) + license-acceptance (>= 1.0.11, < 3.0) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 4.0) - net-scp (>= 1.1, < 3.0) - net-ssh (>= 2.9, < 6.0) + net-scp (>= 1.1, < 4.0) + net-ssh (>= 2.9, < 7.0) net-ssh-gateway (>= 1.2, < 3.0) - thor (~> 0.19) + thor (>= 0.19, < 2.0) winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) - thor (0.20.3) + thor (1.1.0) thread_safe (0.3.6) timeliness (0.3.10) - tins (1.24.1) - sync - tomlrb (1.2.9) - train (3.2.22) - activesupport (~> 5.2.3) + tomlrb (1.3.0) + train (3.4.9) + activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) azure_mgmt_security (~> 0.18) azure_mgmt_storage (~> 0.18) - docker-api (~> 1.26) - google-api-client (>= 0.23.9, < 0.35.0) - googleauth (>= 0.6.6, < 0.11.0) - train-core (= 3.2.22) + docker-api (>= 1.26, < 3.0) + google-api-client (>= 0.23.9, <= 0.52.0) + googleauth (>= 0.6.6, <= 0.14.0) + inifile (~> 3.0) + train-core (= 3.4.9) train-winrm (~> 0.2) - train-aws (0.1.15) + train-aws (0.1.35) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) + aws-sdk-applicationautoscaling (>= 1.46, < 1.50) aws-sdk-athena (~> 1.0) - aws-sdk-autoscaling (~> 1.22.0) + aws-sdk-autoscaling (>= 1.22, < 1.54) + aws-sdk-batch (>= 1.36, < 1.44) aws-sdk-budgets (~> 1.0) aws-sdk-cloudformation (~> 1.0) + aws-sdk-cloudfront (~> 1.0) aws-sdk-cloudhsm (~> 1.0) aws-sdk-cloudhsmv2 (~> 1.0) aws-sdk-cloudtrail (~> 1.8) aws-sdk-cloudwatch (~> 1.13) + aws-sdk-cloudwatchevents (>= 1.36, < 1.41) aws-sdk-cloudwatchlogs (~> 1.13) aws-sdk-codecommit (~> 1.0) aws-sdk-codedeploy (~> 1.0) aws-sdk-codepipeline (~> 1.0) + aws-sdk-cognitoidentity (>= 1.26, < 1.30) + aws-sdk-cognitoidentityprovider (>= 1.46, < 1.49) aws-sdk-configservice (~> 1.21) aws-sdk-core (~> 3.0) aws-sdk-costandusagereportservice (~> 1.6) + aws-sdk-databasemigrationservice (>= 1.42, < 1.51) aws-sdk-dynamodb (~> 1.31) aws-sdk-ec2 (~> 1.70) aws-sdk-ecr (~> 1.18) aws-sdk-ecs (~> 1.30) + aws-sdk-efs (~> 1.0) aws-sdk-eks (~> 1.9) aws-sdk-elasticache (~> 1.0) aws-sdk-elasticbeanstalk (~> 1.0) @@ -620,68 +658,74 @@ GEM aws-sdk-elasticloadbalancingv2 (~> 1.0) aws-sdk-elasticsearchservice (~> 1.0) aws-sdk-firehose (~> 1.0) + aws-sdk-glue (>= 1.71, < 1.83) + aws-sdk-guardduty (~> 1.31) aws-sdk-iam (~> 1.13) aws-sdk-kafka (~> 1.0) aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) - aws-sdk-organizations (~> 1.17.0) + aws-sdk-organizations (>= 1.17, < 1.56) + aws-sdk-ram (>= 1.21, < 1.23) aws-sdk-rds (~> 1.43) aws-sdk-redshift (~> 1.0) aws-sdk-route53 (~> 1.0) aws-sdk-route53domains (~> 1.0) aws-sdk-route53resolver (~> 1.0) aws-sdk-s3 (~> 1.30) + aws-sdk-secretsmanager (>= 1.42, < 1.44) aws-sdk-securityhub (~> 1.0) + aws-sdk-servicecatalog (>= 1.48, < 1.58) aws-sdk-ses (~> 1.0) + aws-sdk-shield (~> 1.30) aws-sdk-sms (~> 1.0) aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.2.22) + aws-sdk-states (>= 1.35, < 1.38) + aws-sdk-transfer (>= 1.26, < 1.30) + train-core (3.4.9) addressable (~> 2.5) - inifile (~> 3.0) + ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 3.0) - net-ssh (>= 2.9, < 6.0) - train-habitat (0.2.13) - train-winrm (0.2.6) - winrm (~> 2.0) + net-scp (>= 1.2, < 4.0) + net-ssh (>= 2.9, < 7.0) + train-habitat (0.2.22) + train-winrm (0.2.12) + winrm (>= 2.3.6, < 3.0) + winrm-elevated (~> 1.2.2) winrm-fs (~> 1.0) - treetop (1.6.10) + treetop (1.6.11) polyglot (~> 0.3) - tty-box (0.5.0) - pastel (~> 0.7.2) - strings (~> 0.1.6) + tty-box (0.7.0) + pastel (~> 0.8) + strings (~> 0.2.0) tty-cursor (~> 0.7) - tty-color (0.5.1) + tty-color (0.6.0) tty-cursor (0.7.1) - tty-prompt (0.20.0) - necromancer (~> 0.5.0) - pastel (~> 0.7.0) - tty-reader (~> 0.7.0) - tty-reader (0.7.0) + tty-prompt (0.23.0) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) tty-cursor (~> 0.7) - tty-screen (~> 0.7) - wisper (~> 2.0.0) - tty-screen (0.7.1) - tty-table (0.11.0) - equatable (~> 0.6) - necromancer (~> 0.5) - pastel (~> 0.7.2) - strings (~> 0.1.5) - tty-screen (~> 0.7) - tzinfo (1.2.6) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.1) + tty-table (0.12.0) + pastel (~> 0.8) + strings (~> 0.2.0) + tty-screen (~> 0.8) + tzinfo (1.2.9) thread_safe (~> 0.1) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.6.1) + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) unicode_utils (1.4.0) uuidtools (2.1.5) - winrm (2.3.4) + winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) @@ -689,15 +733,15 @@ GEM httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.2.1) + rubyntlm (~> 0.6.0, >= 0.6.3) + winrm-elevated (1.2.3) erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.3.3) + winrm-fs (1.3.5) erubi (~> 1.8) logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) + rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) wmi-lite (1.0.5) @@ -707,7 +751,7 @@ PLATFORMS DEPENDENCIES berkshelf - chef-dk (= 4.7.73) + chef-dk (= 4.13.3) chef-provisioning chef-vault chefspec diff --git a/third_party/nixpkgs/pkgs/development/tools/chefdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/chefdk/default.nix index 1a5f6c8626..6a1470e107 100644 --- a/third_party/nixpkgs/pkgs/development/tools/chefdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,7 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }: bundlerEnv { - name = "chef-dk-4.7.73"; + name = "chef-dk-4.13.3"; inherit ruby; gemdir = ./.; diff --git a/third_party/nixpkgs/pkgs/development/tools/chefdk/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/chefdk/gemset.nix index 1f9522ba4c..14c81742cd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/chefdk/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/chefdk/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmlnx79sv18xv1ddm4vq7z3mwdfa4468mq5186av0k8n1k471sp"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -36,30 +36,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.2"; }; aws-eventstream = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkzzk4mxsxvnd8sr5xx57vc29j69h48gj2g24fzjn7ika6az18z"; + sha256 = "0nrqbbzykj9ckri3ci1wsksy8rhz13rigm3aznxy08gqvzv7bcy9"; type = "gem"; }; - version = "1.275.0"; + version = "1.426.0"; }; aws-sdk-apigateway = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "106wn66gnn1rk9z4w84iwqb26wbyz3i2q9ck3xxabc47ly9mj03m"; + sha256 = "15vwm6a18v1xqfpn2ipx1h5wqwd5yipgp624p4pkchcdqacb7gvm"; type = "gem"; }; - version = "1.36.0"; + version = "1.59.0"; }; aws-sdk-apigatewayv2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -78,10 +78,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x9qaxi1614pfp9hy5ywk7y76gfmk5d0iz6lj9p9qy92gfzx169c"; + sha256 = "171v0xng5h6hk1nqrivv49rpz1f4jhj2lhq3pxk5izx3q1lf7rc7"; type = "gem"; }; - version = "1.15.0"; + version = "1.31.0"; + }; + aws-sdk-applicationautoscaling = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01zldlqn573bmlpg7qm562cy9miyrirzknagjbnzs4iwjnm4rgn4"; + type = "gem"; + }; + version = "1.49.0"; }; aws-sdk-athena = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -89,10 +100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hvskqq406vh9xa29jzyjhfpf6m834872p87a2j0ly5kh4ydldkz"; + sha256 = "0lmbchjn30rpk311q2z5g8j96g5mi8hajc3fbzh3nam7wj4hmdbn"; type = "gem"; }; - version = "1.22.0"; + version = "1.35.0"; }; aws-sdk-autoscaling = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -100,10 +111,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jrz4brxbi8rxqk1jg5wcdsa1knfrgzrmx9dygfzbfi2szcfmbhv"; + sha256 = "1vkfybjdmxn7hwsywfgkcr8mms88l4v6kwj29c8qr2k7ds4l4bsn"; type = "gem"; }; - version = "1.22.0"; + version = "1.53.0"; + }; + aws-sdk-batch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14q0b84qa5mc24nw1fqns822wkg1gvlwvwbia1m7bzzmj98maikw"; + type = "gem"; + }; + version = "1.43.0"; }; aws-sdk-budgets = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -111,10 +133,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xxgldgin1gavz7w37pmsxrhiwr8bvssjgv3lwzbwdsjqk0jd0f3"; + sha256 = "0lm7m09fp5jlranzv1hfc3xv8fn6bmw2g3kwjsj6r094qi3nyp42"; type = "gem"; }; - version = "1.27.0"; + version = "1.37.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -122,10 +144,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bxipaq1g6c5g8zirqlbq74kmy8fglavhyrxyd91sy9yj2d9q26r"; + sha256 = "09lcq8gpi4x7xvwy8njmbcbbgyrq6xsfbyc7hwj3m4dps9f116gw"; type = "gem"; }; - version = "1.30.0"; + version = "1.47.0"; + }; + aws-sdk-cloudfront = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w70d8wv5cb8p5wpyq828fjrccz0xxbvg5sk66bmwq0zjcxnvpb6"; + type = "gem"; + }; + version = "1.48.0"; }; aws-sdk-cloudhsm = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -133,10 +166,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "096dpm87k0q1kqnvf5v0sb98gdsq41390pxvs014qphqycqjchc6"; + sha256 = "0a4imw0rahd6bh4clcwxkcvl4lf8pmyba1sjlc1hx37jv641wlqf"; type = "gem"; }; - version = "1.19.0"; + version = "1.28.0"; }; aws-sdk-cloudhsmv2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -144,10 +177,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10cyc1brjppnkmynkb3qf7ar78a4dhngg3fmmfxnxlcrigwbrxpa"; + sha256 = "13kdq0xnbgrvi9f9jqrig453bc5mf7by3cjcdd8jsv8aay0gqads"; type = "gem"; }; - version = "1.20.0"; + version = "1.32.0"; }; aws-sdk-cloudtrail = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -155,10 +188,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "034psp0g7ab9al7389y64pr2ar2jvxsg6p1djj4w53700xrj602g"; + sha256 = "083nld91s8klfr2p0mwrdlx4lgiig9kx0cikiqrifd30lbja51wg"; type = "gem"; }; - version = "1.20.0"; + version = "1.33.0"; }; aws-sdk-cloudwatch = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -166,10 +199,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvjjlcyp1sx0gsgm82h84n32sb51m8ih53ab4qq94m9jcxk49cr"; + sha256 = "1vsb01nw85sk3zsdyw5ix0yw3n81xjhj4h0431qm60mdg9akgbs4"; type = "gem"; }; - version = "1.32.0"; + version = "1.49.0"; + }; + aws-sdk-cloudwatchevents = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14hhy8zbyn5x2660pg5aq02lni69clx3y7rkvzqrldcy0482863y"; + type = "gem"; + }; + version = "1.40.0"; }; aws-sdk-cloudwatchlogs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -177,10 +221,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bhnlh3skqw3l2yfr6nd97arlcmijpm51k664m51l5xw2971bc51"; + sha256 = "0aravrxjnp886kaag037z45xiyfr75gz0p4psjq9x3qj6gzsjn8y"; type = "gem"; }; - version = "1.28.0"; + version = "1.39.0"; }; aws-sdk-codecommit = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -188,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00mkgfywxqzbbin2qidx4qvb5xcjjl41v6am023bl2yww5x8hi5p"; + sha256 = "1cb1bqlf3kh8akll1xybrn314ngk62jqhpli99kdjq27hxir5jq2"; type = "gem"; }; - version = "1.30.0"; + version = "1.41.0"; }; aws-sdk-codedeploy = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -199,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06m5i5g2j2yylksficbla25cjsdw42y5gbzmx5ycxvxz3c4n3qh1"; + sha256 = "117rv0hx77kyhz9zm1fqbxdbk3lhyxcbibwn27nyafch6sl1x2j4"; type = "gem"; }; - version = "1.27.0"; + version = "1.38.0"; }; aws-sdk-codepipeline = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -210,10 +254,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09dkyclanvxz77hh933ph2ad4yh7midy09hbprszfikhfkvi4z2m"; + sha256 = "0xdkc3xmff901bjfsyg454dn27gfr6nzvgkia0kngdzgq6x4xb45"; type = "gem"; }; - version = "1.28.0"; + version = "1.40.0"; + }; + aws-sdk-cognitoidentity = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "122i3g320ccaqg541kzb0pawiz61zyphvbwnkv5rlqpwspca1m3b"; + type = "gem"; + }; + version = "1.29.0"; + }; + aws-sdk-cognitoidentityprovider = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m09dxwyw01vh9rksz8dwdx36vsr8f7p5qmjmvfazjapzv3q6qmn"; + type = "gem"; + }; + version = "1.48.0"; }; aws-sdk-configservice = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -221,10 +287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjw5jv4p9zhdh4cg982x7x3lpfhgi7an14gjwz1llxmmkzv15wr"; + sha256 = "1msdg1gpq9y9maf2fdljcp2vbydbjqfk07ff9j532bvikax0qmfy"; type = "gem"; }; - version = "1.40.0"; + version = "1.56.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -232,10 +298,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7f9jkpmpppj31kh3wnzybkphq4piy8ays3vld0zsibfjs9iw7i"; + sha256 = "15lynby6r91p9hh5h92pg4jr8xgnjr52px5ax0p0wncdw4vz0skp"; type = "gem"; }; - version = "3.90.1"; + version = "3.112.0"; }; aws-sdk-costandusagereportservice = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -243,10 +309,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yzz7av4z8qh321r0ih6m5lc1x4mh10pn67z6y70ny8syxm4kl6"; + sha256 = "1dzbh8xf8j466gwrawmprwclslvd8sqlzzzxpzyxv4y9m09bhypk"; type = "gem"; }; - version = "1.18.0"; + version = "1.29.0"; + }; + aws-sdk-databasemigrationservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vd4a5z1q282xx7717f542yavb6x13fli64rhwnc143xij4izgpn"; + type = "gem"; + }; + version = "1.50.0"; }; aws-sdk-dynamodb = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -254,10 +331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06nbf297r85ix92x9ilx8ysz67sm59mprscmmdp4rsn74v78dzaj"; + sha256 = "19k3iznglnwwgqd95i5zmim41c98l8ydf6ih9am50gs0n6bky41q"; type = "gem"; }; - version = "1.43.0"; + version = "1.59.0"; }; aws-sdk-ec2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -265,10 +342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wnql5rzwkn97w4l3pq6k97grqdci1qs7h132pnd6lc3bx62v4h5"; + sha256 = "1lg8vh124viba77b0qhi5j8xx8b4wxdiyycl4kaawmddwhr33zx9"; type = "gem"; }; - version = "1.144.0"; + version = "1.224.0"; }; aws-sdk-ecr = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -276,10 +353,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1smq30avqjq6h4yvw9h0k2gwp97c4l4868f2vdj93l84i80gh1pi"; + sha256 = "0di8s9dpyzal5n2qpx8l3jnbkm72h6kz759l04kxfapgzd5ppwhv"; type = "gem"; }; - version = "1.25.0"; + version = "1.41.0"; }; aws-sdk-ecs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -287,10 +364,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "113kwczkqr4jsyrnnxkm0kpdqs3ysc0913nclb5mdwapd5dbq3br"; + sha256 = "0qilim7dm5hc4knhvz9090hzbmlrd24m5fywj9kr60fvhgnm0wf0"; type = "gem"; }; - version = "1.57.0"; + version = "1.74.0"; + }; + aws-sdk-efs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03bf0g1nky772r4xz3w6nvpf09wf1096qifd0i8hgzp7cwirbmby"; + type = "gem"; + }; + version = "1.37.0"; }; aws-sdk-eks = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -298,10 +386,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h3bvqizz95lngmpsgysdpnn1fshrppfc6zq3qphv5hagpa1gj5n"; + sha256 = "0nj666bl877n61h6s570ad9mcvjq4m2s6yink218zslfp10y03v4"; type = "gem"; }; - version = "1.31.0"; + version = "1.47.0"; }; aws-sdk-elasticache = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -309,10 +397,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0805g31chgr65bc74g8s33vk8id0gmyzvwpxjvf5drsrplbv1kca"; + sha256 = "1kgpn2n1ap943q5nzxrl95v6g7fyff6bw5i4mhcw6g97gvv7p675"; type = "gem"; }; - version = "1.29.0"; + version = "1.53.0"; }; aws-sdk-elasticbeanstalk = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -320,10 +408,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxrcfwngmbrvcbxh0cl6mqbvxda82k9kpjr1a0agypazapmy980"; + sha256 = "1a9k9srp1q5qhlcwna7zyvviimri4gi9smlqshbvcfvy2lys5w2z"; type = "gem"; }; - version = "1.26.0"; + version = "1.41.0"; }; aws-sdk-elasticloadbalancing = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -331,10 +419,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mc6mahnnrcgf2ah3p12sm538mfdygz6a6afgwijaar0za126l3"; + sha256 = "1n6ssl3hqqm658k5ig667bgy457rs8gynl8vvin4xwknxws186di"; type = "gem"; }; - version = "1.19.0"; + version = "1.30.0"; }; aws-sdk-elasticloadbalancingv2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -342,10 +430,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17rvv3wlp7bm2f1cfkd8cvwz51kg6pzj8cw6jh4fvlnahx7cilr0"; + sha256 = "0cqb2bncvqqqcqks7d6lrjb7pl06fcjizdfjpr44a7v6sjyx3bcr"; type = "gem"; }; - version = "1.39.0"; + version = "1.59.0"; }; aws-sdk-elasticsearchservice = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -353,10 +441,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lzm94grzggz6vrlzbk6226vlyfnxbq0rih71vdnj1h63f8gj73m"; + sha256 = "1379lp7jqigp03zv25fgbx4bwacypjj38qbki648398r161f4bzy"; type = "gem"; }; - version = "1.30.0"; + version = "1.48.0"; }; aws-sdk-firehose = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -364,10 +452,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpx6r6z2gfybfsndi7n6wr6zv6gqzfz9fm39wj8ljhsmbf2p2ch"; + sha256 = "0ji75vqfprnkjsy6gdk9qci6wd9kwm7h7lycpx7jsw0fbv6hjx0p"; type = "gem"; }; - version = "1.24.0"; + version = "1.36.0"; + }; + aws-sdk-glue = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "026hka71fnzmqrn5yyb50pz1wa44irqncsk6kcgb476px4zxqwmd"; + type = "gem"; + }; + version = "1.82.0"; + }; + aws-sdk-guardduty = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n963y20rafh51xanx0bff7jqbjcgg3wj5hs4js8h9sax48k97q9"; + type = "gem"; + }; + version = "1.44.0"; }; aws-sdk-iam = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -375,10 +485,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s78ssjcp974v7r1znrgk78bqz23jhws4gy1nm659z5390zsn1fz"; + sha256 = "16152qidkisakl2iqvghrjnccq279pahb953q5a4q0ipk5imw2c1"; type = "gem"; }; - version = "1.33.0"; + version = "1.47.0"; }; aws-sdk-kafka = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -386,10 +496,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k6pixxh9vfq2bhm89h1jpdzpikh600xmp1m1zqh9k8qa62g0glm"; + sha256 = "182g1ya4bhxw90zb0jfqlb5s46r8k3mvl2dczir5jamjp2h1n24y"; type = "gem"; }; - version = "1.17.0"; + version = "1.34.0"; }; aws-sdk-kinesis = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -397,10 +507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mx60qi7sgr8a2k8h1c0ify2l3dvp509hflmbwq87jgq6npz89jr"; + sha256 = "1wsnn4303q7501xp10gfr8s15cazm4a0xy8knz5b8pmaw93x0g4b"; type = "gem"; }; - version = "1.20.0"; + version = "1.31.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -408,10 +518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "191qnrpg9qhwj24pisha28fwqx30sqkj75ibgpqcf4q389l3a2gw"; + sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i"; type = "gem"; }; - version = "1.29.0"; + version = "1.42.0"; }; aws-sdk-lambda = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -419,10 +529,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16llkc8dl88m2f58kpn81lnw37zlh0ghlb1g5bzli5hm8ygn1z5s"; + sha256 = "15fvdqp8k5w7wjgc7f5h9syd8v14h8pzklg5ldb49n5jsr0i3n73"; type = "gem"; }; - version = "1.36.0"; + version = "1.59.0"; }; aws-sdk-organizations = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -430,10 +540,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z71zxsvz1g3i6mnpvb05gzk2lay4dzrl45lby8n7acpp4wb2j1g"; + sha256 = "00i8kbcx1vdch1g6pznvm0hg0hsz2kfd5vpdlfarbilv6zyh9mp7"; type = "gem"; }; - version = "1.17.0"; + version = "1.55.0"; + }; + aws-sdk-ram = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04n9x3nrxakx1zys0cc6vmkyqlqa83h6abdfyqaah1icxp585zjb"; + type = "gem"; + }; + version = "1.22.0"; }; aws-sdk-rds = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -441,10 +562,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09ld8vrhrhywc4imvbj238pic7qi2mg1n3421s0iwd1xhf5fvakp"; + sha256 = "1jnmk7z4ys13vv2i1r6pvpiblgaqlpvjhcslcnqyqlmjh2ydwjxk"; type = "gem"; }; - version = "1.78.0"; + version = "1.112.0"; }; aws-sdk-redshift = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -452,10 +573,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w8y5vlzzws2fqpjjq59gmgrf1l5whm1zcm7fhlkikxspq9iw16b"; + sha256 = "1f54ig5vyc2cvipsv5d62n5xd6a1i9myjgayf6x6slkvnzk5xk4g"; type = "gem"; }; - version = "1.37.0"; + version = "1.54.0"; }; aws-sdk-route53 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -463,10 +584,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "132c11g43zbmn2wzrnys7viymcdsznzl26igpv6ixv4jvi62r7fq"; + sha256 = "1jxm6knx9rp5m3an93c187ds8zla4chl7zdvwnml2imna3adk4z7"; type = "gem"; }; - version = "1.30.0"; + version = "1.46.0"; }; aws-sdk-route53domains = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -474,10 +595,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01flbzipphp2qm4lcrxbmwqlgl7jy5w7gyj6hbgb8aich927w5qx"; + sha256 = "0k3b37q9mhfnf4mzbhhhgx0v6y82ivq6v01g8fvdfb5n6235j0yg"; type = "gem"; }; - version = "1.18.0"; + version = "1.29.0"; }; aws-sdk-route53resolver = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -485,10 +606,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hlyd4h49sa3s61l1w362l2qmnm78kfj2ks6mshrjwr8l8zql1q5"; + sha256 = "1qyb2n40v52n0xjqncaflb6cl1y0p7szlx1bzxpcnm4g5nfdcf3l"; type = "gem"; }; - version = "1.11.0"; + version = "1.23.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -496,10 +617,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pblkq7rw465w08hs2xy6v7w10x9n004hk43yqzswqxirki68ldz"; + sha256 = "029iqr52fxxz8d6jb2g4k76i7nnjyspvjdlx52xah25zzhp3bx7v"; type = "gem"; }; - version = "1.60.2"; + version = "1.88.0"; + }; + aws-sdk-secretsmanager = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pv5idvap742r4mfwgi01l0sd7skz3m9iy28piy236f6xjiiqsw3"; + type = "gem"; + }; + version = "1.43.0"; }; aws-sdk-securityhub = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -507,10 +639,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a88i8bkqjy91ydj95h9v9mmlsqnx62hkinsprrx6ym0ix78kzim"; + sha256 = "0j6wl0v5p19h3x1fphyq8db5appig7w3gsxnj6mmlm77smlkwjlq"; type = "gem"; }; - version = "1.18.0"; + version = "1.40.0"; + }; + aws-sdk-servicecatalog = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1awf0gcywzylqsdypx2lpib5jiy02fd4iz5q19q9qkpvxw7zj9cd"; + type = "gem"; + }; + version = "1.57.0"; }; aws-sdk-ses = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -518,10 +661,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "046bsyj6zblcbffj15qbdz5fp8ipr6vfhrycsv6hznciy6jvpq4h"; + sha256 = "1j45jykqll5s8y71bp4723mvcxbrihp4rhlhq1rvcyyr4y0706yy"; type = "gem"; }; - version = "1.27.0"; + version = "1.37.0"; + }; + aws-sdk-shield = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0416mrby897fnhc3iwb698m0gyih7pfgmx35h5f618i8my53alin"; + type = "gem"; + }; + version = "1.34.0"; }; aws-sdk-sms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -529,10 +683,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x1x1hrs8v4vb5l79dp5qpdi0znb5cxviwk1zcx6zajpzabv7hdl"; + sha256 = "0121bx79galz99x2wdksmzyibdy6l18k2i2nzc8lsmrgkdz22c03"; type = "gem"; }; - version = "1.17.0"; + version = "1.28.0"; }; aws-sdk-sns = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -540,10 +694,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vfyn7hc21qgarhrfghyw3qi550656834b51n5vnginraryk6ji8"; + sha256 = "0cqri14igfmcxlapbagg0nmy79zzg29awzybv51gl76m3mljbafb"; type = "gem"; }; - version = "1.21.0"; + version = "1.38.0"; }; aws-sdk-sqs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -551,10 +705,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c81w75ph7c3g8fkq8xxs1f5zkvv5yv0k3xy6441gjxvwkpiaih6"; + sha256 = "07qg8awkqpdwf2r7y54183jfcffwjl1mdd98vmgsxv94617bnh4q"; type = "gem"; }; - version = "1.23.1"; + version = "1.36.0"; }; aws-sdk-ssm = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -562,10 +716,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "116vbhw7l2hk1vk3dq79czp857bcw7giw00ip4par1cgwkxym03c"; + sha256 = "1svhxfjmvb6m8h7lm5cr7mmz6zngrhknrrkmwilnrq0lzg1wfp1r"; type = "gem"; }; - version = "1.71.0"; + version = "1.104.0"; + }; + aws-sdk-states = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04pdrsijckiz9fyzyvdndwci004a4fswv8mq5jm53bzmybwhndz2"; + type = "gem"; + }; + version = "1.37.0"; + }; + aws-sdk-transfer = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ivbkfw7j83c7nagdhzdmcmwxn6ym50ak0jfkq1rdc1ppyir31dp"; + type = "gem"; + }; + version = "1.29.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -573,10 +749,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; + sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.2"; }; azure_graph_rbac = { dependencies = ["ms_rest_azure"]; @@ -584,10 +760,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fq9gnsihrrljmlsg70kmryf72rxyy8kb4v9fa9z28abj0lncqgk"; + sha256 = "0mmx8jp85xa13j3asa9xnfi6wa8a9wwlp0hz0nj70fi3ydmcpdag"; type = "gem"; }; - version = "0.17.1"; + version = "0.17.2"; }; azure_mgmt_key_vault = { dependencies = ["ms_rest_azure"]; @@ -595,10 +771,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vcdhzndwa81lg877b1mg2804vhvvnw83qagx6v99adicjf8y8b"; + sha256 = "0f4fai5l3453yirrwajds0jgah60gvawffx53a0jyv3b93ag88mz"; type = "gem"; }; - version = "0.17.5"; + version = "0.17.7"; }; azure_mgmt_resources = { dependencies = ["ms_rest_azure"]; @@ -606,10 +782,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "036p2d59jdjx5a49jz4swf37kfpc9ryyrb13xrdyghk1q79qli8p"; + sha256 = "1hb9010cxrmm23v4dfrsf9wgvr53qkcd6397c4azg3wc65a6i1vc"; type = "gem"; }; - version = "0.17.8"; + version = "0.18.1"; }; azure_mgmt_security = { dependencies = ["ms_rest_azure"]; @@ -617,10 +793,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01rk0wbfbhrxnm0vv520ilxd55hv7n3w0sq5j0v17mnwjgm7pa6d"; + sha256 = "11h2dyz4awzidvfj41h7k2q7mcqqcgzvm95fxpfxz609pbvck0g2"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; azure_mgmt_storage = { dependencies = ["ms_rest_azure"]; @@ -628,30 +804,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m1xajw39958kcv4qlhad2n19flijn9aqzxks2wx4b0k207vp87c"; + sha256 = "0r8klsq3x7s4nn42h9w1kbqblrxnj7z7cpa8bxvc3xwv0vvql7m0"; type = "gem"; }; - version = "0.19.2"; - }; - backports = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sp3l5wa77klj34sqib95ppxyam53x3p57xk0y6gy2c3z29z6hs5"; - type = "gem"; - }; - version = "3.16.1"; + version = "0.22.0"; }; bcrypt_pbkdf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35"; + sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; berkshelf = { dependencies = ["chef" "chef-config" "cleanroom" "concurrent-ruby" "minitar" "mixlib-archive" "mixlib-config" "mixlib-shellout" "octokit" "retryable" "solve" "thor"]; @@ -659,10 +825,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pb20i2blbj9w4cf9nxxxskbd7q5zk8rrirppsfjx8r02dywpq8f"; + sha256 = "1mkakim23w7b38c8lw81wxqw68q6g7rlvxx82lq6bpp1hmmni64n"; type = "gem"; }; - version = "7.0.9"; + version = "7.1.0"; }; builder = { groups = ["default"]; @@ -680,21 +846,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lfx43yl77x074vjg77ixfxnxwl103ywjya55m4lj4vj0b2nxxxn"; + sha256 = "068jzw97g40wbpzn51vcvwdp012202rkmjfafxwhx31wxjzhwy0n"; type = "gem"; }; - version = "15.8.23"; + version = "15.15.0"; }; chef-cli = { - dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"]; + dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "pastel" "solve"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05178w55vwqgrv8jaic2f77h6hx5b40lsmlaqfvdq63a459wl5sd"; + sha256 = "1nw73p8wg67qkzx07v21fwiqljb0yndjm10z56li72d6b1hbw0sb"; type = "gem"; }; - version = "2.0.0"; + version = "3.1.1"; }; chef-config = { dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"]; @@ -702,10 +868,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbl4pgn4kavi6b1m1f232xx4l9fhlz7d4ndmb11m36wb8l05hsk"; + sha256 = "1ji166i5n7cxn69amsfxsvy3b7bf5ksgxxg985w5jfl1gp5bihfl"; type = "gem"; }; - version = "15.8.23"; + version = "15.15.0"; }; chef-dk = { dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"]; @@ -713,10 +879,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zhfq3kwchay6aj6128pr13xabrfprs288ma9abnv9d6vz3ddpw6"; + sha256 = "0zqznvry08pyiv8820b962fzvabzwbsmmwlyvk4ayjr2wshyi6g2"; type = "gem"; }; - version = "4.7.73"; + version = "4.13.3"; }; chef-provisioning = { dependencies = ["cheffish" "inifile" "mixlib-install" "net-scp" "net-ssh" "net-ssh-gateway" "winrm" "winrm-elevated" "winrm-fs"]; @@ -730,35 +896,35 @@ version = "2.7.6"; }; chef-telemetry = { - dependencies = ["chef-config" "concurrent-ruby" "ffi-yajl" "http"]; + dependencies = ["chef-config" "concurrent-ruby" "ffi-yajl"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lx85wy6d1khrya0idwqkdvh1x57qak3d8y699gwccfhl88xymg3"; + sha256 = "0hnmqr6vkgsbnzdzcc6j6svnms14irrcd70wk8qg3p98cy359rm5"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.14"; }; chef-utils = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149pgbybdpi9y11qfsm4bmnqm655s682yv7qkwxhzwqn2fylzb2j"; + sha256 = "1j8rhqc6mj8iay755rl5yaf0rqs54gwcygib1s8g7dxl3vqcpwxa"; type = "gem"; }; - version = "15.8.23"; + version = "15.15.0"; }; chef-vault = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k0famr2cbrrarp4rpzcymqnpnwg734psbf0pxhasxdsjjg8nl6f"; + sha256 = "1rpcgzawdgzvk60fw9s40i5alc7b1rc2phkgm89dckfmklfh6794"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.0"; }; chef-zero = { dependencies = ["ffi-yajl" "hashie" "mixlib-log" "rack" "uuidtools"]; @@ -788,10 +954,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ry6707plcrj7aicadmzxzfmlvz43i2g55k2iph8m390wpxhnhcl"; + sha256 = "15sz88xxh48phq1w3rsivzasg4r36dhqnpqna5cfi120vk28ylb2"; type = "gem"; }; - version = "9.1.0"; + version = "9.2.1"; }; cleanroom = { groups = ["default"]; @@ -808,20 +974,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.8"; }; cookbook-omnifetch = { dependencies = ["mixlib-archive"]; @@ -829,41 +995,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w4xh4ffcm4jd3fys9yg3rb8asngll15mvra8lfi2328alvbanvb"; + sha256 = "1qw8ayyflx222igmrmp1jpgfcfhpnc4myaxv9lk3ckd5l6n3w7qh"; type = "gem"; }; - version = "0.9.1"; - }; - cucumber-core = { - dependencies = ["backports" "cucumber-tag_expressions" "gherkin"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1iavlh8hqj9lwljbpkw06259gdicbr1bdb6pbj5yy3n8szgr8k3c"; - type = "gem"; - }; - version = "3.2.1"; - }; - cucumber-tag_expressions = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc"; - type = "gem"; - }; - version = "1.1.1"; + version = "0.11.1"; }; declarative = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.20"; }; declarative-option = { groups = ["default"]; @@ -890,10 +1035,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhx743lcx61r2d3925jk61c6r8clfjmpf5g93cdy5sq00ig76lh"; + sha256 = "0nrg7kpgz6cn1gv2saj2fa5sfiykamvd7vn9lw2v625k7pjwf31l"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.0"; }; docker-api = { dependencies = ["excon" "multi_json"]; @@ -901,10 +1046,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04dkbg7x2m4102dnwil2v688gblxh1skh374nkzksn18jjrivkdp"; + sha256 = "09lkc50nl3158za0fk8kpd05zlzfxiajnf6zrxpamw1nzdw89ac9"; type = "gem"; }; - version = "1.34.2"; + version = "2.0.0"; }; domain_name = { dependencies = ["unf"]; @@ -927,25 +1072,15 @@ }; version = "1.2.4"; }; - equatable = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf"; - type = "gem"; - }; - version = "0.6.1"; - }; erubi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; erubis = { groups = ["default"]; @@ -962,21 +1097,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vhc5c16i8zrm3d98ppsnw514d7jvwdg0wk60kc9i1xw3797qkkd"; + sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23"; type = "gem"; }; - version = "0.72.0"; + version = "0.79.0"; }; faraday = { - dependencies = ["multipart-post"]; + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; type = "gem"; }; - version = "0.17.3"; + version = "1.3.0"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -984,10 +1119,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1di4gx6446a6zdkrpj679m5k515i53wvb4yxcsqvy8d8zacxiiv6"; + sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; type = "gem"; }; - version = "0.0.6"; + version = "0.0.7"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -995,10 +1140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; type = "gem"; }; - version = "0.12.2"; + version = "1.0.0"; }; fauxhai-ng = { dependencies = ["net-ssh"]; @@ -1006,20 +1151,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vm9hz6k8v4i7r1s5z489n58liaaxmb8bgcvklfg1hf8k3d5afdp"; + sha256 = "0pxzmsp31lxlkq1p0205j2s9kkjqs5a9zy2qpqabbmhny0d9ri8k"; type = "gem"; }; - version = "7.6.0"; + version = "8.7.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; type = "gem"; }; - version = "1.12.2"; + version = "1.14.2"; }; ffi-libarchive = { dependencies = ["ffi"]; @@ -1027,10 +1172,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vs8s37lr3bgw5d3mb6vamcqy16dj61yzzq0xf453lhr3dcampkb"; + sha256 = "1wmbwg6hirxr85c3skdq2na8xwg4ky880qbs1z1adb9aizcjbdkx"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.17"; }; ffi-yajl = { dependencies = ["libyajl2"]; @@ -1038,21 +1183,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11m9pkx2a1vssplzb3fwx4kc25bg5xmjf0j97l5kv6mhnhd93sik"; + sha256 = "1pfmn0gprc3c15baxa9rx64pqllk64m60f5vg4gp0icpafkp0jx5"; type = "gem"; }; - version = "2.3.3"; + version = "2.3.4"; }; foodcritic = { - dependencies = ["cucumber-core" "erubis" "ffi-yajl" "nokogiri" "rake" "rufus-lru" "treetop"]; + dependencies = ["erubis" "ffi-yajl" "nokogiri" "rake" "rufus-lru" "treetop"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11dzfcf6p1z75anizwqm48nadd84j5wk0vm4mp4s5a7xfqjh3psi"; + sha256 = "1gnp8lr37cv87adr3568kh7p55vwdqp01f2hwjxlvqkwkwk3fvn4"; type = "gem"; }; - version = "16.2.0"; + version = "16.3.0"; }; fuzzyurl = { groups = ["default"]; @@ -1064,37 +1209,27 @@ }; version = "0.9.0"; }; - gherkin = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cgcdchwwdm10rsk44frjwqd4ihprhxjbm799nscqy2q1raqfj5s"; - type = "gem"; - }; - version = "5.1.0"; - }; git = { dependencies = ["rchardet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15sbv16dlap5d6naybl8cc99zffrpzygkhjz3m6l3r5y5yrhwwjc"; + sha256 = "0vdcv93s33d9914a9nxrn2y2qv15xk7jx94007cmalp159l08cnl"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.1"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xndfscxxaw73qah484vmhcd60hlbyrr9rlh7sf2n2sjfcqikjsf"; + sha256 = "1q1lsyyyfvff7727sr01j8qx6b30qpx6h0bna5s0bfz853fhl33b"; type = "gem"; }; - version = "0.34.1"; + version = "0.52.0"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1102,10 +1237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnkh017ln5g7x3y0w743g61bxb2cdcyr1vax9ic3gx7vkrfj3iw"; + sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; type = "gem"; }; - version = "0.10.0"; + version = "0.14.0"; }; gssapi = { dependencies = ["ffi"]; @@ -1113,10 +1248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13l6pqbfrx3vv7cw26nq9p8rnyp9br31gaz85q32wx6hnzfcriwh"; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; gyoku = { dependencies = ["builder"]; @@ -1149,27 +1284,6 @@ }; version = "1.7.10"; }; - htmlentities = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; - type = "gem"; - }; - version = "4.3.4"; - }; - http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kcd9qp8vm1rkyp7gfh8j0dbl3zpi97vz2vbhpbcsdsa7l21a59r"; - type = "gem"; - }; - version = "2.2.2"; - }; http-cookie = { dependencies = ["domain_name"]; groups = ["default"]; @@ -1181,26 +1295,6 @@ }; version = "1.0.3"; }; - http-form_data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j8dwwbfpf8kc0lcsqcgy29lflszd1x4d7kc0f7227892m7r6y0m"; - type = "gem"; - }; - version = "1.0.3"; - }; - "http_parser.rb" = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; - type = "gem"; - }; - version = "0.6.0"; - }; httpclient = { groups = ["default"]; platforms = []; @@ -1217,10 +1311,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "0k7q3pwm0l1qvx6sc3d4dxmdxqx2pc63lbfjwv0k0higq94rinvs"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.8"; }; inifile = { groups = ["default"]; @@ -1237,10 +1331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbik6838gfh5yq9ahh1m7dzszxlk0g7x5lvhb8amk60mafkrgws"; + sha256 = "1wb1qy4i2xrrd92dc34pi7q7ibrjpapzk9y465v0n9caiplnb89n"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; }; inspec = { dependencies = ["faraday_middleware" "inspec-core" "train" "train-aws" "train-habitat" "train-winrm"]; @@ -1248,21 +1342,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04cyv81rgspr9xachq2dk9xgb740jrq7vpy2r88lqdzlzbpz3f4n"; + sha256 = "0jg818r56vzzh971ckzbknv8b70da73njr3x2y7xd6jwv5pjs93m"; type = "gem"; }; - version = "4.18.85"; + version = "4.26.4"; }; inspec-core = { - dependencies = ["addressable" "chef-telemetry" "faraday" "hashie" "htmlentities" "json-schema" "license-acceptance" "method_source" "mixlib-log" "multipart-post" "parallel" "parslet" "pry" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "term-ansicolor" "thor" "tomlrb" "train-core" "tty-prompt" "tty-table"]; + dependencies = ["addressable" "chef-telemetry" "faraday" "faraday_middleware" "hashie" "license-acceptance" "method_source" "mixlib-log" "multipart-post" "parallel" "parslet" "pry" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "thor" "tomlrb" "train-core" "tty-prompt" "tty-table"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ha6dmi5lywv4gldpv2pyj0zwqv4wsf422jd4x8licmkpkcrwc2r"; + sha256 = "0nrd4ny5cyah76pchr5xyi2m9rx0lkyk9vd2sp68rjp0x1x5y3p8"; type = "gem"; }; - version = "4.18.85"; + version = "4.26.4"; }; ipaddress = { groups = ["default"]; @@ -1274,16 +1368,6 @@ }; version = "0.8.3"; }; - jaro_winkler = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; - type = "gem"; - }; - version = "1.5.4"; - }; jmespath = { groups = ["default"]; platforms = []; @@ -1299,31 +1383,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.0"; - }; - json-schema = { - dependencies = ["addressable"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5"; - type = "gem"; - }; - version = "2.8.1"; + version = "2.5.1"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01zg1vp3lyl3flyjdkrcc93ghf833qgfgh2p1biqfhkzz11r129c"; + sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; kitchen-inspec = { dependencies = ["hashie" "inspec" "test-kitchen"]; @@ -1331,10 +1404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v85hnmhqdbl9zxphvbqfgma9rl095mq9jz223mkffdh9q5xv282"; + sha256 = "1fx27vkc29kx59qmkrkl53sbyigny3rkqlfp836rwlxf1wfbbdlv"; type = "gem"; }; - version = "1.3.1"; + version = "2.3.0"; }; kitchen-vagrant = { dependencies = ["test-kitchen"]; @@ -1342,10 +1415,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01wwryb4ha6gzhnmbg7xir32rpynbw4zc2l9dch02pwizw0n669x"; + sha256 = "1pix3n9hbr9s736n4jh8dn71ccsm5xcqvx9clwilzhr3r89qfiwg"; type = "gem"; }; - version = "1.6.1"; + version = "1.8.0"; }; knife-spork = { dependencies = ["app_conf" "chef" "diffy" "git"]; @@ -1353,10 +1426,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcry9fbsi9kqfi8rrdda17yzmfyg21g9jv01sgzg1sj59kzb79s"; + sha256 = "1ddgmv3j75m908ldykrgn9rdjdw09yakmxav7569f18lhxxfs9l0"; type = "gem"; }; - version = "1.7.2"; + version = "1.7.3"; }; libyajl2 = { groups = ["default"]; @@ -1374,10 +1447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lxgpmzb9hafzx7f5fssb1mamcbzbdp87awvjr33fk6nsvyg3zaj"; + sha256 = "03n3jpzivqxajvf3507c2z9vq2mrriqqc1yg3g0pgzacb3d38k2d"; type = "gem"; }; - version = "1.0.13"; + version = "1.0.19"; }; little-plugger = { groups = ["default"]; @@ -1395,10 +1468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; memoist = { groups = ["default"]; @@ -1415,10 +1488,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; type = "gem"; }; - version = "0.9.2"; + version = "1.0.0"; }; mini_mime = { groups = ["default"]; @@ -1435,10 +1508,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitar = { groups = ["default"]; @@ -1455,10 +1528,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.3"; }; mixlib-archive = { dependencies = ["mixlib-log"]; @@ -1466,30 +1539,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01c7g55x126cj2493wx03n9b83i9m1rdfx2aivg1yg8d1lmj8jdg"; + sha256 = "0dj52irvnp1riz52kg6fddmdvl9nxsrxk3vyidr7lfzhw5sj8vdk"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.4"; }; mixlib-authentication = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d854b55d0hx0q12gwbycfdcpnxx88zz0jk557ngq2cqq94g96jy"; + sha256 = "1wfyn645wnb79rl3ys83171ymv56k8zks9qvxh29vj8nicyrzr23"; type = "gem"; }; - version = "3.0.6"; + version = "3.0.7"; }; mixlib-cli = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yrfgg18hlm0hkg81w5bw3fbk0m89lg96a0b65q9mrrscg37rvn2"; + sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; type = "gem"; }; - version = "2.1.5"; + version = "2.1.8"; }; mixlib-config = { dependencies = ["tomlrb"]; @@ -1497,10 +1570,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lb9dg4wg86qhbd0rykdjr00arkyvmrg20a5ylf0zd6wp7w01jk"; + sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; type = "gem"; }; - version = "3.0.6"; + version = "3.0.9"; }; mixlib-install = { dependencies = ["mixlib-shellout" "mixlib-versioning" "thor"]; @@ -1508,30 +1581,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bsn4d0m3xw142v1vssyrxwa6y64fqd5hx2hsnm5vc1xj4xmcg0f"; + sha256 = "0p11qf6b86dzl3q5gqi63myz484dicmn90d8v8jjb1dm51gqpajq"; type = "gem"; }; - version = "3.11.26"; + version = "3.12.5"; }; mixlib-log = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00kmwx7s3xpxmy44saxjk36gbhsywyxy4f8jf4gjvwwpr0ps8q0g"; + sha256 = "0n5dm5iz90ijvjn59jfm8gb8hgsvbj0f1kpzbl38b02z0z4a4v7x"; type = "gem"; }; - version = "3.0.8"; + version = "3.0.9"; }; mixlib-shellout = { + dependencies = ["chef-utils"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2nqa82xp0hg8sj69cypar8n7p3azl5pl2v2mjbkhgmmhqxa8km"; + sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; type = "gem"; }; - version = "3.0.9"; + version = "3.2.2"; }; mixlib-versioning = { groups = ["default"]; @@ -1548,10 +1622,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6"; + sha256 = "17kvf6fijn6k886dhj89h0x39qh90c47asa2k16s913fcgn3a1n3"; type = "gem"; }; - version = "0.6.6"; + version = "0.7.0"; }; ms_rest = { dependencies = ["concurrent-ruby" "faraday" "timeliness"]; @@ -1559,31 +1633,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mgfspn3g75mhmfprpr2pnkmav34gix8cfga43g7162d0i1pd9l"; + sha256 = "1jiha1bda5knpjqjymwik6i41n69gb0phcrgvmgc5icl4mcisai7"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; ms_rest_azure = { - dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest" "unf_ext"]; + dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "135va1hzxwn0apb2lf7b9yi8d1czid250cgf91dm331rqz84jnvz"; + sha256 = "06i37b84r2q206kfm5vsi9s1qiiy09091vhvc5pzb7320h0hc1ih"; type = "gem"; }; - version = "0.11.1"; + version = "0.12.0"; }; multi_json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.14.1"; + version = "1.15.0"; }; multipart-post = { groups = ["default"]; @@ -1595,16 +1669,6 @@ }; version = "2.1.1"; }; - necromancer = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w2y31947axs62bsf0xrpgalsw4ip1m44vpw7p8f4s9zvnayj2vd"; - type = "gem"; - }; - version = "0.5.1"; - }; net-scp = { dependencies = ["net-ssh"]; groups = ["default"]; @@ -1660,15 +1724,15 @@ version = "1.2.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.8"; + version = "1.11.1"; }; nori = { groups = ["default"]; @@ -1686,10 +1750,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.16.0"; + version = "4.20.0"; }; ohai = { dependencies = ["chef-config" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "systemu" "wmi-lite"]; @@ -1697,20 +1761,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6c22nqg905sivr099qrwbvnwwyvm37xzxxrysvkalxglkvxr23"; + sha256 = "0qw3mz8f9hpzfchwqa1nix7fcvy34k5n7lln91b8gsbx2l6aycs6"; type = "gem"; }; - version = "15.7.4"; + version = "15.12.0"; }; os = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06r55k01g32lvz4wf2s6hpjlxbbag113jsvff3w64jllfr315a73"; + sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.1"; }; paint = { groups = ["default"]; @@ -1727,10 +1791,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.1"; }; parser = { dependencies = ["ast"]; @@ -1738,10 +1802,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "145lv6rbbnbddbk79l10kadycjq05vyrzq5d733zswmypshpq6ni"; + sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; type = "gem"; }; - version = "2.7.0.2"; + version = "3.0.0.0"; }; parslet = { groups = ["default"]; @@ -1754,25 +1818,25 @@ version = "1.8.2"; }; pastel = { - dependencies = ["equatable" "tty-color"]; + dependencies = ["tty-color"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm"; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; type = "gem"; }; - version = "0.7.3"; + version = "0.8.0"; }; plist = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ra0910xxbhfsmdi0ig36pr3q0khdqzwb5da3wg7y3n8d1sh9ffp"; + sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; }; polyglot = { groups = ["default"]; @@ -1800,10 +1864,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + sha256 = "1shq3vfdg7c9l1wppl8slridl95wmwvnngqhga6j2571nnv50piv"; type = "gem"; }; - version = "0.12.2"; + version = "0.14.0"; }; public_suffix = { groups = ["default"]; @@ -1815,15 +1879,25 @@ }; version = "3.1.1"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp"; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; rainbow = { groups = ["default"]; @@ -1840,10 +1914,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rchardet = { groups = ["default"]; @@ -1855,6 +1929,16 @@ }; version = "1.8.0"; }; + regexp_parser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip"; + type = "gem"; + }; + version = "2.0.3"; + }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; groups = ["default"]; @@ -1902,10 +1986,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + sha256 = "1dwai7jnwmdmd7ajbi2q0k0lx1dh88knv5wl7c34wjmf94yv8w5q"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -1913,10 +1997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzc1wdjb1qnbimjl8i1q1r1z5hdv2lmcw7ysz7jawj4d1cvpqvd"; + sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1924,10 +2008,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjqfb39da6gywdcp4h77738r7khbrn2v4y45589z25bj4z9paf0"; + sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.1"; }; rspec-its = { dependencies = ["rspec-core" "rspec-expectations"]; @@ -1946,61 +2030,82 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.2"; }; rspec-support = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zwpyq1na23pvgacpxs2v9nwfbjbw6x3arca5j3l1xagigqmzhc3"; + sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; type = "gem"; }; - version = "3.9.2"; + version = "3.10.2"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0adfpv76whv5dy5wr5brqkki39jfv6r08482saj64h9j4wzwcznb"; + sha256 = "06npybjypxsrz09z8ivxqfcwzpbgif6z3hwpp0ls8znqlgp3m922"; type = "gem"; }; - version = "0.80.0"; + version = "1.9.1"; + }; + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; + type = "gem"; + }; + version = "1.4.1"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; }; rubyntlm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; rubyzip = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "1.3.0"; + version = "2.3.0"; }; rufus-lru = { groups = ["default"]; @@ -2039,10 +2144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m8brljfgrxpr5j7kggv3dphqj9in3rkbf5dryx8f7nprkk85wdd"; + sha256 = "1zmrsnrrj5j3bp9fmaa74cvlkpdwspv8gv5vpz1lclhirkiqz1xv"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.1"; }; solve = { dependencies = ["molinillo" "semverse"]; @@ -2050,20 +2155,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zymaik4cxd4kmd8f4n1ij8ykrfinhnlvlhjnsdv2cv1xnqnjqmk"; + sha256 = "059lrsf40rl5kclp1w8pb0fzz5sv8aikg073cwcvn5mndk14ayky"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; sslshake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dy7pnvn0zb3qbfahgksfxqw1hxhk2i2wlw34bvr2iyzqlw04a3s"; + sha256 = "0r3ifksx8a05yqhv7nc4cwan8bwmxgq5kyv7q7hy2h9lv5zcjs8h"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; strings = { dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; @@ -2071,10 +2176,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0"; + sha256 = "0xgw0zmwansvmk8dnxgd83pvrj4f5y8j72bpzp409hwd6xy1hy7m"; type = "gem"; }; - version = "0.1.8"; + version = "0.2.0"; }; strings-ansi = { groups = ["default"]; @@ -2086,16 +2191,6 @@ }; version = "0.2.0"; }; - sync = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; - type = "gem"; - }; - version = "0.5.0"; - }; syslog-logger = { groups = ["default"]; platforms = []; @@ -2116,37 +2211,26 @@ }; version = "2.6.5"; }; - term-ansicolor = { - dependencies = ["tins"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; - type = "gem"; - }; - version = "1.7.1"; - }; test-kitchen = { dependencies = ["bcrypt_pbkdf" "ed25519" "license-acceptance" "mixlib-install" "mixlib-shellout" "net-scp" "net-ssh" "net-ssh-gateway" "thor" "winrm" "winrm-elevated" "winrm-fs"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14wvv8vgm3lqqk9ifywjhhxlvnbx5gpl4f8zbw5gj41sq8hdqgqj"; + sha256 = "1s5sj6x2dscd3wci7ns1m3jwfp1b7h8535q44ggdsz60gp63p974"; type = "gem"; }; - version = "2.3.4"; + version = "2.10.0"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "0.20.3"; + version = "1.1.0"; }; thread_safe = { groups = ["default"]; @@ -2168,80 +2252,69 @@ }; version = "0.3.10"; }; - tins = { - dependencies = ["sync"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nghqcdg7ak91n2h6igx8i2ykbhna93xpg33w6232451vphlwdm0"; - type = "gem"; - }; - version = "1.24.1"; - }; tomlrb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njkyq5csj4km8spmw33b5902v254wvyvqq1b0f0kky5hs7bvrgg"; + sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; type = "gem"; }; - version = "1.2.9"; + version = "1.3.0"; }; train = { - dependencies = ["activesupport" "azure_graph_rbac" "azure_mgmt_key_vault" "azure_mgmt_resources" "azure_mgmt_security" "azure_mgmt_storage" "docker-api" "google-api-client" "googleauth" "train-core" "train-winrm"]; + dependencies = ["activesupport" "azure_graph_rbac" "azure_mgmt_key_vault" "azure_mgmt_resources" "azure_mgmt_security" "azure_mgmt_storage" "docker-api" "google-api-client" "googleauth" "inifile" "train-core" "train-winrm"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y7aggjyarc531a0vmh86vdqr6ws3y3h64jnkh8cavpqns4jhmjg"; + sha256 = "09nflqvdgzxfncr8qki0jhnarfg36mii0h6hi2cd71q49613m6gk"; type = "gem"; }; - version = "3.2.22"; + version = "3.4.9"; }; train-aws = { - dependencies = ["aws-sdk-apigateway" "aws-sdk-apigatewayv2" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-budgets" "aws-sdk-cloudformation" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchlogs" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-configservice" "aws-sdk-core" "aws-sdk-costandusagereportservice" "aws-sdk-dynamodb" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-firehose" "aws-sdk-iam" "aws-sdk-kafka" "aws-sdk-kinesis" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-organizations" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-route53resolver" "aws-sdk-s3" "aws-sdk-securityhub" "aws-sdk-ses" "aws-sdk-sms" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm"]; + dependencies = ["aws-sdk-apigateway" "aws-sdk-apigatewayv2" "aws-sdk-applicationautoscaling" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-batch" "aws-sdk-budgets" "aws-sdk-cloudformation" "aws-sdk-cloudfront" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchevents" "aws-sdk-cloudwatchlogs" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-cognitoidentity" "aws-sdk-cognitoidentityprovider" "aws-sdk-configservice" "aws-sdk-core" "aws-sdk-costandusagereportservice" "aws-sdk-databasemigrationservice" "aws-sdk-dynamodb" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-efs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-firehose" "aws-sdk-glue" "aws-sdk-guardduty" "aws-sdk-iam" "aws-sdk-kafka" "aws-sdk-kinesis" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-organizations" "aws-sdk-ram" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-route53resolver" "aws-sdk-s3" "aws-sdk-secretsmanager" "aws-sdk-securityhub" "aws-sdk-servicecatalog" "aws-sdk-ses" "aws-sdk-shield" "aws-sdk-sms" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm" "aws-sdk-states" "aws-sdk-transfer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dvwzk9h5kzbb9v6qm387mfysjz4nfcr56685ccl5c1jj5a59553"; + sha256 = "014cbgkzkw1rf7652h1xqshb9crr6pn2yhlv1z41ndxlkmmdx4fg"; type = "gem"; }; - version = "0.1.15"; + version = "0.1.35"; }; train-core = { - dependencies = ["addressable" "inifile" "json" "mixlib-shellout" "net-scp" "net-ssh"]; + dependencies = ["addressable" "ffi" "json" "mixlib-shellout" "net-scp" "net-ssh"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfqyfi4q2vykbiw4b373n7n2aqzhq9gkn8sr3sx2w7hpd7lkd3x"; + sha256 = "1pbfbmi9l5hxr1zly1bc72fk8a6by4d19wdap8q3mi3rlflqzbfp"; type = "gem"; }; - version = "3.2.22"; + version = "3.4.9"; }; train-habitat = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w642zkvgq0d1dy622lk50ngr0872v6ghd4r1g692qv8g4k6d90n"; + sha256 = "0qdi2q5djzfl6x3fv2vrvybjdvrnx53nfh4vzrcl2h7nrf801n6v"; type = "gem"; }; - version = "0.2.13"; + version = "0.2.22"; }; train-winrm = { - dependencies = ["winrm" "winrm-fs"]; + dependencies = ["winrm" "winrm-elevated" "winrm-fs"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4sv6hblq9y259aka6j868di2w669f6aj2m7ssi5jxhanaf5mqk"; + sha256 = "0nin3qfkh173yjcihxaz0sbnskds9n1n0ciphc7y70647vpsqgrh"; type = "gem"; }; - version = "0.2.6"; + version = "0.2.12"; }; treetop = { dependencies = ["polyglot"]; @@ -2249,10 +2322,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7"; + sha256 = "0697qz1akblf8r3wi0s2dsjh468hfsd57fb0mrp93z35y2ni6bhh"; type = "gem"; }; - version = "1.6.10"; + version = "1.6.11"; }; tty-box = { dependencies = ["pastel" "strings" "tty-cursor"]; @@ -2260,20 +2333,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14g63v0jx87hba50rlv3c521zg9rw0f5d31cihcvym19xxa7v3l5"; + sha256 = "12yzhl3s165fl8pkfln6mi6mfy3vg7p63r3dvcgqfhyzq6h57x0p"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.0"; }; tty-color = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0czbnp19cfnf5zwdd22payhqjv57mgi3gj5n726s20vyq3br6bsp"; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.0"; }; tty-cursor = { groups = ["default"]; @@ -2286,15 +2359,15 @@ version = "0.7.1"; }; tty-prompt = { - dependencies = ["necromancer" "pastel" "tty-reader"]; + dependencies = ["pastel" "tty-reader"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19kbxny8cfsy1r02awih1gf76mi3a7zqg3ymxpmf9720khlmziax"; + sha256 = "0rhvwpl5wk51njrh3avm09c8pwl2z5iwc0l67h40gq3r7ix2fjk2"; type = "gem"; }; - version = "0.20.0"; + version = "0.23.0"; }; tty-reader = { dependencies = ["tty-cursor" "tty-screen" "wisper"]; @@ -2302,31 +2375,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1977ajs9sxwhd88qqmf6l1hw63dqxlvg9mx626rymsc5ap2xa1r4"; + sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6"; type = "gem"; }; - version = "0.7.0"; + version = "0.9.0"; }; tty-screen = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwgr2i3wilng3mx851xczmkzllbirmsmr42ik4amqyyvry1yzyf"; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.1"; }; tty-table = { - dependencies = ["equatable" "necromancer" "pastel" "strings" "tty-screen"]; + dependencies = ["pastel" "strings" "tty-screen"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y07yikpk65jqmxinw8l4c45pbw1b2h4fv9fikb43a7sdlr6sn69"; + sha256 = "0fcrbfb0hjd9vkkazkksri93dv9wgs2hp6p1xwb1lp43a13pmhpx"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -2334,10 +2407,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.9"; }; uber = { groups = ["default"]; @@ -2365,20 +2438,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04d13bp6lyg695x94whjwsmzc2ms72d94vx861nx1y40k3817yp8"; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; type = "gem"; }; - version = "0.0.7.2"; + version = "0.0.7.7"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; unicode_utils = { groups = ["default"]; @@ -2406,10 +2479,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13c0vf32vinkp3ia86rvq779dacl37v4v2814v4g9qrk3liv0dym"; + sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; type = "gem"; }; - version = "2.3.4"; + version = "2.3.6"; }; winrm-elevated = { dependencies = ["erubi" "winrm" "winrm-fs"]; @@ -2417,10 +2490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv"; + sha256 = "1lmlaii8qapn84wxdg5d82gbailracgk67d0qsnbdnffcg8kswzd"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.3"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; @@ -2428,10 +2501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0phhzliw47hmpi3ddygs500kfxa7il5yzmp7dw4ix2dvhrxrj7s6"; + sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.5"; }; wisper = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index 0cc386b657..5539489afb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "clj-kondo"; - version = "2020.12.12"; + version = "2021.02.13"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "27b8a82fb613803ab9c712866b7cc89c40fcafc4ac3af178c11b4ed7549934dc"; + sha256 = "sha256-Rq7W5sP9nRB0TGRUSQIyC3U568uExmcM/gd+1HjAqac="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/clpm/default.nix b/third_party/nixpkgs/pkgs/development/tools/clpm/default.nix index 03174d6c4f..0dfa99367a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clpm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clpm/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchgit , wrapLisp , sbcl @@ -7,13 +8,13 @@ stdenv.mkDerivation rec { pname = "clpm"; - version = "0.3.5"; + version = "0.3.6"; src = fetchgit { url = "https://gitlab.common-lisp.net/clpm/clpm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0jivnnp3z148yf4c2nzzr5whz76w5kjhsb97z2vs5maiwf79y2if"; + sha256 = "04w46yhv31p4cfb84b6qvyfw7x5nx6lzyd4yzhd9x6qvb7p5kmfh"; }; buildInputs = [ @@ -22,13 +23,21 @@ stdenv.mkDerivation rec { ]; buildPhase = '' + runHook preBuild + ln -s ${openssl.out}/lib/libcrypto.so.* . ln -s ${openssl.out}/lib/libssl.so.* . common-lisp.sh --script scripts/build.lisp + + runHook postBuild ''; installPhase = '' + runHook preInstall + INSTALL_ROOT=$out sh install.sh + + runHook postInstall ''; # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core` diff --git a/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix b/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix index 2a2ce1b190..7441d4018a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchgit, python3 }: stdenv.mkDerivation { pname = "gnulib"; @@ -10,19 +10,26 @@ stdenv.mkDerivation { sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; }; - dontFixup = true; - # no "make install", gnulib is a collection of source code + postPatch = '' + patchShebangs gnulib-tool.py + ''; + + buildInputs = [ python3 ]; + installPhase = '' - mkdir -p $out; mv * $out/ - ln -s $out/lib $out/include mkdir -p $out/bin + cp -r * $out/ + ln -s $out/lib $out/include ln -s $out/gnulib-tool $out/bin/ ''; - meta = { + # do not change headers to not update all vendored build files + dontFixup = true; + + meta = with lib; { homepage = "https://www.gnu.org/software/gnulib/"; description = "Central location for code to be shared among GNU packages"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix index 9f553aa6ba..fc13b68258 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, asciidoc, cmake, libxslt }: stdenv.mkDerivation rec { pname = "genkfs"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp"; }; - nativeBuildInputs = [ asciidoc cmake ]; + strictDeps = true; + + nativeBuildInputs = [ asciidoc libxslt.bin cmake ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix index 5f047d79a1..90a493697c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kcc/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp"; }; - nativeBuildInputs = [ cmake bison flex ]; + strictDeps = true; + + nativeBuildInputs = [ bison cmake flex ]; buildInputs = [ boost ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix index 33ec5b8bbb..70eea0f7b6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kimg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: stdenv.mkDerivation rec { pname = "kimg"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3"; }; - nativeBuildInputs = [ cmake asciidoc ]; + strictDeps = true; + + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix index 43a8e4eddf..447959a1e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/kpack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }: stdenv.mkDerivation rec { pname = "kpack"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8"; }; - nativeBuildInputs = [ cmake ]; + strictDeps = true; - buildInputs = [ asciidoc libxslt.bin docbook_xsl ]; + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "fortify" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix index b1ee36ac2d..2e067e92d9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/mkrom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: stdenv.mkDerivation rec { pname = "mkrom"; @@ -11,10 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2"; }; - nativeBuildInputs = [ - asciidoc - cmake - ]; + strictDeps = true; + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix index a91d1e5bed..efe8d454b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/mktiupgrade/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }: +{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: stdenv.mkDerivation rec { pname = "mktiupgrade"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm"; }; - nativeBuildInputs = [ asciidoc cmake ]; + strictDeps = true; + + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix index 33ed8d38c6..67d7159e50 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/patchrom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }: stdenv.mkDerivation rec { @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv"; }; - nativeBuildInputs = [ cmake asciidoc docbook_xsl ]; + strictDeps = true; - buildInputs = [ libxslt ]; + nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix index 573d261306..eb0ab96217 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSCAS_LIBRARY=1" ]; + strictDeps = true; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix index 6d66f141e9..b8aa281d41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/z80e/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc="; }; - nativeBuildInputs = [ cmake knightos-scas ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ readline SDL2 ]; + buildInputs = [ readline SDL2 knightos-scas ]; cmakeFlags = [ "-Denable-sdl=YES" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix index c49187273c..fc1af1a4d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; buildPhase = "${stdenv.shell} ${./helper.sh}"; - installPhase = ":"; # buildPhase does this. + dontInstall = true; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix index 94f92bfcf2..9537e11e11 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/openfpgaloader/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "openfpgaloader"; - version = "0.2.1"; + version = "0.2.5"; src = fetchFromGitHub { owner = "trabucayre"; repo = "openFPGALoader"; rev = "v${version}"; - sha256 = "0j87mlghbanh6c7lrxv0x3p6zgd0wrkcs9b8jf6ifh7b3ivcfg82"; + sha256 = "sha256-Qbw+vmpxiZXTGM0JwpS5mGzcsSJNegsvmncm+cOVrVE="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index fc1f5c3f31..1599c4213a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -1,13 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "skaffold"; - version = "1.17.2"; + version = "1.20.0"; + + src = fetchFromGitHub { + owner = "GoogleContainerTools"; + repo = "skaffold"; + rev = "v${version}"; + sha256 = "080zhksznwsyi0w1ban90vgh8y1q2703h3h4fvkwg695prd9ij66"; + }; + + vendorSha256 = "1jvrk5jhjzg0dq0zg7p4hvjwda2289cmwh0ldz3269y8g3l113x8"; - goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; - buildFlagsArray = let t = "${goPackagePath}/pkg/skaffold"; in '' + buildFlagsArray = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in '' -ldflags= -s -w -X ${t}/version.version=v${version} @@ -15,24 +23,24 @@ buildGoPackage rec { -X ${t}/version.buildDate=unknown ''; - src = fetchFromGitHub { - owner = "GoogleContainerTools"; - repo = "skaffold"; - rev = "v${version}"; - sha256 = "1sn4pmikap93kpdgcalgb3nam7zp60ck6wmynsv8dnzihrr7ycm3"; - }; - nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - for shell in bash zsh; do - $out/bin/skaffold completion $shell > skaffold.$shell - installShellCompletion skaffold.$shell - done + installShellCompletion --cmd skaffold \ + --bash <($out/bin/skaffold completion bash) \ + --zsh <($out/bin/skaffold completion zsh) ''; meta = with lib; { - description = "Easy and Repeatable Kubernetes Development"; homepage = "https://skaffold.dev/"; + changelog = "https://github.com/GoogleContainerTools/skaffold/releases/tag/v${version}"; + description = "Easy and Repeatable Kubernetes Development"; + longDescription = '' + Skaffold is a command line tool that facilitates continuous development for Kubernetes applications. + You can iterate on your application source code locally then deploy to local or remote Kubernetes clusters. + Skaffold handles the workflow for building, pushing and deploying your application. + It also provides building blocks and describe customizations for a CI/CD pipeline. + ''; license = licenses.asl20; maintainers = with maintainers; [ vdemeester ]; }; diff --git a/third_party/nixpkgs/pkgs/games/blobwars/default.nix b/third_party/nixpkgs/pkgs/games/blobwars/default.nix new file mode 100644 index 0000000000..b99c9f2b8e --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/blobwars/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchurl, pkg-config, gettext, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf, zlib }: + +stdenv.mkDerivation rec { + pname = "blobwars"; + version = "2.00"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99"; + }; + + nativeBuildInputs = [ pkg-config gettext ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf zlib ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + + makeFlags = [ "PREFIX=$(out)" "RELEASE=1" ]; + + postInstall = '' + install -Dm755 $out/games/blobwars -t $out/bin + rm -r $out/games + cp -r {data,gfx,sound,music} $out/share/games/blobwars/ + # fix world readable bit + find $out/share/games/blobwars/. -type d -exec chmod 755 {} + + find $out/share/games/blobwars/. -type f -exec chmod 644 {} + + ''; + + meta = with lib; { + description = "Platform action game featuring a blob with lots of weapons"; + homepage = "https://www.parallelrealities.co.uk/games/metalBlobSolid/"; + license = with licenses; [ gpl2Plus free ]; + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/ezquake/default.nix b/third_party/nixpkgs/pkgs/games/ezquake/default.nix index 7089c81ee3..90ddb6d645 100644 --- a/third_party/nixpkgs/pkgs/games/ezquake/default.nix +++ b/third_party/nixpkgs/pkgs/games/ezquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ezquake"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "ezQuake"; repo = pname + "-source"; rev = version; - sha256 = "1rfp816gnp7jfd27cg1la5n1q6z2wgd9qljnlmnx7v2jixql8brf"; + sha256 = "sha256-EBhKmoX11JavTG6tPfg15FY2lqOFfzSDg3058OWfcYQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dlx/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/dlx/default.nix index 3360d45ccc..7ba4516a49 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dlx/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dlx/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation { sha256 = "0q5hildq2xcig7yrqi26n7fqlanyssjirm7swy2a9icfxpppfpkn"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; - makeFlags = [ "LINK=gcc" "CFLAGS=-O2" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LINK=${stdenv.cc.targetPrefix}cc" "CFLAGS=-O2" ]; hardeningDisable = [ "format" ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation { homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index c4448194a9..d2faa00db9 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-02-11"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "8cb9f5ef515f73eb3cf3188cc20ff57a51d9217b"; - sha256 = "1ml2j5l91n1zwp7zxdg2cny48bbj1gw0dfa223bf5iq472c1ggk2"; + rev = "88d052b5a9ee3a41364497e1b98f01305d01df35"; + sha256 = "05d4dv9sqvnz0cqiyzkiyv5i7vrdw0niipdv9plm1zkf5arpd2d4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -257,12 +257,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-01-16"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "80860e972cdf78e0e0b8dc7f16e07142966f73cf"; - sha256 = "009gnamainla5z2q98p6mi4gifmlbx5im7d2gx2d0da62cbdrcsl"; + rev = "130b5bc9de263d89c003bf88190e29ac7ad53978"; + sha256 = "1ihc25yw53hnflqycl7brjc9xyhrp5ci641vjqh4j7naf60ffapb"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-02-12"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e3e679e077708ee8a4de6bdcdf4135ac1f1ebd9c"; - sha256 = "0i7wznlvamybbrz0qjvynkzk6alcxa327nrlw95la6qbw67vkbsl"; + rev = "c93c385a7c3e43edca1fd9c4e24fbdfb860886cf"; + sha256 = "1jxmkskr6x1610jjswivvaqi8mqslq797z4bxyd1byqbrrcz3vvy"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -425,12 +425,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-01-31"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "c7537d81a796b4559e03309aeec9cb8d6d7bda21"; - sha256 = "05p8viz5q7rknzyh7zp3k2qhl14nlamik5gvqy86bfgwmhbac350"; + rev = "a98f31d7ab86d4886d72f50064fb85d86c6843eb"; + sha256 = "0s2mgxyzhaj9hvdinkal608yrxyigm7al22cwif6f9ls7aik20zs"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -497,12 +497,12 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-12-29"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "a8b32b8b8a37d7fb87687c0187b7ad36987e2122"; - sha256 = "1x6xfizcix1hlcl2dhxbaxxl2q7lpgnfyvdg81c88rcn68qykfn0"; + rev = "a3272d19bce58f921ed9d112cc8128877307daac"; + sha256 = "1qg8awk5v6kfdb6livknx3y0v1ww3ashyn1pv1iwj3s0cms91mzr"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -618,12 +618,12 @@ let compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-02-12"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "ea3e34dcbe09563c986bc60ec7d3c0db18ce9690"; - sha256 = "1gsi5ybkqxqv1q3yj2qdv5j2lhkwiabr3mrcj60ah5rb1qjvlmib"; + rev = "e16e1661574a8bd56e27c67aa6dffa91efdc76b2"; + sha256 = "1ydcws12xx4prqmhri9pld5j3lz08p15s1j97018fp3vs7aq2wky"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -1547,12 +1547,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-02-06"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "298c69898c11c2da574a6d2c32e195b0adc6f356"; - sha256 = "1999c3x2bpif0ppv1i452fcklgmjdxrvj510sy7dv8aym93vpmax"; + rev = "abbb157ac9d06fdfba537f97ab96e197b3bb36cb"; + sha256 = "008alqgqbrjh9sqgazqq1kk5hnpikd8afnia5lx9rv8c2am1d2fv"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1571,12 +1571,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-02-11"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "ae0c39167c83507c6c257cd13268c98b8066cb50"; - sha256 = "1xggg0h7phjjdjpzp884z7xqniyk3ca4yjc86lyh9vhbww87xa9c"; + rev = "be97d5efca0326f826003d0ca3437e4c20a0ccb2"; + sha256 = "07ijvgh21nl39f948f5pdlw38ysk5dswximaczmgghngnzk2yqgs"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1595,12 +1595,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-02-10"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "317750d66a572588eef9a23fefce4aff1cbcad94"; - sha256 = "0nc52f0hkb701scvnas6my9i92ys1i9c5y9h4h42yk00ph83k2k1"; + rev = "fb6327c80aa41490fb14df9f270fd68508460374"; + sha256 = "1sr63ch37fcjhdhxksx4mmxjbza8b4zaswvxrixr3qdnkq1bf5bl"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1679,12 +1679,12 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-01-17"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "c73e63203f76ab8e39b2b05369c0a8877a981435"; - sha256 = "0lwvv5chxq0fb9k1y73g5zr8v54xghlqnq64k0vx2v2ravp3313r"; + rev = "8b29832551088fd7ecc1241c2576c8cf89f0842c"; + sha256 = "0447iplif457yyd6d7xanvrrizfl9jlwim16i31vwnrlrb3s0r4x"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -2136,12 +2136,12 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2021-02-12"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "3223bccf0ee4168aae6753a5cf0c0aa32a60c586"; - sha256 = "1qka3hqm2376wz5pbr8x2c3rqycv392lv34spkqayq0d0fs4sqq0"; + rev = "c80801760eeacb6fa9fa231408a8723d6a183262"; + sha256 = "1bs2f9j28hcd977x0dz40g9p33863l3riyp7qlwzllbas2w3k7bs"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -2268,24 +2268,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-02-11"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "284b357137c3c57ff3716e07c865477788ab8e6d"; - sha256 = "1n737lqnkgvyjxnmxfg6hmbnjgdx0qyrqql0fxb85m1n06gsm2n7"; + rev = "ee3b0e75811432d7e6f6e8cfbbd8799394cd315f"; + sha256 = "00fgcsf77csjyfjj82pyrbxb4v9k1mprp58zpascm6jibs74v6jc"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-02-10"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "8a4baa804b7b2906eb8b9c325546dceabffdfcfd"; - sha256 = "1fq5aa4yg5r1dr2g18xnywg7pyid6s9vzm71zy3anmdp4g24amgx"; + rev = "55c0f0fe9a01389df4671bd1bf9286f869a4d216"; + sha256 = "0f502gg56kzf811nzmjif3n5a73lpsf7l7jfbz2cmfp9ci3bg9z8"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2808,12 +2808,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-02-11"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "3a9d533f3de86a43b69f6c47d3394c0d866fdb08"; - sha256 = "032hn7p7kgvrj0qg4gmpvl072zz4p9s5n8mrbs3k8c3lln1n9wh6"; + rev = "a1fa4a33bf16b6661e502080fc97788bb98afd35"; + sha256 = "1qi2jzrps2c2h8c91rxma445yj8knl41sb5yfg37wjnsbig6jcxl"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2916,12 +2916,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-02-11"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "bef454eecc11fb13e5bc3f29f443f495904470ef"; - sha256 = "0plhhwip0nwc0fhgx5f1i6qhfl6msxf43vhgrv2xihmb30zjf2qr"; + rev = "fa13fecd577f90c4fa8a1bd539f405989a8df7f0"; + sha256 = "06vnavw203k76d7nsn08kp1g9xvl8aijmffy89jfgq3918dd6892"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -2940,12 +2940,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-02-07"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "10a740b2364efc9acff78f4e7466902f153e584b"; - sha256 = "1w4dvdd9fmi8gmgdq4zkrhrwdii4k7ns782gv4abpkzss5v6s66h"; + rev = "273890967e76322f726405e6c6c79d4fc69ae068"; + sha256 = "0azk7n06kn2n4l0xdyvbhvmgzq0rp24dng7vlkairl0sm3bnb3x9"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3060,12 +3060,12 @@ let nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2021-02-11"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "d4276b9601c683ad802893fed0cfe12a8631e931"; - sha256 = "06sazbjcnv77c11b835b7n8p78vmzw9zl3lkqbfl6yarbbzniisi"; + rev = "94e7279851fdd3da00c3178e64fb448b05fbba7e"; + sha256 = "1h0n6wfzrlya717571qfgr9zjs1yi2a08k4rppz509jdbkv1mnz9"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; @@ -3108,12 +3108,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-02-12"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "e5facde11bc8a2577dbfd56e2a4063320b09bc0b"; - sha256 = "1i1dn4akszkly6cjf3z9s17y1fdgsgk0fr5i50hs4mlnxy7al01i"; + rev = "34fdacc0e971eccb958c3ce0c88198bcfed8f9cc"; + sha256 = "1r6q36ri17zrv06qgclidd58dn62kz4yivjyp4qzcyf77x18s9c6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3168,12 +3168,12 @@ let nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-02-11"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "cadf0c30659acc8c60fec8100b81ea0fd92a8a9c"; - sha256 = "06d32z6rlz153vfbydcjvm6l2qrnjw0d6a60qxjpmbmby66nvcya"; + rev = "cc7771275822c951767c056a14830d713023247f"; + sha256 = "1qk2h8cwcb0v12lxayjdxka6wh5r1phn9cz5xkm5hvm1vcwrvlln"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -3384,12 +3384,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-02-09"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "b77fc46c5f35978c03277cd7261c07a36dafc8a4"; - sha256 = "0a38ma4kn6s75s286bdl5mhqlnbzzpir29gzjq7kxqi4y4zh9spc"; + rev = "877f7997c61bba8efa55950761dd23403ca3bc1e"; + sha256 = "11z44n8f2jmzi6m88g6r9zvgszkbnjrm9y7a247imcfq40p7yyma"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3757,12 +3757,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-01-31"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "6aae3517c612a96c59b5417984889bff388210b2"; - sha256 = "13d0jzzn7gr6c0zkpa5bkfp06246hbpfb6y7mmsw2waybw3hij9s"; + rev = "3cb3b47646c95316a739e660d1501d7a85d7f2e5"; + sha256 = "0a9d4m2gjn9kajfl3dzdxxahly5lrfn46wj0nyfscx0ypz38fr7a"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -3901,12 +3901,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-12-15"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "91ba14b41f6e767414d7bf2a8e82947c6bfdb978"; - sha256 = "0q01xfnjqk3vnmknb01zlkzn1jj03lqsygk863vwrdazq86g5aci"; + rev = "966a3123a7d80333878443c0011e451c29f157cb"; + sha256 = "19kjvx49vpnl5xs5bib7xqrl5vnqqzavndkwl3cg34mnhnjfzka3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -4046,12 +4046,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-02-01"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "7e8aeb69709b73cdbdaf50f4d26ab45d7920b7f0"; - sha256 = "02mlr9aw4ppi4cs6r1v3d39j3l85sy7q2xm1dxg1ld6k1p5imk94"; + rev = "2fb3171ed7549df1c27840452b7815a108bd1a27"; + sha256 = "15djvax4nyxki2kbkmryds4b5zli1v18js90aah9m9ipvpnwrp91"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4131,12 +4131,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-02-09"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "3a7fa41857394cd2d90d00891413c12fada039c3"; - sha256 = "0bn7jvwwaxfhcqd4l3wi9bshabbrcd4aws7d564kh1js8bklwx1b"; + rev = "1c5e42a6a5a6d29be8fbf8dcefb0d8da535eac9a"; + sha256 = "088scjf7iz4j3l0zl3sn4db6w6h456wrlz1g30fgz378cs022d35"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4660,12 +4660,12 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-12-17"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "8f1aa2c7fa44bf33b1fd4678f9c7b40c126b0e2b"; - sha256 = "1gwk7m8ghg5lix14bqxjyxc1wv5agkfhqinsikssydab0liw0xyf"; + rev = "d148d42d9caf331ff08b6cae683d5b210003cde7"; + sha256 = "0dd0vp72r95wqa2780rbdmj61mcj77b4hg6fpkwbb07apizrp43b"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -4912,12 +4912,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-02-12"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "2e8538beaf1cef636deab2d40edcb270044485d1"; - sha256 = "1ay90j72sknqhp1rdlgzdb5rxs98mwc5ad7q3rgqj8hpsr21x991"; + rev = "2f16948ca63ee37b27bf9b2a3a6c505204cac1cd"; + sha256 = "12axglcxxmsyin8wycm5gh72mskjzajv3lf9xdqdg0d8xi4qnq81"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5476,12 +5476,12 @@ let vim-fetch = buildVimPluginFrom2Nix { pname = "vim-fetch"; - version = "2020-01-31"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "wsdjeg"; repo = "vim-fetch"; - rev = "dd674b50b261275a6a75cab6929b7bb7c5c4acba"; - sha256 = "1hadfzhzkq2n9k3yga55fsl6nm5mgl2vv975jnxsi4qgz9cwcsgr"; + rev = "0a6ab17e84c7f4808bf05ec380121bce40b40d21"; + sha256 = "04srlz3zaiqkv9hz6q3vdkfq02k1wj4p9mg4m8930das4nkl7a05"; }; meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; @@ -5548,12 +5548,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-02-12"; + version = "2021-02-13"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "bd76979d17c28db94430dbfa4007e5aef667441a"; - sha256 = "0ih17mimpjkk9w81cpmzks63rd4k5v32i5y1anykcgn9nmmbp8qm"; + rev = "a892836203b8ce003bee88e9a9da8aefaa08a2ca"; + sha256 = "0gpqfgfayyqsgvipc65j7xzdbf2kjbygp1va1sqzxqii01yi7m37"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5596,12 +5596,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-02-11"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5c821eb78d4018025a1a9f54a9ef2af2a5ddd365"; - sha256 = "0vzhc9dr166pn4xpznzxfyhfibas3m0an0z74gl3vih1qlg59h9y"; + rev = "d4bcc75ef6449c0e5592513fb1e0a42b017db9ca"; + sha256 = "12621ai3wx43m146cfjpcdz6main3rq6ira6gb2m06zsk1am1fjn"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6138,12 +6138,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-10-10"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "548767343ff221a4efd0c055a43c022d23fcafc5"; - sha256 = "0scmpjav4zapglybdqilimqb3n805k8gqc46qvkiihprq9j9za4d"; + rev = "82b10427e9f3af270b3d3e252f2bcfafc61b221e"; + sha256 = "1sxdk2infw12lf1lkw05zz1aqk1pirjfph9phma89q4hc1i5hndk"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -6366,12 +6366,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-02-02"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "21a29936ed74b2212e1904cca6c22bff4e27b637"; - sha256 = "11jlqri1fyh1mbxrkihg1jj7g8mllh9w6gy64ah8gvpw505fws4c"; + rev = "6f8dfe19d59041a606f30b7764ccd51d4299d0e5"; + sha256 = "0rqlzp5qbidd1f02yx1l1cf0a5bdl7ha4wsixakixdrsy4ws68fh"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6511,12 +6511,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-12-02"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "7f42bcd0e05921c7a5d7333c96bae8b21fa76064"; - sha256 = "10ip0y9p2qf869h2yhp2zs6qc048rw1x5i0spziajca96251gvig"; + rev = "65fa0678d8426ae2cc7a4c42a8f0d72bde2a7bbe"; + sha256 = "0r118mxm34kr8yk66x9ddg2yh44gn00iaxljfbhg43nhp8jyzjbn"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -8265,26 +8265,26 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-02-11"; + version = "2021-02-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "1319bca15f1e25cf8f0ca64818719c860d2d83ac"; - sha256 = "043x5x4pxhni2isjxh6x4klldyanhpks3pljc246ybiz9q372bsi"; + rev = "4ff3e993ef17c7101d8db9de79674e320a20fcec"; + sha256 = "1zx45jyddxx0gqwgwf426ybv1dgghjls685ngsq3j8yhzj3mldfr"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2017-10-24"; + version = "2021-02-14"; src = fetchFromGitHub { - owner = "ostera"; + owner = "preservim"; repo = "vimux"; - rev = "37f41195e6369ac602a08ec61364906600b771f1"; - sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra"; + rev = "3693ec6f129fa10b1f3435829645c4607584c3ab"; + sha256 = "1pmcablswp2q32xc1njzfh5vxbani4a8n95k0jzhq0cz8w4ssxpw"; }; - meta.homepage = "https://github.com/ostera/vimux/"; + meta.homepage = "https://github.com/preservim/vimux/"; }; vimwiki = buildVimPluginFrom2Nix { diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 9b1aa6cd05..80a047bc23 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -7,9 +7,7 @@ , ruby , which , fetchFromGitHub -, fetchgit , fetchurl -, fetchzip , fetchpatch , llvmPackages , rustPlatform @@ -731,7 +729,7 @@ self: super: { libiconv ]; - cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c="; + cargoSha256 = "0r3ldipdfzhdivgc43bv31c1g9hl458yznabmfzxr2phpyvq2dnn"; }; in '' diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py b/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py index b9bab293a7..f5d7434fe2 100755 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -503,9 +503,9 @@ def parse_args(): def commit(repo: git.Repo, message: str, files: List[Path]) -> None: - files_staged = repo.index.add([str(f.resolve()) for f in files]) + repo.index.add([str(f.resolve()) for f in files]) - if files_staged: + if repo.index.diff("HEAD"): print(f'committing to nixpkgs "{message}"') repo.index.commit(message) else: diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 416dc7fc72..c52f278847 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -433,7 +433,6 @@ Olical/aniseed Olical/conjure onsails/lspkind-nvim OrangeT/vim-csharp -ostera/vimux osyo-manga/shabadou.vim osyo-manga/vim-anzu osyo-manga/vim-over @@ -459,6 +458,7 @@ prabirshrestha/vim-lsp preservim/nerdcommenter preservim/nerdtree preservim/tagbar +preservim/vimux psliwka/vim-smoothie ptzz/lf.vim puremourning/vimspector diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix index dc0b13ef59..70864b311d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "btfs"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "johang"; repo = pname; rev = "v${version}"; - sha256 = "1cfjhyn9cjyyxyd0f08b2ra258pzkljwvkj0iwrjpd0nrbl6wkq5"; + sha256 = "sha256-fkS0U/MqFRQNi+n7NE4e1cnNICvfST2IQ9FMoJUyj6w="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix index 369ba13a0f..af77264582 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; postPatch = '' - substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" - substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" - substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" + substituteInPlace ./Documentation/Makefile \ + --replace "2>/dev/null" "" \ + --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index b8bb91b3b7..5e90010a11 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -95,9 +95,7 @@ let BLK_CGROUP_IOCOST = whenAtLeast "5.4" yes; IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1 MQ_IOSCHED_DEADLINE = whenAtLeast "4.11" yes; - BFQ_GROUP_IOSCHED = whenAtLeast "4.12" yes; MQ_IOSCHED_KYBER = whenAtLeast "4.12" yes; - IOSCHED_BFQ = whenAtLeast "4.12" module; }; # Enable NUMA. diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index aed631bee1..843b93a77d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,20 +7,20 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.175-hardened1.patch", - "sha256": "04pflpzb8fs2wlx2sm46r1lxn4vcmhsygzk088m8rg3jjygany3i", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.175-hardened1/linux-hardened-4.19.175-hardened1.patch" + "name": "linux-hardened-4.19.176-hardened1.patch", + "sha256": "0h6jv38n98dp395hs9s29yszbr9zj7rwiv9hny82nffllw6d3vxk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.176-hardened1/linux-hardened-4.19.176-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.15-hardened1.patch", - "sha256": "1xd0qr58lz38swivhrbhjf1jz3y8y4i9ba1qcij7bydw125qvz14", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.15-hardened1/linux-hardened-5.10.15-hardened1.patch" + "name": "linux-hardened-5.10.16-hardened1.patch", + "sha256": "0qd38hrc5qhm1gkk7rdlsf897cw7srs0ibz3xqdbl2zvwxrk1f1w", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.16-hardened1/linux-hardened-5.10.16-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.97-hardened1.patch", - "sha256": "1610lgvxxx6rmbi38q3pcaf9kcw8fqxspwmg2irgmvvzniv5p42x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.97-hardened1/linux-hardened-5.4.97-hardened1.patch" + "name": "linux-hardened-5.4.98-hardened1.patch", + "sha256": "0nwj49rb87agkbsv9qfi8wc6mv31a40zdbvl2wp316qxhb1d5n9c", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.98-hardened1/linux-hardened-5.4.98-hardened1.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 390724b8a8..64633e9cc3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.175"; + version = "4.19.176"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "099b3dw9rj2z147dpjppd57g24paxw8x4fq1ir1ss5ibzy24pvnc"; + sha256 = "0wv0hb25c5jgw6h3zwbb24mfnn19yr0sgcmk1g2xa6x33g9bihz1"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 0d37a8b435..569f1a6100 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.15"; + version = "5.10.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "00bf1v8zn4qngxhj6sca0lhv71xlnajw02iq6854s76my6y8flnq"; + sha256 = "05289lr531piv1ncisbazfk0lj0q7gxflqkb0bn4c95vx0y64kp8"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix new file mode 100644 index 0000000000..b7603c174a --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.11"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04"; + }; +} // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 2e11688910..31a1c602a7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.97"; + version = "5.4.99"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0gs856v3q3m0q245mf8b9ivds8dizqrgjw27s9kbq3v31886da3i"; + sha256 = "09qs6nqzq7hsaq928jvbri4nfjm0m6rf0lfx6vc30g95d4nd3njv"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 85cc0d16ea..17c865a6e0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.12-rt26"; # updated by ./update-rt.sh + version = "5.10.16-rt30"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1an460q3affd7gmd6fqv8g37j3z2fnmq19iy677k8kxb2wl4yi8x"; + sha256 = "0dqa40yd1yf488pd5vv8c30wsnqazykv7lvi6lmwgz1v4zmf6vsk"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "06sb7cj24v4kh7zghndpxv95pkihahc7653lxdw4wj9jhi58bs2k"; + sha256 = "152kcx7hxrg77wmrhmsi249y9p42y7hykamypfg25wllmz361azc"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix index d6d04f12f8..3ac8e6dcd4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20201118"; + version = "20210216"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "1xs3f2rbfqnpz9qs7a1kl363qdyb8fybmmyd37v573clqf7l4lgg"; + sha256 = "17wrfp7h7xbvncgm1fp103zkyz9n1f820jy6yca1aq208264hjkv"; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix index 6ffc605005..ffb397334c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pam_gnupg"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "cruegge"; repo = "pam-gnupg"; rev = "v${version}"; - sha256 = "1d8046clv7r3bl77dbpza4f1zlkjffvdczbb5bci3prz7dyfrwsz"; + sha256 = "sha256-NDl6MsvIDAXkaLqXt7Wa0T7aulT31P5Z/d/Vb+ILya0="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 7300ae3254..6e7e5607c6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -197,7 +197,7 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.11"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; # this package should point to the latest release. version = "2.0.3"; @@ -207,11 +207,13 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.11"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; # this package should point to a version / git revision compatible with the latest kernel release version = "2.0.3"; sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs="; + + isUnstable = true; }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix index cadc1064ac..aad46be30b 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.6"; - sha256 = "1d9kzks8x1226prjbpdin4dz93fjnv304zlqybfqachx5fh9a4di"; + version = "1.19.7"; + sha256 = "03mmfnkhayn8vm2yhs3ngvif6275c368ymx8wvhsbls11h1dvr3s"; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index f9d26da629..9fce836326 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.26.0"; + version = "1.27.0"; src = fetchPypi { inherit pname version; - sha256 = "1jppwqxamj3a65fw2a87brz4iqgijaa4lja51wlxh2xdkqj0sn6l"; + sha256 = "1kpkxgyzz35ga4ld7cbjr0pfbhrcbrfmp9msnwjqllmsmy0g5bas"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix index bd74a62887..ddfa6faf24 100644 --- a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix @@ -5,7 +5,7 @@ , systemd, withSystemd ? stdenv.isLinux , libcap, withCap ? stdenv.isLinux , python2, python3, ncurses -, ruby, php, libmysqlclient +, ruby, php }: let php-embed = php.override { diff --git a/third_party/nixpkgs/pkgs/shells/fish/wrapper.nix b/third_party/nixpkgs/pkgs/shells/fish/wrapper.nix index 053568bc6b..6713a69d56 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/wrapper.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/wrapper.nix @@ -14,12 +14,12 @@ let complPath = completionDirs ++ map (vendorDir "completions") pluginPkgs; funcPath = functionDirs ++ map (vendorDir "functions") pluginPkgs; confPath = confDirs ++ map (vendorDir "conf") pluginPkgs; - safeConfPath = map escapeShellArg confPath; in writeShellScriptBin "fish" '' ${fish}/bin/fish --init-command " set --prepend fish_complete_path ${escapeShellArgs complPath} set --prepend fish_function_path ${escapeShellArgs funcPath} - for c in {${concatStringsSep "," safeConfPath}}/*; source $c; end + set --local fish_conf_source_path ${escapeShellArgs confPath} + for c in $fish_conf_source_path/*; source $c; end " "$@" '') diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix new file mode 100644 index 0000000000..56f6cddb61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix @@ -0,0 +1,127 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wine +, boost +, libxcb +}: + +let + # Derived from subprojects/bitsery.wrap + bitsery = rec { + version = "5.2.0"; + src = fetchFromGitHub { + owner = "fraillt"; + repo = "bitsery"; + rev = "v${version}"; + sha256 = "132b0n0xlpcv97l6bhk9n57hg95pkhwqzvr9jkv57nmggn76s5q7"; + }; + }; + + # Derived from subprojects/function2.wrap + function2 = rec { + version = "4.1.0"; + src = fetchFromGitHub { + owner = "Naios"; + repo = "function2"; + rev = version; + sha256 = "0abrz2as62725g212qswi35nsdlf5wrhcz78hm2qidbgqr9rkir5"; + }; + }; + + # Derived from subprojects/tomlplusplus.wrap + tomlplusplus = rec { + version = "2.1.0"; + src = fetchFromGitHub { + owner = "marzer"; + repo = "tomlplusplus"; + rev = "v${version}"; + sha256 = "0fspinnpyk1c9ay0h3wl8d4bbm6aswlypnrw2c7pk2i4mh981b4b"; + }; + }; + + # Derived from vst3.wrap + vst3 = rec { + version = "e2fbb41f28a4b311f2fc7d28e9b4330eec1802b6"; + src = fetchFromGitHub { + owner = "robbert-vdh"; + repo = "vst3sdk"; + rev = version; + fetchSubmodules = true; + sha256 = "1fqpylkbljifwdw2z75agc0yxnhmv4b09fxs3rvlw1qmm5mwx0p2"; + }; + }; +in stdenv.mkDerivation rec { + pname = "yabridge"; + version = "3.0.0"; + + # NOTE: Also update yabridgectl's cargoSha256 when this is updated + src = fetchFromGitHub { + owner = "robbert-vdh"; + repo = pname; + rev = version; + sha256 = "0ha7jhnkd2i49q5rz2hp7sq6hv19bir99x51hs6nvvcf16hlf2bp"; + }; + + # Unpack subproject sources + postUnpack = ''( + cd "$sourceRoot/subprojects" + cp -R --no-preserve=mode,ownership ${bitsery.src} bitsery-${bitsery.version} + tar -xf bitsery-patch-${bitsery.version}.tar.xz + cp -R --no-preserve=mode,ownership ${function2.src} function2-${function2.version} + tar -xf function2-patch-${function2.version}.tar.xz + cp -R --no-preserve=mode,ownership ${tomlplusplus.src} tomlplusplus + cp -R --no-preserve=mode,ownership ${vst3.src} vst3 + )''; + + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wine + ]; + + buildInputs = [ + boost + libxcb + ]; + + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + + mesonFlags = [ + "--cross-file" "cross-wine.conf" + + # Requires CMake and is unnecessary + "-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled" + + # tomlplusplus examples and tests don't build with winegcc + "-Dtomlplusplus:BUILD_EXAMPLES=disabled" + "-Dtomlplusplus:BUILD_TESTS=disabled" + ]; + + installPhase = '' + mkdir -p "$out/bin" "$out/lib" + cp yabridge-group.exe{,.so} "$out/bin" + cp yabridge-host.exe{,.so} "$out/bin" + cp libyabridge-vst2.so "$out/lib" + cp libyabridge-vst3.so "$out/lib" + ''; + + meta = with lib; { + description = "Yet Another VST bridge, run Windows VST2 plugins under Linux"; + homepage = "https://github.com/robbert-vdh/yabridge"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ metadark ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix new file mode 100644 index 0000000000..6fa85cd89e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, yabridge }: + +rustPlatform.buildRustPackage rec { + pname = "yabridgectl"; + version = yabridge.version; + + src = yabridge.src; + sourceRoot = "source/tools/yabridgectl"; + cargoSha256 = "1sjhani8h7ap42yqlnj05sx59jyz2h12qlm1ibv8ldxcpwps0bwy"; + + patches = [ + ./libyabridge-from-nix-profiles.patch + ]; + + patchFlags = [ "-p3" ]; + + meta = with lib; { + description = "A small, optional utility to help set up and update yabridge for several directories at once"; + homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ metadark ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch new file mode 100644 index 0000000000..e17cda6ada --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch @@ -0,0 +1,70 @@ +diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs +index c1c89cf..d7bd822 100644 +--- a/tools/yabridgectl/src/config.rs ++++ b/tools/yabridgectl/src/config.rs +@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet}; + use std::env; + use std::fmt::Display; + use std::fs; ++use std::iter; + use std::path::{Path, PathBuf}; + use which::which; + use xdg::BaseDirectories; +@@ -216,34 +217,24 @@ impl Config { + } + } + None => { +- // Search in the system library locations and in `~/.local/share/yabridge` if no +- // path was set explicitely. We'll also search through `/usr/local/lib` just in case +- // but since we advocate against installing yabridge there we won't list this path +- // in the error message when `libyabridge-vst2.so` can't be found. +- let system_path = Path::new("/usr/lib"); ++ // Search through NIX_PROFILES & data home directory if no path was set explicitly. ++ let nix_profiles = env::var("NIX_PROFILES"); + let user_path = xdg_dirs.get_data_home(); +- let lib_directories = [ +- system_path, +- // Used on Debian based distros +- Path::new("/usr/lib/x86_64-linux-gnu"), +- // Used on Fedora +- Path::new("/usr/lib64"), +- Path::new("/usr/local/lib"), +- Path::new("/usr/local/lib/x86_64-linux-gnu"), +- Path::new("/usr/local/lib64"), +- &user_path, +- ]; ++ let lib_directories = nix_profiles.iter() ++ .flat_map(|profiles| profiles.split(' ') ++ .map(|profile| Path::new(profile).join("lib"))) ++ .chain(iter::once(user_path.clone())); ++ + let mut candidates = lib_directories +- .iter() + .map(|directory| directory.join(LIBYABRIDGE_VST2_NAME)); ++ + match candidates.find(|directory| directory.exists()) { + Some(candidate) => candidate, + _ => { + return Err(anyhow!( +- "Could not find '{}' in either '{}' or '{}'. You can override the \ +- default search path using 'yabridgectl set --path='.", ++ "Could not find '{}' through 'NIX_PROFILES' or '{}'. You can override the \ ++ default search path using 'yabridgectl set --path='.", + LIBYABRIDGE_VST2_NAME, +- system_path.display(), + user_path.display() + )); + } +diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs +index 0db1bd4..221cdd0 100644 +--- a/tools/yabridgectl/src/main.rs ++++ b/tools/yabridgectl/src/main.rs +@@ -102,7 +102,7 @@ fn main() -> Result<()> { + .about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'") + .long_about( + "Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \ +- is not set, then yabridgectl will look in both '/usr/lib' and \ ++ is not set, then yabridgectl will look through 'NIX_PROFILES' and \ + '~/.local/share/yabridge' by default.", + ) + .validator(validate_path) diff --git a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix index cd91d51d96..63808d4851 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix @@ -24,12 +24,6 @@ stdenv.mkDerivation rec { # Tainted Mode disables PERL5LIB substituteInPlace btrbk --replace "perl -T" "perl" - # Fix btrbk-mail - substituteInPlace contrib/cron/btrbk-mail \ - --replace "/bin/date" "${coreutils}/bin/date" \ - --replace "/bin/echo" "${coreutils}/bin/echo" \ - --replace '$btrbk' 'btrbk' - # Fix SSH filter script sed -i '/^export PATH/d' ssh_filter_btrbk.sh substituteInPlace ssh_filter_btrbk.sh --replace logger ${util-linux}/bin/logger diff --git a/third_party/nixpkgs/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch b/third_party/nixpkgs/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch deleted file mode 100644 index 90b60235aa..0000000000 --- a/third_party/nixpkgs/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001 -From: srs5694 -Date: Fri, 15 May 2020 12:34:14 -0400 -Subject: [PATCH] Fix GCC 10 compile problem - ---- - Make.common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Make.common b/Make.common -index 3f0b919..95a3a97 100644 ---- a/Make.common -+++ b/Make.common -@@ -60,7 +60,7 @@ endif - # - - # ...for both GNU-EFI and TianoCore.... --OPTIMFLAGS = -Os -fno-strict-aliasing -+OPTIMFLAGS = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns - CFLAGS = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall - - # ...for GNU-EFI.... --- -2.29.2 - diff --git a/third_party/nixpkgs/pkgs/tools/bootloaders/refind/default.nix b/third_party/nixpkgs/pkgs/tools/bootloaders/refind/default.nix index 9c36e55b8f..eac55d6bea 100644 --- a/third_party/nixpkgs/pkgs/tools/bootloaders/refind/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bootloaders/refind/default.nix @@ -14,17 +14,16 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.12.0"; - srcName = "refind-src-${version}"; + version = "0.13.0"; src = fetchurl { - url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz"; - sha256 = "1i5p3sir3mx4i2q5w78360xn2kbgsj8rmgrqvsvag1zzr5dm1f3v"; + url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "0zivlcw1f3zwnrwvbhwq6gg781hh72g2bhc2cxcsb2zmg7q8in65"; }; patches = [ + # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. ./0001-toolchain.patch - ./0001-Fix-GCC-10-compile-problem.patch ]; buildInputs = [ gnu-efi ]; @@ -44,6 +43,8 @@ stdenv.mkDerivation rec { buildFlags = [ "gnuefi" "fs_gnuefi" ]; installPhase = '' + runHook preInstall + install -d $out/bin/ install -d $out/share/refind/drivers_${efiPlatform}/ install -d $out/share/refind/tools_${efiPlatform}/ @@ -102,6 +103,8 @@ stdenv.mkDerivation rec { sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fwanalyzer/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fwanalyzer/default.nix new file mode 100644 index 0000000000..0026681739 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fwanalyzer/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, e2tools +, makeWrapper +, mtools +}: + +buildGoModule rec { + pname = "fwanalyzer"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "cruise-automation"; + repo = pname; + rev = version; + sha256 = "1pj6s7lzw7490488a30pzvqy2riprfnhb4nzxm6sh2nsp51xalzv"; + }; + + vendorSha256 = "1cjbqx75cspnkx7fgc665q920dsxnsdhqgyiawkvx0i8akczbflw"; + + subPackages = [ "cmd/${pname}" ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/fwanalyzer" --prefix PATH : "${lib.makeBinPath [ e2tools mtools ]}" + ''; + + # The tests requires an additional setup (unpacking images, etc.) + doCheck = false; + + meta = with lib; { + description = "Tool to analyze filesystem images"; + homepage = "https://github.com/cruise-automation/fwanalyzer"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/lprof/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/lprof/default.nix deleted file mode 100644 index a1c81f16f2..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/lprof/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }: - -/* how to calibrate your monitor: - Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles -*/ -stdenv.mkDerivation { - name = "lprof-1.11.4.1"; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; - buildInputs = [ qt3 lcms1 libtiff vigra ]; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - export QTDIR=${qt3} - export qt_directory=${qt3} - ''; - - src = fetchurl { - url = "mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz"; - sha256 = "0q8x24fm5yyvm151xrl3l03p7hvvciqnkbviprfnvlr0lyg9wsrn"; - }; - - sconsFlags = "SYSLIBS=1"; - preBuild = '' - export CXX=g++ - ''; - prefixKey = "PREFIX="; - - patches = [ ./lcms-1.17.patch ./keep-environment.patch ]; - - meta = { - description = "Little CMS ICC profile construction set"; - homepage = "https://sourceforge.net/projects/lprof"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - broken = true; # Broken since 2020-07-28 (https://hydra.nixos.org/build/135234622) - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/lprof/keep-environment.patch b/third_party/nixpkgs/pkgs/tools/graphics/lprof/keep-environment.patch deleted file mode 100644 index 7d0beaed58..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/lprof/keep-environment.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- lprof-1.11.4.1.org/SConstruct 2006-06-06 02:11:32.000000000 +0100 -+++ lprof-1.11.4.1/SConstruct 2017-08-29 12:56:13.425654683 +0100 -@@ -22,12 +22,7 @@ - # opts.Add(BoolOption('qt-mt-lib', 'Flag used to set QT library to either qt-mt or qt. Value of 1 = qt-mt, 0 = qt.', 'yes')) - - # setup base environment --env = Environment( -- ENV = { -- 'PATH' : os.environ[ 'PATH' ], -- 'HOME' : os.environ[ 'HOME' ], # required for distcc -- 'LDFLAGS' : '' -- }, options = opts) -+env = Environment(ENV = os.environ, options = opts) - - opts.Update(env) - opts.Save('lprof.conf', env) # Save, so user doesn't have to diff --git a/third_party/nixpkgs/pkgs/tools/graphics/lprof/lcms-1.17.patch b/third_party/nixpkgs/pkgs/tools/graphics/lprof/lcms-1.17.patch deleted file mode 100644 index a88471e143..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/lprof/lcms-1.17.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/liblprof/lcmsprf.h 2007-08-31 15:36:20.000000000 -0700 -+++ b/src/liblprof/lcmsprf.h 2007-08-31 15:37:39.000000000 -0700 -@@ -67,6 +67,9 @@ - #define mmax(a,b) ((a) > (b)?(a):(b)) - #endif - -+#if LCMS_VERSION > 116 -+typedef int BOOL; -+#endif - - /* Misc operations ------------------------------------------------------------------------ */ - - diff --git a/third_party/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix index 79094dc954..c78c0121ed 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchFromGitHub, python2Packages }: +{ lib, fetchFromGitHub, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "bmap-tools"; - version = "3.4"; + version = "3.6"; src = fetchFromGitHub { owner = "intel"; repo = "bmap-tools"; rev = "v${version}"; - sha256 = "0p0pdwvyf9b4czi1pnhclm1ih8kw78nk2sj4if5hwi7s5423wk5q"; + sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl"; }; + propagatedBuildInputs = with python3Packages; [ six ]; + # tests fail only on hydra. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix index 12e63686d5..718da8dca4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { done ''; + outputs = [ "out" "dev" ]; + meta = with lib; { description = "A tool for automating interactive applications"; homepage = "http://expect.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix index 1c2d7ab671..343f2d0527 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, darwin, fetchFromGitHub, rustPlatform }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "kak-lsp"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c"; - buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optional stdenv.isDarwin [ Security ]; meta = with lib; { description = "Kakoune Language Server Protocol Client"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix index 3322196d6e..4cb3f794fd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix @@ -1,18 +1,17 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, buildPythonPackage, fetchPypi , setuptools, pytestCheckHook }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { + pname = "lice"; + version = "0.6"; - version = "0.4"; - name = "lice-${version}"; - - src = fetchFromGitHub { - owner = "licenses"; - repo = "lice"; - rev = version; - sha256 = "0yxf70fi8ds3hmwjply2815k466r99k8n22r0ppfhwjvp3rn60qx"; - fetchSubmodules = true; + src = fetchPypi { + inherit pname version; + sha256 = "0skyyirbidknfdzdvsjga8zb4ar6xpd5ilvz11dfm2a9yxh3d59d"; }; + propagatedBuildInputs = [ setuptools ]; + + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Print license based on selection and user options"; homepage = "https://github.com/licenses/lice"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch b/third_party/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch index e92f5a46ae..6bead60dc5 100755 --- a/third_party/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch @@ -1,5 +1,5 @@ From e295844e8ef5c13487996ab700e5f12a7fadb1a6 Mon Sep 17 00:00:00 2001 -From: Nima Vasseghi +From: Private Date: Wed, 30 Dec 2020 16:06:46 -0800 Subject: [PATCH] malloc.h to stdlib.h in rfc2440.c diff --git a/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix index 1ed201802d..1826d6846d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub, bash }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "neofetch"; version = "7.1.0"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv"; }; - dontBuild = true; + strictDeps = true; + buildInputs = [ bash ]; + postPatch = '' + patchShebangs --host neofetch + ''; makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index 720b73f3fe..aec80f0ede 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace src/parallel --subst-var-by coreutils ${coreutils} ''; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl procps ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix index be5fd6d499..3b6df828fd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "pubs"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix index ac1431d3a1..a78d6f143a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rlwrap/default.nix @@ -1,26 +1,30 @@ -{ lib, stdenv, fetchurl, readline }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl, readline }: stdenv.mkDerivation rec { pname = "rlwrap"; - version = "0.43"; + version = "0.45"; - src = fetchurl { - url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf"; + src = fetchFromGitHub { + owner = "hanslub42"; + repo = "rlwrap"; + rev = "v${version}"; + sha256 = "1ppkjdnxrxh99g4xaiaglm5bmp24006rfahci0cn1g7zwilkjy8s"; }; + postPatch = '' + substituteInPlace src/readline.c \ + --replace "if(*p >= 0 && *p < ' ')" "if(*p >= 0 && (*p >= 0) && (*p < ' '))" + ''; + + nativeBuildInputs = [ autoreconfHook perl ]; + buildInputs = [ readline ]; - # Be high-bit-friendly - preBuild = '' - sed -i src/readline.c -e "s@[*]p [<] ' '@(*p >= 0) \\&\\& (*p < ' ')@" - ''; - - meta = { + meta = with lib; { description = "Readline wrapper for console programs"; homepage = "https://github.com/hanslub42/rlwrap"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 0f81f132ab..1176e440ce 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -11,8 +11,6 @@ , qtgraphicaleffects , qtquickcontrols , qtquickcontrols2 -, qtdeclarative -, qtsvg , yubikey-manager , yubikey-personalization }: diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix index 304972717d..37cb23f987 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "boundary"; - version = "0.1.6"; + version = "0.1.7"; src = fetchsrc version { - x86_64-linux = "sha256-6Pwl8smp6ZX57hzPc7e8gVSqnPHse+RvhU2xprG/2dg="; - aarch64-linux = "sha256-/ZhLZ/Sj0h4HvOJthe83Y5Hqpz1UYiaQZxuyR8loI44="; - x86_64-darwin = "sha256-s+XoEmup/jvIf+jGI3OPIGFDwsWbgE1yuySLWsC3jJE="; + x86_64-linux = "sha256-cSD9V/Hj/eEc6k+LMNRnSEA94fA6bQUfCgA+XdqAR4k="; + aarch64-linux = "sha256-MG97PhG/t1rdmTF3n2YHYsTo8VODCaY3cfnv8YHgAY8="; + x86_64-darwin = "sha256-p60UiIy9DGx7AaEvmyo4FLa0Z67MQRNJkw1nHaM6eww="; }; dontConfigure = true; @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { install -D boundary $out/bin/boundary ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/boundary --help + $out/bin/boundary version + runHook postInstallCheck + ''; + dontPatchELF = true; dontPatchShebangs = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index fc7a1ffc4f..92465a9fc7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "0bpkgq7srwpjmadsz3nsd14jpr19b1zfrpc074lzjaq15icxxgxc"; + sha256 = "sha256-f1ew2i/tgRdIAo/oOgFIFquKve+ImRzqoZqmlzfwpz8="; }; buildInputs = with lib; [ boost zlib openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/pritunl-ssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pritunl-ssh/default.nix new file mode 100644 index 0000000000..586fc78069 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/pritunl-ssh/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + pname = "pritunl-ssh"; + version = "1.0.1674.4"; + + src = fetchFromGitHub { + owner = "pritunl"; + repo = "pritunl-zero-client"; + rev = version; + sha256 = "07z60lipbwm0p7s2bxcij21jid8w4nyh6xk2qq5qdm4acq4k1i88"; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + mkdir -p $out/bin + install ssh_client.py $out/bin/pritunl-ssh + install ssh_host_client.py $out/bin/pritunl-ssh-host + ''; + + meta = with lib; { + description = "Pritunl Zero SSH client"; + homepage = "https://github.com/pritunl/pritunl-zero-client"; + license = licenses.unfree; + maintainers = with maintainers; [ Thunderbottom ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 059c531cc6..d822dfc7fc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.3"; + version = "0.34.4"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tkIoLYfqlnyyAAgEKyQgE317uwyhc8xRTCTUXi+9r9s="; + sha256 = "sha256-Kh2B+2BImQdDOo9iyg4ijSMUNQjXFaqWDStpAQL3fy8="; }; - vendorSha256 = "sha256-DviK+MkJwcv2Dhwmqra5G/fTaWxXFbUSUVnAkSHjeII="; + vendorSha256 = "sha256-0Y9QDBVNYE2x3nY3loRKTCtYWXRnK7v+drRVvTMY4Dg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix new file mode 100644 index 0000000000..1537da3616 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/wget2/default.nix @@ -0,0 +1,100 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch + # build support +, autoreconfHook +, flex +, gnulib +, lzip +, pkg-config +, python3 +, texinfo + # libraries +, brotli +, bzip2 +, gpgme +, libhsts +, libidn2 +, libpsl +, lzma +, nghttp2 +, sslSupport ? true +, openssl +, pcre2 +, zlib +, zstd +}: + +stdenv.mkDerivation rec { + pname = "wget2"; + version = "1.99.2"; + + src = fetchFromGitLab { + owner = "gnuwget"; + repo = pname; + rev = version; + sha256 = "1gws8y3z8xzi46c48n7jb162mr3ar4c34s7yy8kjcs14yzq951qz"; + }; + + patches = [ + (fetchpatch { + name = "fix-autotools-2.70.patch"; + url = "https://gitlab.com/gnuwget/wget2/-/commit/580af869093cfda6bc8a9d5901850354a16b3666.patch"; + sha256 = "1x6wq4wxvvy6174d52qrhxkcgmv366f8smxyki49zb6rs4gqhskd"; + }) + (fetchpatch { + name = "update-potfiles-for-gnulib-2020-11-28.patch"; + url = "https://gitlab.com/gnuwget/wget2/-/commit/368deb9fcca0c281f9c76333607cc878c3945ad0.patch"; + sha256 = "1qsz8hbzbgg14wikxsbjjlq0cp3jw4pajbaz9wdn6ny617hdvi8y"; + }) + ]; + + # wget2_noinstall contains forbidden reference to /build/ + postPatch = '' + substituteInPlace src/Makefile.am \ + --replace 'bin_PROGRAMS = wget2 wget2_noinstall' 'bin_PROGRAMS = wget2' + ''; + + nativeBuildInputs = [ autoreconfHook flex lzip pkg-config python3 texinfo ]; + + buildInputs = [ brotli bzip2 gpgme libhsts libidn2 libpsl lzma nghttp2 pcre2 zlib zstd ] + ++ lib.optional sslSupport openssl; + + # TODO: include translation files + autoreconfPhase = '' + # copy gnulib into build dir and make writable. + # Otherwise ./bootstrap copies the non-writable files from nix store and fails to modify them + rmdir gnulib + cp -r ${gnulib} gnulib + chmod -R u+w gnulib/{build-aux,lib} + + # fix bashisms can be removed when https://gitlab.com/gnuwget/wget2/-/commit/c9499dcf2f58983d03e659e2a1a7f21225141edf is in the release + sed 's|==|=|g' -i configure.ac + + ./bootstrap --no-git --gnulib-srcdir=gnulib --skip-po + ''; + + configureFlags = [ + "--disable-static" + # TODO: https://gitlab.com/gnuwget/wget2/-/issues/537 + (lib.withFeatureAs sslSupport "ssl" "openssl") + ]; + + outputs = [ "out" "lib" "dev" ]; + + meta = with lib; { + description = "successor of GNU Wget, a file and recursive website downloader."; + longDescription = '' + Designed and written from scratch it wraps around libwget, that provides the basic + functions needed by a web client. + Wget2 works multi-threaded and uses many features to allow fast operation. + In many cases Wget2 downloads much faster than Wget1.x due to HTTP2, HTTP compression, + parallel connections and use of If-Modified-Since HTTP header. + ''; + homepage = "https://gitlab.com/gnuwget/wget2"; + # wget2 GPLv3+; libwget LGPLv3+ + license = with licenses; [ gpl3Plus lgpl3Plus ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix b/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix index 51ff5b0e81..20ee69eeae 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gen-oath-safe/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - buildPhase = ":"; + dontBuild = true; installPhase = let diff --git a/third_party/nixpkgs/pkgs/tools/security/shhgit/default.nix b/third_party/nixpkgs/pkgs/tools/security/shhgit/default.nix new file mode 100644 index 0000000000..a05eba1282 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/shhgit/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "shhgit"; + version = "0.4-${lib.strings.substring 0 7 rev}"; + rev = "7e55062d10d024f374882817692aa2afea02ff84"; + + src = fetchFromGitHub { + owner = "eth0izzle"; + repo = pname; + inherit rev; + sha256 = "1b7r4ivfplm4crlvx571nyz2rc6djy0xvl14nz7m0ngh6206df9k"; + }; + + vendorSha256 = "0isa9faaknm8c9mbyj5dvf1dfnyv44d1pjd2nbkyfi6b22hcci3d"; + + meta = with lib; { + description = "Tool to detect secrets in repositories"; + homepage = "https://github.com/eth0izzle/shhgit"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index 8766e957aa..f040b17f89 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.4.7"; + version = "0.4.5.6"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "1vh5kdx7s74il8a6gr7jydbpv0an01nla4y2r8w7h33z2wk2jv9j"; + sha256 = "0cz78pjw2bc3kl3ziip1nhhbq89crv315rf1my3zmmgd9xws7jr2"; }; outputs = [ "out" "geoip" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix b/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix index b4bef5fc5e..f86ac47fdd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "1.5.3"; + version = "1.6.1"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NDIdQ4gUN2jG+VWXsv3fdUogZxOOiNtnbekD30+jx6M="; + sha256 = "sha256-oz3C1150CPfT0kkx1x7VIX/Rm06dkjyxeDPFCRJaWNc="; }; propagatedBuildInputs = with python3Packages; [ click distro psutil ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch b/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch index 232ac78034..7f86f6eda0 100644 --- a/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch +++ b/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch @@ -1,8 +1,17 @@ diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 482a544..d142013 100644 +index a685db8..1ca1ca1 100644 --- a/auto_cpufreq/core.py +++ b/auto_cpufreq/core.py -@@ -163,31 +163,13 @@ def get_current_gov(): +@@ -72,7 +72,7 @@ def app_version(): + print("Git commit:", check_output(["git", "describe", "--always"]).strip().decode()) + else: + print(getoutput("pacman -Qi auto-cpufreq | grep Version")) +- else: ++ else: + # source code (auto-cpufreq-installer) + try: + print("Git commit:", check_output(["git", "describe", "--always"]).strip().decode()) +@@ -179,31 +179,13 @@ def get_current_gov(): return print("Currently using:", getoutput("cpufreqctl.auto-cpufreq --governor").strip().split(" ")[0], "governor") def cpufreqctl(): @@ -38,8 +47,8 @@ index 482a544..d142013 100644 def footer(l=79): print("\n" + "-" * l + "\n") -@@ -212,74 +194,12 @@ def remove_complete_msg(): - +@@ -233,74 +215,12 @@ def remove_complete_msg(): + footer() def deploy_daemon(): - print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") @@ -60,7 +69,7 @@ index 482a544..d142013 100644 - except: - print("\nERROR:\nWas unable to turn off bluetooth on boot") - -- auto_cpufreq_log_path.touch(exist_ok=True) +- auto_cpufreq_stats_path.touch(exist_ok=True) - - print("\n* Deploy auto-cpufreq install script") - shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install") @@ -102,12 +111,12 @@ index 482a544..d142013 100644 - # remove auto-cpufreq-remove - os.remove("/usr/bin/auto-cpufreq-remove") - -- # delete log file -- if auto_cpufreq_log_path.exists(): -- if auto_cpufreq_log_file is not None: -- auto_cpufreq_log_file.close() +- # delete stats file +- if auto_cpufreq_stats_path.exists(): +- if auto_cpufreq_stats_file is not None: +- auto_cpufreq_stats_file.close() - -- auto_cpufreq_log_path.unlink() +- auto_cpufreq_stats_path.unlink() - - # restore original cpufrectl script - cpufreqctl_restore() @@ -116,6 +125,15 @@ index 482a544..d142013 100644 def gov_check(): for gov in get_avail_gov(): +@@ -331,7 +251,7 @@ def countdown(s): + if auto_cpufreq_stats_file is not None: + auto_cpufreq_stats_file.seek(0) + auto_cpufreq_stats_file.truncate(0) +- ++ + # execution timestamp + from datetime import datetime + now = datetime.now() diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh index 63a2b5b..e157efe 100755 --- a/scripts/cpufreqctl.sh diff --git a/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix b/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix index a89de032ab..20a9631117 100644 --- a/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, zlib, kmod, which , static ? stdenv.hostPlatform.isStatic -, darwin ? null +, IOKit }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib kmod which ] ++ - lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + lib.optional stdenv.hostPlatform.isDarwin IOKit; preConfigure = if stdenv.cc.isGNU then null else '' substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" diff --git a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix index b012bdfe57..61b0cee76b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix @@ -44,5 +44,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/BurntSushi/ripgrep"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = with maintainers; [ tailhook globin ma27 zowoq ]; + mainProgram = "rg"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix b/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix index c8eb43a51c..6e1a7b24b5 100644 --- a/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/source-highlight/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; + outputs = [ "out" "doc" "dev" ]; + meta = with lib; { description = "Source code renderer with syntax highlighting"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/fop/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/fop/default.nix index a572ce216e..1c5e7b0079 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/fop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/fop/default.nix @@ -2,22 +2,25 @@ stdenv.mkDerivation rec { pname = "fop"; - version = "2.1"; + version = "2.6"; src = fetchurl { url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz"; - sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5"; + sha256 = "145qph3c0m4bmb342qxq1hwsg594lndmfs9ga1v7pk53s34sckq8"; }; buildInputs = [ ant jdk ]; - buildPhase = "ant"; + # build only the "package" target, which generates the fop command. + buildPhase = '' + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + ant -f fop/build.xml package + ''; installPhase = '' mkdir -p $out/bin $out/lib $out/share/doc/fop - - cp build/*.jar lib/*.jar $out/lib/ - cp -r README examples/ $out/share/doc/fop/ + cp fop/build/*.jar fop/lib/*.jar $out/lib/ + cp -r README fop/examples/ $out/share/doc/fop/ # There is a fop script in the source archive, but it has many impurities. # Instead of patching out 90 % of the script, we write our own. diff --git a/third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/clipman/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix rename to third_party/nixpkgs/pkgs/tools/wayland/clipman/default.nix index 80a0afe68d..3a2c2ca601 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/clipman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/clipman/default.nix @@ -1,4 +1,9 @@ -{ buildGoModule, fetchFromGitHub, lib, wl-clipboard, makeWrapper }: +{ buildGoModule +, fetchFromGitHub +, lib +, wl-clipboard +, makeWrapper +}: buildGoModule rec { pname = "clipman"; @@ -24,9 +29,9 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/yory8/clipman"; - license = licenses.gpl3; - maintainers = with maintainers; [ ma27 ]; description = "A simple clipboard manager for Wayland"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ma27 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/kanshi/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/kanshi/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/tools/misc/kanshi/default.nix rename to third_party/nixpkgs/pkgs/tools/wayland/kanshi/default.nix index 90ee2a3446..c661c98a24 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kanshi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/kanshi/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, wayland +}: stdenv.mkDerivation rec { pname = "kanshi"; @@ -15,6 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland ]; meta = with lib; { + homepage = "https://github.com/emersion/kanshi"; description = "Dynamic display configuration tool"; longDescription = '' kanshi allows you to define output profiles that are automatically enabled @@ -24,8 +33,6 @@ stdenv.mkDerivation rec { kanshi can be used on Wayland compositors supporting the wlr-output-management protocol. ''; - homepage = "https://github.com/emersion/kanshi"; - downloadPage = "https://github.com/emersion/kanshi"; license = licenses.mit; maintainers = with maintainers; [ balsoft ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/oguri/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/oguri/default.nix new file mode 100644 index 0000000000..458ea310a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/oguri/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, cairo +, gdk-pixbuf +, wayland +, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "oguri"; + version = "unstable-2020-12-19"; + + src = fetchFromGitHub { + owner = "vilhalmer"; + repo = pname; + rev = "6937fee10a9b0ef3ad8f94f606c0e0d9e7dec564"; + sha256 = "sXNvpI/YPDPd2cXQAfRO4ut21gSCXxbo1DpaZmHJDYQ="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + cairo + gdk-pixbuf + wayland + wayland-protocols + ]; + + meta = with lib; { + homepage = "https://github.com/vilhalmer/oguri/"; + description = "A very nice animated wallpaper daemon for Wayland compositors"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/slurp/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/slurp/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/tools/misc/slurp/default.nix rename to third_party/nixpkgs/pkgs/tools/wayland/slurp/default.nix index ed4bb0037f..107ef68da5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/slurp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/slurp/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config -, cairo, libxkbcommon, wayland, wayland-protocols +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, cairo +, libxkbcommon +, wayland +, wayland-protocols , buildDocs ? true, scdoc }: @@ -33,7 +41,7 @@ stdenv.mkDerivation rec { description = "Select a region in a Wayland compositor"; homepage = "https://github.com/emersion/slurp"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ buffet ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/wev/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wev/default.nix similarity index 88% rename from third_party/nixpkgs/pkgs/tools/misc/wev/default.nix rename to third_party/nixpkgs/pkgs/tools/wayland/wev/default.nix index c1debfd924..83e4113f7e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wev/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wev/default.nix @@ -1,6 +1,11 @@ -{ lib, stdenv, fetchurl -, pkg-config, scdoc, wayland -, wayland-protocols, libxkbcommon +{ lib +, stdenv +, fetchurl +, pkg-config +, scdoc +, wayland +, wayland-protocols +, libxkbcommon }: stdenv.mkDerivation rec { @@ -18,14 +23,14 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { + homepage = "https://git.sr.ht/~sircmpwn/wev"; description = "Wayland event viewer"; longDescription = '' This is a tool for debugging events on a Wayland window, analagous to the X11 tool xev. ''; - homepage = "https://git.sr.ht/~sircmpwn/wev"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix similarity index 75% rename from third_party/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix rename to third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix index 676ff03ad9..0bc195e962 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wl-clipboard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config -, wayland, wayland-protocols }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland +, wayland-protocols +}: stdenv.mkDerivation rec { pname = "wl-clipboard"; @@ -16,10 +23,11 @@ stdenv.mkDerivation rec { buildInputs = [ wayland ]; meta = with lib; { - description = "Command-line copy/paste utilities for Wayland"; homepage = "https://github.com/bugaevc/wl-clipboard"; - license = licenses.gpl3; + description = "Command-line copy/paste utilities for Wayland"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux; }; } +# TODO: is wayland-protocols a nativeBuildInput or a buildInput? diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlogout/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wlogout/default.nix new file mode 100644 index 0000000000..2625405808 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/wlogout/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, scdoc +, gtk3 +, libxkbcommon +, wayland +, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "wlogout"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "ArtsyMacaw"; + repo = "wlogout"; + rev = version; + sha256 = "cTscfx+erHVFHwwYpN7pADQWt5sq75sQSyXSP/H8kOs="; + }; + + nativeBuildInputs = [ pkg-config meson ninja scdoc ]; + buildInputs = [ + gtk3 + libxkbcommon + wayland + wayland-protocols + ]; + + postPatch = '' + substituteInPlace style.css \ + --replace "/usr/share/wlogout" "$out/share/${pname}" + + substituteInPlace main.c \ + --replace "/etc/wlogout" "$out/etc/${pname}" + ''; + + mesonFlags = [ + "--datadir=${placeholder "out"}/share" + "--sysconfdir=${placeholder "out"}/etc" + ]; + + meta = with lib; { + homepage = "https://github.com/ArtsyMacaw/wlogout"; + description = "A wayland based logout menu"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: shell completions diff --git a/third_party/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix similarity index 75% rename from third_party/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix rename to third_party/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix index b635316bf7..e2c941998a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wlr-randr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, wayland }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland +}: stdenv.mkDerivation rec { pname = "wlr-randr"; @@ -11,13 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; }; - nativeBuildInputs = [ meson ninja cmake pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ wayland ]; meta = with lib; { - license = licenses.mit; description = "An xrandr clone for wlroots compositors"; homepage = "https://github.com/emersion/wlr-randr"; + license = licenses.mit; maintainers = with maintainers; [ ma27 ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/wob/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/tools/misc/wob/default.nix rename to third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix index e0622e5416..3567ed6eea 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wob/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wob/default.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc, wayland # wayland-scanner -, wayland-protocols, libseccomp +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, libseccomp +, wayland # wayland-scanner +, wayland-protocols }: stdenv.mkDerivation rec { @@ -21,15 +28,15 @@ stdenv.mkDerivation rec { mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; meta = with lib; { + inherit (src.meta) homepage; description = "A lightweight overlay bar for Wayland"; longDescription = '' A lightweight overlay volume/backlight/progress/anything bar for Wayland, inspired by xob. ''; - inherit (src.meta) homepage; changelog = "https://github.com/francma/wob/releases/tag/${version}"; license = licenses.isc; - platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 6e61d241ad..a9a13aaa6b 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -361,6 +361,7 @@ mapAliases ({ linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 @@ -573,6 +574,7 @@ mapAliases ({ retroshare06 = retroshare; gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 + qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 85d4ff8563..4ff218311e 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -748,6 +748,12 @@ in metapixel = callPackage ../tools/graphics/metapixel { }; + yabridge = callPackage ../tools/audio/yabridge { + wine = wineWowPackages.minimal; + }; + + yabridgectl = callPackage ../tools/audio/yabridgectl { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -1671,7 +1677,6 @@ in else libtensorflow-bin; libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { - inherit (linuxPackages) nvidia_x11; cudaSupport = config.cudaSupport or false; }; @@ -1964,7 +1969,33 @@ in chntpw = callPackage ../tools/security/chntpw { }; - clipman = callPackage ../tools/misc/clipman { }; + clipman = callPackage ../tools/wayland/clipman { }; + + kanshi = callPackage ../tools/wayland/kanshi { }; + + oguri = callPackage ../tools/wayland/oguri { }; + + slurp = callPackage ../tools/wayland/slurp { }; + + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; + + wev = callPackage ../tools/wayland/wev { }; + + wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; + + wlogout = callPackage ../tools/wayland/wlogout { }; + + wlr-randr = callPackage ../tools/wayland/wlr-randr { }; + + wlsunset = callPackage ../tools/wayland/wlsunset { }; + + wob = callPackage ../tools/wayland/wob { }; + + wshowkeys = callPackage ../tools/wayland/wshowkeys { }; + + wtype = callPackage ../tools/wayland/wtype { }; + + ydotool = callPackage ../tools/wayland/ydotool { }; clipster = callPackage ../tools/misc/clipster { }; @@ -3850,22 +3881,8 @@ in wallutils = callPackage ../tools/graphics/wallutils { }; - wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - - wev = callPackage ../tools/misc/wev { }; - - wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; - - wlsunset = callPackage ../tools/wayland/wlsunset { }; - - wob = callPackage ../tools/misc/wob { }; - - wtype = callPackage ../tools/wayland/wtype { }; - wrangler = callPackage ../development/tools/wrangler { }; - wshowkeys = callPackage ../tools/wayland/wshowkeys { }; - wsl-open = callPackage ../tools/misc/wsl-open { }; xkcdpass = with python3Packages; toPythonApplication xkcdpass; @@ -4216,8 +4233,6 @@ in lp_solve = callPackage ../applications/science/math/lp_solve { }; - lprof = callPackage ../tools/graphics/lprof { }; - fastlane = callPackage ../tools/admin/fastlane { }; fatresize = callPackage ../tools/filesystems/fatresize {}; @@ -5493,7 +5508,9 @@ in plugins = [ ]; # override with the list of desired plugins }; - kak-lsp = callPackage ../tools/misc/kak-lsp { }; + kak-lsp = callPackage ../tools/misc/kak-lsp { + inherit (darwin.apple_sdk.frameworks) Security; + }; kbdd = callPackage ../applications/window-managers/kbdd { }; @@ -6997,7 +7014,9 @@ in pcimem = callPackage ../os-specific/linux/pcimem { }; - pciutils = callPackage ../tools/system/pciutils { }; + pciutils = callPackage ../tools/system/pciutils { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; pcsclite = callPackage ../tools/security/pcsclite { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -7220,6 +7239,8 @@ in prettyping = callPackage ../tools/networking/prettyping { }; + pritunl-ssh = callPackage ../tools/networking/pritunl-ssh { }; + profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; @@ -9049,6 +9070,18 @@ in libpsl = null; }; + wget2 = callPackage ../tools/networking/wget2 { + # update breaks grub2 + gnulib = pkgs.gnulib.overrideAttrs (oldAttrs: rec { + version = "20210208"; + src = fetchgit { + url = "https://git.savannah.gnu.org/r/gnulib.git"; + rev = "0b38e1d69f03d3977d7ae7926c1efeb461a8a971"; + sha256 = "06bj9y8wcfh35h653yk8j044k7h5g82d2j3z3ib69rg0gy1xagzp"; + }; + }); + }; + wg-bond = callPackage ../applications/networking/wg-bond { }; which = callPackage ../tools/system/which { }; @@ -10163,6 +10196,13 @@ in buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); + go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); + go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { @@ -10398,27 +10438,19 @@ in jwasm = callPackage ../development/compilers/jwasm { }; - knightos-genkfs = callPackage ../development/tools/knightos/genkfs { - asciidoc = asciidoc-full; - }; + knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; knightos-kcc = callPackage ../development/tools/knightos/kcc { }; - knightos-kimg = callPackage ../development/tools/knightos/kimg { - asciidoc = asciidoc-full; - }; + knightos-kimg = callPackage ../development/tools/knightos/kimg { }; knightos-kpack = callPackage ../development/tools/knightos/kpack { }; - knightos-mkrom = callPackage ../development/tools/knightos/mkrom { - asciidoc = asciidoc-full; - }; + knightos-mkrom = callPackage ../development/tools/knightos/mkrom { }; knightos-patchrom = callPackage ../development/tools/knightos/patchrom { }; - knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { - asciidoc = asciidoc-full; - }; + knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { }; knightos-scas = callPackage ../development/tools/knightos/scas { }; @@ -13848,6 +13880,8 @@ in libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; + libhsts = callPackage ../development/libraries/libhsts { }; + glbinding = callPackage ../development/libraries/glbinding { }; gle = callPackage ../development/libraries/gle { }; @@ -16345,10 +16379,6 @@ in qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; - qt3 = callPackage ../development/libraries/qt-3 { - libpng = libpng12; - }; - qt4 = qt48; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { @@ -16652,6 +16682,8 @@ in sfsexp = callPackage ../development/libraries/sfsexp {}; + shhgit = callPackage ../tools/security/shhgit { }; + shhmsg = callPackage ../development/libraries/shhmsg { }; shhopt = callPackage ../development/libraries/shhopt { }; @@ -17317,8 +17349,6 @@ in yder = callPackage ../development/libraries/yder { }; - ydotool = callPackage ../tools/wayland/ydotool { }; - yojimbo = callPackage ../development/libraries/yojimbo { }; yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; @@ -17478,6 +17508,9 @@ in buildGo115Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_15; }; + buildGo116Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_16; + }; buildGoPackage = buildGo115Package; @@ -17487,6 +17520,9 @@ in buildGo115Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_15; }; + buildGo116Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_16; + }; buildGoModule = buildGo115Module; @@ -18842,6 +18878,8 @@ in fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl/legacy.nix { }; + fwanalyzer = callPackage ../tools/filesystems/fwanalyzer { }; + fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; @@ -19154,6 +19192,13 @@ in ]; }; + linux_5_11 = callPackage ../os-specific/linux/kernel/linux-5.11.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -19412,7 +19457,7 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_10; + linuxPackages_latest = linuxPackages_5_11; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. @@ -19436,6 +19481,7 @@ in linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); + linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11); # When adding to the list above: # - Update linuxPackages_latest to the latest version @@ -22524,7 +22570,7 @@ in gitit = callPackage ../applications/misc/gitit {}; gkrellm = callPackage ../applications/misc/gkrellm { - inherit (darwin) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit; }; glow = callPackage ../applications/editors/glow { }; @@ -22818,8 +22864,6 @@ in super-productivity = callPackage ../applications/networking/super-productivity { }; - wlr-randr = callPackage ../tools/misc/wlr-randr { }; - wlroots = callPackage ../development/libraries/wlroots { }; sway-unwrapped = callPackage ../applications/window-managers/sway { }; @@ -23126,8 +23170,6 @@ in kanboard = callPackage ../applications/misc/kanboard { }; - kanshi = callPackage ../tools/misc/kanshi { }; - kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; @@ -23918,6 +23960,8 @@ in qbec = callPackage ../applications/networking/cluster/qbec { }; + qemacs = callPackage ../applications/editors/qemacs { }; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; @@ -24011,6 +24055,8 @@ in mupdf = callPackage ../applications/misc/mupdf { }; mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; + muso = callPackage ../applications/audio/muso { }; + mystem = callPackage ../applications/misc/mystem { }; diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; @@ -24827,8 +24873,6 @@ in slrn = callPackage ../applications/networking/newsreaders/slrn { }; - slurp = callPackage ../tools/misc/slurp { }; - sniproxy = callPackage ../applications/networking/sniproxy { }; sooperlooper = callPackage ../applications/audio/sooperlooper { }; @@ -26503,6 +26547,8 @@ in blobby = callPackage ../games/blobby { }; + blobwars = callPackage ../games/blobwars { }; + boohu = callPackage ../games/boohu { }; braincurses = callPackage ../games/braincurses { }; @@ -29102,7 +29148,7 @@ in lkproof = callPackage ../tools/typesetting/tex/lkproof { }; - lice = callPackage ../tools/misc/lice {}; + lice = python3Packages.callPackage ../tools/misc/lice {}; m33-linux = callPackage ../misc/drivers/m33-linux { }; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 673b9f2383..5f250d79af 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -1075,6 +1075,8 @@ let semaphore-compat = callPackage ../development/ocaml-modules/semaphore-compat { }; + sha = callPackage ../development/ocaml-modules/sha { }; + sodium = callPackage ../development/ocaml-modules/sodium { }; spelll = callPackage ../development/ocaml-modules/spelll { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 620c4aeeb6..cfe7296589 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -6144,6 +6144,10 @@ let license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestDifferences ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/* + ''; }; DevelOverloadInfo = buildPerlPackage { diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 4d2b065500..a5de7a1e72 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -3548,6 +3548,8 @@ in { labelbox = callPackage ../development/python-modules/labelbox { }; + labgrid = callPackage ../development/python-modules/labgrid { }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.mpi; }; langcodes = callPackage ../development/python-modules/langcodes { }; @@ -6163,6 +6165,8 @@ in { pytest-httpserver = callPackage ../development/python-modules/pytest-httpserver { }; + pytest-httpx = callPackage ../development/python-modules/pytest-httpx { }; + pytest-instafail = callPackage ../development/python-modules/pytest-instafail { }; pytest-isort = callPackage ../development/python-modules/pytest-isort { }; @@ -6311,6 +6315,8 @@ in { python-engineio = callPackage ../development/python-modules/python-engineio { }; + python-engineio_3 = callPackage ../development/python-modules/python-engineio/3.nix { }; + python-etcd = callPackage ../development/python-modules/python-etcd { }; python_fedora = callPackage ../development/python-modules/python_fedora { }; @@ -6451,6 +6457,8 @@ in { python-socketio = callPackage ../development/python-modules/python-socketio { }; + python-socketio_4 = callPackage ../development/python-modules/python-socketio/4.nix { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python_statsd = callPackage ../development/python-modules/python_statsd { }; @@ -6501,9 +6509,7 @@ in { pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; }; - pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { - inherit (pkgs.linuxPackages) nvidia_x11; - }; + pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { }; pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; @@ -7923,7 +7929,9 @@ in { translationstring = callPackage ../development/python-modules/translationstring { }; - transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; + transmission-rpc = callPackage ../development/python-modules/transmission-rpc { }; + + transmissionrpc = self.transmission-rpc; # alias for compatibility 2020-02-07 treq = callPackage ../development/python-modules/treq { };