diff --git a/doc/contributing/reviewing-contributions.xml b/doc/contributing/reviewing-contributions.xml index fe79d8d992b..4fe51677f18 100644 --- a/doc/contributing/reviewing-contributions.xml +++ b/doc/contributing/reviewing-contributions.xml @@ -7,8 +7,8 @@ The following section is a draft, and the policy for reviewing is still being discussed in issues such as #11166 and #20836 . + xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166 and #20836 . diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index c56f4728bed..88fd74db825 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -64,9 +64,9 @@ $ dotnet --info The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project. -## dotnetCorePackages.sdk vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore +## dotnetCorePackages.sdk vs vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore -The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. +The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version. ## Packaging a Dotnet Application diff --git a/doc/stdenv/meta.xml b/doc/stdenv/meta.xml index 67c7a23c32e..c9d1b136219 100644 --- a/doc/stdenv/meta.xml +++ b/doc/stdenv/meta.xml @@ -189,8 +189,7 @@ hello-2.3 A program that produces a familiar, friendly greeting - A list of names and e-mail addresses of the maintainers of this Nix expression. If you would like to be a maintainer of a package, you may want to add yourself to nixpkgs/maintainers/maintainer-list.nix. There is no restriction to becoming a maintainer, just add each new maintainer to that list in a separate commit titled 'maintainers: add alice', and reference maintainers with maintainers = with lib.maintainers; [ alice bob ]. + A list of the maintainers of this Nix expression. Maintainers are defined in nixpkgs/maintainers/maintainer-list.nix. There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled 'maintainers: add alice', and reference maintainers with maintainers = with lib.maintainers; [ alice bob ]. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c3970f3e02f..2838f60ad00 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2023,6 +2023,16 @@ githubId = 49904992; name = "Dawid Sowa"; }; + dbirks = { + email = "david@birks.dev"; + github = "dbirks"; + githubId = 7545665; + name = "David Birks"; + keys = [{ + longkeyid = "ed25519/0xBB999F83D9A19A36"; + fingerprint = "B26F 9AD8 DA20 3392 EF87 C61A BB99 9F83 D9A1 9A36"; + }]; + }; dbohdan = { email = "dbohdan@dbohdan.com"; github = "dbohdan"; @@ -3883,6 +3893,8 @@ }; jcumming = { email = "jack@mudshark.org"; + github = "jcumming"; + githubId = 1982341; name = "Jack Cummings"; }; jD91mZM2 = { @@ -9970,4 +9982,10 @@ githubId = 19290397; name = "Tunc Uzlu"; }; + pulsation = { + name = "Philippe Sam-Long"; + email = "1838397+pulsation@users.noreply.github.com"; + github = "pulsation"; + githubId = 1838397; + }; } diff --git a/nixos/doc/manual/configuration/gpu-accel.xml b/nixos/doc/manual/configuration/gpu-accel.xml index 95ee13f4796..3695a5ff445 100644 --- a/nixos/doc/manual/configuration/gpu-accel.xml +++ b/nixos/doc/manual/configuration/gpu-accel.xml @@ -65,16 +65,16 @@ Platform Vendor Advanced Micro Devices, Inc. AMD - Modern AMD Graphics - Core Next (GCN) GPUs are supported through the - rocm-opencl-icd package. Adding this package to - enables OpenCL - support: + Modern AMD Graphics + Core Next (GCN) GPUs are supported through the + rocm-opencl-icd package. Adding this package to + enables OpenCL + support: - = [ - rocm-opencl-icd -]; + = [ + rocm-opencl-icd + ]; @@ -100,9 +100,9 @@ Platform Vendor Advanced Micro Devices, Inc. support. For example, for Gen8 and later GPUs, the following configuration can be used: - = [ - intel-compute-runtime -]; + = [ + intel-compute-runtime + ]; @@ -173,31 +173,31 @@ GPU1: AMD - Modern AMD Graphics - Core Next (GCN) GPUs are supported through either radv, which is - part of mesa, or the amdvlk package. - Adding the amdvlk package to - makes both drivers - available for applications and lets them choose. A specific driver can - be forced as follows: + Modern AMD Graphics + Core Next (GCN) GPUs are supported through either radv, which is + part of mesa, or the amdvlk package. + Adding the amdvlk package to + makes both drivers + available for applications and lets them choose. A specific driver can + be forced as follows: - = [ - pkgs.amdvlk -]; + = [ + pkgs.amdvlk + ]; -# To enable Vulkan support for 32-bit applications, also add: - = [ - pkgs.driversi686Linux.amdvlk -]; + # To enable Vulkan support for 32-bit applications, also add: + = [ + pkgs.driversi686Linux.amdvlk + ]; -# For amdvlk -.VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; -# For radv -.VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; - + # For amdvlk + .VK_ICD_FILENAMES = + "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; + # For radv + .VK_ICD_FILENAMES = + "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; + diff --git a/nixos/doc/manual/contributing-to-this-manual.xml b/nixos/doc/manual/contributing-to-this-manual.xml index 9820e75fc33..935dd66bc14 100644 --- a/nixos/doc/manual/contributing-to-this-manual.xml +++ b/nixos/doc/manual/contributing-to-this-manual.xml @@ -12,7 +12,7 @@ xlink:href="https://github.com/NixOS/nixpkgs">Nixpkgs repository. You can quickly check your edits with the following: -$ cd /path/to/nixpkgs/nixos/doc/manual +$ cd /path/to/nixpkgs $ nix-build nixos/release.nix -A manual.x86_64-linux diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index f10a7d65887..43f69b923d1 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -161,6 +161,13 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable existing systems without the help of a rescue USB drive or similar. + + + On some distributions there are separate PATHS for programs intended only for root. + In order for the installation to succeed, you might have to use PATH="$PATH:/usr/sbin:/sbin" + in the following command. + + $ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt Again, please refer to the nixos-install step in diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 75c8adbf45e..afb09d7c5d2 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -234,7 +234,17 @@ - + + + Starting with this release, the hydra-build-result + nixos-YY.MM + branches no longer exist in the deprecated + nixpkgs-channels repository. These branches are now in + the main nixpkgs + repository. + + @@ -1593,30 +1603,30 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; Agda has been heavily reworked. - - - agda.mkDerivation has been heavily changed and - is now located at agdaPackages.mkDerivation. - - - - - New top-level packages agda and - agda.withPackages have been added, the second - of which sets up agda with access to chosen libraries. - - - - - All agda libraries now live under - agdaPackages. - - - - - Many broken libraries have been removed. - - + + + agda.mkDerivation has been heavily changed and + is now located at agdaPackages.mkDerivation. + + + + + New top-level packages agda and + agda.withPackages have been added, the second + of which sets up agda with access to chosen libraries. + + + + + All agda libraries now live under + agdaPackages. + + + + + Many broken libraries have been removed. + + See the new diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 5d3f26dd580..5c017c65a25 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -163,6 +163,15 @@ vim switched to Python 3, dropping all Python 2 support. + + + boot.zfs.forceImportAll + previously did nothing, but has been fixed. However its default has been + changed to false to preserve the existing default + behaviour. If you have this explicitly set to true, + please note that your non-root pools will now be forcibly imported. + + diff --git a/nixos/doc/varlistentry-fixer.rb b/nixos/doc/varlistentry-fixer.rb index 6c7cc1e6439..02168016b55 100755 --- a/nixos/doc/varlistentry-fixer.rb +++ b/nixos/doc/varlistentry-fixer.rb @@ -15,8 +15,8 @@ require "rexml/document" include REXML if ARGV.length < 1 then - $stderr.puts "Needs a filename." - exit 1 + $stderr.puts "Needs a filename." + exit 1 end filename = ARGV.shift @@ -51,17 +51,17 @@ $touched = false # Generates: --optionnamevalue # ^^ ^^ doc.elements.each("//varlistentry/term") do |term| - ["varname", "function", "option", "replaceable"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end + ["varname", "function", "option", "replaceable"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end end @@ -75,17 +75,17 @@ end # Generates: -Ipath # ^^ doc.elements.each("//cmdsynopsis/arg") do |term| - ["option", "replaceable"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end + ["option", "replaceable"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end end # @@ -104,21 +104,21 @@ end # Generates: [{--profile-name | -p }name] # ^^^^ doc.elements.each("//cmdsynopsis/arg") do |term| - ["group"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end + ["group"].each do |prev_name| + term.elements.each(prev_name) do |el| + if el.next_element and + el.next_element.name == "replaceable" and + el.next_sibling_node.class == Element + then + $touched = true + term.insert_after(el, Text.new(" ")) + end + end + end end if $touched then - doc.context[:attribute_quote] = :quote - doc.write(output: File.open(filename, "w")) + doc.context[:attribute_quote] = :quote + doc.write(output: File.open(filename, "w")) end diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 044fa48853d..a77524d75d8 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -263,7 +263,7 @@ in { (drv: drv.override { pulseaudio = overriddenPackage; }) cfg.extraModules; modulePaths = builtins.map - (drv: "${drv}/lib/pulse-${overriddenPackage.version}/modules") + (drv: "${drv}/${overriddenPackage.pulseDir}/modules") # User-provided extra modules take precedence (overriddenModules ++ [ overriddenPackage ]); in lib.concatStringsSep ":" modulePaths; diff --git a/nixos/modules/hardware/acpilight.nix b/nixos/modules/hardware/acpilight.nix index 34e8a222096..2de448a265c 100644 --- a/nixos/modules/hardware/acpilight.nix +++ b/nixos/modules/hardware/acpilight.nix @@ -19,6 +19,7 @@ in }; config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ acpilight ]; services.udev.packages = with pkgs; [ acpilight ]; }; } diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 230492c6b09..6f5a6d3bf28 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -15,6 +15,8 @@ in { hardware.bluetooth = { enable = mkEnableOption "support for Bluetooth"; + hsphfpd.enable = mkEnableOption "support for hsphfpd[-prototype] implementation"; + powerOnBoot = mkOption { type = types.bool; default = true; @@ -72,7 +74,8 @@ in { }; }; - environment.systemPackages = [ bluez-bluetooth ]; + environment.systemPackages = [ bluez-bluetooth ] + ++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ]; environment.etc."bluetooth/main.conf"= { source = pkgs.writeText "main.conf" @@ -80,7 +83,8 @@ in { }; services.udev.packages = [ bluez-bluetooth ]; - services.dbus.packages = [ bluez-bluetooth ]; + services.dbus.packages = [ bluez-bluetooth ] + ++ optionals cfg.hsphfpd.enable [ pkgs.hsphfpd ]; systemd.packages = [ bluez-bluetooth ]; systemd.services = { @@ -90,11 +94,31 @@ in { # 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"; + }; + }) + ; 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"; + }; + }) + ; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 9ca7c6fb343..7b6c2277741 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -175,14 +175,10 @@ in forceImportAll = mkOption { type = types.bool; - default = true; + default = false; description = '' Forcibly import all ZFS pool(s). - This is enabled by default for backwards compatibility purposes, but it is highly - recommended to disable this option, as it bypasses some of the safeguards ZFS uses - to protect your ZFS pools. - If you set this option to false and NixOS subsequently fails to import your non-root ZFS pool(s), you should manually import each pool with "zpool import -f <pool-name>", and then reboot. You should only need to do @@ -507,6 +503,7 @@ in Type = "oneshot"; RemainAfterExit = true; }; + environment.ZFS_FORCE = optionalString cfgZfs.forceImportAll "-f"; script = (importLib { # See comments at importLib definition. zpoolCmd="${packages.zfsUser}/sbin/zpool"; diff --git a/nixos/tests/postfix.nix b/nixos/tests/postfix.nix index 37ae76afec1..6d22b4edba0 100644 --- a/nixos/tests/postfix.nix +++ b/nixos/tests/postfix.nix @@ -11,9 +11,9 @@ import ./make-test-python.nix { enable = true; enableSubmission = true; enableSubmissions = true; - sslCACert = certs.ca.cert; - sslCert = certs.${domain}.cert; - sslKey = certs.${domain}.key; + tlsTrustedAuthorities = "${certs.ca.cert}"; + sslCert = "${certs.${domain}.cert}"; + sslKey = "${certs.${domain}.key}"; submissionsOptions = { smtpd_sasl_auth_enable = "yes"; smtpd_client_restrictions = "permit"; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 87e6c900c98..e05cd540227 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -18,7 +18,7 @@ let maintainers = [ adisbladis ]; }; - machine = { pkgs, ... }: { + machine = { pkgs, lib, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; networking.hostId = "deadbeef"; boot.kernelPackages = kernelPackage; @@ -26,6 +26,24 @@ let boot.zfs.enableUnstable = enableUnstable; environment.systemPackages = [ pkgs.parted ]; + + # Setup regular fileSystems machinery to ensure forceImportAll can be + # tested via the regular service units. + fileSystems = lib.mkVMOverride { + "/forcepool" = { + device = "forcepool"; + fsType = "zfs"; + options = [ "noauto" ]; + }; + }; + + # forcepool doesn't exist at first boot, and we need to manually test + # the import after tweaking the hostId. + systemd.services.zfs-import-forcepool.wantedBy = lib.mkVMOverride []; + systemd.targets.zfs.wantedBy = lib.mkVMOverride []; + boot.zfs.forceImportAll = true; + # /dev/disk/by-id doesn't get populated in the NixOS test framework + boot.zfs.devNodes = "/dev/disk/by-uuid"; }; testScript = '' @@ -57,6 +75,21 @@ let "zpool destroy rpool", "udevadm settle", ) + + with subtest("boot.zfs.forceImportAll works"): + machine.succeed( + "rm /etc/hostid", + "zgenhostid deadcafe", + "zpool create forcepool /dev/vdb1 -O mountpoint=legacy", + ) + machine.shutdown() + machine.start() + machine.succeed("udevadm settle") + machine.fail("zpool import forcepool") + machine.succeed( + "systemctl start zfs-import-forcepool.service", + "mount -t zfs forcepool /tmp/mnt", + ) '' + extraTest; }; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index a26431a82ed..f1f97de256e 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , qmake , qtbase -, qtmultimedia , qttools , alsaSupport ? stdenv.hostPlatform.isLinux , alsaLib @@ -19,20 +18,20 @@ let in mkDerivation rec { pname = "bambootracker"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "rerrahkr"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0d0f4jqzknsiq725pvfndarfjg183f92rb0lim3wzshnsixr5vdc"; + sha256 = "0ibi0sykxf6cp5la2c4pgxf5gvy56yv259fbmdwdrdyv6vlddf42"; }; sourceRoot = "source/BambooTracker"; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase qtmultimedia ] + buildInputs = [ qtbase ] ++ optional alsaSupport alsaLib ++ optional pulseSupport libpulseaudio ++ optional jackSupport libjack2; diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 8fc0616ff73..5f0eb61a5be 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.93.1"; + version = "0.94.0"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "05qsxyr7x8l0vlmn4yjg4gglxvcw9raf6vfzvblsl2ngsdsrnizy"; + sha256 = "0hifyawsr38vsx12aqw38nms4kzbaghihib1r80x56f1jjsdhww0"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 556dd5f1061..42e780af098 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -18,8 +18,12 @@ let pulseSources = runCommand "pulseaudio-sources" {} '' mkdir $out - tar -xf ${pulseaudio.src} - mv pulseaudio*/* $out/ + if [ -d ${pulseaudio.src} ]; then + ln -s ${pulseaudio.src}/* $out/ + else + tar -xf ${pulseaudio.src} + mv pulseaudio*/* $out/ + fi ''; in stdenv.mkDerivation rec { @@ -61,7 +65,7 @@ in stdenv.mkDerivation rec { # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version} - substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version} + substituteInPlace CMakeLists.txt --replace '${"\${PULSE_DIR}"}' ${pulseaudio.pulseDir} # Fraunhofer recommends to enable afterburner but upstream has it set to false by default substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \ @@ -72,7 +76,7 @@ in stdenv.mkDerivation rec { for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ + --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/${pulseaudio.pulseDir}/modules:$orig_rpath" \ "$so" done ''; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch index 3c498fe8af1..7cdb7de4dd1 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch +++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch @@ -8,4 +8,4 @@ index 8d20dbf..63fe7ba 100644 module-bluetooth-policy - LIBRARY DESTINATION ${PulseAudio_modlibexecdir}) - -+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PULSE_DIR}/modules/) diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index 62ae1d2c049..dfae5d40e11 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, cmake, pkgconfig, alsaLib, libjack2, qt4 }: +{ mkDerivation, lib, fetchurl, cmake, pkg-config +, qttools, qtx11extras, drumstick +, docbook-xsl-nons +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "vmpk"; - version = "0.5.1"; + version = "0.7.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc"; + sha256 = "5oLrjQADg59Mxpb0CNLQAE574IOSYLDLJNaQ/9q2cMQ="; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ]; - buildInputs = [ alsaLib libjack2 qt4 ]; + buildInputs = [ qtx11extras drumstick ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual MIDI Piano Keyboard"; homepage = "http://vmpk.sourceforge.net/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 7d5acc62050..563b2378f84 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -5,23 +5,23 @@ , llvmPackages , openssl , pkg-config +, stdenv , systemd +, darwin }: rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "08dkcrga1x18csh6pw6f54x5xwijppyjhg46cf4p452xc1l3a6ir"; + sha256 = "cs84Zz0nhagGDu5sDFTaFZF3SPEgJU8F4vGX7KLihOM="; }; - cargoSha256 = "1xliragihwjfc5qmfm0ng519bw8a28m1w1yqcl9mpk8zywiybaah"; - - cargoPatches = [ ./lock.patch ]; + cargoSha256 = "6suNkHw1BbISb0MkYkUaD+mpUal+kn3y1SFVqzJFqJc="; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ @@ -31,7 +31,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ openssl systemd ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isLinux [ systemd ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; cargoBuildFlags = [ "--features final" ]; @@ -43,6 +45,6 @@ rustPlatform.buildRustPackage rec { homepage = "http://parity.io/ethereum"; license = licenses.gpl3; maintainers = with maintainers; [ akru xrelkd ]; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/blockchains/openethereum/lock.patch b/pkgs/applications/blockchains/openethereum/lock.patch deleted file mode 100644 index 66709480bb7..00000000000 --- a/pkgs/applications/blockchains/openethereum/lock.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /nix/store/hv764a65zmfzw5scjhz5839agv10da6x-source/Cargo.lock 1969-12-31 16:00:01.000000000 -0800 -+++ ./Cargo.lock 2020-07-31 21:30:31.146750066 -0700 -@@ -3113,7 +3113,7 @@ - - [[package]] - name = "openethereum" --version = "3.0.0" -+version = "3.0.1" - dependencies = [ - "ansi_term", - "atty", -@@ -3562,7 +3562,7 @@ - - [[package]] - name = "parity-version" --version = "3.0.0" -+version = "3.0.1" - dependencies = [ - "parity-bytes", - "rlp", diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 19382544551..866adeea278 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.26"; + version = "0.8.26-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "1bvma6k3gsjqh8w76k4kf52sjg8wxn1b7a409kmnmmvmd9j6z5ia"; + sha256 = "17ji1gjrx3gzw4msaz9kgvm132y14wgh8z183l3mfw1cj44a6kqk"; }; - cargoSha256 = "0pacmmvvjgzmaxgg47qbfhqwl02jxj3i6vnmkjbj9npzqfmqf72d"; + cargoSha256 = "07zwlwx02xw1y20br2c4grwv7bprhynqy7gav4qh3vw117ijpiqk"; nativeBuildInputs = [ clang ]; diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix new file mode 100644 index 00000000000..163d87ee888 --- /dev/null +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "turbo-geth"; + version = "2020.11.01"; + + src = fetchFromGitHub { + owner = "ledgerwatch"; + repo = pname; + rev = "v${version}"; + sha256 = "0hm8kqd0w231mlclsmsghf15r8pbrs5g064mkpx59qpqzk37lgss"; + }; + + vendorSha256 = "0b7ldrnwkz3r1d4fw95hvvpi3bz56d9v8p2mjzdvlpk5zhl2a37p"; + runVend = true; + + subPackages = [ + "cmd/tg" + "cmd/restapi" + "cmd/rpcdaemon" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ledgerwatch/turbo-geth/"; + description = "Ethereum node and geth fork focused on scalability and modularity"; + license = with licenses; [ lgpl3 gpl3 ]; + maintainers = with maintainers; [ xwvvvvwx ]; + }; +} diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 3b4ec1c49c4..e566661d36a 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.12"; + version = "1.1.12.2"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "0nfd0pwsgrkaxcxfs8wb3i8kslfcqnc91iahw3rmlcxdzb81kjs4"; + sha256 = "0nl7n24nsy3gyzrxa6llx81pvsjqcwi0a4qdv34dpcq483aclp2r"; }; dontBuild = true; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index cca7b0b2f41..51c7ebcc907 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,9 +9,9 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.1.0.19"; # "Android Studio 4.1.0" - build = "201.6858069"; - sha256Hash = "sha256-S5Uh/EpjE61l/z4UsPP7UEJ9Rk/hQidVVWX0bg/60gI="; + version = "4.1.1.0"; # "Android Studio 4.1.1" + build = "201.6953283"; + sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os="; }; betaVersion = { version = "4.1.0.18"; # "Android Studio 4.1 RC 3" diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 025f97b54e6..4ba7cb8eb03 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -163,8 +163,10 @@ in stdenv.mkDerivation rec { # The declarations for `gimp-with-plugins` wrapper, # used for determining plug-in installation paths majorVersion = "${lib.versions.major version}.0"; - targetPluginDir = "lib/gimp/${majorVersion}/plug-ins"; - targetScriptDir = "share/gimp/${majorVersion}/scripts"; + targetLibDir = "lib/gimp/${majorVersion}"; + targetDataDir = "share/gimp/${majorVersion}"; + targetPluginDir = "${targetLibDir}/plug-ins"; + targetScriptDir = "${targetDataDir}/scripts"; # probably its a good idea to use the same gtk in plugins ? gtk = gtk2; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index b78350ae4d3..84f5abfce06 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -1,33 +1,51 @@ -# install these packages into your profile. Then add -# ~/.nix-profile/gimp-version-plugins to your plugin list you can find at -# preferences -> Folders -> Plug-ins -# same applies for the scripts +# Use `gimp-with-plugins` package for GIMP with all plug-ins. +# If you just want a subset of plug-ins, you can specify them explicitly: +# `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`. + +{ config, lib, pkgs }: -{ config, pkgs, gimp }: let - inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub; - inherit (gimp) targetPluginDir targetScriptDir; + inherit (pkgs) stdenv fetchurl pkg-config intltool glib fetchFromGitHub; +in - pluginDerivation = a: let - name = a.name or "${a.pname}-${a.version}"; +lib.makeScope pkgs.newScope (self: + +let + # Use GIMP from the scope. + inherit (self) gimp; + + pluginDerivation = attrs: let + name = attrs.name or "${attrs.pname}-${attrs.version}"; in stdenv.mkDerivation ({ prePhases = "extraLib"; extraLib = '' installScripts(){ - mkdir -p $out/${targetScriptDir}/${name}; - for p in "$@"; do cp "$p" -r $out/${targetScriptDir}/${name}; done + mkdir -p $out/${gimp.targetScriptDir}/${name}; + for p in "$@"; do cp "$p" -r $out/${gimp.targetScriptDir}/${name}; done } installPlugins(){ - mkdir -p $out/${targetPluginDir}/${name}; - for p in "$@"; do cp "$p" -r $out/${targetPluginDir}/${name}; done + mkdir -p $out/${gimp.targetPluginDir}/${name}; + for p in "$@"; do cp "$p" -r $out/${gimp.targetPluginDir}/${name}; done } ''; + + # Override installation paths. + PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}"; + PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}"; } - // a + // attrs // { name = "gimp-plugin-${name}"; - buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []); - nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []); + buildInputs = [ + gimp + gimp.gtk + glib + ] ++ (attrs.buildInputs or []); + + nativeBuildInputs = [ + pkg-config + intltool + ] ++ (attrs.nativeBuildInputs or []); } ); @@ -35,10 +53,11 @@ let phases = [ "extraLib" "installPhase" ]; installPhase = "installScripts ${src}"; } // attrs); - in +{ + # Allow overriding GIMP package in the scope. + inherit (pkgs) gimp; -stdenv.lib.makeScope pkgs.newScope (self: with self; { gap = pluginDerivation { /* menu: Video @@ -49,10 +68,6 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; NIX_LDFLAGS = "-lm"; - patchPhase = '' - sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ - -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure - ''; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "The GIMP Animation Package"; @@ -99,7 +114,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { version = "2.0.3"; buildInputs = with pkgs; [ fftw ]; nativeBuildInputs = with pkgs; [ autoreconfHook ]; - makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/lib/gimp/2.0" ]; + makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/${gimp.targetLibDir}" ]; src = fetchFromGitHub { owner = "bootchk"; repo = "resynthesizer"; @@ -138,14 +153,14 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { Layer/Liquid Rescale */ pname = "lqr-plugin"; - version = "0.7.1"; + version = "0.7.2"; buildInputs = with pkgs; [ liblqr1 ]; - src = fetchurl { - url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/gimp-lqr-plugin-${version}.tar.bz2"; - sha256 = "sha256-YpgYPjHZkueJWS51QGmugXavGS+1x4o20St31qoRng4="; + src = fetchFromGitHub { + owner = "carlobaldassi"; + repo = "gimp-lqr-plugin"; + rev = "v${version}"; + sha256 = "81ajdZ2zQi/THxnBlSeT36tVTEzrS1YqLGpHMhFTKAo="; }; - #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"''; - installPhase = "installPlugins src/gimp-lqr-plugin"; }; gmic = pkgs.gmic-qt.override { @@ -201,9 +216,4 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49"; }; }; - -} // stdenv.lib.optionalAttrs (config.allowAliases or true) { - - resynthesizer2 = resynthesizer; - }) diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 841728d3a29..7e8ce913f02 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -2,7 +2,7 @@ let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); -selectedPlugins = if plugins == null then allPlugins else plugins; +selectedPlugins = lib.filter (pkg: pkg != gimpPlugins.gimp) (if plugins == null then allPlugins else plugins); extraArgs = map (x: x.wrapArgs or "") selectedPlugins; versionBranch = stdenv.lib.versions.majorMinor gimp.version; diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index da5caeff3a0..6d5e9d9b947 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "0.9.16"; + version = "0.9.18"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "0xmpglfzff3jpxbr304czsa24fbp497b69yd8kjkjdp2cd0l70qc"; + sha256 = "0inl6zmc1726gmj85jbvq3ra4zphd2ikhrnqphgy2b0c72yh4pf7"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 2c3e9fa865a..3f91fae0beb 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "0cbbbf93gxx768fs6pldy25xk46k7mc8k94r3f7cd83f1qd3s5zn"; + sha256 = "13b1ncpx189ca0h70j5cdp0jwlj95kasysryz1l6g13cwn9n6mii"; }; - vendorSha256 = "1i0w4284icbl40yrjny9qd5iqrq18x63lrs7p1gz58nybc606azx"; + vendorSha256 = "11w9i1829hk1qb9w24dyxv1bi49358a274g60x11fp5x5cw7bqa7"; # No tests doCheck = false; diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 4bf707cd043..35d55787ec7 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -1,6 +1,5 @@ { mkDerivation, lib , extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info -, qtwebkit , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , flac, lame, libmad, libmpcdec, libvorbis , libsamplerate, libsndfile, taglib @@ -17,8 +16,6 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ - # qt - qtwebkit # kde libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui # formats diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 18dbcc9ce26..90fca4ce28c 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf"; + sha256 = "0yc7xgwb3i4m8m9kg2xspqig3s2qgh2i9bkalvnkziayjb7y59qn"; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ad26a912e78..f2d779c8a65 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -19,7 +19,7 @@ }: let - version = "4.0.3"; + version = "4.0.4"; # electrum is not compatible with dnspython 2.0.0 yet # use the latest 1.x release instead @@ -43,7 +43,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1r40i0v7nm35m3pzbd0l5z4qphl13s31l9v5njmyvpfjirdmhjbv"; + sha256 = "0bzvyfqnd0r0l8syf95hr3nsh8rmmmcs74bvc7v04v0nm5m0fmf1"; extraPostFetch = '' mv $out ./all @@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0q891fgzxvyzjxfczynx92hvclfs8i3nr5nr9sgbvz13hsg4s6lg"; + sha256 = "03dc5jwgp18sism5v4lbqfyn2zljchng8j2yi07yf8i01ivy2mmv"; }; postUnpack = '' diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 1bfe642752b..11b373ac131 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.35"; + version = "7.36"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5"; + sha256 = "18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j"; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index a4932943fa2..74485e2004a 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.3.4"; + version = "3.4.8"; src = fetchzip { url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "14xr0yqklmm4jvj1hnkj89lj83zzs2l1375ni0jbf12gy31jlb2w"; + sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index be103f3543a..de68e90a4f1 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.2.6"; + version = "1.3.18"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "14svzfhszb0pnsajbydsic0rdc64zp6csqjp6k2p2i20jf0c0im6"; - x86_64-darwin = "1wdv8idnvn5567xdmsaa3f7skv48i9q6jqd4pgv8pz1zkhiqj0wi"; + x86_64-linux = "1dldy137ia8qxhf7d5xzq5slm12bhnmw4kx7fm37n1ajjdcn5sf7"; + x86_64-darwin = "0zm9vhxlfs1ldd8za4yha54psqwl0al4hzdfxjfp7ir98i9a4cj7"; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 0a8d7ce547f..60905be3b1b 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.26.6"; + version = "0.26.8"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "0z17pdjdc2r2m5yi5bfz504dzzs978z8p6bhlf08v2npvigp8vz1"; + sha256 = "0pkhvxcfk70dnmgczyyq585mxrfwqai44ikshs4c1imh92z25llq"; }; postPatch = '' diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 05cf15b8acc..455c08fb295 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -17,10 +17,10 @@ let pname = "simplenote"; - version = "1.21.1"; + version = "2.0.0"; sha256 = { - x86_64-linux = "00qx82d17yrrg2mxwhm40av0mpf5hy14j338i5ijhwp79yc8fk8x"; + x86_64-linux = "18alzsl1y9pvd5rs6gfnzv0py8ha0im33ylg7h6dicil5vii4l05"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index bb4b3ac90ce..beccfe5477b 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "1.0.0"; + version = "1.0.1"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-mB23UOUrOfEmbFfVsAXyi3iod0NAfp/sl7Gkklqfmbo="; + sha256 = "1dln5gh3p8nz9qmg07cw2s0lpzp3rfhyrwdhczj89g27bwk0lr4k"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 4aeff6c9ec8..7b9e38c87d1 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "wofi"; - version = "1.2.1"; + version = "1.2.3"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "0hx61br19dlmc3lay23ww3n9ry06m7b6xrkjx7sk4vrg1422iq99"; + sha256 = "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i"; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/applications/misc/xmenu/default.nix index ecbb205c98e..e84f95e0998 100644 --- a/pkgs/applications/misc/xmenu/default.nix +++ b/pkgs/applications/misc/xmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xmenu"; - version = "4.3.1"; + version = "4.4.1"; src = fetchFromGitHub { owner = "phillbush"; repo = "xmenu"; rev = "v${version}"; - sha256 = "0m97w1nwak5drcxxlyisqb73fxkapy2rlph9mg531kbx3k2h30r1"; + sha256 = "1s70zvsaqnsjqs298vw3py0vcvia68xlks1wcz37pb88bwligz1x"; }; buildInputs = [ imlib2 libX11 libXft libXinerama ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A menu utility for X"; homepage = "https://github.com/phillbush/xmenu"; - license = licenses.publicDomain; + license = licenses.mit; maintainers = with maintainers; [ neonfuz ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index a166ca3b50a..1b8f7941583 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1jh527bcl74018jd0qi32y4pcgmnbm21dyfhj4kg0j0ip15mx9j6"; + sha256 = "0bcbil9b5z95haqbmdqaslckvjflw7h77fqrcdxc6lrn29575nnf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 58b1a81c90f..2fc158daf62 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "zathura"; - version = "0.4.5"; + version = "0.4.7"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c"; + sha256 = "1rx1fk9s556fk59lmqgvhwrmv71ashh89bx9adjq46wq5gzdn4p0"; }; outputs = [ "bin" "man" "dev" "out" ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 32a2ec42011..97f36f82847 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,29 +1,45 @@ { stdenv, lib, meson, ninja, fetchurl, fetchpatch -, pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: +, cairo +, girara +, gtk-mac-integration +, gumbo +, jbig2dec +, libjpeg +, mupdf +, openjpeg_2 +, pkgconfig +, zathura_core +}: stdenv.mkDerivation rec { - version = "0.3.5"; + version = "0.3.6"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq"; + sha256 = "1r3v37k9fl2rxipvacgxr36llywvy7n20a25h3ajlyk70697sa66"; }; - patches = [ - # compatibility with MuPDF 1.17 - (fetchpatch { - url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/commit/c7f341addb76d5e6fd8c24c666d8fe97c451a4cb.patch"; - sha256 = "12rikx2j7dpngfma9x4i504w58a8xx3rc0gmyz183v19hn54c075"; - }) - ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - zathura_core girara mupdf cairo + cairo + girara + gumbo + jbig2dec + libjpeg + mupdf + openjpeg_2 + zathura_core ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; + mesonFlags = [ + "-Dlink-external=true" + ]; + + # avoid: undefined symbol: gumbo_destroy_output + NIX_LDFLAGS = [ "-lgumbo" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index fc4b5521b0d..f0abf2a79fe 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -86,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.15.76"; + version = "1.16.72"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "3b054584c2272a9eeb9029f754cabaf4804db295fd0e6b84ead680b08af38d48"; + sha256 = "0gcmbqkrkdrjj0cc34bp56iqawhyfz46k7q8x82pw9b1rbjp1x6k"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 565f884c510..b88a63f27a4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "86.0.4240.183", - "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma", - "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9", + "version": "86.0.4240.198", + "sha256": "0i3s1il0x5yi3528gdsg3bhnyhs2x24zh7p1nd5apv3va9g85ax0", + "sha256bin64": "0qfhs73r6j0r3nyqbnscnf7h1rs1s68lfl5ndsyd32dmip7ma01x", "deps": { "gn": { "version": "2020-08-07", @@ -13,9 +13,9 @@ } }, "beta": { - "version": "87.0.4280.40", - "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3", - "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41", + "version": "87.0.4280.47", + "sha256": "0a3c4kz85857wrbcxqknbqmai250d36nq332l66a83r8sidhbxfq", + "sha256bin64": "0bjls2airr4p448rx7im1a7gff68yfnfb5vymr4bin4kz0s38mpw", "deps": { "gn": { "version": "2020-09-09", @@ -26,15 +26,15 @@ } }, "dev": { - "version": "88.0.4300.0", - "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b", - "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv", + "version": "88.0.4315.5", + "sha256": "0k6man2xq8vmnk73dqv3fcc9929agqq8j6s6nvc9z653q4jdphkw", + "sha256bin64": "0m139w8lwaawridk8in24ss1g1i6ah5298xky226k3vhk5i4mn3j", "deps": { "gn": { - "version": "2020-09-09", + "version": "2020-10-21", "url": "https://gn.googlesource.com/gn", - "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", - "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + "rev": "f5f465b52e5df6d4de9fbe67cc79f1914ba4dbfc", + "sha256": "1xb31vsvg27ivvcdyiq93h8wj4d90qdrpagfh1dvm6xszkajsca1" } } } diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index f6f6deb7380..e340e3a052e 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.2"; + version = "10.0.4"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "sha256-JBJDMC44VSh1ekXPxsVvFk5nOB8Ro4UGtD32pG1weP8="; + sha256 = "sha256-2Ye1+mhFnkZnAYQXgKZ5YIOiIVaiunTCyCOM+ZExw2I=="; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "sha256-EanW2Q8TtCPY5FSp8zfgBXMte9+RfKE24fu8ROtArK0="; + sha256 = "sha256-B0WGkIt8KDtma/WGyenQ04ctKE7AantUtYnwsjAZZb0="; }; }; in @@ -231,9 +231,10 @@ stdenv.mkDerivation rec { # Preload extensions by moving into the runtime instead of storing under the # user's profile directory. - mkdir -p "$TBB_IN_STORE/browser/extensions" + # See https://support.mozilla.org/en-US/kb/deploying-firefox-with-extensions + mkdir -p "$TBB_IN_STORE/distribution/extensions" mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \ - "$TBB_IN_STORE/browser/extensions" + "$TBB_IN_STORE/distribution/extensions" # Hard-code paths to geoip data files. TBB resolves the geoip files # relative to torrc-defaults_path but if we do not hard-code them @@ -409,6 +410,5 @@ stdenv.mkDerivation rec { # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. license = licenses.free; - broken = true; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index fd5a8604455..2b8dc83da50 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -344,7 +344,12 @@ let patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" ''; - passthru.updateScript = ./update.py; + passthru = { + updateScript = ./update.py; + chromiumDeps = { + gn = gnChromium; + }; + }; }; # Remove some extraAttrs we supplied to the base attributes already. diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix index 3cd0ec34db1..b02c91c6e23 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -37,26 +37,15 @@ let inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; inherit ungoogled; - # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-07-20"; + inherit (upstream-info.deps.gn) version; src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe"; - sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q"; + inherit (upstream-info.deps.gn) url rev sha256; }; }); } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine) - gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-08-17"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "6f13aaac55a977e1948910942675c69f2b4f7a94"; - sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251"; - }; - }); }); browser = callPackage ./browser.nix { inherit channel enableWideVine; }; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix index abcb2ce391a..73c9796aaa9 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -1,6 +1,6 @@ { - "86.0.4240.111" = { - rev = "86.0.4240.111-1"; - sha256 = "0fkk0lxbvik8q8d5njxmwiam64qz5g74hlb56w24nh5mh1jm59a8"; + "86.0.4240.183" = { + rev = "86.0.4240.183-1"; + sha256 = "0528l2wr5bpl1cwsxzl5zxz1gw91kffkh5j1kzmc5n7m4mscqxyc"; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py index bfc7f0d2478..b404ca555bf 100755 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py @@ -1,13 +1,15 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python -p python3 nix +#! nix-shell -i python -p python3 nix nix-prefetch-git import csv import json +import re import subprocess import sys from codecs import iterdecode from collections import OrderedDict +from datetime import datetime from os.path import abspath, dirname from urllib.request import urlopen @@ -26,6 +28,30 @@ def nix_prefetch_url(url, algo='sha256'): out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) return out.decode('utf-8').rstrip() +def nix_prefetch_git(url, rev): + print(f'nix-prefetch-git {url} {rev}') + out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev]) + return json.loads(out) + +def get_file_revision(revision, file_path): + url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}' + with urlopen(url) as http_response: + return http_response.read() + +def get_channel_dependencies(channel): + deps = get_file_revision(channel['version'], 'DEPS') + gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'" + gn_commit = re.search(gn_pattern, deps).group(1).decode() + gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit) + return { + 'gn': { + 'version': datetime.fromisoformat(gn['date']).date().isoformat(), + 'url': gn['url'], + 'rev': gn['rev'], + 'sha256': gn['sha256'] + } + } + channels = {} last_channels = load_json(JSON_PATH) @@ -58,6 +84,8 @@ with urlopen(HISTORY_URL) as resp: # the next one. continue + channel['deps'] = get_channel_dependencies(channel) + channels[channel_name] = channel with open(JSON_PATH, 'w') as out: diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json index 5fded39c749..565f884c510 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json @@ -1,17 +1,41 @@ { "stable": { - "version": "86.0.4240.111", - "sha256": "05y7lwr89awkhvgmwkx3br9j4ap2aypg2wsc0nz8mi7kxc1dnyzj", - "sha256bin64": "10aqiiydw4i3jxnw8xxdgkgcqbfqc67n1fbrg40y54kg0v5dz8l6" + "version": "86.0.4240.183", + "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma", + "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9", + "deps": { + "gn": { + "version": "2020-08-07", + "url": "https://gn.googlesource.com/gn", + "rev": "e327ffdc503815916db2543ec000226a8df45163", + "sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr" + } + } }, "beta": { - "version": "87.0.4280.27", - "sha256": "0w0asxj7jlsw69cssfia8km4q9cx1c2mliks2rmhf4jk0hsghasm", - "sha256bin64": "1lsx4mhy8nachfb8c9f3mrx5nqw2bi046dqirb4lnv7y80jjjs1k" + "version": "87.0.4280.40", + "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3", + "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41", + "deps": { + "gn": { + "version": "2020-09-09", + "url": "https://gn.googlesource.com/gn", + "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", + "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + } + } }, "dev": { - "version": "88.0.4298.4", - "sha256": "0ka11gmpkyrmifajaxm66c16hrj3xakdvhjqg04slyp2sv0nlhrl", - "sha256bin64": "0768y31jqbl1znp7yp6mvl5j12xl1nwjkh2l8zdga81q0wz52hh6" + "version": "88.0.4300.0", + "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b", + "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv", + "deps": { + "gn": { + "version": "2020-09-09", + "url": "https://gn.googlesource.com/gn", + "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", + "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + } + } } } diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index d61d32e40e9..49abbc7f2cc 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.10.2"; + version = "2020.11.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "0ppl74gb46r2x65hl7z1hjdqlr8la0pvhy8af8isk11sbxmprqjj"; + sha256 = "1v262wr1z0z3frb9avg6bgsv973cn6gmn4w6wghpcjwsm6jld575"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index f26697f0561..ec5b6f44c6f 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.23.3"; + version = "0.23.10"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "0jdrjsv6miprw0bj964rgkbci4xdwfi536z3px93i2n9zrhhawpn"; + sha256 = "0nfgi67ja36mymhcyh4902680pkfnk4g8j8nbajksx9nfp53n91v"; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "105vmy8agl3ppgi28wg7djx0jrfam7nxfvvlps9ycgyrv2qpjh2n"; + vendorSha256 = "116aidry55917ays7rn5r5kj17nbgb9qi16bplml9kxfkjv072kz"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 4d883553bc3..ced9c43876f 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "18rkjdl8asr5c1kgdm2iqb5qwkfcrv2sk3nns3hhfqzs2v9mxmha"; + sha256 = "0jw8v6ff0iwkwxlhcr35cvhy4zg31dsm1s3q4fxgi901yj1wn6zy"; }; vendorSha256 = "0al8y65xvnwl34jkpqyf6zwr21xn30zswknlym9nnn1n47fyayxb"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index a56db433194..9a8bbe09a50 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.19.3"; + version = "1.19.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0fpkgrykkjmkrh327g6zf3r6s39bnv5w1wlqsvvzyp2zsswgw81v"; + sha256 = "05gisihrklkzsdsrrmvmqlfwfdx73jbwd5668n5wa5hp432qyvwi"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix new file mode 100644 index 00000000000..9e37bb6afe2 --- /dev/null +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl }: +let + version = "0.16.0"; + + system = 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}"; + }; +in +stdenv.mkDerivation rec { + pname = "octant"; + inherit version; + + src = fetchsrc { + x86_64-linux = "1i6i42hwxaczkfv8ldxn3wp6bslgwfkycvh88khfmapw2f5f9mhr"; + aarch64-linux = "1ka5vscyqxckxnhnymp06yi0r2ljw42q0g62yq7qv4safljd452p"; + x86_64-darwin = "1c50c2r2hq2fi8jcijq6vn336w96ar7b6qccv5w2240i0szsxxql"; + }; + + doBuild = false; + doCheck = false; + + installPhase = '' + mkdir -p "$out/bin" + mv octant $out/bin + ''; + + meta = with stdenv.lib; { + 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. + It aims to be part of the developer's toolkit for gaining insight and approaching complexity found in Kubernetes. + 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 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 1793af1085a..293cdb67371 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "0hp10qgalglsdhh6z6v4azh2hsr89mdrv1g5lssfl5jyink409yd"; + sha256 = "1f67b236njz1qdxjyf2568vkigjmpylqlra29jlgm6vhd5qky7ia"; }; - vendorSha256 = "15x8fqz2d2793ivgxpd9jyr34njzi1xpyxdlfyj1b01n2vr3xg4m"; + vendorSha256 = "1pr265g11lcviqw974lf05q52qrfpwnpn9a64q6088g0nfp4ly06"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index b73f24ed47d..b478071ead1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -114,7 +114,7 @@ let (orig: { passthru = orig.passthru // passthru; }) else lib.appendToName "with-plugins" (stdenv.mkDerivation { - inherit (terraform) name; + inherit (terraform) name meta; buildInputs = [ makeWrapper ]; buildCommand = pluginDir + '' diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e3f2adacfb2..e607a9ee75b 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.25.5"; + version = "0.26.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "19rsnhws4cvssxjmm22j746jck0wzrhwi24hnlwxkdaaw92yd36l"; + sha256 = "0bp43rsnkq2ysdl0v28i9agan738m0zk5yn8zza6js28sx0y7kns"; }; vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n"; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index d9168d7a298..a0f35f3779d 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.15"; + stableVersion = "2.2.16"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -26,8 +26,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "149yphmxc47bhc2f942lp4bx354qj3cyrpn10s1xabkn2hwrsm0d"; - serverSrcHash = "03cfg48xzgz362ra5x853k8r244dgbrmszcprs2lg70i3m722345"; + guiSrcHash = "1kz5gr5rwqp1hn9fw17v6sy2467506zks574nqcd2vgxzhr6cy6x"; + serverSrcHash = "1r6qj1l8jgyjm67agn83zp9c2n7pgfzwyh8a5q314zxi18nm6rqp"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 795f71a3cd0..03508c2ffb5 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -18,24 +18,15 @@ stdenv.mkDerivation rec { pname = "dino"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "1k5cgj5n8s40i71wqdh6m1q0njl45ichfdbbywx9rga5hljz1c54"; + sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw"; }; - patches = [ - (fetchpatch { - # Allow newer versions of libsignal-protocol-c - url = "https://github.com/dino/dino/commit/fbd70ceaac5ebbddfa21a580c61165bf5b861303.patch"; - sha256 = "0ydpwsmwrzfsry89fsffkfalhki4n1dw99ixjvpiingdrhjmwyl2"; - excludes = [ "plugins/signal-protocol/libsignal-protocol-c" ]; - }) - ]; - nativeBuildInputs = [ vala cmake diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index c1b9cdc122c..995c050d90c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.10"; + version = "0.6.11"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "0zglcx5ylqjc3hjkzi84mjhp9dchnnkv12qq75q5pqkx1w45rmim"; + sha256 = "0gkaxhx87yn8gmkqjdn78m1axfnfkw07sw9qsn7821966fd5l5ax"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 540aa3fcea4..8560a8b9447 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w"; + sha256 = "0p1cmj1kyp506y5xm04mhlznhf5wcylvgsn6b307ms91vjqs3fg2"; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index ea00669006b..404810e5f24 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -27,12 +27,12 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.9"; + version = "3.0"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "12h4m4ag8cdab7q6f5n357mfg0fdayab1gcikncjkkid3bjd4r4g"; + sha256 = "0ciddvyhyp38fnfsi1plj3z8d76f28lbzbxib2857vw7rzyqfcky"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 64bcf5f6838..bfc928cfbc6 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -64,7 +64,7 @@ mkDerivation rec { description = "Nextcloud themed desktop client"; homepage = "https://nextcloud.com"; license = licenses.gpl2; - maintainers = with maintainers; [ caugner ma27 ]; + maintainers = with maintainers; [ caugner ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index be583755868..da54ecf44db 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.07"; + version = "2.09"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "0yrfpj4ph9f321vqfn1zadv44pqa3ivjq9rx6gsz9hlv50gfaqn1"; + sha256 = "0yy5a7hr597vj6xbn7f5vzqdwnr637b3l1d62cmk0h7qbmh4anji"; }; - vendorSha256 = "1ysqagi4y25bi84h5fhkdimnsigy43klf6hrcqn7q75382fb4bzn"; + vendorSha256 = "1r7k0rzizs61r4gqqll7l2j7mdpi3w1ja6l4w6vxgzb45h2sjhi7"; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index b48edd69837..9dda62b3bad 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.7"; + version = "1.4.8"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "1dx5l48m4634y0zi6wjky412g80lfxqq1nphv7pi1kwvm1k5m5ri"; + sha256 = "0lnwsw9x4y4lr1yh749y24f71p5zsghwh5lp28zqfanw025mipf2"; }; buildInputs = [ diff --git a/pkgs/applications/networking/sync/unison/4.08-compatibility.patch b/pkgs/applications/networking/sync/unison/4.08-compatibility.patch deleted file mode 100644 index a6921b516f0..00000000000 --- a/pkgs/applications/networking/sync/unison/4.08-compatibility.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001 -From: Jaap Boender -Date: Thu, 21 Mar 2019 12:26:51 +0000 -Subject: [PATCH] Compatibility with OCaml 4.08 - ---- - src/files.ml | 2 +- - src/recon.ml | 4 ++-- - src/system/system_generic.ml | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/files.ml b/src/files.ml -index ba42ad57..5babf21e 100644 ---- a/src/files.ml -+++ b/src/files.ml -@@ -722,7 +722,7 @@ let get_files_in_directory dir = - with End_of_file -> - dirh.System.closedir () - end; -- Sort.list (<) !files -+ List.sort String.compare !files - - let ls dir pattern = - Util.convertUnixErrorsToTransient -diff --git a/src/recon.ml b/src/recon.ml -index 5ed358d7..0df2cfe4 100644 ---- a/src/recon.ml -+++ b/src/recon.ml -@@ -651,8 +651,8 @@ let rec reconcile - - (* Sorts the paths so that they will be displayed in order *) - let sortPaths pathUpdatesList = -- Sort.list -- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) -+ List.sort -+ Path.compare - pathUpdatesList - - let rec enterPath p1 p2 t = -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index ed8e18f3..0e28a781 100755 ---- a/src/system/system_generic.ml -+++ b/src/system/system_generic.ml -@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen - let chmod = Unix.chmod - let chown = Unix.chown - let utimes = Unix.utimes --let link = Unix.link -+let link s d = Unix.link s d - let openfile = Unix.openfile - let opendir f = - let h = Unix.opendir f in diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 7b7318544c5..36e80350926 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -6,12 +6,12 @@ let inherit (ocamlPackages) ocaml lablgtk; in stdenv.mkDerivation (rec { pname = "unison"; - version = "2.51.2"; + version = "2.51.3"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq"; + sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y="; }; buildInputs = [ ocaml makeWrapper ncurses ]; @@ -27,12 +27,6 @@ stdenv.mkDerivation (rec { "UISTYLE=${if enableX11 then "gtk2" else "text"}" ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; - patches = [ - # NOTE: Only needed until Unison 2.51.3 is released! - ./4.08-compatibility.patch - ./lablgtk.patch - ]; - preInstall = "mkdir -p $out/bin"; postInstall = if enableX11 then '' diff --git a/pkgs/applications/networking/sync/unison/lablgtk.patch b/pkgs/applications/networking/sync/unison/lablgtk.patch deleted file mode 100644 index 20c1db1b116..00000000000 --- a/pkgs/applications/networking/sync/unison/lablgtk.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001 -From: daviddavid -Date: Mon, 26 Feb 2018 13:36:36 +0100 -Subject: [PATCH] Fix for lablgtk >= 2.18.6 - ---- - src/uigtk2.ml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/uigtk2.ml b/src/uigtk2.ml -index 2ba6d79..04c4da4 100644 ---- a/src/uigtk2.ml -+++ b/src/uigtk2.ml -@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic") - (* This does not work with the current version of Lablgtk, due to a bug - let icon = - GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true -- (Gpointer.region_of_string Pixmaps.icon_data) -+ (Gpointer.region_of_bytes Pixmaps.icon_data) - *) - let icon = - let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in - Gpointer.blit -- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); -+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); - p - - let leftPtrWatch = --- -2.25.1 - diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 11c5c46ae68..6e70a9f8d03 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dump1090"; - version = "3.8.1"; + version = "4.0"; src = fetchFromGitHub { owner = "flightaware"; repo = pname; rev = "v${version}"; - sha256 = "0xg8rzrxqklx1m9ncxsd96dlkbjcsxfi2mrb859v50f07xysdyd8"; + sha256 = "1zacsqaqsiapljhzw31dwc4nld2rp98jm3ivkyznrhzk9n156p42"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 786e463686f..106d2103ec4 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { pname = "gqrx"; - version = "2.13.2"; + version = "2.13.5"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "1lcy9gqb1x9fwq550bywj7h66rdacq5893wsax1p7qvqa27d945b"; + sha256 = "168wjad5g0ka555hwsciwbj7fqx1c89q59hq1yxj8aiyp5kfcahx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix new file mode 100644 index 00000000000..1a032554e19 --- /dev/null +++ b/pkgs/applications/radio/quisk/default.nix @@ -0,0 +1,39 @@ +{ stdenv, python38Packages, fetchPypi +, fftw, alsaLib, pulseaudio, wxPython_4_0 }: + +python38Packages.buildPythonApplication rec { + pname = "quisk"; + version = "4.1.72"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qw00b9d0l3ysdrmd3nr5a2zlwg9ygdil7krnk2gjp5g8bb778k7"; + }; + + buildInputs = [ fftw alsaLib pulseaudio ]; + + propagatedBuildInputs = [ wxPython_4_0 ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A SDR transceiver for radios that use the Hermes protocol"; + longDescription = '' + QUISK is a Software Defined Radio (SDR) transceiver. You supply radio + hardware that converts signals at the antenna to complex (I/Q) data at an + intermediate frequency (IF). Data can come from a sound card, Ethernet or + USB. Quisk then filters and demodulates the data and sends the audio to + your speakers or headphones. For transmit, Quisk takes the microphone + signal, converts it to I/Q data and sends it to the hardware. + + Quisk can be used with SoftRock, Hermes Lite 2, HiQSDR, Odyssey and many + radios that use the Hermes protocol. Quisk can connect to digital + programs like Fldigi and WSJT-X. Quisk can be connected to other software + like N1MM+ and software that uses Hamlib. + ''; + license = licenses.gpl2Plus; + homepage = "https://james.ahlstrom.name/quisk/"; + maintainers = with maintainers; [ pulsation ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 96849c30029..6667f2be9c3 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, m4, tcsh, libX11, tcl, tk, cairo, ncurses, mesa_glu, python3 }: +{ stdenv, fetchurl +, m4, tcsh, libX11, tcl, tk +, cairo, ncurses, mesa_glu, python3 +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.5"; + version = "8.3.80"; src = fetchurl { - url = "http://opencircuitdesign.com/magic/archive/magic-8.3.5.tgz"; - sha256 = "0wv4zmxlqjfaakgp802icn0cd9f8ylkz2sppix83axq8p5cg90yq"; + url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; + sha256 = "0a5x4sh5xsr79pqbgv6221jc4fvaxkg2pvrdhy1cs4bmsc1sbm9j"; }; buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ]; nativeBuildInputs = [ python3 ]; + enableParallelBuilding = true; configureFlags = [ "--with-tcl=${tcl}" @@ -22,6 +26,8 @@ stdenv.mkDerivation { patchShebangs scripts/* ''; + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + patches = [ ./0001-strip-bin-prefix.patch ./0002-fix-format-security.patch @@ -29,8 +35,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "VLSI layout tool written in Tcl"; - homepage = "http://opencircuitdesign.com/magic/"; - license = licenses.mit; - maintainers = [ maintainers.anna328p ]; + homepage = "http://opencircuitdesign.com/magic/"; + license = licenses.mit; + maintainers = with maintainers; [ anna328p thoughtpolice ]; }; } diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index df1ce7b7235..abe80378024 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -6,40 +6,35 @@ let iverilog-test = fetchFromGitHub { - owner = "steveicarus"; - repo = "ivtest"; - rev = "6882cb8ec08926c4e356c6092f0c5f8c23328d5c"; - sha256 = "04sj5nqzwls1y760kgnd9c2whkcrr8kvj9lisd5rvk0w580kjb2x"; + owner = "steveicarus"; + repo = "ivtest"; + rev = "d4c80beb845cad92136c05074b3910b822a9315f"; + sha256 = "13cpnkki3xmhsh2v4bp2s35mhwknapcikdh85g4q6925ka940r45"; }; in stdenv.mkDerivation rec { - pname = "iverilog"; - version = "unstable-2020-08-24"; + pname = "iverilog"; + version = "unstable-2020-10-24"; src = fetchFromGitHub { - owner = "steveicarus"; - repo = pname; - rev = "d8556e4c86e1465b68bdc8d5ba2056ba95a42dfd"; - sha256 = "sha256-sT9j/0Q2FD5MOGpH/quMGvAuM7t7QavRHKD9lX7Elfs="; + owner = "steveicarus"; + repo = pname; + rev = "d6e01d0c557253414109a4dde46b2966a5a3fb08"; + sha256 = "1bl75mbycj9zpjbpay8z12384yk9ih5q9agsrjh9pva0vv3h4y4y"; }; - enableParallelBuilding = true; - - preConfigure = '' - chmod +x $PWD/autoconf.sh - $PWD/autoconf.sh - ''; - nativeBuildInputs = [ autoconf gperf flex bison ]; - buildInputs = [ readline ncurses bzip2 zlib ]; - # tests from .travis.yml - doCheck = true; # runs ``make check`` - # most tests pass, but some that rely on exact text of floating-point numbers fail on aarch64. + preConfigure = "bash $PWD/autoconf.sh"; + + enableParallelBuilding = true; + doCheck = true; + + # most tests pass, but some that rely on exact text of floating-point numbers + # fail on aarch64. doInstallCheck = !stdenv.isAarch64; installCheckInputs = [ perl ]; - installCheckPhase = '' # copy tests to allow writing results export TESTDIR=$(mktemp -d) @@ -58,9 +53,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icarus Verilog compiler"; - homepage = "http://iverilog.icarus.com/"; - license = with licenses; [ gpl2Plus lgpl21Plus] ; - maintainers = with maintainers; [ winden ]; - platforms = platforms.all; + homepage = "http://iverilog.icarus.com/"; + license = with licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ winden thoughtpolice ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 749220382c6..88e1b4fbc0e 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.21.0"; + version = "3.23.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1c7f2x6hdamjkr50761gcb5mg8hhlc75k1mf18vn1k9zsy1gxlgz"; + sha256 = "09mklc1p6ms1jayg2f89hqfmhca3h5744lli936l38ypn1d00sxx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 4fe805f752c..767e471f8a3 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "17hbgi1jh4p07r4p5mr7w7p01i6zzr28mn5i4jaki7p0jwfqbvvi"; + sha256 = "1lk3lhw598v966c553a3j0bp6vhf03xg7ggv827vzs1s8gnhxshz"; }; - vendorSha256 = "0ybbwbw4vdsxdq4w75s1i0dqad844sfgs69b3vlscwfm6g3i9h51"; + vendorSha256 = "0bkd2ndda6w8pdpvw8hhlb60g8r6gbyymgfb69dvanw5i5shsp5q"; nativeBuildInputs = [ installShellFiles ]; @@ -30,9 +30,8 @@ buildGoModule rec { done ''; - checkPhase = '' - make test - ''; + # fails with `unable to find git executable in PATH` + doCheck = false; meta = with lib; { description = "GitHub CLI tool"; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index b17e759c657..0eadb51fd1a 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,64 +1,44 @@ -{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }: +{ stdenv +, fetchCrate +, rustPlatform +, pkg-config +, clang +, libclang +, libsodium +, openssl +, xxHash +, zstd +, darwin +, gitImportSupport ? true +, libgit2 ? null +}: -let - # nettle-sys=1.0.1 requires the des-compat.h header, but it was removed in - # nettle 3.5. See https://nest.pijul.com/pijul_org/pijul/discussions/416 - # Remove with the next release - nettle_34 = nettle.overrideAttrs (_oldAttrs: rec { - version = "3.4.1"; - src = fetchurl { - url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr"; - }; - }); -in rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "0.12.0"; + version = "1.0.0-alpha"; - src = fetchurl { - url = "https://pijul.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; + src = fetchCrate { + inherit version pname; + sha256 = "0dnw2cxsxb20my81szyqjsmmnkakxawvsk6cnd1fi88k4lr0z2xh"; }; - cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v"; + cargoSha256 = "130vryqs0g4a0328ivqafdylwqs64g4mp8vgmz6nz4c9l3h9wgcx"; - # N.B. The cargo depfile checker expects us to have unpacked the src tarball - # into the standard dirname "source". - cargoDepsHook = '' - ln -s ${pname}-${version} source - ''; - - # TODO: Delete once pijul fixes upstream: - # https://nest.pijul.com/pijul_org/pijul/discussions/447 - postPatch = '' - pushd ../${pname}-${version}-vendor.tar.gz/thrussh/ - patch -p1 < ${./thrussh-build-fix.patch} - substituteInPlace .cargo-checksum.json --replace \ - 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \ - a199f2bba520d56e11607b77be4dde0cfae576c90badb9fbd39af4784e8120d1 - popd - ''; - - nativeBuildInputs = [ pkgconfig clang ]; - - postInstall = '' - mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d} - $out/bin/pijul generate-completions --bash > $out/share/bash-completion/completions/pijul - $out/bin/pijul generate-completions --zsh > $out/share/zsh/site-functions/_pijul - $out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish - ''; - - LIBCLANG_PATH = libclang + "/lib"; - - buildInputs = [ openssl libsodium nettle_34 libclang ] ++ stdenv.lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ CoreServices Security ]); + cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; + LIBCLANG_PATH = "${libclang}/lib"; doCheck = false; + nativeBuildInputs = [ pkg-config clang ]; + buildInputs = [ openssl libclang libsodium xxHash zstd ] + ++ (stdenv.lib.optionals gitImportSupport [ libgit2 ]) + ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreServices Security SystemConfiguration + ])); meta = with stdenv.lib; { description = "A distributed version control system"; homepage = "https://pijul.org"; license = with licenses; [ gpl2Plus ]; - maintainers = [ maintainers.gal_bolle ]; + maintainers = with maintainers; [ gal_bolle dywedir ]; }; } diff --git a/pkgs/applications/version-management/pijul/thrussh-build-fix.patch b/pkgs/applications/version-management/pijul/thrussh-build-fix.patch deleted file mode 100644 index 3989639620b..00000000000 --- a/pkgs/applications/version-management/pijul/thrussh-build-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/client/connection.rs 2020-02-04 12:48:43.845299096 +0100 -+++ b/src/client/connection.rs 2020-02-04 12:50:00.140329310 +0100 -@@ -546,8 +546,8 @@ - &[msg::NEWKEYS], - &mut session.0.write_buffer, - ); -- session.0.kex = Some(Kex::NewKeys(newkeys)); - newkeys.sent = true; -+ session.0.kex = Some(Kex::NewKeys(newkeys)); - } - Ok(()) - } diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index d3cb12924c2..6f47307f4a6 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,23 +1,33 @@ -{ stdenv, mkDerivation, fetchurl, autoPatchelfHook -, ffmpeg_3, openssl, qtbase, zlib, pkgconfig +{ stdenv +, mkDerivation +, fetchurl +, autoPatchelfHook +, pkg-config +, ffmpeg_3 +, openssl +, qtbase +, zlib + +, withJava ? true +, jre_headless }: let - version = "1.15.2"; + version = "1.15.3"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "1dbips0qllbwhak44c50nlwn8n3kx8i6773cal5zl3dv4v2nf6ql"; + hash = "sha256-Y23aetnwqLGaBIgJ/AP0oCrh8P5jpVrcMJgmc0Oe+i8="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "1wnhzlz5fw6qwh82hjcpimg60xb3a9a54zb6gcjhqr9zdly2zphy"; + hash = "sha256-Qruq9YKAaNF1pDtOhptP95UjFL2NA4EuROR4v6XZHEw="; }; in mkDerivation { pname = "makemkv"; @@ -27,10 +37,17 @@ in mkDerivation { sourceRoot = "makemkv-oss-${version}"; - nativeBuildInputs = [ autoPatchelfHook pkgconfig ]; + nativeBuildInputs = [ autoPatchelfHook pkg-config ]; buildInputs = [ ffmpeg_3 openssl qtbase zlib ]; + qtWrapperArgs = + let + binPath = stdenv.lib.makeBinPath [ jre_headless ]; + in stdenv.lib.optionals withJava [ + ''--prefix PATH : ${binPath}'' + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 0d0fce279bb..cdecde6b869 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -32,6 +32,7 @@ , alsaLib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio +, libcef }: let @@ -44,8 +45,9 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; - rev = version; - sha256 = "1d502f80whh686mvq0yn6zpa5nvmnlzxwp5sjz43vpbbvhpbrdqj"; + rev = "refs/tags/${version}"; + sha256 = "1bf56z2yb7gq1knqwcqj369c3wl9jr3wll5vlngmfy2gwqrczjmw"; + fetchSubmodules = true; }; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; @@ -55,6 +57,7 @@ in mkDerivation rec { fdk_aac ffmpeg jansson + libcef libjack2 libv4l libxkbcommon @@ -73,6 +76,18 @@ in mkDerivation rec { ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio; + # Copied from the obs-linuxbrowser + postUnpack = '' + mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ + for i in ${libcef}/share/cef/*; do + cp -r $i cef/Release/ + cp -r $i cef/Resources/ + done + cp -r ${libcef}/lib/libcef.so cef/Release/ + cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ + cp -r ${libcef}/include cef/ + ''; + # obs attempts to dlopen libobs-opengl, it fails unless we make sure # DL_OPENGL is an explicit path. Not sure if there's a better way # to handle this. @@ -80,6 +95,9 @@ in mkDerivation rec { "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" "-DOBS_VERSION_OVERRIDE=${version}" "-Wno-dev" # kill dev warnings that are useless for packaging + # Add support for browser source + "-DBUILD_BROWSER=ON" + "-DCEF_ROOT_DIR=../../cef" ]; postInstall = '' diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix deleted file mode 100644 index a33383937fb..00000000000 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ /dev/null @@ -1,49 +0,0 @@ -# We don't have a wrapper which can supply obs-studio plugins so you have to -# somewhat manually install this: - -# nix-env -f . -iA obs-linuxbrowser -# mkdir -p ~/.config/obs-studio/plugins -# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/ - -{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef }: - -stdenv.mkDerivation rec { - pname = "obs-linuxbrowser"; - version = "0.6.1-6-gf86dba6"; - - src = fetchFromGitHub { - owner = "bazukas"; - repo = "obs-linuxbrowser"; - rev = version; - sha256 = "08d7qz0721va88bcyia8p0ycw50f6x3yk97s3vzhsc9xpq691kpi"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio ]; - postUnpack = '' - mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ - for i in ${libcef}/share/cef/*; do - ln -s $i cef/Release/ - ln -s $i cef/Resources/ - done - ln -s ${libcef}/lib/libcef.so cef/Release/ - ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ - ln -s ${libcef}/include cef/ - ''; - cmakeFlags = [ - "-DCEF_ROOT_DIR=../../cef" - "-DOBS_INCLUDE_SEARCH_DIR=${obs-studio}/include/obs" - ]; - installPhase = '' - mkdir -p $out/share/obs/obs-plugins - cp -r build/obs-linuxbrowser $out/share/obs/obs-plugins/ - ''; - - meta = with stdenv.lib; { - description = "Browser source plugin for obs-studio based on Chromium Embedded Framework"; - homepage = "https://github.com/bazukas/obs-linuxbrowser"; - maintainers = with maintainers; [ puffnfresh ]; - license = licenses.gpl2; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index 3e6903c5642..dbeb08af224 100644 --- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-clipboard-indicator"; - version = "34"; + version = "37"; src = fetchFromGitHub { owner = "Tudmotu"; repo = "gnome-shell-extension-clipboard-indicator"; rev = "v${version}"; - sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s"; + sha256 = "0npxhaam2ra2b9zh2gk2q0n5snlhx6glz86m3jf8hz037w920k41"; }; uuid = "clipboard-indicator@tudmotu.com"; diff --git a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix index 7b5156997b2..1b8341a281f 100644 --- a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/material-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-material-shell"; - version = "9"; + version = "10"; src = fetchFromGitHub { owner = "material-shell"; repo = "material-shell"; rev = version; - sha256 = "154ids72hkkvibqpq3522wf6h9qw7zkjnf8dgz50vxbkiiy015xn"; + sha256 = "18d813n8s7ns8xp75zmlna7a8mi23rn9yqps51xvdd0sdgn72a1c"; }; # This package has a Makefile, but it's used for building a zip for diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix new file mode 100644 index 00000000000..ee3050b8ba6 --- /dev/null +++ b/pkgs/development/compilers/4th/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "4th"; + version = "3.62.5"; + + src = fetchurl { + url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz"; + sha256 = "sha256-+CL33Yz7CxdEpi1lPG7+kzV4rheJ7GCgiFCaOLyktPw="; + }; + + dontConfigure = true; + + makeFlags = [ + "-C sources" + "CC=${stdenv.cc}/bin/cc" + ]; + + preInstall = '' + install -d ${placeholder "out"}/bin \ + ${placeholder "out"}/lib \ + ${placeholder "out"}/share/doc/${pname} \ + ${placeholder "out"}/share/man + ''; + + installFlags = [ + "BINARIES=${placeholder "out"}/bin" + "LIBRARIES=${placeholder "out"}/lib" + "DOCDIR=${placeholder "out"}/share/doc" + "MANDIR=${placeholder "out"}/share/man" + ]; + + meta = with stdenv.lib; { + description = "A portable Forth compiler"; + homepage = "https://thebeez.home.xs4all.nl/4tH/index.html"; + license = licenses.lgpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index 09e76d63235..e1728e8c931 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -90,6 +90,6 @@ in stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 # aarch64 fails, as GHC fails with "ghc: could not execute: opt" - maintainers = with stdenv.lib.maintainers; [ flokli thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ jcumming thoughtpolice ]; }; } diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 8c8a56d8e28..3dea91970e2 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -3,9 +3,6 @@ , tools ? stdenv.cc }: -assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02"; -assert lib.versionAtLeast coq.coq-version "8.8.0"; - let ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir ]; ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix index 6ab729cd313..627ac36329a 100644 --- a/pkgs/development/compilers/dasm/default.nix +++ b/pkgs/development/compilers/dasm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dasm"; - version = "2.20.14"; + version = "2.20.14.1"; src = fetchFromGitHub { owner = "dasm-assembler"; repo = "dasm"; rev = version; - sha256 = "09hzw228j43a78624bmq9cam7y1fjs48d3hpjqh2gn8iwnyk0pnp"; + sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41"; }; configurePhase = false; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index b4d6a0933e9..54784ea63cc 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -105,12 +105,30 @@ rec { # v5.0.0 - sdk_5_0 = buildNetCoreSdk { - version = "5.0.100-rc.1.20452.10"; + aspnetcore_5_0 = buildAspNetCore { + version = "5.0.0"; sha512 = { - x86_64-linux = "d7e709dacc4bb188c2380060d24bfb5b791240dc33af8499fb4a31e1885a9377dad1d1ebc76847432ea67d5e4ac832a31679dc293e09fa6dade28f5fbbe4db9b"; - aarch64-linux = "2d04890c71e845d1eb08f5dfbbb9c93024d7a52fb1cc3fd50bd51bc6bd44e455c5c82abc8f04eef23bd012984ae5f86143c600ceb49c4c733935d95d5b68785f"; - x86_64-darwin = "06bb40273071f3dd1e84ebf58abc7798795d5f1ac298f24bf7109d1597fd52ff31bcbf2b81f86d91d37ae293678d07f8da0469d7cbd318d19a8d718b6629dcac"; + x86_64-linux = "402046ee144915ef7d75a788cf19552eea56cf897681721b74bfc403fd366f71eb7e56f6b83ea299b6b812c6b87378c15e7bfe249415427dcd147dfeacd084d0"; + aarch64-linux = "13e174de1cf10135531468c2a76852de2c37253f4d8b487ff25d249c2d7a1c590475545ca246515338baff2950422ec6c5ffe2180e8327f25cb5f9fede696ccc"; + x86_64-darwin = "b47a9958f5412b22edb2cb47702ad442c389901ede3ca2a7f75d901f8ed608494431849f498c2191327065ff1db52a1658b1a8c0feb53aaec4c814fb0baf6818"; + }; + }; + + net_5_0 = buildNetCore { + version = "5.0.0"; + sha512 = { + x86_64-linux = "d4d67df5ff5f6dde0d865a6e87559955bd57429df396cf7d05fe77f09e6220c67dc5e66439b1801ca4d301a62f81f666122bf4b623b31a46b861677dcafc62a4"; + aarch64-linux = "c7a5ae2bd4e0edbd3b681c2997ebf1633bfa1cd30a4333cb63fc9945b4e7c9278282516fb5bc22c710ce6fb59dc2e28230c07b0e99826165fa148406ab8afb0f"; + x86_64-darwin = "eba97211e158a0c1c15b03a79b42027319d83456dc377a2513c32defb560cd43fcfa1e84154a43243b77ca6b454c4dbc32be4153f0ba9c954c7b1e69ab5d7c53"; + }; + }; + + sdk_5_0 = buildNetCoreSdk { + version = "5.0.100"; + sha512 = { + x86_64-linux = "bec37bfb327c45cc01fd843ef93b22b556f753b04724bba501622df124e7e144c303a4d7e931b5dbadbd4f7b39e5adb8f601cb6293e317ad46d8fe7d52aa9a09"; + aarch64-linux = "5fceac0a9468097d66af25516da597eb4836b294ed1647ba272ade5c8faea2ed977a95d9ce720c44d71607fa3a0cf9de55afe0e66c0c89ab1cc6736945978204"; + x86_64-darwin = "69ccc7c686ac06f6c658d118f59cf1a0e7284b4570375dd88d3e3043098e311745922301f2650d159624d09c4d39a1f3cbdd5daee0e408eef915de839e3bce8f"; }; }; } diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 67f9184d8d9..8b1dda5ebc8 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.11"; + version = "1.14.12"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "05hgnyda5bpm29gnx1956syq54jmpk4k9cf976vypw8ckg9g6w8q"; + sha256 = "0wdr85l3rr6w50dmlbsib895gs9cc19z5piblp0v9slrsxx4nkxk"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 61531fb62b1..5dd55dee95a 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0rr3gp99bmdzg381x5fdwa15brllihn57175l0c82sqqljlscg86"; + sha256 = "1wc43h3pmi92r6ypmh58vq13vm44rl1di09assz3xdwlry86n1y1"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 5dfefa61220..1f5c6a3d4c4 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.08.22"; + version = "2020.11.10"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "c8ecb8341ca766e1e7565cc2b652b63eaba67508"; - sha256 = "1cf9ad7w5x452qdc6m9c3in6v9yzip3n1as978lbdh76f5mc00fv"; + rev = "cf331ca2a7fa92d3414fabf003ce6fc7b515f76b"; + sha256 = "0ka8ncfq3v8v70m3gwb3nd2rb39sy4vz0lx9hi277cbdsprmf55j"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index dbc5c1fa517..ba13cd7b4b2 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "0f7jwmgv83m85lrb2qwvr4cfwzbqww7pik884xd2593fsfqhpnkn"; + sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5"; }; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index dcb32690eb5..f34c4fb7fe1 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -14,15 +14,32 @@ , zlib }: +# NOTE: as of late 2020, yosys has switched to an automation robot that +# automatically tags their repository Makefile with a new build number every +# day when changes are committed. please MAKE SURE that the version number in +# the 'version' field exactly matches the YOSYS_VER field in the Yosys +# makefile! +# +# if a change in yosys isn't yet available under a build number like this (i.e. +# it was very recently merged, within an hour), wait a few hours for the +# automation robot to tag the new version, like so: +# +# https://github.com/YosysHQ/yosys/commit/71ca9a825309635511b64b3ec40e5e5e9b6ad49b +# +# note that while most nix packages for "unstable versions" use a date-based +# version scheme, synchronizing the nix package version here with the unstable +# yosys version number helps users report better bugs upstream, and is +# ultimately less confusing than using dates. + stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.10.20"; + version = "0.9+3675"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "06347b119b08257eff37cdd10ed802e794c1a3cf"; - sha256 = "07058r8095192gwkiy2yyvj9vxv09fcw9bqi2b39wn85lh5kx2k2"; + rev = "71ca9a825309635511b64b3ec40e5e5e9b6ad49b"; + sha256 = "03jlhfvm5rxx8yybf94nqd3ld2y6brp8r0k6gfi56chv3iqqavy3"; }; enableParallelBuilding = true; @@ -55,11 +72,17 @@ stdenv.mkDerivation rec { (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto) if ! grep -q "ABCREV = ${shortAbcRev}" Makefile; then - echo "yosys isn't compatible with the provided abc (${shortAbcRev}), failing." + echo "ERROR: yosys isn't compatible with the provided abc (${shortAbcRev}), failing." + exit 1 + fi + + if ! grep -q "YOSYS_VER := ${version}" Makefile; then + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing." exit 1 fi ''; + checkTarget = "test"; doCheck = true; checkInputs = [ verilog ]; @@ -68,10 +91,10 @@ stdenv.mkDerivation rec { # they just assume that 'yosys-abc' is available -- but it's not installed # when using ABCEXTERNAL # - # add a symlink to fake things so that both variants work the same way. - postInstall = '' - ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc - ''; + # add a symlink to fake things so that both variants work the same way. this + # is also needed at build time for the test suite. + postBuild = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc"; + postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc"; meta = with stdenv.lib; { description = "Open RTL synthesis framework and tools"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ff3a7be3b13..02cb1d10aaa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1110,9 +1110,9 @@ self: super: { }) (pkgs.fetchpatch { # Relax dependency constraints, - # upstream PR: https://github.com/james-preston/hail/pull/15 - url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/15.patch"; - sha256 = "03kdvr8hxi6isb8yxp5rgcmz855n19m1yacn3d56a4i58j2mldjw"; + # upstream PR: https://github.com/james-preston/hail/pull/16 + url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/16.patch"; + sha256 = "0dpagpn654zjrlklihsg911lmxjj8msylbm3c68xa5aad1s9gcf7"; }) ]; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4328d6a7589..2c7af6097cc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5717,7 +5717,6 @@ broken-packages: - Haggressive - hahp - haiji - - hail - hailgun-send - hairy - hakaru diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 11b9cd1ba50..a97f132b3b2 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,22 +2,30 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "144xqi19d2nj9qgmhpx6d1kfhx9vfkmk7rnq6nzybpx4mbbl3ki2"; + sha256 = "sha256-QpUhUE65/IuT/VenziPX6z+CbJswbPPIv/ZnTthZpEU="; }; - cargoSha256 = "07lzxh0wh6azrlzfaacg29zmkn8jdnkdqbwgd5ajy79y8nii3c7z"; + cargoSha256 = "sha256-iUzVd4XtD+41yTV/BmqWLenzAUNPfS7vIHm1KfuPe9A="; + + RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - postInstall = '' - wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} - wrapProgram $out/bin/evcxr_jupyter --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} + postInstall = let + wrap = exe: '' + wrapProgram $out/bin/${exe} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} \ + --set-default RUST_SRC_PATH "$RUST_SRC_PATH" + ''; + in '' + ${wrap "evcxr"} + ${wrap "evcxr_jupyter"} rm $out/bin/testing_runtime ''; diff --git a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch index a1f9d68eb16..c259aed72b9 100644 --- a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch @@ -1,18 +1,18 @@ -From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Mon, 28 Aug 2017 09:24:06 +0200 -Subject: [PATCH] Don't use ldconfig +From 084c6dd6352077e64f10cf7aa168f95d800f3819 Mon Sep 17 00:00:00 2001 +From: Jonathan Ringer +Date: Mon, 9 Nov 2020 10:24:35 -0800 +Subject: [PATCH] CPython: Don't use ldconfig --- - Lib/ctypes/util.py | 70 ++---------------------------------------------------- - 1 file changed, 2 insertions(+), 68 deletions(-) + Lib/ctypes/util.py | 77 ++-------------------------------------------- + 1 file changed, 2 insertions(+), 75 deletions(-) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 5e8b31a854..7b45ce6c15 100644 +index 0c2510e..7fb98af 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -94,46 +94,7 @@ elif os.name == "posix": - import re, tempfile +@@ -100,53 +100,7 @@ elif os.name == "posix": + return thefile.read(4) == elf_header def _findLib_gcc(name): - # Run GCC's linker with the -t (aka --trace) option and examine the @@ -51,15 +51,22 @@ index 5e8b31a854..7b45ce6c15 100644 - # Raised if the file was already removed, which is the normal - # behaviour of GCC if linking fails - pass -- res = re.search(expr, trace) +- res = re.findall(expr, trace) - if not res: - return None -- return os.fsdecode(res.group(0)) +- +- for file in res: +- # Check if the given file is an elf file: gcc can report +- # some files that are linker scripts and not actual +- # shared objects. See bpo-41976 for more details +- if not _is_elf(file): +- continue +- return os.fsdecode(file) + return None if sys.platform == "sunos5": -@@ -255,34 +216,7 @@ elif os.name == "posix": +@@ -268,34 +222,7 @@ elif os.name == "posix": else: def _findSoname_ldconfig(name): @@ -96,5 +103,5 @@ index 5e8b31a854..7b45ce6c15 100644 def _findLib_ld(name): # See issue #9998 for why this is needed -- -2.15.0 +2.28.0 diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 143662abcc9..77512c02d55 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -14,6 +14,7 @@ , self , configd , autoreconfHook +, autoconf-archive , python-setup-hook , nukeReferences # For the Python package set @@ -67,6 +68,8 @@ let nativeBuildInputs = optionals (!stdenv.isDarwin) [ autoreconfHook + ] ++ optionals (!stdenv.isDarwin && passthru.pythonAtLeast "3.10") [ + autoconf-archive # needed for AX_CHECK_COMPILE_FLAG ] ++ [ nukeReferences ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a8db9bc9257..ae666d44f57 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -122,9 +122,9 @@ in { major = "3"; minor = "10"; patch = "0"; - suffix = "a1"; + suffix = "a2"; }; - sha256 = "0q59a99w1yad808mx4w6l0j7bk7dbd2kakngbk0w1h9z4dhr8wyv"; + sha256 = "0zl5h61s8n2w2v1n40af0mwaw7lqh5fl1ys7kyjgcph60vb9wzjr"; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index a306a02be06..450182138a4 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "13hwynp1dnk3flw8ly00wjj12x2wsvj2da39bzay8c08m3dj3q4m"; + sha256 = "0pb3ypdaiiw0895x1zzzjvkrfp39bsl3s4f6zb5bzv4wbjv7kvwn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix index 7b24f08822b..127fe1c9750 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p"; + sha256 = "1mcw6gmacrzx4cyg4223dpwcmj3qf8l30mxsg43292lajzwsm2hz"; }; nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection ]; diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 17f7bbc667c..a95f131c00c 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchFromGitHub, icmake +{ stdenv, fetchFromGitLab, icmake , libmilter, libX11, openssl, readline , utillinux, yodl }: stdenv.mkDerivation rec { pname = "bobcat"; - version = "4.08.03"; + version = "5.05.00"; - src = fetchFromGitHub { - sha256 = "163mdl8hxids7123bjxmqhcaqyc1dv7hv8k33s713ac6lzawarq2"; + src = fetchFromGitLab { + sha256 = "sha256:14lvxzkxmkk54s97ah996m6s1wbw1g3iwawbhsf8qw7sf75vlp1h"; + domain = "gitlab.com"; rev = version; repo = "bobcat"; owner = "fbb-git"; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brokken's Own Base Classes And Templates"; - homepage = "https://fbb-git.github.io/bobcat/"; + homepage = "https://fbb-git.gitlab.io/bobcat/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 6d6282debf9..4e41f39b49b 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.13.2"; + version = "2.13.3"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="100r0kmra8jmra2hv92lzvwcmphpaiccwvq3lpdsa5b7hailhach"; + sha256="0m7pwsam1nb93akgnf5fxi737pgbrbcj0y28bavhzcss7yrm4gys"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 7cd826b1fe3..5cef17f1119 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, alsaLib, cmake, docbook_xsl, docbook_xml_dtd_45, doxygen -, fluidsynth, pkgconfig, qtbase, qtsvg +{ stdenv, fetchurl +, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook +, alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio }: stdenv.mkDerivation rec { @@ -11,18 +12,25 @@ stdenv.mkDerivation rec { sha256 = "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m"; }; + patches = [ + ./drumstick-fluidsynth.patch + ./drumstick-plugins.patch + ]; + + postPatch = '' + substituteInPlace library/rt/backendmanager.cpp --subst-var out + ''; + outputs = [ "out" "dev" "man" ]; enableParallelBuilding = true; - #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket - postInstall = '' - rm $out/bin/drumstick-vpiano - ''; + nativeBuildInputs = [ + cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook + ]; - nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ]; buildInputs = [ - alsaLib doxygen fluidsynth qtbase qtsvg + alsaLib fluidsynth libpulseaudio qtbase qtsvg ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch b/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch new file mode 100644 index 00000000000..b8cdf63fb64 --- /dev/null +++ b/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch @@ -0,0 +1,9 @@ +It works with fluidsynth 2. + +Backported from r400: https://sourceforge.net/p/drumstick/code/400/ + +--- a/library/rt-backends/CMakeLists.txt ++++ b/library/rt-backends/CMakeLists.txt +@@ -54,1 +54,1 @@ if (PKG_CONFIG_FOUND) +- pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1 fluidsynth<=1.1.11) ++ pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1) diff --git a/pkgs/development/libraries/drumstick/drumstick-plugins.patch b/pkgs/development/libraries/drumstick/drumstick-plugins.patch new file mode 100644 index 00000000000..cbb0a0e3489 --- /dev/null +++ b/pkgs/development/libraries/drumstick/drumstick-plugins.patch @@ -0,0 +1,12 @@ +Make it look for its plugin in its own installation directory. + +--- a/library/rt/backendmanager.cpp ++++ b/library/rt/backendmanager.cpp +@@ -159,6 +159,7 @@ namespace rt { + foreach(const QString& path, QCoreApplication::libraryPaths()) { + d->appendDir( path + QDir::separator() + QSTR_DRUMSTICK, result ); + } ++ d->appendDir( "@out@/lib/drumstick", result ); + return result; + } + diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 2898eb937fc..8f6123fb85a 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.10"; + version = "20.11"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "0f5b45zdsy3yv2jsdy5zsd6xcfk1z5w5vlyvnim3d4bn875sp370"; + sha256 = "0mc8dkdmvkaq418vwn6y9d7fbcdp47djc38rly7b4zarl8hwmc4q"; }; - nativeBuildInputs = [cmake]; + nativeBuildInputs = [cmake]; buildInputs = [ SDL2 ]; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index eb9ecea7a18..6cb3ec5a2b3 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,60 +1,76 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }: -stdenv.mkDerivation rec { - pname = "fmt"; - version = "6.2.1"; +let + generic = { version, sha256, patches ? [ ] }: + stdenv.mkDerivation { + pname = "fmt"; + inherit version; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" ]; - src = fetchFromGitHub { - owner = "fmtlib"; - repo = "fmt"; - rev = version; + src = fetchFromGitHub { + owner = "fmtlib"; + repo = "fmt"; + rev = version; + inherit sha256; + }; + + inherit patches; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Small, safe and fast formatting library"; + longDescription = '' + fmt (formerly cppformat) is an open-source formatting library. It can be + used as a fast and safe alternative to printf and IOStreams. + ''; + homepage = "http://fmtlib.net/"; + downloadPage = "https://github.com/fmtlib/fmt/"; + maintainers = [ maintainers.jdehaas ]; + license = licenses.bsd2; + platforms = platforms.all; + }; + }; +in +{ + fmt_6 = generic { + version = "6.2.1"; sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic"; + + patches = [ + # Fix BC break breaking Kodi + # https://github.com/xbmc/xbmc/issues/17629 + # https://github.com/fmtlib/fmt/issues/1620 + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch"; + sha256 = "0v8hm5958ih1bmnjr16fsbcmdnq4ykyf6b0hg6dxd5hxd126vnxx"; + }) + + # Fix paths in pkg-config file + # https://github.com/fmtlib/fmt/pull/1657 + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch"; + sha256 = "1hqp96zl9l3qyvsm7pxl6ah8c26z035q2mz2pqhqa0wvzd1klcc6"; + }) + + # Fix cmake config paths. + (fetchpatch { + url = "https://github.com/fmtlib/fmt/pull/1702.patch"; + sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3"; + }) + ]; }; - patches = [ - # Fix BC break breaking Kodi - # https://github.com/xbmc/xbmc/issues/17629 - # https://github.com/fmtlib/fmt/issues/1620 - (fetchpatch { - url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch"; - sha256 = "0v8hm5958ih1bmnjr16fsbcmdnq4ykyf6b0hg6dxd5hxd126vnxx"; - }) - - # Fix paths in pkg-config file - # https://github.com/fmtlib/fmt/pull/1657 - (fetchpatch { - url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch"; - sha256 = "1hqp96zl9l3qyvsm7pxl6ah8c26z035q2mz2pqhqa0wvzd1klcc6"; - }) - - # Fix cmake config paths. - (fetchpatch { - url = "https://github.com/fmtlib/fmt/pull/1702.patch"; - sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests - ]; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Small, safe and fast formatting library"; - longDescription = '' - fmt (formerly cppformat) is an open-source formatting library. It can be - used as a fast and safe alternative to printf and IOStreams. - ''; - homepage = "http://fmtlib.net/"; - downloadPage = "https://github.com/fmtlib/fmt/"; - maintainers = [ maintainers.jdehaas ]; - license = licenses.bsd2; - platforms = platforms.all; + fmt_7 = generic { + version = "7.0.3"; + sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a"; }; } diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index b2d8856bfea..104823b2795 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { license = with licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; - maintainers = with maintainers; [ andir flokli ]; + maintainers = with maintainers; [ andir ]; broken = true; # Broken on Hydra since 2020-05-19 }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 88c9f9a385a..a29fad8a4c9 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -116,16 +116,18 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig + orc # for orcc python3 gettext gobject-introspection ] ++ optionals stdenv.isLinux [ - wayland-protocols + wayland # for wayland-scanner ]; buildInputs = [ gst-plugins-base orc + gobject-introspection faad2 libass libkate @@ -179,6 +181,7 @@ in stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ bluez wayland + wayland-protocols ] ++ optionals (!stdenv.isDarwin) [ # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin @@ -282,6 +285,9 @@ in stdenv.mkDerivation rec { "-Dapplemedia=disabled" ]; + # Argument list too long + strictDeps = true; + postPatch = '' patchShebangs \ scripts/extract-release-date-from-doap-file.py diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 498265a5a2f..4130d8cf8b9 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "20.4.0"; + version = "20.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0nah3h3s6hqbgz1wqp5j1grzq0q939wbh4b9d27dmb4wy6ma41sl"; + sha256 = "1axklxzv85flhv41s8nmp7m4kswnav6qpg8w9przac9ji07rknwl"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 4d08c2ba1fb..93aaebc110e 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "74.1.14-g50c3c5c"; + version = "75.1.14-gc81164e"; src = fetchurl { - name = "cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131_linux64_minimal.tar.bz2"; - url = "http://opensource.spotify.com/cefbuilds/cef_binary_74.1.19%2Bgb62bacf%2Bchromium-74.0.3729.157_linux64_minimal.tar.bz2"; - sha256 = "0v3540kq4y68gq7mb4d8a9issm363lm5ngrd6d96pcc7vckkw4wn"; + name = "cef_binary_75.1.14+gc81164e+chromium-75.0.3770.100_linux64_minimal.tar.bz2"; + url = "http://opensource.spotify.com/cefbuilds/cef_binary_75.1.14%2Bgc81164e%2Bchromium-75.0.3770.100_linux64_minimal.tar.bz2"; + sha256 = "0985b2bx505j0q693hifjgidzb597wqf5idql5aqxs8lfxhc2pgg"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 0b36efa189b..ac8552fa9ef 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -15,24 +15,16 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "2.72.0"; + version = "2.72.2"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "1yhf9xyxdawbihsx89dpjlac800wrmpwx63rphad2nj225y9q40f"; + sha256 = "1ijqpx1pagc6qg63ynqrinvckwc8aaw1i0lx48gg5szwk8afib4i"; }; - patches = [ - # to work with latest glslang, remove on release >2.72.0 - (fetchpatch { - url = "https://code.videolan.org/videolan/libplacebo/-/commit/523056828ab86c2f17ea65f432424d48b6fdd389.patch"; - sha256 = "051vhd0l3yad1fzn5zayi08kqs9an9j8p7m63kgqyfv1ksnydpcs"; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index b4141d4ff07..4645b5ea0d8 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,13 +1,22 @@ { stdenv, fetchurl, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "raptor2-2.0.15"; + pname = "raptor2"; + version = "2.0.15"; src = fetchurl { - url = "http://download.librdf.org/source/${name}.tar.gz"; + url = "http://download.librdf.org/source/${pname}-${version}.tar.gz"; sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; }; + patches = [ + (fetchurl { + name = "CVE-2017-18926.patch"; + url = "https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch"; + sha256 = "1qlpb5rm3j2yi0x6zgdi5apymg5zlvwq3g1zl417gkjrlvxmndgp"; + }) + ]; + buildInputs = [ libxml2 libxslt ]; postInstall = "rm -rvf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 8480cc868c1..3bd6bb02a05 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.2"; pname = "nanoflann"; - + src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${version}"; - sha256 = "07vi3yn5y9zk9acdbxy954ghdml15wnyqfizzqwsw8zmc9bf30ih"; + sha256 = "0lq1zqwjvk8wv15hd7aw57jsqbvv45cwb8ngdh1d2iyw5rvnbhsn"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index b780b9f4e39..6dc4bd704dd 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "1.6.4"; + version = "1.7"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "0y4lpx24k08wydv4aprfn2icg6ixk0iprk8pmbvyaa6gyab70vjy"; + sha256 = "15kanz3zflmxr355dhny4rdycq0ni9iz42vvlblzc5lmj39n84fj"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index 42ca50ae8f9..ac2b8ba6d1e 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opencascade-occt"; - version = "7.4.0p1"; + version = "7.5.0"; commit = "V${builtins.replaceStrings ["."] ["_"] version}"; src = fetchurl { name = "occt-${commit}.tar.gz"; url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0b9hs3akx1f3hhg4zdip6qdv04ssqqcf9kk12amkidgvsl73z2hs"; + sha256 = "0bpzpaqki3k6i7xmhan0f1c1fr05smpcmgrp4vh572j61lwpq1r3"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index f9b2e07fb42..e160bfb7d36 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.1.4"; + version = "2.1.6"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal"; + sha256 = "0sjb2a3yqnabwgmmn8gapc1dq9m8vp9z8w85zhsj654i5h3gp6zv"; }; nativeBuildInputs = diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 2aa53b213a9..dc809d58932 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -48,12 +48,12 @@ let in stdenv.mkDerivation rec { - version = "10.6.2"; + version = "10.6.3"; pname = "geant4"; src = fetchurl{ - url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p02.tar.gz"; - sha256 = "0vznm3pjlbihjy1wsxc4gj229k0dzc283wvil2xghyl08vwdpnpc"; + url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p03.tar.gz"; + sha256 = "1wzv5xky1pfm7wdfdkvqcaaqlcnsrz35dc7zcrxh8l3j5rki6pqb"; }; boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 9405e18edab..c098680d27a 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "10.0.1"; + version = "10.0.3"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "release-qpdf-${version}"; - sha256 = "0g3rqf4wd1n9cms7ra1jnszsgw5bygv37jq2l20d8z5fajckhyyi"; + sha256 = "14c4ig51hhrvrwhhriklylp40349xqgd3filajsvqk9vaww6na7f"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 83d2db6a26b..2c60c4c10d0 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qrencode"; - version = "4.0.2"; + version = "4.1.1"; outputs = [ "bin" "out" "man" "dev" ]; src = fetchurl { url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; - sha256 = "079v3a15ydpr67zdi3xbgvic8n2kxvi0m32dyz8jaik10yffgayv"; + sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4="; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index efc8857e235..6e2542e1db2 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rnnoise-plugin"; - version = "0.9"; + version = "0.91"; src = fetchFromGitHub { owner = "werman"; repo = "noise-suppression-for-voice"; rev = "v${version}"; - sha256 = "18bq5b50xw3d4r1ildinafpg3isb9y216430h4mm9wr3ir7h76a7"; + sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 71c7915c2ed..b29095f7e19 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -2,23 +2,26 @@ stdenv.mkDerivation rec { pname = "soundtouch"; - version = "2.1.2"; + version = "2.2"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "174wgm3s0inmbnkrlnspxjwm2014qhjhkbdqa5r8rbfi0nzqxzsz"; + sha256 = "12i6yg8vvqwyk412lxl2krbfby6hnxld8qxy0k4m5xp4g94jiq4p"; }; nativeBuildInputs = [ autoconf automake libtool ]; preConfigure = "./bootstrap"; + enableParallelBuilding = true; + meta = with lib; { description = "A program and library for changing the tempo, pitch and playback rate of audio"; - homepage = "http://www.surina.net/soundtouch/"; - license = licenses.lgpl21; + homepage = "https://www.surina.net/soundtouch/"; + license = licenses.lgpl21Plus; platforms = platforms.all; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 89318dd4e75..5fe6b57f044 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.0.7"; + version = "2.1.2"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "00g8ibsbnl4wjfx3qg4qy6s7z6dsj898j0yqfhw1gjr1pb5dsapb"; + sha256 = "12f3jvb9b6ji5w2n2k3sjn156ikaf06mriwbqlc54ii1zznaw43r"; }; # (bundled) blosc headers have a warning on some archs that it will be using diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 814a1f22592..8d52e8703a9 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -59,7 +59,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.30.1"; + version = "2.30.2"; outputs = [ "out" "dev" ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1cfnsl5kvwrbclmp7v9q9ynrz702i9ncb6xmx6972dxpmpyrvi8p"; + sha256 = "0ak8slddg7gpk6m096xzkiqw9bfsrrizvqr815bw44665fyf0ry4"; }; patches = optionals stdenv.isLinux [ diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index d02104decba..dd8a0f57164 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,27 +1,27 @@ -{ lib, fetchurl, fetchpatch, buildDunePackage +{ lib, ocaml, fetchurl, buildDunePackage , bigarray-compat, eqaf, stdlib-shims -, alcotest +, alcotest, astring, bos, findlib, fpath }: buildDunePackage rec { pname = "digestif"; - version = "0.8.0"; + version = "0.9.0"; + + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz"; - sha256 = "09g4zngqiw97cljv8ds4m063wcxz3y7c7vzaprsbpjzi0ja5jdcy"; + sha256 = "0vk9prgjp46xs8qizq7szkj6mqjj2ymncs2016bc8zswcdc1a3q4"; }; - # Fix tests with alcotest ≥ 1 - patches = [ (fetchpatch { - url = "https://github.com/mirage/digestif/commit/b65d996c692d75da0a81323253429e07d14b72b6.patch"; - sha256 = "0sf7qglcp19dhs65pwrrc7d9v57icf18jsrhpmvwskx8b4dchfiv"; - })]; - - buildInputs = lib.optional doCheck alcotest; propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; - doCheck = true; + checkInputs = [ alcotest astring bos fpath ]; + doCheck = lib.versionAtLeast ocaml.version "4.05"; + + postCheck = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ test/test_runes.ml + ''; meta = { description = "Simple hash algorithms in OCaml"; diff --git a/pkgs/development/ocaml-modules/mstruct/default.nix b/pkgs/development/ocaml-modules/mstruct/default.nix deleted file mode 100644 index ae26f879ef8..00000000000 --- a/pkgs/development/ocaml-modules/mstruct/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, cstruct }: - -buildDunePackage rec { - pname = "mstruct"; - version = "1.4.0"; - - minimumOCamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-${pname}"; - rev = "v${version}"; - sha256 = "1p4ygwzs3n1fj4apfib0z0sabpph21bkq1dgjk4bsa59pq4prncm"; - }; - - propagatedBuildInputs = [ cstruct ]; - - meta = { - description = "A thin mutable layer on top of cstruct"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index 23f4257a357..a2ba5b10268 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -2,12 +2,11 @@ buildPythonPackage rec { pname = "bitstring"; - version = "3.1.5"; + version = "3.1.7"; src = fetchPypi { inherit pname version; - sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1"; - extension = "zip"; + sha256 = "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index a7a04c1f605..a29894fcf42 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "4.2.1"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "066i7904vc7814gqnlprksf0ikz2dmviw93r2mr7sf53qci5irbm"; + sha256 = "0272c537469ab1e63b9915535874d15b671963c9325db0c4891a2aeff97ce3d1"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fastecdsa/default.nix b/pkgs/development/python-modules/fastecdsa/default.nix new file mode 100644 index 00000000000..04d9da87c5c --- /dev/null +++ b/pkgs/development/python-modules/fastecdsa/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, gmp +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "fastecdsa"; + version = "2.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "d0772f7fe243e8a82d33e95c542ea6cc0ef7f3cfcced7440d6defa71a35addfa"; + }; + + buildInputs = [ gmp ]; + + checkInputs = [ pytestCheckHook ]; + + # skip tests which require being online to download test vectors + pytestFlags = [ + "--ignore=fastecdsa/tests/test_wycheproof_vectors.py" + "--ignore=fastecdsa/tests/test_rfc6979_ecdsa.py" + ]; + + # skip tests for now, they fail with + # ImportError: cannot import name '_ecdsa' from 'fastecdsa' + # but the installed package works just fine + doCheck = false; + + pythonImportsCheck = [ "fastecdsa" ]; + + meta = with lib; { + description = "Fast elliptic curve digital signatures"; + homepage = "https://github.com/AntonKueltz/fastecdsa"; + license = licenses.unlicense; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/gtts-token/default.nix b/pkgs/development/python-modules/gtts-token/default.nix index d3443ef0c97..f3325aab8e6 100644 --- a/pkgs/development/python-modules/gtts-token/default.nix +++ b/pkgs/development/python-modules/gtts-token/default.nix @@ -1,31 +1,35 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , requests +, pytestCheckHook }: buildPythonPackage rec { pname = "gtts-token"; - version = "1.1.3"; + version = "1.1.4"; - src = fetchPypi { - pname = "gTTS-token"; - inherit version; - sha256 = "9d6819a85b813f235397ef931ad4b680f03d843c9b2a9e74dd95175a4bc012c5"; + src = fetchFromGitHub { + owner = "boudewijn26"; + repo = "gTTS-token"; + rev = "v${version}"; + sha256 = "0vr52zc0jqyfvsccl67j1baims3cdx2is1y2lpx2kav9gadkn8hp"; }; propagatedBuildInputs = [ requests ]; - # Tests only in github repo, require working internet connection - doCheck = false; + checkInputs = [ pytestCheckHook ]; + + # requires internet access + disabledTests = [ "test_real" ]; meta = with lib; { description = "Calculates a token to run the Google Translate text to speech"; homepage = "https://github.com/boudewijn26/gTTS-token"; license = licenses.mit; - maintainers = [ maintainers.makefu ]; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index e9bf5bcd48c..1f8ecad0013 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -1,6 +1,6 @@ { base58 , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy27 , lib , morphys @@ -14,11 +14,13 @@ buildPythonPackage rec { pname = "py-multihash"; - version = "0.2.3"; + version = "1.0.0"; - src = fetchPypi { - inherit pname version ; - sha256 = "f0ade4de820afdc4b4aaa40464ec86c9da5cae3a4578cda2daab4b0eb7e5b18d"; + src = fetchFromGitHub { + owner = "multiformats"; + repo = pname; + rev = "v${version}"; + sha256 = "07qglrbgcb8sr9msqw2v7dqj9s4rs6nyvhdnx02i5w6xx5ibzi3z"; }; nativeBuildInputs = [ @@ -38,6 +40,8 @@ buildPythonPackage rec { pytestcov ]; + pythonImportsCheck = [ "multihash" ]; + disabled = isPy27; meta = with lib; { diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index b04fa39149c..84465cd475d 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "0.11.4"; + version = "0.11.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9714fcb94c78e6ab1864ddac7750049e105fd4f7c52103aecf40d408e94a722f"; + sha256 = "04ea21f1bd029046fb87d098be4d7dc74663a58dd1f9fc6edcf8f3e4123ec4a8"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 1b5c58b9ca5..c441d93f6f7 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -3,21 +3,29 @@ , fetchFromGitHub , glibcLocales , urwid +, fetchpatch }: buildPythonPackage rec { pname = "urwidtrees"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "pazz"; repo = "urwidtrees"; rev = version; - sha256 = "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2"; + sha256 = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g="; }; propagatedBuildInputs = [ urwid ]; + patches = [ + (fetchpatch { + url = "https://github.com/pazz/urwidtrees/commit/ed39dbc4fc67b0e0249bf108116a88cd18543aa9.patch"; + sha256 = "sha256-fA+30d2uVaoNCg4rtoWLNPvrZtq41Co4vcmM80hkURs="; + }) + ]; + checkInputs = [ glibcLocales ]; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 47832c5ae2a..5e80d5b096d 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python3Packages, which, procps, gdb, capnproto }: stdenv.mkDerivation rec { - version = "5.3.0"; + version = "5.4.0"; pname = "rr"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "1x6l1xsdksnhz9v50p4r7hhmr077cq20kaywqy1jzdklvkjqzf64"; + sha256 = "1sfldgkkmsdyaqa28i5agcykc63gwm3zjihd64g86i852w8al2w6"; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 61a6b4bed4c..4c6d47ecb18 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.4"; + version = "1.4.5"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "1pyf559bpnsmvca4kw36nb9lwkwa9q0ghrpa117s96dhvrp3i2bv"; + sha256 = "0a3ayvq62nbfrcs2xgrfqg27h0wf9x28pxabmwd8y0ncafsnifjy"; }; bloop-bash = fetchurl { @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0hf0priy93zqba78a9nvbgl3mzwlc4jz43gz7cv2cdkj6x0lp0y1" - else if stdenv.isDarwin && stdenv.isx86_64 then "0g2rnmlfnqymji4f4rn0kaz7hipgv3bakdpn08600gg1f3s8gabw" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0wh02djny3a9882423lh4kf67z981d1ky85gfphsw52fbdhbzmn9" + else if stdenv.isDarwin && stdenv.isx86_64 then "0db30zbqpa9q285hspaba124dfnnr1gmlrxwwvn9szxz1d55n417" else throw "unsupported platform"; }; diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix index 776a3b06143..0392c4c95f9 100644 --- a/pkgs/development/tools/dt-schema/default.nix +++ b/pkgs/development/tools/dt-schema/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "dtschema"; - version = "2020.8.1"; + version = "2020.11"; src = fetchPypi { inherit pname version; - sha256 = "5c98202abb4977aac6a2995a7f4ed2f7e51739db6fd72861d29681f865c27c1b"; + sha256 = "ad052d293eadb5b64631bfffac62c496427ad4105e76eef19a5422ba762ee734"; }; nativeBuildInputs = [ setuptools_scm git ]; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 55125fbeff4..19e666ced11 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.4"; + version = "0.9.5"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1k07gg13z3kambvvrxsc27781cd5npb2a50ahdbj7x6j6h67k0pg"; + outputHash = "1hcfnxxahh3yfkpz6ybfr9xsf5mx008rhn7q6p8pmfxrgkdh4c1l"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 274577c4a4c..e5988b1d5a9 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -4,7 +4,7 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system) stdenv.mkDerivation rec { pname = "lsof"; - version = "4.93.2"; + version = "4.94.0"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv"; + sha256 = "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp"; }; patches = [ ./no-build-info.patch ]; diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix index 6450ee43385..7886c7c450a 100644 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nix-build-uncached"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-build-uncached"; rev = "v${version}"; - sha256 = "0hjx2gdwzg02fzxhsf7akp03vqj2s7wmcv9xfqn765zbqnljz14v"; + sha256 = "1v9xyv0hhvfw61k4pbgzrlgy7igl619cangi40fkh7gdvs01dxz4"; }; vendorSha256 = null; diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/development/tools/misc/terraformer/default.nix index 6ff0dd77aae..07333d7e24a 100644 --- a/pkgs/development/tools/misc/terraformer/default.nix +++ b/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "1lzf30vpa0blbkz4ngnhrn3hpbqflqd4sni4bly9yqh4fnc44nvi"; + sha256 = "11j7yra0qbjadg4cb57qbdxf0di7crfv0aqam6gc1zng3fzlh4w9"; }; - vendorSha256 = "087448wkaw6jxv9d26hck4w3vdh06vcgywna6ydkqvxr0hp011b6"; + vendorSha256 = "1lsg5svdnmqiradpr4h2420y5jmml3af8pp0np1735n3wh1q1blh"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix index f7bcc8bf8f4..6b603ef0060 100644 --- a/pkgs/development/tools/packet-cli/default.nix +++ b/pkgs/development/tools/packet-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "packet-cli"; - version = "0.0.8"; + version = "0.1.1"; src = fetchFromGitHub { owner = "packethost"; repo = pname; rev = version; - sha256 = "0ys6zyhyi65g0sj15pb6rslgbjgkh73y32gc0yvhfd6xmgzaxpxf"; + sha256 = "089fcn7yslijjivyvwl85j32gfwif8aazqdhm6hi676lz80ssppp"; }; - vendorSha256 = "1h9p3hrr61hwkhkh4qbw0ld3hd5xi75qm8rwfrpz5z06jba1ll25"; + vendorSha256 = "1p3v4pzw9hc1iviv1zghw9imbd23nlp24dpa8hf0w8a03jvpy96x"; postInstall = '' ln -s $out/bin/packet-cli $out/bin/packet diff --git a/pkgs/development/tools/parsing/bisonc++/default.nix b/pkgs/development/tools/parsing/bisonc++/default.nix new file mode 100644 index 00000000000..c6a4fc1a068 --- /dev/null +++ b/pkgs/development/tools/parsing/bisonc++/default.nix @@ -0,0 +1,56 @@ +{stdenv, fetchurl, fetchFromGitLab +, yodl, icmake, flexcpp, bobcat +}: +stdenv.mkDerivation rec { + pname = "bisonc++"; + version = "6.04.00"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "fbb-git"; + repo = "bisoncpp"; + rev = "6.04.00"; + sha256 = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl"; + }; + + buildInputs = [ bobcat ]; + + nativeBuildInputs = [ yodl icmake flexcpp ]; + + setSourceRoot = '' + sourceRoot="$(echo */bisonc++)" + ''; + + gpl = fetchurl { + url = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt"; + sha256 = "sha256:0hq6i0dm4420825fdm0lnnppbil6z67ls67n5kgjcd912dszjxw1"; + }; + + postPatch = '' + substituteInPlace INSTALL.im --replace /usr $out + patchShebangs . + for file in $(find documentation -type f); do + substituteInPlace "$file" --replace /usr/share/common-licenses/GPL ${gpl} + substituteInPlace "$file" --replace /usr $out + done + ''; + + buildPhase = '' + ./build program + ./build man + ./build manual + ''; + + installPhase = '' + ./build install x + ''; + + meta = with stdenv.lib; { + inherit version; + description = "A parser generator like bison, but it generates C++ code"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + homepage = "https://fbb-git.gitlab.io/bisoncpp/"; + }; +} diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 63082f60ac2..e3435061563 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -3,6 +3,9 @@ , writeShellScript, runCommand, which , rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten , callPackage +, enableShared ? true +, enableStatic ? false +, Security }: # TODO: move to carnix or https://github.com/kolloch/crate2nix @@ -11,9 +14,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.17.1"; - sha256 = "sha256-k61actAEyao/Ea8aw9PCm252U+1I0d43MAYC68/lui4="; - cargoSha256 = "sha256-Jp/Fl20ZZfaIdWinOOujNVH5JjJNtyUYHfyTrmeeoRg="; + version = "0.17.3"; + sha256 = "sha256-uQs80r9cPX8Q46irJYv2FfvuppwonSS5HVClFujaP+U="; + cargoSha256 = "sha256-fonlxLNh9KyEwCj7G5vxa7cM/DlcHNFbQpp0SwVQ3j4="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -49,6 +52,8 @@ in rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version cargoSha256; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ emscripten which ]; postPatch = '' @@ -68,6 +73,12 @@ in rustPlatform.buildRustPackage { bash ./script/build-wasm --debug ''; + postInstall = '' + PREFIX=$out make install + ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"} + ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"} + ''; + # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out doCheck = false; @@ -95,9 +106,8 @@ in rustPlatform.buildRustPackage { ''; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Profpatsch ]; - # Darwin needs some more work with default libraries # Aarch has test failures with how tree-sitter compiles the generated C files - broken = stdenv.isDarwin || stdenv.isAarch64; + broken = stdenv.isAarch64; }; } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 083dc61a96f..e9cb0a1db6e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -5,6 +5,7 @@ embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json)); go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json)); html = (builtins.fromJSON (builtins.readFile ./tree-sitter-html.json)); + java = (builtins.fromJSON (builtins.readFile ./tree-sitter-java.json)); javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json)); jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json)); json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 99af884be9f..16aef8ee33e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "5e7476bd014445abdae879661e9caf299215478a", - "date": "2020-05-14T11:46:56-07:00", - "path": "/nix/store/xz540ah1xx06n3wwmk3ym72nj0bz82hh-tree-sitter-cpp", - "sha256": "0v2l5269bhbpzcd929r3pn88gqcczx6spsq7p6ibsvsydbwj95wx", + "rev": "fb8250eef8b4cf1ce104806c50dc206e388b0e72", + "date": "2020-11-02T09:46:58-08:00", + "path": "/nix/store/qmza43f0fraa111bg50vaxsgnrs5kqs1-tree-sitter-cpp", + "sha256": "1sbk5a2p1fh6798naiswsap6fpj7n7bqhwd3xdyi35xf613qpwsi", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 67d58d64063..612b8eb64d8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "34181774b3e86b7801c939c79c7b80a82df91a2b", - "date": "2020-08-13T12:21:50-07:00", - "path": "/nix/store/3a5w7pz1m74y0lhbzq3bw3k2297lypqs-tree-sitter-go", - "sha256": "0cfi7ghs0m3iqwd4jvsqgsj4gnfikn1j2q0wbkdfvz2j25l0qwq0", + "rev": "dadfd9c9aab2630632e61cfce645c13c35aa092f", + "date": "2020-10-27T13:42:16-04:00", + "path": "/nix/store/91a8w265vjc955hyp7cqvpm8ks9zcmqv-tree-sitter-go", + "sha256": "1pwbzkg7s0l2fhr4p1rpcldjcpxbkaqsm3q81543almc75k38x8w", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json new file mode 100644 index 00000000000..260dc4d10c0 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-java", + "rev": "f7b62ac33d63bea56ce202ace107aaa4285e50af", + "date": "2020-10-27T13:41:02-04:00", + "path": "/nix/store/h51zjbzdrm89gczcdv7nyih54vnd2xps-tree-sitter-java", + "sha256": "0jbh79brs1dskfqw05s9ndrp46hibyc37nfvhxlvanmgj3pjwgxb", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 9020e8a40bc..68008d393d1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "3d5493495b62b4ff8e8c24aee7519dd904e25813", - "date": "2020-09-21T17:18:41-07:00", - "path": "/nix/store/bhjws8yif1ihhvhfsrdrp4inf03ks08r-tree-sitter-javascript", - "sha256": "10fscmclcgl1a0314ppkfy0s7pmiiz5vjipbmks76608kic8nzpp", + "rev": "852f11b394804ac2a8986f8bcaafe77753635667", + "date": "2020-10-27T13:43:40-04:00", + "path": "/nix/store/7a9nd3prxbv2izvilqdxf58his097ak7-tree-sitter-javascript", + "sha256": "1cdqx75fm7fvna0iymw7n03a7f6gayfg97qwqz3himi0775fz9ir", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 1c057f51ea9..402c4c087b1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "30f538aa1f932a2864c102694761d3127a61dc68", - "date": "2020-09-21T13:21:51-07:00", - "path": "/nix/store/bxv85lm636xdsdqjf4n7sxjlhhh35qnv-tree-sitter-python", - "sha256": "0hzzz90pn1qwyl5xk03cah62rbvp1c1yp1pw2m3hifqflxg4rs1g", + "rev": "d245768132eb6cb74d8a394ca4d29dc57169b096", + "date": "2020-10-27T13:20:04-04:00", + "path": "/nix/store/afv7ibxpf5c2shafa89cnza88hsfb7kj-tree-sitter-python", + "sha256": "075r5i2id2rn76xm3pcrn5cpvj63dlaxcpvphig39a4c9f9hrpdx", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index 06418942b4d..d5a1767a23c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "a6fcb529e9097a2efbbb3f4857e42773e7f2474f", - "date": "2020-05-26T16:18:48-07:00", - "path": "/nix/store/yqd5b7ky21scahnhrik9psalbkwi3ab3-tree-sitter-ruby", - "sha256": "0bxg5lfdazz5mlfnf0amcygvc8b2ydzl2blvbbhnziyx92r8di6q", + "rev": "f86d90cce578e28c824afdcdbdca7d031b88c0b0", + "date": "2020-11-02T20:49:49-08:00", + "path": "/nix/store/gs0hhb1dlgmv0y60zyyz7ki30yvpddfx-tree-sitter-ruby", + "sha256": "1n1irdjfmv27p5ia2vqzv8zfsq19pxi0as0wrkb7z7s1lqr1gwrb", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 9f037cdc094..4e0e2e2f7f4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "40620bf4097cbc9cea79504d7e877865df43a19e", - "date": "2020-05-15T10:53:35-07:00", - "path": "/nix/store/r24bba6gxchb5zqzghna8yjvqnngbv4a-tree-sitter-rust", - "sha256": "0hjp6nsskw341g97x41481b3zfwh8g853fs9six6j1mh92irmv6y", + "rev": "cf47ff80cbd8bdc6dd649a005c5f5d73f9c347e2", + "date": "2020-11-04T06:23:40-08:00", + "path": "/nix/store/8cvjxw8cz5jrkqwvgq88r7rfm269xwk1-tree-sitter-rust", + "sha256": "0yzcag0yy3ncxwpnb3fmsw8bxaidp7z8kbl8wwaxaj2vvxxf6sam", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 7081d3036cf..d31f72754bf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "5a38a5bd04364d9f48b902fd1514e075b98b0edc", - "date": "2020-09-17T10:19:01-07:00", - "path": "/nix/store/b3q7vz9zhgjdbv3c2xap4k2ghpdjp2yf-tree-sitter-typescript", - "sha256": "1mxwvzqbaaq11cz7zidiwr29fs0b6ycf3nadwdkgiz8c6x2xx398", + "rev": "73afadbd117a8e8551758af9c3a522ef46452119", + "date": "2020-10-20T12:15:52-07:00", + "path": "/nix/store/wrgp1j5l50cigv5cmlxikw693a55i6g9-tree-sitter-typescript", + "sha256": "0dsbmcvjzys9s229drp1l8anram7d6nsx1nixl5m9znw54hr4w9p", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 3a6ea879e58..f8b800745dc 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -18,11 +18,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2020.8.13"; + version = "2020.11.4"; src = fetchPypi { inherit pname version; - sha256 = "eff0e10eadb330f612edfa5051d3d8e775e9e0e918c3c50361da703bd0daa035"; + sha256 = "d6ac39d1721517b23aca12cdb4c726dc318ec4d7bdede5c1220bbb81775005c3"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index 06f6c08feef..54200c15715 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.5"; + version = "1.0.12"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "09j1wcx66sz2b0pps0bgbay5x06lc0d2awxjvd5zi8wqnbsrdq60"; + sha256 = "1amj5qsnxf6ya2l5rigjia5qis8i7q0qnd9ci74r721nj95m9jvr"; }; - vendorSha256 = "1qy51jx181rwim2v53ysgf7rys0nmxsbawvsbh3z1ihh3dlgw5bc"; + vendorSha256 = "1y4nyw7rpgipblxqaps2zsd07cin8d0i0g9gvsnc3vifi6g29s8z"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index d0b0bff05be..e00bed45119 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.15.0"; + version = "1.16.0"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0cir9ld61pq1rziw6vyz1ihkq0aylzrsxg1vqb9544rwnbq7z2qs"; + sha256 = "18v1s1k05bq38aljazvpxvp543xchy9h4n531pis4w4jl47n387f"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 21f14adc2f7..89287b2ac4f 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,26 +8,26 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.07.27"; + version = "2020.11.07"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-182-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-469-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "8c0a6382e11b160ed88d17af8493c12a897617ed"; - sha256 = "1g0ppjfw8dq5cg5kl2p1p87grb0i88apaim4f5b6wj4sfqz8iln8"; + rev = "b013a135a9b95c18ece559e19aa73ad6c84446c9"; + sha256 = "09bx30jm9bgdxmbxf49a27spg4yd1nk5r5mympq7xi28hq1xwjnf"; name = "trellis"; }) (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis-db"; - rev = "c137076fdd8bfca3d2bf9cdacda9983dbbec599a"; - sha256 = "1br0vw8wwcn2qhs8kxkis5xqlr2nw7r3mf1qwjp8xckd6fa1wlcw"; + rev = "2cf058e7a3ba36134d21e34823e9b2ecaaceac2c"; + sha256 = "1hjaw5jkwiaiznm2z0smy88m2cdz63cd51z4nibajfih7ikvkj6g"; name = "trellis-database"; }) ]; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 24f93f55eff..3d5fe88bfcc 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.11"; + version = "2.2.13"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "sha256-KDQDEMebqQYgsBroHmQrm/OJWTES9C9eGl0dDHTBpIc="; + sha256 = "sha256-NN+8t08yycINbtxOjhOWU96nJ0fZKDAopEr3WyAeG8U="; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index f1b9fa11979..c18b9818f33 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -138,10 +138,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi"; + sha256 = "07q48aca4r782jh53znqq7ams4pcf1dhmq21dwhyxzjqfclcb48g"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; little-plugger = { groups = ["default"]; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 22ce3553352..7151c872e4d 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.5"; + version = "1.22.10"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1yb1pb80jhw6mx1r28hf7zd54dygmnrf30r3fz7kn9nrgdpl5in8"; + sha256 = "0pdimll8lhsnqfafhdaxd6h6mgxhj1c7h56r111cmxhzw462y3mr"; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 3d9d6cf0a0c..479494e515d 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "1rvs27c5mz55zqq9c7yif0dms53bd30d8ylh45f3y3zgh82jihp8"; + sha256 = "09kcqa15assjhp3kdffa3yhc2vykinzgscjzg996qa85kjircy9b"; }; vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd"; diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 098ed35406f..c006adcb271 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -4,7 +4,7 @@ let major = "2020"; minor = "08"; - patch = "07"; + patch = "25"; version = "${major}.${minor}.${patch}"; @@ -16,7 +16,7 @@ let owner = "daid"; repo = "SeriousProton"; rev = "EE-${version}"; - sha256 = "1mfizhmwh6xgb5n34l3wrbxm21f7gsvsyacsmnxw9rkz0ya7ch30"; + sha256 = "sha256-LiMEgsUpNBtduFO85ct6NYr/Smbzd8yE8Vce3voErLY="; }; nativeBuildInputs = [ cmake ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version}"; - sha256 = "0p41wx9yk09xjmfkjpdgi3b2999ps2am3xqwd866q11f6ci7viv5"; + sha256 = "sha256-3QREWTq1Jq9T/FtGFVU4MidZeUQvRSVChn9JKxv2SiQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 0fdf7ecf96d..afde25ee6b4 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.23"; + version = "1.1.24"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm" - "https://web.archive.org/web/20201019154323if_/https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" + "https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" ]; - sha256 = "1d5zd8cwgp3n25ramdqwqb770iim7kh4l7hmhf6a6ivpy0cxpwx6"; + sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co="; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 41a1e6c90c7..b5cab43d31b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -221,12 +221,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2020-11-06"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "92e70f9e369d106476de283354bc30e37a94e864"; - sha256 = "17az4flcsry4f2p4xnmgw0ymbbybcfycajm25g6r692hcbgkg5dx"; + rev = "16fee1a0309910645f28caa1a3cac607a4ea47a3"; + sha256 = "1h5cn9z9446pjzdpr4nnay7g4cfyl4cf541nmy6r0v7mq68zfijc"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -401,12 +401,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-11-02"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "3530aaf09473366e3d21811a708d9cde7e1f4a02"; - sha256 = "1qksmhgn71rax5gz5zjxp80wx3xabgv9k8y9pbldr19r777gb14r"; + rev = "6be196d41f9738b6678de07f5509f56a58c149ec"; + sha256 = "1gmc2m2i7i11hx8v18bvz18pzwf82234z740syl66xm2q9z1d1sb"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -425,12 +425,12 @@ let coc-markdownlint = buildVimPluginFrom2Nix { pname = "coc-markdownlint"; - version = "2020-11-02"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "56af4992a9f48a5ae210a0bf346e00a08075908a"; - sha256 = "0gjfs3mrxv88z8fvm4rc51hw8kghami80pbvz7jcz0bf9bfwgdaw"; + rev = "a9304f7b096871e15c2992d0d09e7c7f3a3675d4"; + sha256 = "0r7mr4qmw04hhxihfn4pndpv0dakwjcj6jf1jccgydxc35qv14vj"; }; meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; }; @@ -473,12 +473,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-11-05"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "815d105fe9bada4fda9c85f98557005b70a9e667"; - sha256 = "0hxrja25hwcnw31bwcrs8krvjdxwvb6wxjrrx9zwbplj4x7xbkyp"; + rev = "02a058c5fb563ce79bead38a49bbff21664c016e"; + sha256 = "1dhfi86i0cx1llaj6ywk8wv3ym595fkscg5w4qrbxazsmbjgrbaq"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -606,12 +606,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2020-10-30"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "778f5f5868aec79bb5415f790c8f18b8253fd99c"; - sha256 = "1p7lg6ln9vkw6ds3bllyf1rlpnlhb5cyly6cab1v9zgjz4xagx80"; + rev = "42625407e022ff3cd56c53ac87270ad9fb70f605"; + sha256 = "0rm5vvdzl63lm76fmp52l51619bd62gk7ddg1j8vzb074nlyc66m"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -702,24 +702,24 @@ let ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp-vim"; - version = "2020-10-16"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "3866ae170a342fb40d83e1538c37c81c7977b821"; - sha256 = "1ksi46g33ghdrp0nff0fyysxnzw0sr1x5b1ln6xzjv4hkdxiz51k"; + rev = "971c4d41880b72dbbf1620b3ad91418a6a6f6b9c"; + sha256 = "0n68hg59h4rjn0ziqbsh5pr03l3kr98zk54659ny6vq107af1w96"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2020-08-14"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "378bddc9f0e109607935ab9a4ac717df008deac7"; - sha256 = "0idaph0wdaf2rk9mh468zg8c4gf5hyvad5zqlpcd9q1f576ysswy"; + rev = "8ff9e1abd264f16fd1d192024348f6c63b514a0d"; + sha256 = "15rkgh68j9agbj4144a0jis7qpcfjfspp6598laqjz1qzrx82pmf"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -908,12 +908,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-08-06"; + version = "2020-11-07"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "2786058b9022ce6e50db7f75088e69e07185e52c"; - sha256 = "0myn6rgwq7yd3hpxdxa7kj3dlk2x9ljqlznqg95qcm8i0w53z1wg"; + rev = "2d61fe45e348f89979c8faf663b3e88c61435f47"; + sha256 = "0qmszwrchp272zc4rf727k9l0x472lxbbql8k2pyj1vd1ks97q1i"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/"; }; @@ -1040,12 +1040,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-11-04"; + version = "2020-11-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "9aacded51b323f338859f01fcdca30a4acaf7dcc"; - sha256 = "07gmj9cljbn4h7naxayq05p38930ffby97zg3x2c98x3hxldqsq8"; + rev = "44a3e2393a99d5975ac7f282be10d008f4c70251"; + sha256 = "1ikaqqmms0zcf997wf9jysdzmn2r1w9gqjqn58sw5drnnfamwvml"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1076,12 +1076,12 @@ let diagnostic-nvim = buildVimPluginFrom2Nix { pname = "diagnostic-nvim"; - version = "2020-10-01"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "diagnostic-nvim"; - rev = "bef1c6140563cb6416081b2517ae9953cd4e05ab"; - sha256 = "05f2hr3229zph3x9lhmabb9rzdf61r92f3ybj2gs40hfbak0c3pb"; + rev = "a8401479822e638fa70472009949e7be8b24e0fd"; + sha256 = "1dl4b8xhvnb2x9fw220jis7hqmiwfz0969d44l96p41bj68qbbs9"; }; meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; @@ -1112,12 +1112,12 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2020-11-04"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "8242b8f5aaa07fb3102d8ef649797454039b261b"; - sha256 = "15sjrn8ajagbymxswa5qmaqbw517s2j9xavzhfxmfffv9h10rs3c"; + rev = "ba00ac0432541811955e50b8420c25b22762c7c9"; + sha256 = "1rp0zip0p07rbfiz8b5nvm6k1d80yvdgn4h59v3bg8j9qan7rg3h"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1343,12 +1343,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-11-03"; + version = "2020-11-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "61c4b6d1ed30287edcbfd3dbaed4e43b5c251c93"; - sha256 = "09fx5bg9kaw2zv98vvvx5pix0b0dn06kxk3mq9khiak2liyq96lv"; + rev = "53b3aea0da5e3581e224c958dbc13558cbe5daee"; + sha256 = "0r19v3431ps7mmq2vb0vf1phwmgi1xp0n7z43wa68i4ilyjhbnr6"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1559,12 +1559,12 @@ let hoon-vim = buildVimPluginFrom2Nix { pname = "hoon-vim"; - version = "2020-10-15"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "urbit"; repo = "hoon.vim"; - rev = "aeb307427f2ffaf756cb04574f5ed0d77626d51e"; - sha256 = "11nsws8q54lya6lk51zkwhv47rmidg1wclgd4vq7v4jwc25gw8id"; + rev = "91b1922f8627bb0a55341bb088f2526d0f43a6ac"; + sha256 = "0h87r7r74iljwvfc6mb1maa08cxwnk6k89gc6vnwqm1zx6qxw1js"; }; meta.homepage = "https://github.com/urbit/hoon.vim/"; }; @@ -1655,12 +1655,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-10-12"; + version = "2020-11-11"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "6107214eff0cac5d9810d29ae8614ddfdfcd986b"; - sha256 = "1aycs427w9w5hjnif5c13wf3jd872a3i94zzdfisfrispbs3ad2m"; + rev = "9662ef8f0443211b11fd87919343d12179bca548"; + sha256 = "1mdbppz3xb8dzbw61fcv3gn3ad4hgia9i5s96vyw5frwxlkfyqpm"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -1920,12 +1920,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-10-27"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "b5959b4fa3635d9a7eac587a5c223effca14a970"; - sha256 = "0rfl5c2bf0j6kn1knzg4kywi7xvqhr6impwfh5466ncb4p529vlk"; + rev = "38a20127dc8aaf76f686b0b96023b51c466969b9"; + sha256 = "19pw4mmhp4cj2xjb6ygiahmix2wq123a738whjg5137zkrzfqz2j"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -1956,11 +1956,11 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-11-05"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "53176a0b75d6389d775d7bce0d494e58fc654f38"; + rev = "fdccae8c9dc243d58f48c428b99be4920f89d1a0"; sha256 = "0wg0nrjbr8my98ivaawj3khyx1fkkgbafwhmq6mlb8j8aj47pigx"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; @@ -2280,12 +2280,12 @@ let neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2020-09-13"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "e7b5a73cba668a351b0953063b6e18e1dc1773b2"; - sha256 = "0mfli085rpr5assb4n21wnd59fnnsbfilim7impcwr9imvrw6ymf"; + rev = "2b1dca6ca16d6f5655748fcd4d54d772fcfd0d81"; + sha256 = "1prnclm9i7m09v1ip0sgkgddxwclas3x48zc8c800vxmmvjhzd7j"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -2316,12 +2316,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-11-02"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "2132bc678f5389593cea1b82ec1ea630cde0041a"; - sha256 = "0h4ymq4jgxw48s2ccvsj5612pmb8vdsqq2hgx877rjji1chxk432"; + rev = "0b1c3ed1d19fceb3c7367fe40ef9934819effb13"; + sha256 = "0479vh85cdrijrghpkva5s4sv0q66hs5n2gl5nhqplz52may0xxg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2340,12 +2340,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-07-15"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "a3082cca83424e28730c738cf33157326b0be5ba"; - sha256 = "0jxxy6ibj73xh77rvfkcqr98q1pr563zsmzq1qdm3s9lb6xvzka6"; + rev = "3b611ca24a7b78f7842facf6361404724717af1a"; + sha256 = "0x710kk7cac4m6s7xlqbm8pch1kfbwkmk6myvmsgf2qflj2qxn2j"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -2364,12 +2364,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-10-08"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "7448233dfd40e7f0a1075fefa76d1d5a84e5d28a"; - sha256 = "0dy7fgdhkz06720ws4r5gyksqg60hb2v157vkbzii3jqd5fx8mkf"; + rev = "4b0829cc82704d98ac65a95e9317b8dd1fe90dee"; + sha256 = "0yvkixv8ls4j7blfnk4a4bkxr47qfq0rs7ddzsfc6m3w2zms7c6j"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2400,12 +2400,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-09-30"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "e24d0edc1ac932da813e3034b6ecee9179c4b0e9"; - sha256 = "1n21i2y8w58ijqsj8c798s60in6lbw3ayx35vm781sk2gfrf1ckl"; + rev = "78461935fcd6888c02e4368126a2cb645b80816e"; + sha256 = "07szw3jd5vj4sxzmrdalk79pdba7cm0c7k3rvn5bw4lyjgzml7ll"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2472,24 +2472,24 @@ let nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2020-10-16"; + version = "2020-11-11"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "01b84c63b9ba48628285779fbdfd046dd2bc2970"; - sha256 = "1bmnm5my7r8ranafanwc33qksic444p47i23qsnkkphxk2hiq5q7"; + rev = "9e33a3fe8aa90f5ece2439f3b1b3a98fe7e35f85"; + sha256 = "1qv526rn4yysvpka6pigs4p6gk5izqh0ik32b5aa2qk3059lkpx4"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; neuron-vim = buildVimPluginFrom2Nix { pname = "neuron-vim"; - version = "2020-10-29"; + version = "2020-11-11"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "neuron.vim"; - rev = "2b4321bf12a4d0b589cd8c26aabb7e31311dab26"; - sha256 = "0h8m72n4jdl9fa308wrchckn6xsbs3b5w8b0714qf9rdpg8jzwa6"; + rev = "1f0d334aaee523c9269811809d64b0d2057a3fdf"; + sha256 = "18shra0cff76vsla9ydzmbi41d2iqgb6fh7f9i994lknjqlhfcgw"; }; meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; @@ -2604,12 +2604,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-11-04"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "6e80f426bf9dc44c14b73d3589c6e19cbe9aa682"; - sha256 = "14nprh59sif0kvkdxqw8ij7wnnm4d5zcv4cfgah4y7mj5a99na53"; + rev = "1f98c2e92810f02afcd7ce981beac5142e34ea87"; + sha256 = "1g9f1w9xghzmy9npf208ywb67wx6ryz6vfl2k0shwk7iym0fxpyp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2640,12 +2640,12 @@ let oceanic-next = buildVimPluginFrom2Nix { pname = "oceanic-next"; - version = "2019-04-10"; + version = "2020-11-08"; src = fetchFromGitHub { owner = "mhartington"; repo = "oceanic-next"; - rev = "08158eec24cd154afd1623686aeb336fad580be7"; - sha256 = "1s2h9mnhl54ww7zpdllwlxz93d5i7l7rx3s9mr8w6sv8azcak3v8"; + rev = "9fa644b0f545cad22ee28ee3dd9a719a9a6bf75b"; + sha256 = "0xxc6im5rvd2c14i0jpnsgjhcsc7l5zs30razc4gqvv753g663qs"; }; meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; @@ -2676,12 +2676,12 @@ let open-browser-github-vim = buildVimPluginFrom2Nix { pname = "open-browser-github-vim"; - version = "2020-07-08"; + version = "2020-11-11"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser-github.vim"; - rev = "7c31cd0093fdf89d53fa02b210c82b1326b00a8c"; - sha256 = "1r3b16b7siyxj3n44z899spma5vamc5g76p947h95m9d0rc6sfnk"; + rev = "ee132b0f8ea180f996a2e34c5e977d23c615b47a"; + sha256 = "17da42h05840vv8n4sj0im4rc18g2drb9sh0grjlpnz86mc8fqj0"; }; meta.homepage = "https://github.com/tyru/open-browser-github.vim/"; }; @@ -2712,12 +2712,12 @@ let papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2020-06-16"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "c657f5c2d5964bbae633f8a42c16f8316f6d6733"; - sha256 = "1vv1gd64isrgyxc4fyp5mzlhffwkzdc8agnv0aka4v7qdaca45ni"; + rev = "0428fc228afc50085326bfd43746b7734e42c428"; + sha256 = "092zp0f5jvfwh2q8asxdnkrhz9djgw0lqzg70g38xk606fxy16a9"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -3132,12 +3132,12 @@ let skim-vim = buildVimPluginFrom2Nix { pname = "skim-vim"; - version = "2020-10-20"; + version = "2020-11-11"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim.vim"; - rev = "2908249af6b759c79c7834862bd42af3a8bc6d4e"; - sha256 = "1819niha13yzhk7sya1mx8qigjwacd4mdp6s2hkk03l1s6x84dj7"; + rev = "83faea7f2581005d4adc9256ec76e0fe3f8a15e6"; + sha256 = "0wppb2wgpk085cwh9kmqzv6f30j2hb3brqx2ik371gkrcfbpf4ly"; }; meta.homepage = "https://github.com/lotabout/skim.vim/"; }; @@ -3313,12 +3313,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-11-04"; + version = "2020-11-06"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "5788b1c6df63bc31ae93d6c1a3523e0602c60901"; - sha256 = "1a6mr5ffwx7f7yclp9i2hvkq2lf3zm1j4761vqmc8nq73w4sbd2z"; + rev = "63741646a9e87bbe105674747555aded6f52c490"; + sha256 = "0x1rn76zjig4kdbs719fcpc22mbh2jz93ni8zpzpkn8r186f05s5"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3361,12 +3361,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-11-03"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "53c8e196764ec74353c0e9c758daa108b9fe4c38"; - sha256 = "07ayc60w86w4mnm49jh4h89pwz5ry2a5vagy8xsv5hy1r6wqirpy"; + rev = "68a77323cb707e227d16302d39d35949dbb0f85a"; + sha256 = "1038p1w7pfwg6ydqxbahb9plab8d40mdqmnbm6z36y7yrssmjhsj"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3409,14 +3409,14 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2020-11-03"; + version = "2020-11-13"; src = fetchFromGitHub { - owner = "nvim-lua"; + owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "1f3110bf54877b975956e42911e05d517d8f4993"; - sha256 = "1172fj2vzf9p86pvl9b297xp9qmikwmcj7j3qv3dgk3rdh4f66mg"; + rev = "3e58e1ab7d4c80fec7d9b02e3f27503bd72f21ff"; + sha256 = "0ilxdffipa7mcaam1x21h0k578q2mq76a4ajnmmmis7066jk39z4"; }; - meta.homepage = "https://github.com/nvim-lua/telescope.nvim/"; + meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; tender-vim = buildVimPluginFrom2Nix { @@ -3554,24 +3554,24 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-10-21"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e6478871c04bb75f3c6cb9b90e171fffbf9c8ff3"; - sha256 = "17f1q0hv89l5mdiv3xrk1l3lnlxj6gbg8pnzcpx5dk4sd14xivd3"; + rev = "b837416c1ffe39b168baee35c0938739e96211c5"; + sha256 = "1c1ahpdw0d18x5g5s5mpv7mcf0igrpla33k2khmk4q739ywb21qc"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2019-03-13"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "be23eacb2a63380bd79e207a738c728214ecc9d3"; - sha256 = "00zyvff32zp7pyjzkq8da9xhr378mlpi8gj717yfr9wbwwarwfd7"; + rev = "9ceb50062135dd30de3da000d5fd46125f51887d"; + sha256 = "1vwjggf3csbysavk3yyfzjklyq8xwfvk17rprmj660h2whgjjzvg"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -3902,12 +3902,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-11-05"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "d64e5f8dd7ac0b094f0caacc63453a0418b37fdb"; - sha256 = "0kspf0m00slrscld6qg5rj3i4lr9pwv25xvqqldyk8h884b182g7"; + rev = "731bdb11d2f57365e02bdb8adaeb59a8b93db27d"; + sha256 = "1b6l1460319rnl4p3zzpz3ngc114bfyqicbdyq6pk4sy5hbn15j1"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -3926,12 +3926,12 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-11-05"; + version = "2020-11-08"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "3dafdfc0424716bae21f5340314f7d90a9ddf4f2"; - sha256 = "1j18anw9202cplfzgmsy8y6pl8zrxwnrhyn9djy580slakrk1s8k"; + rev = "cd6f16978d5af4b9fb861be9d728732d72789df3"; + sha256 = "0ifb43q053grj2fvjjw52xsr79xnpc00k9302xnx1x4li9s5l64d"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -4046,12 +4046,12 @@ let vim-bsv = buildVimPluginFrom2Nix { pname = "vim-bsv"; - version = "2019-07-11"; + version = "2020-11-08"; src = fetchFromGitHub { owner = "mtikekar"; repo = "vim-bsv"; - rev = "dc775cb06891dd0923b5e2a882f5dcee6451540a"; - sha256 = "18wsbvypi62nwgcazw2m47d6k8ymlv1zwabs2gwl931n710ldkfc"; + rev = "b03893b98f5b772297e48671a9c5f92f1c7d10eb"; + sha256 = "1cd0jmxmb30c50a0ssa96a34qm2r3vasnn0x6ah9azx75k4anrcx"; }; meta.homepage = "https://github.com/mtikekar/vim-bsv/"; }; @@ -4130,12 +4130,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-11-04"; + version = "2020-11-07"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "992c2d43318ba096eedac0592a0c2d6f90fed236"; - sha256 = "1nl29l1zb9prsm5iz0psiav846fv2ybwxd06rmf2mcigg96502vr"; + rev = "45a91bf706e9dcf85172c126bbac8964e209a4ae"; + sha256 = "1b7sb9dqdy48w28pjhh9vsr20w0gd5lillrlynskywab9x99ifkx"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4178,12 +4178,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-09-09"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "9346c381c94c0f9312c6e7970a4ab15419935464"; - sha256 = "03nymldw5ifc57z5vr0xaz00vml6v854zp2fnzm4q9v9n295kh66"; + rev = "d418de02d5a6225883b08466414e33e80a509685"; + sha256 = "1lsl2xcsyjj7ri32p89d425bq1lhpkbfac72hnwc7k6xwq87ibgm"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -4586,12 +4586,12 @@ let vim-exchange = buildVimPluginFrom2Nix { pname = "vim-exchange"; - version = "2020-06-24"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-exchange"; - rev = "0e95600517aad244d947b955a2e34ec30bdd09ff"; - sha256 = "1dh8xc5szm5rrv7xp299hcfhgp1155k5kfipzz6q2r69blhwyl1d"; + rev = "8bb662407f8576fa645fb6908b63b6473e236580"; + sha256 = "08q39xg1s90gkp24v374kbvsw6lzin61b1mkp4ibkl76h2lp0r3g"; }; meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; @@ -4694,12 +4694,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-10-19"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "f6654e2f9c29bd85039a11f305acd4e5222b03f8"; - sha256 = "07bh7hkajfg5gchmi0psy0anaz2rdvhii3p09xml9dfkvrapzdrx"; + rev = "3c34e84282f542be7dc75c3d2154c1f25df4a47e"; + sha256 = "1c48s8655fg1bddnzxpqfl8cxdk3dsc4a45ixsc7s910bk8rlxn6"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -4802,12 +4802,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-10-30"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "696a6ed389e5b54c8bf480f44ee4e8fc59e6f903"; - sha256 = "1x38qi9kzhvhfyrzhfbzj8xvgmi02prqg6zcvpnwdmxcs5asgj39"; + rev = "987a33355ef424161fdbc4e5d625b5b5aed9704c"; + sha256 = "1qg5ri74wipf0krnwgii2jqdzy36hpwnx8nvgf7vkw8a3l90rswj"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4838,12 +4838,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-11-01"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "35ea9acf5fc409d1eed341333789f18c2d135c66"; - sha256 = "0n6yj1ql2c2kq9y407zr9d6pkpwp7jjzssbd0fyl68cb9rxzg3j8"; + rev = "e3d6ada0530190300a5227bb0b417ee71b994cc2"; + sha256 = "1kyyidicghhgnsc9x2gynnxh4x6yzjdg5d633sb74xkkhgvxx9yn"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -4862,12 +4862,12 @@ let vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-10-04"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "51c5b178cce145c3aaa22fbc37fd5d64065baebc"; - sha256 = "0kgnyc94fd5i7456vdnad58yn1qcanfp0lg7xdf5dbs1nbarzywg"; + rev = "c2fe34c8c950aceb56b9b4c69e9e95922fa7a78e"; + sha256 = "1q7v0qyd1my9hgxyhz921fr4c6x9ipfgqlm41546iz097vnv715p"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -5271,12 +5271,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-09-29"; + version = "2020-11-07"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "3a24dca8f8cc9b88efca3faf446db41f5b7da121"; - sha256 = "0gn9rlwndq0awv51gxvd3gsxlh5sb76cvc60bh0lsh4f4lhmyy3r"; + rev = "8059c9269ab62ffc4ccca587e2a2a894806fa5e6"; + sha256 = "04jmmyz79mrq7mpl9kqrc8v28gn50jl93lzkyyhzp7dyhixgbgkm"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; @@ -5439,12 +5439,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-10-17"; + version = "2020-11-08"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "9230c11dfb630ef4a9dadf491f1e1c1b2d86ace8"; - sha256 = "13w3fjwy3iy6j48f16g3bg956dd0fl9ynywd1nqvk4ba305g6crx"; + rev = "c8f04821a9b92fd5675ed9ad54c59bec9af37eaf"; + sha256 = "1m6cr2c3srnddxmmly8icnx1jyzh5cjxf9sffp3f871cgq954jy7"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; @@ -5643,12 +5643,12 @@ let vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2020-07-20"; + version = "2020-11-08"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "f6b24082b1d22932cb834673c37aa936b6f4f6da"; - sha256 = "1xr7g5wxfdd2rzdr94p2sasfm6zyha2rhjr3rx5mnpbcik7l3j61"; + rev = "33a91cc55ebc7a55b8846c46f0ab50ec0d81613f"; + sha256 = "18qbmnwlwf9hmak73zam44daf6c50hi72b9g8ra7v1l5psgi39z7"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -5871,12 +5871,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2020-07-30"; + version = "2020-11-07"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "049ece9fa8f21afaa62215865afac22daa6fd30f"; - sha256 = "0wjrbp06ffh9ficd22lcijrc99n72b7gbg5lqpms9r0442fb88kq"; + rev = "0aeed75603a55887c2b492d1fe19ac8065dae671"; + sha256 = "13xjpkq9lbb04igwif23zmb3395awk48kdyfshsga2gbv5h1i9fn"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -6051,12 +6051,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2020-05-05"; + version = "2020-10-31"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "1d95458273a8ecdb678e65db918c045f9bb7e220"; - sha256 = "1h5gb29rs64cfr55g12s1f0w0cqzqs2nhfw8qfbfch5jbh21p10p"; + rev = "0c6967d3a8c3bd3d3b42013531c3f12c843aff80"; + sha256 = "1s6yxnlwxlblj5m9gxlc8699g2a1d7cbjacp4fk4fa9mrkga7bv8"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -6495,12 +6495,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-11-02"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "0f3d4d187c842419fe6e131fe20f5f3336418a62"; - sha256 = "09phzarfakz5mv3jshsab60iiq8byv6xggb0qiasafvxfrcx8c2s"; + rev = "3e30104f106a2aaf4dc5f7072aba7d97fdf8bb2d"; + sha256 = "1pxh5s9r20wbawyrcalkb6nr21xsmsc00wdaf2ryz5vhpakai72w"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6844,12 +6844,12 @@ let vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2020-09-29"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "6c0b5d2faa49f2059331a4004b34a916c96abcb3"; - sha256 = "11kq87drp0ca5rj9j34rpajbzv79wxm3k2cf249dxvi0chcl41ma"; + rev = "6a1e58c3ca3bc7acca36c90521b3dfae83b2a602"; + sha256 = "17219h69vd6b994qrywg1rpx80y1rmycbfsmf9wb6c693sx721sn"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -6880,12 +6880,12 @@ let vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2020-06-29"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "610ca1a97c8dc85cdeb38635e5a4703317c4b94d"; - sha256 = "1bh15yw2aysvpn2ndnc0s6jzc0y93x6q1blc5pph67rdix5bm7gy"; + rev = "b5289251ae8f93473febdcf2fd10e39a8287d9fd"; + sha256 = "083zlwm3a85cclb28ryas4rpd3b4ph8n7chb1nwvcc22g447pfsl"; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; @@ -7000,24 +7000,24 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-10-27"; + version = "2020-11-08"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "562cabf644314c97224a025ad2594a47966e6207"; - sha256 = "1i1b8la3w9x8lay63kqx958k4csxnqmdw9bfmhyh2vf1p0cdqv6l"; + rev = "5fedeec956359d05496ad92fb6fd02231aeb4c76"; + sha256 = "18k44h3fvg8vm8dwxy78jpl1zv8sbr0kiviyxm03hy3n6sb2czlg"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2020-10-25"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "383573b9b07fd37caf98247dfdbb1d4711eecee9"; - sha256 = "1kavjyr53cbg630snri2x94f7h80p2vl6vlskqfwi3djfdvn68x6"; + rev = "8f171eac11eb7668a33991953f9ae5af9556cc59"; + sha256 = "0a8f1nblgwdv7z0ycxlx5arx68dgg5qzvwwgws18lpf201qp07sx"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -7264,12 +7264,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-10-23"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "7b048367f7d4921e4eeea1bb82e6f368b418d89a"; - sha256 = "0n1kqiki5gag7nd5c5gmnv6czv90kzsfndbb92n3wzvwxhpf1ff6"; + rev = "30741f88139931c5ee83ef906cf16ee1187bf8f3"; + sha256 = "01b3q4zmys5xnikwl8jg28057d5war0hk1wzizw3rly3kjmmkx8y"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7277,12 +7277,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-10-29"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "982185bb454942a5c04d41b647ab58fceb4e7683"; - sha256 = "16vy97k6lgl62pibhdfdigfv2gp16hvzlfywv1i6wx46hycb3swq"; + rev = "01762d18f86422ddc85361c86b849f9707f23ef3"; + sha256 = "0ncgfd23x8g5n568amzd9x7bvvm5mgjs7qqmr9qn7hjpprad5icq"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7325,12 +7325,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-10-10"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "27889ff58d4340167bb8dd4abbe9ff4a8869da8f"; - sha256 = "1asc8fqyv6rfmdd0g5n78mzzssn7rcanzy2d30gddgfa3gr65yms"; + rev = "bc3b2a74efb253be4b79cc7b70b192e1360f26c1"; + sha256 = "0qfdykp7sf4p2h8gfx40qmnfj94p4hksngqqkzrhzi9z3i6fqk2a"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7349,12 +7349,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2020-03-06"; + version = "2020-11-08"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "10f228ce1e7947f62be412f916229131b7710239"; - sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735"; + rev = "c72ba0d18946f29aab9c95eb6975d321c68b3681"; + sha256 = "03hrn0d6mqjlrixwx5l270jfgwgkzr6xg00h39i49j7k3f1ql078"; }; meta.homepage = "https://github.com/dylanaraps/wal.vim/"; }; @@ -7445,12 +7445,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-11-01"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "fc97ad973a2bbf932dffb74c5560e97f60d21ce7"; - sha256 = "07gx88vapcb579nvmkbmps16spvd1y8kvmi28955lw31rxi1n7b3"; + rev = "d4f95eebcf8b765bf1198b57045e45f976ab0c19"; + sha256 = "04blzfgklh9x0xb1qa9bndhha8cnks83v0xn2pr8wzi2i0r3r4mx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -7458,12 +7458,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-10-30"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "fa8c985dee864d33e48e3b3e803b541bdc433ffa"; - sha256 = "1cc9wyp3dbh4fvic9zvh2bxqw0nrb3zwzlfj106cs2qbrpkiqszd"; + rev = "604a2a02e070bbd46f58c79a46f4df048e26a97c"; + sha256 = "0m9wfpm855cp9zzg0nsd6bb7ijmgj9vhfhm7x5nhmqjqjfyl8282"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2cc00b630f5..3ddd3f5c132 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -373,7 +373,7 @@ nvie/vim-flake8 nvim-lua/completion-nvim nvim-lua/diagnostic-nvim nvim-lua/lsp_extensions.nvim -nvim-lua/telescope.nvim +nvim-telescope/telescope.nvim nvim-treesitter/completion-treesitter nvim-treesitter/nvim-treesitter ocaml/vim-ocaml diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 53796981e59..cd1d4ab2850 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -179,8 +179,8 @@ stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) mktplcRef = { name = "scala"; publisher = "scala-lang"; - version = "0.3.8"; - sha256 = "17dl10m3ayf57sqgil4mr9fjdm7i8gb5clrs227b768pp2d39ll9"; + version = "0.4.5"; + sha256 = "0nrj32a7a86vwc9gfh748xs3mmfwbc304dp7nks61f0lx8b4wzxw"; }; meta = { license = stdenv.lib.licenses.mit; @@ -191,8 +191,8 @@ stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.9.4"; - sha256 = "029s1al1f3qk4pa3539rs045g9jwkhbmdg7wj7biqc6shcria4ca"; + version = "1.9.6"; + sha256 = "12sjzk64kz7z8zqh3zg1dyb3v4c5xxgi1ain1jvw8hwf0hicqlgi"; }; meta = { license = stdenv.lib.licenses.asl20; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index a90b2fce34d..2bc705d4487 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -6,13 +6,13 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.16.0"; + version = "0.17.0"; disabled = !stdenv.isLinux; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "sha256-ekVRyugpZOU1nr0N9kWCSoJTmtD2qGsn/DmWgK7XZ/c="; + sha256 = "sha256-aEy8WwtKGaf7GZOTK5IHhwzenqU2U+vpWrcNWMCGvMw="; }; format = "other"; @@ -26,12 +26,6 @@ python.pkgs.buildPythonApplication rec { # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch - - # This is already upstream; remove it on the next release - (fetchpatch { - url = "https://github.com/iovisor/bcc/commit/60de17161fe7f44b534a8da343edbad2427220e3.patch"; - sha256 = "0pd5b4vgpdxbsrjwrw2kmn4l9hpj0rwdm3hvwvk7dsr3raz7w4b3"; - }) ]; propagatedBuildInputs = [ python.pkgs.netaddr ]; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 462658396c8..92fabffcd02 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "criu"; - version = "3.14"; + version = "3.15"; src = fetchurl { url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2"; - sha256 = "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn"; + sha256 = "09d0j24x0cyc7wkgi7cnxqgfjk7kbdlm79zxpj8d356sa3rw2z24"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e2df369456a..101b8fdb6c8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,18 +1,18 @@ { "4.14": { - "name": "linux-hardened-4.14.205.a.patch", - "sha256": "0a9llmpkz4rs1xr574iiyjvll1i9fd6y5k0gxqniz2x2m2nl1mkz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.205.a/linux-hardened-4.14.205.a.patch" + "name": "linux-hardened-4.14.206.a.patch", + "sha256": "17pd23lvhkpa923nw24g5b0gv0kmzj9jkkmc8366k86r0zxk6z53", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.206.a/linux-hardened-4.14.206.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.156.a.patch", - "sha256": "1f3di0fvsfs9p549nna67i108v3730hc5mjyh8lk07s2bbigi09z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.156.a/linux-hardened-4.19.156.a.patch" + "name": "linux-hardened-4.19.157.a.patch", + "sha256": "159v7z1a55b5kcmkrdna18hvcnscxf79r00kvr0kl8flvsnhf1p0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.157.a/linux-hardened-4.19.157.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.76.a.patch", + "name": "linux-hardened-5.4.77.a.patch", "sha256": "0b47id64vi55s7lmyasmvhwbfcv9cjwfhw9g4lf220g0rnl6h8jm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.76.a/linux-hardened-5.4.76.a.patch" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.77.a/linux-hardened-5.4.77.a.patch" }, "5.8": { "name": "linux-hardened-5.8.18.a.patch", @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch" }, "5.9": { - "name": "linux-hardened-5.9.7.a.patch", + "name": "linux-hardened-5.9.8.a.patch", "sha256": "1sb4rsd3yfh49aqg5j24zav9x38c44q7d9pyx6pb8pl368rd26l4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.7.a/linux-hardened-5.9.7.a.patch" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.8.a/linux-hardened-5.9.8.a.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 98968c8385c..99f20985cdd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.205"; + version = "4.14.206"; # 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 = "0m6ajw3iypxwvym8hmymd0dlcm9gdczpa6y6id4b447r774aqmcc"; + sha256 = "1b46f0s15xnlam43cmw8w41rrvcwrhm6km0278lq6f86lpx3w8qw"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 7657656fbc0..6458f02da66 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.156"; + version = "4.19.157"; # 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 = "0b9g2v8dvlhq0kbns2z62v93pnaprk7xbjzzx8rk0b522x42nq08"; + sha256 = "0mgpgv2ny49bb7kgaygy2ay6ckjgw7mg091viivi66jw4mjs7p3n"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0fb971e00a9..ad34346b913 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.242"; + version = "4.4.243"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "089gigqali5q8izac82ybigxyi1bnw0xhm1cc590h4v7lkmk0mm1"; + sha256 = "1daqbmj9ka9wdkkym625hqwqaxq5n11y7c4yc9ln3xkjpnv4dplm"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index bda5a463599..3682f6fd5ea 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.242"; + version = "4.9.243"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1r1myvxkhnsz419i5y6zjdkz177q3d19jk7748vv1v505gi3k1g4"; + sha256 = "111rlzx6z4kf8zwxncib96d9wy6qmkbs0cq3dhnybipwlyf1iank"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 55ec4d341f7..93f7fc599b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.76"; + version = "5.4.77"; # 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 = "1lpppqjsrcmpr6vawxycsy7lpwdh3pb3d3f841sxzqgm3b9mymkg"; + sha256 = "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix index 010bdc788c2..0f814311475 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9.7"; + version = "5.9.8"; # 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 = "1dv933lnkcfrpjbq1hdc3b5r210f6vn5y04jp87pij4mmkn47a6y"; + sha256 = "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix deleted file mode 100644 index e53c3ceb5c4..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: -let - mptcpVersion = "0.94.6"; - modDirVersion = "4.14.127"; -in -buildLinux ({ - version = "${modDirVersion}-mptcp_v${mptcpVersion}"; - inherit modDirVersion; - - extraMeta = { - branch = "4.4"; - maintainers = with stdenv.lib.maintainers; [ teto layus ]; - }; - - src = fetchFromGitHub { - owner = "multipath-tcp"; - repo = "mptcp"; - rev = "v${mptcpVersion}"; - sha256 = "071cx9205wpzhi5gc2da79w2abs3czd60jg0xml7j1szc5wl4yfn"; - }; - - structuredExtraConfig = stdenv.lib.mkMerge [ - (import ./mptcp-config.nix { inherit stdenv; }) - structuredExtraConfig - ]; -} // args) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 3ea7d620595..11a5387cac3 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.74-rt41"; # updated by ./update-rt.sh + version = "5.4.74-rt42"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -21,7 +21,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0ap5zvdx6zxwqh2cy67rha4zgz3k8vqzd2vhll1mx81d10fmvmp8"; + sha256 = "11hk5ps2nsffcjmccp839l55nzbl9irss0ralj2y1xah1ikbs7fh"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 7931c5a0537..4cc8e38915b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10-rc2"; + version = "5.10-rc3"; extraMeta.branch = "5.10"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1qh353xd48mbvavpw61r2lz1cn8007yyc2xqiacbn8xsj7xdlxkj"; + sha256 = "08zwz6rjpd6nzhzs1hwix3709w22495sxcs0ajizyq50pydn77vd"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 475288a0b6f..19487fb7058 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20200616"; + version = "20201112"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "13jrs8hwh7dhjjb9kncb8lk199afaxglkh1cfisl6zca1h36g563"; + sha256 = "104l3py5z6405wpa2fscqpc5r9dgrf1ckaf27hrswivi32gvp7f2"; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 3e9a8d41b3a..74042cf7023 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "202009"; + version = "202010"; pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "1phkdmbgvrmv5w0xa4i2j9v7lcxkxjdhzi5x6l52z9y9as30dzbd"; + sha256 = "00i7bp7hqwnphh7qyjydvz5s14ydj8rwivz995bdnd37582dyij9"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index ef81dd54a73..25a59b14ab8 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,17 +7,13 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200908"; + version = "1.0.20201112"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1nd2kc3c62907kxm1084dw7krd8xsy3hxydmcpz4jvk03vm5dnkg"; + sha256 = "sha256-HnYvjZ3VUH79NwNIvyTTygWYbVqEL2ttvlOlLiHhb5s="; }; - patches = [ - ./linux-5.4.76-fix.patch - ]; - hardeningDisable = [ "pic" ]; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch b/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch deleted file mode 100644 index 78c3365bcb3..00000000000 --- a/pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h ---- wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h 2020-09-08 16:22:40.000000000 +0000 -+++ wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h 2020-11-10 15:05:43.720093522 +0000 -@@ -40,7 +40,7 @@ - #undef pull - #endif - --#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76) - #define SYM_FUNC_START ENTRY - #define SYM_FUNC_END ENDPROC - #endif diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index b9a8c83060b..80fb7389877 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -203,9 +203,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.0-rc5"; + version = "2.0.0-rc6"; - sha256 = "0vnldx95c36yy18v1hfr8r4cmmh3hw4n6pwz30drkwgywakjwnsd"; + sha256 = "0p027x9hsawniwa9h3yayfbcx010anwcfy45rqgkg2r91zr2nfvw"; isUnstable = true; }; } diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 88b0c843586..a3a59906437 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.8.1"; + version = "7.9.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "0jgwd8vb58yzwvnns0kyb0vzgrdvjwzvpk4x8228hrisjxahsm45"; + sha256 = "0y21ivvzzs6mq2p96csmhbvz1jzwp1x4zrw26qrwavf84l2v7nlh"; }; buildPhase = '' diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index f220f4002a0..2a835c346ce 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.0.5"; + version = "0.9.0.6"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "1mm8qghkif48jr7fq28kp7zk5x71zm43isf0a96crpi9qi91sdd5"; + sha256 = "1mgvsi8y3camj215vnbw20f1z6jvpbyrj1hrcj4szxfcjkxdg2hv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index add9dcebde3..fa54c2b5f26 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.117.5"; + version = "0.117.6"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -312,7 +312,7 @@ "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; "google_translate" = ps: with ps; [ gtts-token ]; - "google_travel_time" = ps: with ps; [ ]; # missing inputs: googlemaps + "google_travel_time" = ps: with ps; [ googlemaps ]; "google_wifi" = ps: with ps; [ ]; "gpmdp" = ps: with ps; [ websocket_client ]; "gpsd" = ps: with ps; [ ]; # missing inputs: gps3 diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d0d88f73bc1..fb2909c3253 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.117.5"; + hassVersion = "0.117.6"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1al2pwj2xrhqyaz2pal4a1bdh4sm63ijfaw8pajghz5z23gf62r0"; + sha256 = "1f9w7migwmdvnbiv4bi0b31zdfrsg87zgiz2l3gymn6w89f3h8y1"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 27f816b269a..a2ae37efe89 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.16.1964"; + version = "0.16.2131"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "06mj9pahziwm77nqjiqcbg3zfxkjy7sp15h84iqcxp0lpz0w2z55"; + sha256 = "1689w80cjji7wq1x3sgkpmx0n543mqkzvhb3hdmz6f66h479hcpk"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 5430c7ddf06..959e82d259b 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "livepeer"; - version = "0.5.11"; + version = "0.5.12"; runVend = true; vendorSha256 = "13cgwpf3v4vlvb0mgdxsdybpghx1cp3fzkdwmq8b193a8dcl8s63"; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "livepeer"; repo = "go-livepeer"; rev = "v${version}"; - sha256 = "12vbnl74z6jk77bnws8a5z5n7bnhkbb4ngzxfir5l3g9zrpsc5p3"; + sha256 = "15gx6pd6zn40x60p07dyaf1ydxvrg372lk3djp302mph8y0ijqfg"; }; # livepeer_cli has a vendoring problem diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 9aee89db9b7..a4346bdbd2b 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl , coreutils, findutils, gnugrep, gawk, icu, pcre, m4 -, buildPackages +, buildPackages, nixosTests , withLDAP ? true, openldap , withPgSQL ? false, postgresql , withMySQL ? false, libmysqlclient @@ -96,6 +96,8 @@ in stdenv.mkDerivation rec { --prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]} ''; + passthru.tests = { inherit (nixosTests) postfix postfix-raise-smtpd-tls-security-level; }; + meta = with lib; { homepage = "http://www.postfix.org/"; description = "A fast, easy to administer, and secure mail server"; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 7679cd88649..85420f237f0 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.3.1"; + version = "7.3.2"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "02by07d0h07zvws2yj71qa84sgp3x49p5ib0bahh0iyr50xqb3yj"; + sha256 = "0lknymp203bgrwq8g05pk07p385k2hh9wap4ql4lxylsn89szs65"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0rqipwiz8bsqkhiv30k9jmk5szhabk9rgl37n7y8l0yk2avbq895"; + sha256 = "08smddc86jm3ign1pb1arw1zqkh72dbddizzn1bqg4lanx2xwjca"; }; - vendorSha256 = "0shaxm2y5i29rb0k5bfpcsxbw3ap913l1rb5qbr9hrx7l142dbx8"; + vendorSha256 = "09rb96fm7ij16r843lbwcxb26vmjyahs1bi5pnnqz0mnm0vvmsjb"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 7af9970b507..6755aeb9968 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,19 +4,19 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "5.21.2"; + version = "6.1.2"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "1hsvdqz0ckk8d1yxinqwylw97jd3gnf7c63zkjly87vasg98qk9x"; + sha256 = "1g4vh4ay5m3sl00j8rn4db87kfdyxcmnaf0rxnv4ah2fbj5nrh2n"; }; inherit subPackages postInstall; - vendorSha256 = "06yfaj9k5n3jw8a142sscaqrvdw2lq51v884lp65wjdwy5c3jbba"; + vendorSha256 = "12qi94k8fjx0kaq2x977yhan8ynd6j6cbqx1l60gqs2xgkm71k9r"; doCheck = false; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 8e6800f48f9..68fb973038c 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "099waxv4p6jq2nimc3ql80j8ikhbzqwr2470x8m96x5kcirmz8nl"; + sha256 = "0432pxpl071wjsijc5b7176mc4lr7sqdwyzqn7dvwkrvvq3n6g5k"; }; - vendorSha256 = "0vfl6bra6487vzv0hd1pnkq7888m4ddn12q69gcm6a7w1z5wvj5b"; + vendorSha256 = "0pbnkqwpp74vanyk3cljj4kgbcid16y9mb5my3iiimbrziw2dkwr"; doCheck = false; diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index a418417ce2f..62d576ffc6d 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "1.4p2"; + version = "2.0"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "0fpnj9yvmj4gbbfpya4i0lyin56r782pz19z3pgd8xgs22gd48cc"; + sha256 = "0vr42s8l617k6893zq7qn9wz7kcdchmr99ivbkrmvd38qrhsa02l"; }; buildInputs = [ libressl ]; diff --git a/pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch b/pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch new file mode 100644 index 00000000000..dd4de7321e9 --- /dev/null +++ b/pkgs/servers/pulseaudio/add-option-for-installation-sysconfdir.patch @@ -0,0 +1,100 @@ + +diff --git a/meson.build b/meson.build +index 86af7243e..e2d48ab94 100644 +--- a/meson.build ++++ b/meson.build +@@ -65,6 +65,11 @@ datadir = join_paths(prefix, get_option('datadir')) + localedir = join_paths(prefix, get_option('localedir')) + localstatedir = join_paths(prefix, get_option('localstatedir')) + sysconfdir = join_paths(prefix, get_option('sysconfdir')) ++if get_option('sysconfdir_install') != '' ++ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install')) ++else ++ sysconfdir_install = sysconfdir ++endif + privlibdir = join_paths(libdir, 'pulseaudio') + + alsadatadir = get_option('alsadatadir') +@@ -75,6 +80,11 @@ endif + pkgconfigdir = join_paths(libdir, 'pkgconfig') + pulselibexecdir = join_paths(libexecdir, 'pulse') + pulsesysconfdir = join_paths(sysconfdir, 'pulse') ++if get_option('sysconfdir_install') != '' ++ pulsesysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'), 'pulse') ++else ++ pulsesysconfdir_install = pulsesysconfdir ++endif + + modlibexecdir = get_option('modlibexecdir') + if modlibexecdir == '' +diff --git a/meson_options.txt b/meson_options.txt +index 824f24e08..59a2b57ab 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -66,6 +66,9 @@ option('bashcompletiondir', + option('zshcompletiondir', + type : 'string', + description : 'Directory for zsh completion scripts ["no" disables]') ++option('sysconfdir_install', ++ type: 'string', value: '', ++ description: 'sysconfdir to use during installation') + + # Optional features + +diff --git a/src/daemon/meson.build b/src/daemon/meson.build +index 9c9f807e7..425cecb46 100644 +--- a/src/daemon/meson.build ++++ b/src/daemon/meson.build +@@ -53,7 +53,7 @@ if x11_dep.found() + po_dir : po_dir, + type : 'desktop', + install : true, +- install_dir : join_paths(sysconfdir, 'xdg', 'autostart'), ++ install_dir : join_paths(sysconfdir_install, 'xdg', 'autostart'), + ) + + desktop_utils = find_program('desktop-file-validate', required: false) +@@ -85,7 +85,7 @@ custom_target('daemon.conf', + command : [m4, '@INPUT@'], + build_by_default : true, + install : true, +- install_dir : pulsesysconfdir, ++ install_dir : pulsesysconfdir_install, + ) + + default_conf = configuration_data() +@@ -111,7 +111,7 @@ custom_target('default.pa', + command : [m4, '@INPUT@'], + build_by_default : true, + install : true, +- install_dir : pulsesysconfdir, ++ install_dir : pulsesysconfdir_install, + ) + + system_conf = configuration_data() +@@ -132,12 +132,12 @@ custom_target('system.pa', + command : [m4, '@INPUT@'], + build_by_default : true, + install : true, +- install_dir : pulsesysconfdir, ++ install_dir : pulsesysconfdir_install, + ) + + if dbus_dep.found() + install_data('pulseaudio-system.conf', +- install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d') ++ install_dir : join_paths(sysconfdir_install, 'dbus-1', 'system.d') + ) + endif + +diff --git a/src/pulse/meson.build b/src/pulse/meson.build +index aaebff53e..05a29a0d0 100644 +--- a/src/pulse/meson.build ++++ b/src/pulse/meson.build +@@ -130,5 +130,5 @@ client_conf_file = configure_file( + input : 'client.conf.in', + output : 'client.conf', + configuration : client_conf, +- install_dir : pulsesysconfdir, ++ install_dir : pulsesysconfdir_install, + ) diff --git a/pkgs/servers/pulseaudio/correct-ldflags.patch b/pkgs/servers/pulseaudio/correct-ldflags.patch new file mode 100644 index 00000000000..174cb8b4f74 --- /dev/null +++ b/pkgs/servers/pulseaudio/correct-ldflags.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 45df103f0..d57d13172 100644 +--- a/meson.build ++++ b/meson.build +@@ -342,7 +342,7 @@ cdata.set('MESON_BUILD', 1) + # On ELF systems we don't want the libraries to be unloaded since we don't clean them up properly, + # so we request the nodelete flag to be enabled. + # On other systems, we don't really know how to do that, but it's welcome if somebody can tell. +-nodelete_link_args = ['-Wl,-z,nodelete'] ++nodelete_link_args = cc.get_supported_link_arguments(['-Wl,-z,nodelete']) + + # Code coverage + diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 513249cb7ad..c9e2c3aa6e5 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -124,6 +124,10 @@ stdenv.mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" ''; + passthru = { + pulseDir = "lib/pulse-" + lib.versions.majorMinor version; + }; + meta = { description = "Sound server for POSIX and Win32 systems"; homepage = "http://www.pulseaudio.org/"; diff --git a/pkgs/servers/pulseaudio/hsphfpd.nix b/pkgs/servers/pulseaudio/hsphfpd.nix new file mode 100644 index 00000000000..8c1bea86aca --- /dev/null +++ b/pkgs/servers/pulseaudio/hsphfpd.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }: + +let + perlLibs = with perlPackages; [ NetDBus XMLTwig XMLParser ]; +in +stdenv.mkDerivation { + pname = "hsphfpd"; + version = "2020-10-25"; + + src = fetchFromGitHub { + owner = "pali"; + repo = "hsphfpd-prototype"; + rev = "601bf8f7bf2da97257aa6f786ec4cbb69b0ecbc8"; + sha256 = "06hh0xmp143334x8dg5nmp5727g38q2m5kqsvlrfia6vw2hcq0v0"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/dbus-1/system.d + cp org.hsphfpd.conf $out/share/dbus-1/system.d + + mkdir -p $out/bin + cp *.pl $out/bin + + runHook postInstall + ''; + + postFixup = '' + for f in $out/bin/*.pl; do + wrapProgram "$f" --set PERL5LIB "${perlPackages.makePerlPath perlLibs}" + done + ''; + + meta = with stdenv.lib; { + description = "Bluetooth HSP/HFP daemon"; + homepage = "https://github.com/pali/hsphfpd-prototype"; + license = licenses.artistic1; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/pulseaudio/pali.nix b/pkgs/servers/pulseaudio/pali.nix new file mode 100644 index 00000000000..d5ae80b5e79 --- /dev/null +++ b/pkgs/servers/pulseaudio/pali.nix @@ -0,0 +1,219 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitLab +, meson +, ninja +, pkgconfig +, libsndfile +, libtool +, makeWrapper +, perlPackages +, xorg +, libcap +, alsaLib +, glib +, dconf +, avahi +, libjack2 +, libasyncns +, lirc +, dbus +, sbc +, bluez5 +, udev +, openssl +, fftwFloat +, soxr +, speexdsp +, systemd +, webrtc-audio-processing +, gtk3 +, tdb +, orc +, check +, gettext +, gst_all_1 +, libopenaptx + +, x11Support ? true + +, # Whether to support the JACK sound system as a backend. + jackaudioSupport ? false + +, airtunesSupport ? true + +, bluetoothSupport ? true + +, remoteControlSupport ? true + +, zeroconfSupport ? true + +, # Whether to build only the library. + libOnly ? false + +# Building from Git source +, fromGit ? true + +, CoreServices +, AudioUnit +, Cocoa +}: + +stdenv.mkDerivation rec { + pname = "${if libOnly then "lib" else ""}pulseaudio-hsphfpd"; + version = "13.99.2"; + + outputs = [ "out" "dev" ]; + + # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/288 + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pali"; + repo = "pulseaudio"; + rev = "5336b39e7e03cf50386e719e287a712b59730eb8"; + sha256 = "0vc0i5rzkns3xw6y2q0c94p2qdi5k3mgjvhicgq1b0py2qxmji16"; + }; + + patches = [ + ./add-option-for-installation-sysconfdir.patch + ./correct-ldflags.patch + ]; + + # Says it should be v${version} but it's parsing logic is broken + preConfigure = lib.optionalString fromGit '' + sed -i "s@version : run_command.*@version: '${version}',@" meson.build + ''; + + nativeBuildInputs = [ + gettext + makeWrapper + meson + ninja + pkgconfig + perlPackages.perl + perlPackages.XMLParser + ]; + + checkInputs = [ + check + ]; + + propagatedBuildInputs = lib.optional stdenv.isLinux libcap; + + buildInputs = [ + libopenaptx + fftwFloat + libsndfile + libtool + orc + soxr + speexdsp + tdb + sbc + gst_all_1.gst-plugins-base + ] ++ lib.optionals bluetoothSupport [ + bluez5 + ] ++ lib.optionals stdenv.isLinux [ + dbus + glib + gtk3 + libasyncns + ] ++ lib.optionals stdenv.isDarwin [ + AudioUnit + Cocoa + CoreServices + ] ++ lib.optionals (!libOnly) ( + lib.optionals x11Support [ + xorg.libXi + xorg.libXtst + xorg.xlibsWrapper + ] ++ lib.optionals stdenv.isLinux [ + alsaLib + systemd + udev + ] ++ lib.optional airtunesSupport openssl + ++ lib.optional jackaudioSupport libjack2 + ++ lib.optional remoteControlSupport lirc + ++ lib.optional zeroconfSupport avahi + ++ [ webrtc-audio-processing ] + ); + + mesonFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + "-Daccess_group=audio" + "-Dbashcompletiondir=${placeholder "out"}/share/bash-completions/completions" + "-Dman=false" # TODO: needs xmltoman; also doesn't check for this + "-Dsysconfdir_install=${placeholder "out"}/etc" + "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" + "-Dzshcompletiondir=${placeholder "out"}/share/zsh/site-functions" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dasyncns=disabled" + "-Ddbus=disabled" + "-Dglib=disabled" + "-Dgsettings=disabled" + "-Dgtk=disabled" + ] ++ lib.optionals (!stdenv.isLinux || libOnly) [ + "-Dalsa=disabled" + "-Dsystemd=disabled" + "-Dudev=disabled" + ] ++ lib.optional libOnly "-Dwebrtc-aec=disabled" + ++ lib.optional (!x11Support) "-Dx11=disabled" + ++ lib.optional (!bluetoothSupport) "-Dbluez5=false" + ++ lib.optional (!airtunesSupport) "-Dopenssl=disabled" + ++ lib.optional (!jackaudioSupport) "-Djack=disabled" + ++ lib.optional (!remoteControlSupport) "-Dlirc=disabled" + ++ lib.optional (!zeroconfSupport) "-Davahi=disabled" + ++ lib.optional (!doCheck) "-Dtests=false"; + + # To create ~/.config/pulse + preCheck = '' + export HOME=$(mktemp -d) + ''; + + doCheck = true; + + # not sure what the best practices are here -- can't seem to find a way + # for the compiler to bring in stdlib and stdio (etc.) properly + # the alternative is to copy the files from /usr/include to src, but there are + # probably a large number of files that would need to be copied (I stopped + # after the seventh) + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I/usr/include"; + + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreServices -framework Cocoa -framework AudioUnit"; + + postInstall = '' + moveToOutput lib/cmake "$dev" + rm -f $out/bin/qpaeq # this is packaged by the "qpaeq" package now, because of missing deps + '' + lib.optionalString libOnly '' + rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} + ''; + + preFixup = lib.optionalString (stdenv.isLinux && !libOnly) '' + wrapProgram $out/libexec/pulse/gsettings-helper \ + --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${pname}-${version}" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" + ''; + + passthru = { + pulseDir = "lib/pulse-" + lib.versions.majorMinor version; + }; + + meta = with lib; { + description = "A featureful, general-purpose sound server"; + homepage = "http://www.pulseaudio.org/"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + longDescription = '' + PulseAudio is a sound system for POSIX OSes, meaning that it is + a proxy for your sound applications. It allows you to do advanced + operations on your sound data as it passes between your application + and your hardware. Things like transferring the audio to a different machine, + changing the sample format or channel count and mixing several sounds into one + are easily achieved using a sound server. + ''; + }; +} diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 72cebb95b6b..892ac1921a2 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "rnUmPyT9jAqm7Vf2TokgRGPTn7rTBUvrpJU21IopFsM="; + sha256 = "0mslag208410bvnhnd5hr7zvj8026m291ivkvr9sz3v6rh68cisy"; }; - vendorSha256 = "jAWDz/TclfCKQR/Gh99zSiGAsraciNU+yzFe5DGTeQI="; + vendorSha256 = "1884lbfsalry68m0kzfvbrk4dz9y19d2xxaivafwb7nc0wp64734"; # Tests need docker doCheck = false; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index a382c969da8..4eab9d364e1 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.21.42"; + version = "0.22.15"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "0a18vn1vy4zdp40iizgg3yji6k74r54rb7d7gn5byz1zj28g5c5c"; + sha256 = "1hc0aahfxyv05d3bskfxcv7ik5zvd1j22r3z964idhch8csxw92l"; }; dontBuild = true; diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 3418335d418..3e7548fea34 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -14,13 +14,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "20.1.7"; + version = "20.1.8"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1m1jziby0mzfbpwsak1marh1k9sx8vhc17ix6lgikxip4dpf52qg"; + sha256 = "0mm3hfr778c7djza8gr1clwa8wca4d3ldh9hlg80avw4x664y5zi"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index c97f8344c91..37bc4aa70d8 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - version = "0.2.0"; + version = "0.3.0"; pname = "tempo"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "tempo"; - sha256 = "061l72il8arxa53zfbasiwyjdxc4bf498glxrdj5ijcwgvx14275"; + sha256 = "0inqljiavqyq8dk2w0w0l2bds5390mrf8j190yb7lqwx9ra0cjp9"; }; vendorSha256 = null; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index bc0f052adc6..dffb92326b8 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.3.1"; + version = "2.3.2"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "09328yb6pbrikd1dljmf6spg177w1ymqk1i2152m5srd39mc6ixv"; + sha256 = "1h8wflkzjzz0nr81d99f8vksihqa6q4vmkqq40170a8js06fgizx"; stripRoot = false; }; - vendorSha256 = "026yxahwvbw41vf7yfycwmw797fpw19g1nyi1wcxkkkw383v7dsk"; + vendorSha256 = "16y6cyw4xipadwz7wlzl55sn81by9hc37crf143dfb4c3kmwb581"; doCheck = false; diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix index 73c2fcce347..13ad9d69ad6 100644 --- a/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/pkgs/servers/web-apps/rss-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2020-02-26"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "075k4bylx9308d083ry5a9q4629ccnrnndqqdqp1g42rzlqrw79q"; + sha256 = "00cp61lqvhi7b7j0rglsqg3l7cg8s9b8vq098bgvg5dygyi44hyv"; }; patchPhase = '' diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 5dab6e470cb..adeab519a0b 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-11-10"; + version = "2020-11-12"; pname = "oh-my-zsh"; - rev = "dc4692b53e4a1dc512d405f36f2d2af30c66304b"; + rev = "9b119866dd0e2d5054abd992f4dfbf346ac81b0d"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "00jm6vvjq265injnrd6mbmq2dm3w8wmw3g7ibhv9spi2r3zb6400"; + sha256 = "0m65ii79lp8mhl4adicg4qqzj93321gxpg6s91h0wbpkdgd53qxw"; }; installPhase = '' diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index bfcd3be5e9c..ac7035045bb 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.13.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "16q9v4c8lagp4vxm7qhagilqnwf1g4pbds56x5wfj4cwc0x2gclw"; + sha256 = "0r4y8bglwdq85dwlxh9sm23ppzy1z7i8kmjny5mx9css0likj8qv"; }; installPhase = '' diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 271034fa889..6de26c81e62 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0kg966czixkmaaznl7xm751jpx4252nkm99vaigg1iwhlx2yczh9"; + sha256 = "08vdcbgi0s9rm8rh025yifacqma2c0dxf6jdfnacrz1gj2s7s4rd"; }; vendorSha256 = "1lhs1h0x3ryq0bd5w9ny7i2j9d0x2904br1vlxy677w2xsa9213p"; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 528a4467bb8..05d0f7c7c29 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.5"; + version = "0.10.7"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0w6a8pfk5s30yi5038kdqh4dncx2pskm7a23z66c4xj3842ci79c"; + sha256 = "0aaspzx8sna1m5zldql0ps3sldazwr32q0md0p8z3nimww24i3b3"; }; - cargoSha256 = "07fwznx2czk1ibb77xcfhma9dpqps0m7rsmbb90gah6f32gah617"; + cargoSha256 = "1nb38nnmmc4hf8crp0bka029hlph15zm796nqziq25i26cgz4xvp"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix new file mode 100644 index 00000000000..03fa9156aad --- /dev/null +++ b/pkgs/tools/admin/ssmsh/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ssmsh"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "bwhaley"; + repo = pname; + rev = "v${version}"; + sha256 = "0rvvawn4cavqhbrrp616mi5ipn4q6j22227h4rbjh0zxdlna23gm"; + }; + + vendorSha256 = "127xni0i7w42075bspmm5r61j858i1p59jr2ib8f9r1pbizh63xw"; + + doCheck = true; + + buildFlagsArray = [ "-ldflags=-w -s -X main.Version=${version}" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/bwhaley/ssmsh"; + description = "An interactive shell for AWS Parameter Store"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks ]; + }; +} diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 3ceb0e8509c..51f6499f8e3 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "0anrn7dkxgbzilh45gyqrp2930bkg3g3diarb50qp0rlim302sgy"; + sha256 = "1gb9xk40drj7z6sw6a2hva4kvim508q4f3cfjpmr7yjzspqy32p0"; }; vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r"; diff --git a/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch new file mode 100644 index 00000000000..0e31725936f --- /dev/null +++ b/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch @@ -0,0 +1,42 @@ +From 56873cf29974ff0dfc1ba1afb7022ce49e300835 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Wed, 11 Nov 2020 11:58:25 +0100 +Subject: [PATCH 2/2] Make sure that the setuid-wrapped `umount` is invoked + +--- + src/dav_fuse.c | 2 +- + src/umount_davfs.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dav_fuse.c b/src/dav_fuse.c +index 734bc1f..4501433 100644 +--- a/src/dav_fuse.c ++++ b/src/dav_fuse.c +@@ -187,7 +187,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, + unmounting = 1; + pid_t pid = fork(); + if (pid == 0) { +- execl("/bin/umount", "umount", "-il", mountpoint, NULL); ++ execl("@wrapperDir@/umount", "umount", "-il", mountpoint, NULL); + _exit(EXIT_FAILURE); + } + } +diff --git a/src/umount_davfs.c b/src/umount_davfs.c +index b7019c3..75e3b4b 100644 +--- a/src/umount_davfs.c ++++ b/src/umount_davfs.c +@@ -122,9 +122,9 @@ main(int argc, char *argv[]) + + char *umount_command = NULL; + if (mpoint) { +- umount_command = ne_concat("umount -i '", mpoint, "'", NULL); ++ umount_command = ne_concat("@wrapperDir@/umount -i '", mpoint, "'", NULL); + } else { +- umount_command = ne_concat("umount -i '", argv[optind], "'", NULL); ++ umount_command = ne_concat("@wrapperDir@/umount -i '", argv[optind], "'", NULL); + error(0, 0, + _("\n" + " can't evaluate PID file name;\n" +-- +2.28.0 + diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 4f818ed213b..02536a13d15 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,42 +1,32 @@ { stdenv , fetchurl , fetchpatch -, autoreconfHook , neon , procps , substituteAll , zlib +, wrapperDir ? "/run/wrappers/bin" }: stdenv.mkDerivation rec { - name = "davfs2-1.5.6"; + name = "davfs2-1.6.0"; src = fetchurl { url = "mirror://savannah/davfs2/${name}.tar.gz"; - sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21"; + sha256 = "sha256-LmtnVoW9kXdyvmDwmZrgmMgPef8g3BMej+xFR8u2O1A="; }; - nativeBuildInputs = [ - autoreconfHook # neon-0.31.patch requires reconfiguration - ]; - buildInputs = [ neon zlib ]; patches = [ - ./isdir.patch ./fix-sysconfdir.patch (substituteAll { src = ./0001-umount_davfs-substitute-ps-command.patch; ps = "${procps}/bin/ps"; }) - - # Fix build with neon 0.31 - # http://savannah.nongnu.org/bugs/?58101 - (fetchpatch { - name = "neon-0.31.patch"; - url = "http://savannah.nongnu.org/bugs/download.php?file_id=48737"; - sha256 = "117x9rql6wk230pl1nram3pp8svll9wzfs5nf407z4jnrdr1zm0j"; - extraPrefix = ""; # empty means add 'a/' and 'b/' + (substituteAll { + src = ./0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch; + inherit wrapperDir; }) ]; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index f7732cd76fd..6abad445517 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python , db, libgcrypt, avahi, libiconv, pam, openssl, acl -, ed, glibc, libevent +, ed, libtirpc, libevent }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { /^afpd_LDADD /am__append_2 a - ${glibc.static}/lib/librpcsvc.a \\ + ${libtirpc}/lib/libtirpc.so \\ . w EOF diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix index 816aa1498cc..889f075645a 100644 --- a/pkgs/tools/filesystems/rar2fs/default.nix +++ b/pkgs/tools/filesystems/rar2fs/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rar2fs"; - version = "1.29.1"; + version = "1.29.2"; src = fetchFromGitHub { owner = "hasse69"; repo = pname; rev = "v${version}"; - sha256 = "03m20bnlm70xamrxnswxs4fzc2lr2wr6f7jq6b3a8sdwq3pqbzzx"; + sha256 = "0j7ai0gcbln2lyfc87xxmj0zpf3lnqa6fdm5rar3kdqhczb7s93y"; }; postPatch = '' diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 965c799a217..cdb8a16708e 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,20 +1,15 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "3.0.1"; + version = "4.0.0"; pname = "oxipng"; - src = fetchFromGitHub { - owner = "shssoichiro"; - repo = pname; - rev = "v${version}"; - sha256 = "11lncwxksm7aqczy9ay1qnba2wmgfsirhgrl6vv1jlgj41b7mzi5"; + src = fetchCrate { + inherit version pname; + sha256 = "0p9h006l75ci324lbcx496732pb77srcd46g6dnfw3mcrg33cspc"; }; - cargoSha256 = "0lalb981qzlnmqfg170mh6lnc0qlzb94wc39mf859g2jvxk3pkrl"; - - # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust - cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; + cargoSha256 = "1r2zw7p95abxqc31b5gswdyhm4msxsiml34dsh9x8zydhqnwy17j"; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index eb5afebaa67..c85e8958124 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.10.1"; + version = "8.10.2"; outputs = [ "bin" "out" "man" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "0zfhp86vbxs5qdnjy8hvdcjslfkafvd3s3rjr2dppwm0iz4gdbfx"; + sha256 = "1psi39a4h0awwbyizbsk467z0djwq0rh8hvkklbsd5b92m7768sp"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index a434b38453e..39b12326e80 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "1algvndpl63g3yzp3hhbgm7839njpbmw954nsiwf0j591spz4lph"; + sha256 = "1q248jnbv64mkvg18465dpvjkw2v2hfqyvdvdixyrwyrnlv5cicv"; }; # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 doCheck = false; - cargoSha256 = "1jccaln72aqa9975nbs95gimndqx5kgfkjmh40z6chx1hvn4m2ga"; + cargoSha256 = "18rskn8fchlgk295yk8sc2g1x6h43rmhqif871hgzdx1i35sbajr"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 077d5dc777c..b46d6490c4c 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.0.4"; + version = "1.0.5"; src = fetchCrate { inherit pname version; - sha256 = "06gq7xn9g5wk6d5p732998q7lxbw2g6qb8vsv95jcnybarf88n1v"; + sha256 = "0b28xdc3dwhr4vb3w19fsrbj2m82zwkg44l4an3r4mi2vgb25nv2"; }; - cargoSha256 = "1cbvi3jgj78gly3xkqbn8ai0ra5hpdphpdy7cphlrym0aj77ck4a"; + cargoSha256 = "07gsga5hf4l64kyjadqvmbg5bay7mad9kg2pi4grjxdw6lsxky0f"; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 79d27129173..1db776c8ff0 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "colord"; - version = "1.4.4"; + version = "1.4.5"; outputs = [ "out" "dev" "devdoc" "man" "installedTests" ]; src = fetchurl { url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz"; - sha256 = "19f0938fr7nvvm3jr263dlknaq7md40zrac2npfyz25zc00yh3ws"; + sha256 = "05sydi6qqqx1rrqwnga1vbg9srkf89wdcfw5w4p4m7r37m2flx5p"; }; patches = [ diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 011c5432089..76c868f9b58 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "160"; + version = "161"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1nshcgq31nrbh4r70i5azs7s0wfc4llb60ka1w8rncy22rg8rabc"; + sha256 = "sha256-Frk+aVUQhWn/TvlG4zy5+R2z92rFIwO4NPRXYkS0rN4="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 0804d8b0637..bc23d9dd846 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "3.2.0"; + version = "3.4.1"; # We use fetchurl instead of fetchFromGitHub because the release pack has some # special files. src = fetchurl { url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "0j554ja4min5rbqni8qn5gzk4xiyd643b8r50jyi32pcs88dwp7n"; + sha256 = "02hjf432mq5qpbf1hywid7b356jys5n9brrrmm6z6r05jpzybbg3"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index 19dafb4cef1..a823973bf9a 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "15lwy2rrb5d5r0asa51bgjr42pcknk6znx6qirw9s924i8dbzp6s"; + sha256 = "0a3bah5xa2vmxgqkqihbvcc8rpl64yhw3i0c30lhfdfza0jisaql"; }; vendorSha256 = "06y1v0v1kkbd5vxa8h0qvasm9ibwwhz0v4x03k3nb5xlwn0x9jx8"; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index ca75bf34dd1..8d71f75622c 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mutagen"; - version = "0.11.7"; + version = "0.11.8"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "11wp94khj9bzmadij0nq6i6q0x9z6h0zy4a6fhf322y5nxsmvcgy"; + sha256 = "17ycd2y7hgwa2yxbin86i6aj67x7xaajwz3mqgdyfvkja5hgbjyr"; }; vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index ba210ca3632..4b35d23940d 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9HZLr/dwr5T1m6H/SHy9ULfKMkyrLNb2Z8W3RlSWzGM="; + sha256 = "1l4acikxkxvmdqn10ck4w4f100vz7kfrzghz5h4haj7ycrr35j3l"; }; - cargoSha256 = "sha256-cyffVX1XEF5zaNbk/VeZEtKG/Npwv5Yzz9OU5G9UyGc="; + cargoSha256 = "0rmy0jnf5rqd4dqyl6rinxb3n3rzqnixrybs4i27lcas9m753z40"; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index a84ad1fadb0..601694ebc37 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgcenter"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "lesovsky"; repo = "pgcenter"; rev = "v${version}"; - sha256 = "03n1gn944z6rz5g643y68hvfxpxp65mip32w1zx43xr60x1vpf2v"; + sha256 = "1axwsclssxsg38ppdmd4v1lbs87ksrwj5z76ckjk8jjfni1xp9sr"; }; vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2"; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 600aa3d07d2..ff1b6c01f4f 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.10.0"; + version = "1.10.2"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "1256mcac75nlr1c7pzsgqmjq026m6qxh9dlldndvl1s08bk7pxr9"; + sha256 = "0mhdw985gs9gh44iz78a588nnnapirpnd7s0zh35jyripx8pgw47"; }; vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index dfbe5536bcc..d5061d61f57 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.1.4"; + version = "0.1.7"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "1x9wb0gj5l71xz15ia0i2hrnhcpf457i21w41jzw2ink2fbdxp3b"; + sha256 = "0kspix7ac4fb0gblrlhnf8hi2ijc997qqkhmy47jibmj6120lmqk"; }; - vendorSha256 = "0dg4f9g6895nv3c6d74ijl6hzsyn620ndspbcq7ynvb1z0hsg6iz"; + vendorSha256 = "08fjavadx5mwibzc130mlhp4zph6iwv15xnd4rsniw6zldkzmczy"; doCheck = false; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 456798d816f..16d088c0098 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2020.5"; + version = "2020.7"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "MLLCmnStvGuSbVBdfOm2Sdzzz7LvPQkgDt9G0CDqCkA="; + sha256 = "1f8ajri6k5ni2rm8c75nydl8wcza0q6bv2bia3aqd0mr7iw31pbm"; }; nativeBuildInputs = [ @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; - homepage = "https://rpm-ostree.readthedocs.io/en/latest/"; + homepage = "https://coreos.github.io/rpm-ostree/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index bdbea7367b8..32263bad4a1 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "slurp"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${version}"; - sha256 = "191yjn909dax8z66ks58wjadrycpbwryirkfjcy99dhq7dijg9fh"; + sha256 = "1fby2v2ylcadgclds05wpkl9xi2r9dfz49dqyqpn20rjv1wnz3jv"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 33c8792d418..2f5a52531b9 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.17.1.14"; + version = "0.20.11.7"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "1bqazna223ibqjwbc1wfvfnspfyrvjy8347qlrgv4cpng72n7gfi"; + sha256 = "0083vagy0jkahb5sw1il7r53ggk45zbjwwjsqd76v7ph3v1awf4v"; }; patches = [ @@ -21,18 +21,6 @@ python3Packages.buildPythonApplication rec { then "/usr/lib/libSystem.dylib" else "${stdenv.cc.libc}/lib/libc.so.6"; }) - - # Fix build on Python 3.6. - (fetchpatch { - url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch"; - sha256 = "0w49rjh433sjfc2cl5a9wlbr6kcn9f1qg905qsyv7ay3ar75wvyp"; - }) - - # Fix listing trashed files over mount points, see https://github.com/andreafrancia/trash-cli/issues/95 - (fetchpatch { - url = "https://github.com/andreafrancia/trash-cli/commit/436dfddb4c2932ba3ff696e4732750b7bdc58461.patch"; - sha256 = "02pkcz7nj67jbnqpw1943nrv95m8xyjvab4j62fa64r73fagm8m4"; - }) ]; checkInputs = with python3Packages; [ diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 2ecc64a09b1..62baff512bb 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "0hg15k9bz5iw7mv4m31rg4f5anfiirr3vjvy16z532vwfh05ixw3"; + sha256 = "1pgdajbphqfn430jwm052czz1d4ynl6n4z2wjzmblv7lwkbh9j3d"; }; - vendorSha256 = "032l0xrf4ny4ildinxlfjy8sslhcl2krmgnm07dnx999jxlswxym"; + vendorSha256 = "0x7r7qn4852q57fx5mcrw3aqdydmidk9g0hvj6apj81q77k5svqs"; doCheck = false; diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 0a76a04196c..3a02fceeaba 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.2-1"; + version = "0.9.3"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "19m8qfhmdzgz76xba9wi5cb12jqwr17afqzajvgq681i52fij0lr"; + sha256 = "wO1HwXl6Lf7+2fXX7i8nrD/hi9dAWn50Jkoztx6aT0Q="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index fc52662e536..68721bbdebc 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.27.0"; + version = "2.27.1"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "15ddzab93iqwbvxnaw5wp4dzwlxjqxvyy1c4w37jm69zkczylrmc"; + sha256 = "1ffq7jh14cj45wn5rx9awh5k8hqbfwm4fjz0a0rq22yqfwbbkkj2"; }; runVend = true; diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 4d58095c43b..b8f4eeea338 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spectre-meltdown-checker"; - version = "0.43"; + version = "0.44"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "1ys5m1yvm26qjlsjpqqd33lwpb880p0ay289hmifxjjawkqddjgg"; + sha256 = "1b47wlc52jnp2d5c7kbqnxmlm4g3cfbv25q30llv5mlmzs6d7bam"; }; prePatch = '' diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index dceb6730670..c0755fafc06 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0cx650cz4ap1ng25n17pkz0n6zcs87l4bs0mabhqr289rfkf3ddd"; + sha256 = "1iricyigm0rsc8fr91vk3krvyafbnp0y3ww1rjv94l6jbdl7rrlb"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 2ede543cd39..4257e2f2fd1 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.08-1"; + version = "3.1.09-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "15b0fn8kv09k7kzyzix1pr1wmjw5yinzgw01v8pf9p547m4a899a"; + sha256 = "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index 71bb6dfb357..b19e4c471c0 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "throttled"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "erpalma"; repo = pname; rev = "v${version}"; - sha256 = "1y1sczvj2qc8ml9i1rdzr8hklvci9bdphm3mmri2ncaqys8wdbh4"; + sha256 = "0qw124gdgjqij3xhgg8j1mdsg6j0xg340as5qf8hd3gwc38sqi9x"; }; nativeBuildInputs = [ python3Packages.wrapPython ]; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index bfa22a4fd18..1e2b76c008e 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "11.0.1"; + version = "11.3.3"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "194ds9i1zd80ynzwgv7kprax0crh7bbchayawdcvg2lyr64a82xn"; + sha256 = "0qv34clid65p11dgqalyk7b7myn5ibiz8i9xxhxkmjblw297p6ak"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 6f44c360267..40266a5440b 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "2.5.5"; + version = "3.0.4"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "0ba9h0m9c28rllym1djij3b97k4rj06nsgajmbxg5mpxfzplgxy2"; + sha256 = "0z3l6dm7v5fdki70nmz2qzrzqmkj3lngiwpswqmyygm7v8gvmimv"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 4011df99706..5ae858d79db 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.5.0"; + version = "2.6.1"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0favaijdddm0lajlv0a277mg286jh12kwfndf98zdp0vfq9lv00d"; + sha256 = "1xn3i1d8z2zlnykcz0z779naashn92kd7fnnssamjqblclr8dsp8"; }; vendorSha256 = null; diff --git a/pkgs/tools/text/vgrep/default.nix b/pkgs/tools/text/vgrep/default.nix index c51fce43467..a2ac4b51001 100644 --- a/pkgs/tools/text/vgrep/default.nix +++ b/pkgs/tools/text/vgrep/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vgrep"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "vrothberg"; repo = pname; rev = "v${version}"; - sha256 = "1waxp66286q325avvsq58s8qkfjqa39s5p8c3z59scpm0244nr80"; + sha256 = "06rnmg6ljj4f1g602wdp2wy9v0m1m0sj6jl6wywyjl8grjqc3vac"; }; vendorSha256 = null; diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index d57a054a8b7..7edbeee88b5 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "rootlesskit"; - version = "0.10.0"; + version = "0.11.0"; goPackagePath = "github.com/rootless-containers/rootlesskit"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - sha256 = "0jrzqaczd5zxlbvh0hjym8pc1d7y8c66gslq3d3l5vv4z7hz7yfr"; + sha256 = "1x5f02yw5bzkjwg7lcsa7549d8fj13dnk596rgg90q0z6vqfarzj"; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3db745ec44d..04b27b531e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -479,6 +479,8 @@ in ociTools = callPackage ../build-support/oci-tools { }; + octant = callPackage ../applications/networking/cluster/octant { }; + pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; pruneLibtoolFiles = makeSetupHook { name = "prune-libtool-files"; } @@ -2532,6 +2534,8 @@ in socklog = callPackage ../tools/system/socklog { }; + ssmsh = callPackage ../tools/admin/ssmsh { }; + stagit = callPackage ../development/tools/stagit { }; starboard = callPackage ../applications/networking/cluster/starboard { }; @@ -8582,6 +8586,8 @@ in ### DEVELOPMENT / COMPILERS + _4th = callPackage ../development/compilers/4th { }; + abcl = callPackage ../development/compilers/abcl { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -10899,6 +10905,8 @@ in }; }); + bisoncpp = callPackage ../development/tools/parsing/bisonc++ { }; + black = with python3Packages; toPythonApplication black; blackfire = callPackage ../development/tools/misc/blackfire { }; @@ -11945,7 +11953,9 @@ in travis = callPackage ../development/tools/misc/travis { }; - tree-sitter = callPackage ../development/tools/parsing/tree-sitter { }; + tree-sitter = callPackage ../development/tools/parsing/tree-sitter { + inherit (darwin.apple_sdk.frameworks) Security; + }; trellis = callPackage ../development/tools/trellis { }; @@ -12652,7 +12662,10 @@ in flyway = callPackage ../development/tools/flyway { }; - fmt = callPackage ../development/libraries/fmt/default.nix { }; + inherit (callPackages ../development/libraries/fmt { }) + fmt_6 fmt_7; + + fmt = fmt_7; fplll = callPackage ../development/libraries/fplll {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; @@ -16788,7 +16801,9 @@ in grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; - gerbera = callPackage ../servers/gerbera { }; + gerbera = callPackage ../servers/gerbera { + fmt = fmt_6; + }; gobetween = callPackage ../servers/gobetween { }; @@ -17031,6 +17046,12 @@ in # PulseAudio daemons + hsphfpd = callPackage ../servers/pulseaudio/hsphfpd.nix { }; + + pulseaudio-hsphfpd = callPackage ../servers/pulseaudio/pali.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; + }; + pulseaudio = callPackage ../servers/pulseaudio { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; @@ -17963,18 +17984,11 @@ in linux_mptcp = linux_mptcp_95; - linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((stdenv.hostPlatform.platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; + linux_mptcp_5_9 = linux_5_9.override { + structuredExtraConfig = with lib.kernel; { + MPTCP = yes; + MPTCP_IPV6 = yes; + }; }; linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { @@ -21597,7 +21611,9 @@ in swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; - waybar = callPackage ../applications/misc/waybar { }; + waybar = callPackage ../applications/misc/waybar { + fmt = fmt_6; + }; hikari = callPackage ../applications/window-managers/hikari { }; @@ -22800,8 +22816,6 @@ in inherit (gnome2) libglade; }; - obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; @@ -23283,6 +23297,8 @@ in quilter = callPackage ../applications/editors/quilter { }; + quisk = python38Packages.callPackage ../applications/radio/quisk { }; + quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; @@ -24248,7 +24264,7 @@ in onlyLibVLC = true; }; - vmpk = callPackage ../applications/audio/vmpk { }; + vmpk = libsForQt5.callPackage ../applications/audio/vmpk { }; vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { }; @@ -24976,6 +24992,8 @@ in tessera = callPackage ../applications/blockchains/tessera.nix { }; + turbo-geth = callPackage ../applications/blockchains/turbo-geth.nix { }; + vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 757a77f0403..2947b369ed8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -599,8 +599,6 @@ let mparser = callPackage ../development/ocaml-modules/mparser { }; - mstruct = callPackage ../development/ocaml-modules/mstruct { }; - mtime = callPackage ../development/ocaml-modules/mtime { }; mustache = callPackage ../development/ocaml-modules/mustache { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c0581211150..fea50e92958 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1758,6 +1758,21 @@ let buildInputs = [ TestWarn ]; }; + CatalystAuthenticationStoreLDAP = buildPerlPackage { + pname = "Catalyst-Authentication-Store-LDAP"; + version = "1.016"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz"; + sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8"; + }; + propagatedBuildInputs = [ NetLDAP CatalystPluginAuthentication ClassAccessorFast ]; + buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ]; + meta = { + description= "Authentication from an LDAP Directory"; + license = with stdenv.lib.licenses; [ artistic1 ]; + }; + }; + CatalystComponentInstancePerContext = buildPerlPackage { pname = "Catalyst-Component-InstancePerContext"; version = "0.001001"; @@ -8300,12 +8315,12 @@ let }; }; - FutureAsyncAwait = buildPerlModule { + FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.45"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.45.tar.gz"; - sha256 = "1aq19b21r9i4c1mxkrv0irnx16234cnzsx50178c7xif4gqkar9k"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; + sha256 = "1iqbs7n8923xjkai51hiczn5an8cskddl7qrfi30axjl1d56h6r0"; }; buildInputs = [ TestRefcount ]; propagatedBuildInputs = [ Future XSParseSublike ]; @@ -14910,6 +14925,47 @@ let }; }; + NetLDAPServer = buildPerlPackage { + pname = "Net-LDAP-Server"; + version = "0.43"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz"; + sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x"; + }; + propagatedBuildInputs = [ NetLDAP ConvertASN1 ]; + meta = { + description = "LDAP server side protocol handling"; + license = with stdenv.lib.licenses; [ artistic1 ]; + }; + }; + + NetLDAPSID = buildPerlPackage { + pname = "Net-LDAP-SID"; + version = "0.0001"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-SID-0.001.tar.gz"; + sha256 = "1mnnpkmj8kpb7qw50sm8h4sd8py37ssy2xi5hhxzr5whcx0cvhm8"; + }; + meta = { + description= "Active Directory Security Identifier manipulation"; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + + NetLDAPServerTest = buildPerlPackage { + pname = "Net-LDAP-Server-Test"; + version = "0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz"; + sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i"; + }; + propagatedBuildInputs = [ NetLDAP NetLDAPServer TestMore DataDump NetLDAPSID ]; + meta = { + description= "test Net::LDAP code"; + license = with stdenv.lib.licenses; [ artistic1 ]; + }; + }; + NetNetmask = buildPerlPackage { pname = "Net-Netmask"; version = "1.9104"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2256683d3c6..625683c0497 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2012,6 +2012,8 @@ in { fastdtw = callPackage ../development/python-modules/fastdtw { }; + fastecdsa = callPackage ../development/python-modules/fastecdsa { }; + fasteners = callPackage ../development/python-modules/fasteners { }; fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 865e5cf2900..b3851ba20f0 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -286,6 +286,11 @@ in { libexecinfo = super.libexecinfo.override { enableShared = false; }; + tree-sitter = super.tree-sitter.override { + enableShared = false; + enableStatic = true; + }; + xorg = super.xorg.overrideScope' (xorgself: xorgsuper: { libX11 = xorgsuper.libX11.overrideAttrs (attrs: { depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ];