From 4b7a8ae94753d8cb3f11103bbc60144b9edc47b3 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 30 Apr 2022 18:56:59 +0200 Subject: [PATCH 01/70] treewide: refactor curlWithGnuTls into all-packages.nix --- pkgs/applications/audio/spotify/default.nix | 4 ++-- pkgs/applications/misc/robo3t/default.nix | 6 +----- .../applications/version-management/gitkraken/default.nix | 3 +-- pkgs/applications/video/filebot/default.nix | 8 +------- pkgs/build-support/appimage/default.nix | 2 +- pkgs/games/steam/fhsenv.nix | 2 +- pkgs/top-level/all-packages.nix | 8 +++----- 7 files changed, 10 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 65cf657d8a40..14caa6db9c45 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon }: @@ -26,7 +26,7 @@ let atk cairo cups - curl + curlWithGnuTls dbus expat ffmpeg diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 8c644e5f3cc4..81219fc75269 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, curl +, curlWithGnuTls , zlib , glib , xorg @@ -14,10 +14,6 @@ , makeWrapper }: -let - curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; -in - stdenv.mkDerivation rec { pname = "robo3t"; version = "1.4.3"; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 8d89420607a3..9d543af2691b 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsa-lib +{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curlWithGnuTls, alsa-lib , libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus @@ -9,7 +9,6 @@ with lib; let - curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; version = "8.4.0"; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index df435d03d09d..ca0849a4f968 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -1,13 +1,7 @@ { lib, stdenv, fetchurl, openjdk17, makeWrapper, autoPatchelfHook -, zlib, libzen, libmediainfo, curl, libmms, glib +, zlib, libzen, libmediainfo, curlWithGnuTls, libmms, glib }: -let - # FileBot requires libcurl-gnutls.so to build - curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - -in - stdenv.mkDerivation rec { pname = "filebot"; version = "4.9.6"; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 0bee6ce065ad..2b208ad16ddb 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -108,7 +108,7 @@ rec { xorg.libICE gnome2.GConf freetype - (curl.override { gnutlsSupport = true; opensslSupport = false; }) + curlWithGnuTls nspr nss fontconfig diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index d18accd0d546..86c04b5757a2 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -155,7 +155,7 @@ in buildFHSUserEnv rec { xorg.libSM xorg.libICE gnome2.GConf - (curl.override { gnutlsSupport = true; opensslSupport = false; }) + curlWithGnuTls nspr nss cups diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e665d0bdc23d..725bdb3e5e92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4972,6 +4972,8 @@ with pkgs; curlMinimal = callPackage ../tools/networking/curl { }; + curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; + curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; curlie = callPackage ../tools/networking/curlie { }; @@ -29588,11 +29590,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - spotify-unwrapped = callPackage ../applications/audio/spotify { - curl = curl.override { - opensslSupport = false; gnutlsSupport = true; - }; - }; + spotify-unwrapped = callPackage ../applications/audio/spotify { }; spotify = callPackage ../applications/audio/spotify/wrapper.nix { }; From 30b459c377d104767b9daf119d735f486dc17d4e Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 5 May 2022 11:32:30 +0200 Subject: [PATCH 02/70] dotty: rename to scala_3 Major version 3 of the Scala compiler started out under the codename 'dotty', and that's how it was packaged initially in nixpkgs. Now that dotty has become the 'official' scala 3 compiler (see also b0f0e1d), we should rename the package as well Fixes #170911 --- .../scala/{dotty-bare.nix => bare.nix} | 2 +- pkgs/development/compilers/scala/default.nix | 24 +++++++++++++++++++ pkgs/development/compilers/scala/dotty.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 5 ++-- 4 files changed, 28 insertions(+), 27 deletions(-) rename pkgs/development/compilers/scala/{dotty-bare.nix => bare.nix} (98%) create mode 100644 pkgs/development/compilers/scala/default.nix delete mode 100644 pkgs/development/compilers/scala/dotty.nix diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/bare.nix similarity index 98% rename from pkgs/development/compilers/scala/dotty-bare.nix rename to pkgs/development/compilers/scala/bare.nix index b954fdbe1edc..40a70ef2baa4 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/bare.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.1.0"; - pname = "dotty-bare"; + pname = "scala-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix new file mode 100644 index 000000000000..11787f1aa690 --- /dev/null +++ b/pkgs/development/compilers/scala/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, makeWrapper, jre, callPackage }: + +let + bare = callPackage ./bare.nix { + inherit stdenv fetchurl makeWrapper jre; + }; +in + +stdenv.mkDerivation { + pname = "scala"; + inherit (bare) version; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + ln -s ${bare}/bin/scalac $out/bin/scalac + ln -s ${bare}/bin/scaladoc $out/bin/scaladoc + ln -s ${bare}/bin/scala $out/bin/scala + ln -s ${bare}/bin/common $out/bin/common + ''; + + inherit (bare) meta; +} diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix deleted file mode 100644 index 1cd187f2e540..000000000000 --- a/pkgs/development/compilers/scala/dotty.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, callPackage }: - -let - dotty-bare = callPackage ./dotty-bare.nix { - inherit stdenv fetchurl makeWrapper jre; - }; -in - -stdenv.mkDerivation { - pname = "dotty"; - inherit (dotty-bare) version; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/bin - ln -s ${dotty-bare}/bin/scalac $out/bin/scalac - ln -s ${dotty-bare}/bin/scaladoc $out/bin/scaladoc - ln -s ${dotty-bare}/bin/scala $out/bin/scala - ln -s ${dotty-bare}/bin/common $out/bin/common - ''; - - inherit (dotty-bare) meta; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aca0f5950a7..e34b0848b6da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12400,8 +12400,6 @@ with pkgs; dictu = callPackage ../development/compilers/dictu { }; - dotty = callPackage ../development/compilers/scala/dotty.nix { }; - ecl = callPackage ../development/compilers/ecl { }; ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { }; @@ -13805,6 +13803,9 @@ with pkgs; scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; }; scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; }; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; + scala_3 = callPackage ../development/compilers/scala { }; + # deprecated + dotty = scala_3; scala = scala_2_13; scala-runners = callPackage ../development/compilers/scala-runners { From 0a9f6d1d9c7db38317db2d9a2cd2a1ef06edacfa Mon Sep 17 00:00:00 2001 From: David Tchekachev Date: Mon, 9 May 2022 03:34:56 +0300 Subject: [PATCH 03/70] bird-lg: init at 2022-05-09 --- pkgs/servers/bird-lg/default.nix | 43 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/servers/bird-lg/default.nix diff --git a/pkgs/servers/bird-lg/default.nix b/pkgs/servers/bird-lg/default.nix new file mode 100644 index 000000000000..9061a2d606a4 --- /dev/null +++ b/pkgs/servers/bird-lg/default.nix @@ -0,0 +1,43 @@ +{ buildGoModule, fetchFromGitHub, lib, symlinkJoin }: +let + generic = { modRoot, vendorSha256 }: + buildGoModule rec { + pname = "bird-lg-${modRoot}"; + version = "2022-05-08"; + + doDist = false; + + ldflags = [ + "-s" + "-w" + ]; + + inherit modRoot; + inherit vendorSha256; + + src = fetchFromGitHub { + owner = "xddxdd"; + repo = "bird-lg-go"; + rev = "348295b9aa954a92df2cf6b1179846a9486dafc0"; + sha256 = "sha256-2t8ZP9Uc0sJlqWiJMq3MVoARfMKsuTXJkuOid0oWgyY="; + }; + + meta = with lib; { + description = "Bird Looking Glass"; + homepage = "https://github.com/xddxdd/bird-lg-go"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tchekda ]; + }; + }; + + bird-lg-frontend = generic { + modRoot = "frontend"; + vendorSha256 = "sha256-WKuVGiSV5LZrJ8/672TRN6tZNQxdCktHV6nx0ZxCP4A="; + }; + + bird-lg-proxy = generic { + modRoot = "proxy"; + vendorSha256 = "sha256-7LZeCY4xSxREsQ+Dc2XSpu2ZI8CLE0mz0yoThP7/OO4="; + }; +in +symlinkJoin { name = "bird-lg"; paths = [ bird-lg-frontend bird-lg-proxy ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09c9766ff9d1..26c98cee536a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21598,6 +21598,8 @@ with pkgs; bird = callPackage ../servers/bird { }; + bird-lg = callPackage ../servers/bird-lg { }; + bloat = callPackage ../servers/bloat { }; bosun = callPackage ../servers/monitoring/bosun { }; From 0f63bd3ba84c300db46b384287b066c4c98ca3f4 Mon Sep 17 00:00:00 2001 From: David Tchekachev Date: Thu, 19 May 2022 12:37:12 +0300 Subject: [PATCH 04/70] nixos/bird-lg: init --- .../from_md/release-notes/rl-2205.section.xml | 7 + .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/bird-lg.nix | 269 ++++++++++++++++++ pkgs/servers/bird-lg/default.nix | 19 +- 5 files changed, 288 insertions(+), 10 deletions(-) create mode 100644 nixos/modules/services/networking/bird-lg.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 19aaf12f26a1..068c7e1b444b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -172,6 +172,13 @@ services.aesmd. + + + bird-lg, + a BGP looking glass for Bird Routing. Available as + services.bird-lg. + + rootless diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 9261511e7b8c..f483588e7033 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -59,6 +59,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable). +- [bird-lg](https://github.com/xddxdd/bird-lg-go), a BGP looking glass for Bird Routing. Available as [services.bird-lg](#opt-services.bird-lg.package). + - [rootless Docker](https://docs.docker.com/engine/security/rootless/), a `systemd --user` Docker service which runs without root permissions. Available as [virtualisation.docker.rootless.enable](options.html#opt-virtualisation.docker.rootless.enable). - [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](option.html#opt-services.matrix-conduit.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 35de34aac10c..abd45929578f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -733,6 +733,7 @@ ./services/networking/bitcoind.nix ./services/networking/autossh.nix ./services/networking/bird.nix + ./services/networking/bird-lg.nix ./services/networking/bitlbee.nix ./services/networking/blockbook-frontend.nix ./services/networking/blocky.nix diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix new file mode 100644 index 000000000000..515ef38608b4 --- /dev/null +++ b/nixos/modules/services/networking/bird-lg.nix @@ -0,0 +1,269 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.bird-lg; +in +{ + options = { + services.bird-lg = { + package = mkOption { + type = types.package; + default = pkgs.bird-lg; + defaultText = literalExpression "pkgs.bird-lg"; + description = "The Bird Looking Glass package to use."; + }; + + user = mkOption { + type = types.str; + default = "bird-lg"; + description = "User to run the service."; + }; + + group = mkOption { + type = types.str; + default = "bird-lg"; + description = "Group to run the service."; + }; + + frontend = { + enable = mkEnableOption "Bird Looking Glass Frontend Webserver"; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1:5000"; + description = "Address to listen on."; + }; + + proxyPort = mkOption { + type = types.port; + default = 8000; + description = "Port bird-lg-proxy is running on."; + }; + + domain = mkOption { + type = types.str; + default = ""; + example = "dn42.lantian.pub"; + description = "Server name domain suffixes."; + }; + + servers = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "gigsgigscloud" "hostdare" ]; + description = "Server name prefixes."; + }; + + whois = mkOption { + type = types.str; + default = "whois.verisign-grs.com"; + description = "Whois server for queries."; + }; + + dnsInterface = mkOption { + type = types.str; + default = "asn.cymru.com"; + description = "DNS zone to query ASN information."; + }; + + bgpMapInfo = mkOption { + type = types.listOf types.str; + default = [ "asn" "as-name" "ASName" "descr" ]; + description = "Information displayed in bgpmap."; + }; + + titleBrand = mkOption { + type = types.str; + default = "Bird-lg Go"; + description = "Prefix of page titles in browser tabs."; + }; + + netSpecificMode = mkOption { + type = types.str; + default = ""; + example = "dn42"; + description = "Apply network-specific changes for some networks."; + }; + + protocolFilter = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "ospf" ]; + description = "Information displayed in bgpmap."; + }; + + nameFilter = mkOption { + type = types.str; + default = ""; + example = "^ospf"; + description = "Protocol names to hide in summary tables (RE2 syntax),"; + }; + + timeout = mkOption { + type = types.int; + default = 120; + description = "Time before request timed out, in seconds."; + }; + + navbar = { + brand = mkOption { + type = types.str; + default = "Bird-lg Go"; + description = "Brand to show in the navigation bar ."; + }; + + brandURL = mkOption { + type = types.str; + default = "/"; + description = "URL of the brand to show in the navigation bar."; + }; + + allServers = mkOption { + type = types.str; + default = "ALL Servers"; + description = "Text of 'All server' button in the navigation bar."; + }; + + allServersURL = mkOption { + type = types.str; + default = "all"; + description = "URL of 'All servers' button."; + }; + }; + + extraArgs = mkOption { + type = types.lines; + default = ""; + description = " + Extra parameters documented here. + "; + }; + }; + + proxy = { + enable = mkEnableOption "Bird Looking Glass Proxy"; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1:8000"; + description = "Address to listen on."; + }; + + allowedIPs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "192.168.25.52" "192.168.25.53" ]; + description = "List of IPs to allow (default all allowed)."; + }; + + birdSocket = mkOption { + type = types.str; + default = "/run/bird.ctl"; + example = "/var/run/bird/bird.ctl"; + description = "Bird control socket path."; + }; + + traceroute = { + binary = mkOption { + type = types.str; + default = "${pkgs.traceroute}/bin/traceroute"; + defaultText = literalExpression ''"''${pkgs.traceroute}/bin/traceroute"''; + description = "Traceroute's binary path."; + }; + + rawOutput = mkOption { + type = types.bool; + default = false; + description = "Display traceroute output in raw format."; + }; + }; + + extraArgs = mkOption { + type = types.lines; + default = ""; + description = " + Extra parameters documented here. + "; + }; + }; + }; + }; + + ###### implementation + + config = { + systemd.services = { + bird-lg-frontend = mkIf cfg.frontend.enable { + enable = true; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + description = "Bird Looking Glass Frontend Webserver"; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + ProtectSystem = "full"; + ProtectHome = "yes"; + MemoryDenyWriteExecute = "yes"; + User = cfg.user; + Group = cfg.group; + }; + script = '' + ${cfg.package}/bin/frontend \ + --servers ${concatStringsSep "," cfg.frontend.servers } \ + --domain ${cfg.frontend.domain} \ + --listen ${cfg.frontend.listenAddress} \ + --proxy-port ${toString cfg.frontend.proxyPort} \ + --whois ${cfg.frontend.whois} \ + --dns-interface ${cfg.frontend.dnsInterface} \ + --bgpmap-info ${concatStringsSep "," cfg.frontend.bgpMapInfo } \ + --title-brand ${cfg.frontend.titleBrand} \ + --navbar-brand ${cfg.frontend.navbar.brand} \ + --navbar-brand-url ${cfg.frontend.navbar.brandURL} \ + --navbar-all-servers ${cfg.frontend.navbar.allServers} \ + --navbar-all-url ${cfg.frontend.navbar.allServersURL} \ + --net-specific-mode ${cfg.frontend.netSpecificMode} \ + --protocol-filter ${concatStringsSep "," cfg.frontend.protocolFilter } \ + --name-filter ${cfg.frontend.nameFilter} \ + --time-out ${toString cfg.frontend.timeout} \ + ${cfg.frontend.extraArgs} + ''; + }; + + bird-lg-proxy = mkIf cfg.proxy.enable { + enable = true; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + description = "Bird Looking Glass Proxy"; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + ProtectSystem = "full"; + ProtectHome = "yes"; + MemoryDenyWriteExecute = "yes"; + User = cfg.user; + Group = cfg.group; + }; + script = '' + ${cfg.package}/bin/proxy \ + --allowed ${concatStringsSep "," cfg.proxy.allowedIPs } \ + --bird ${cfg.proxy.birdSocket} \ + --listen ${cfg.proxy.listenAddress} \ + --traceroute_bin ${cfg.proxy.traceroute.binary} + --traceroute_raw ${boolToString cfg.proxy.traceroute.rawOutput} + ${cfg.proxy.extraArgs} + ''; + }; + }; + users = mkIf (cfg.frontend.enable || cfg.proxy.enable) { + groups."bird-lg" = mkIf (cfg.group == "bird-lg") { }; + users."bird-lg" = mkIf (cfg.user == "bird-lg") { + description = "Bird Looking Glass user"; + extraGroups = lib.optionals (config.services.bird2.enable) [ "bird2" ]; + group = cfg.group; + isSystemUser = true; + }; + }; + }; +} diff --git a/pkgs/servers/bird-lg/default.nix b/pkgs/servers/bird-lg/default.nix index 9061a2d606a4..f5294c2a191a 100644 --- a/pkgs/servers/bird-lg/default.nix +++ b/pkgs/servers/bird-lg/default.nix @@ -3,7 +3,14 @@ let generic = { modRoot, vendorSha256 }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "2022-05-08"; + version = "unstable-2022-05-08"; + + src = fetchFromGitHub { + owner = "xddxdd"; + repo = "bird-lg-go"; + rev = "348295b9aa954a92df2cf6b1179846a9486dafc0"; + sha256 = "sha256-2t8ZP9Uc0sJlqWiJMq3MVoARfMKsuTXJkuOid0oWgyY="; + }; doDist = false; @@ -12,15 +19,7 @@ let "-w" ]; - inherit modRoot; - inherit vendorSha256; - - src = fetchFromGitHub { - owner = "xddxdd"; - repo = "bird-lg-go"; - rev = "348295b9aa954a92df2cf6b1179846a9486dafc0"; - sha256 = "sha256-2t8ZP9Uc0sJlqWiJMq3MVoARfMKsuTXJkuOid0oWgyY="; - }; + inherit modRoot vendorSha256; meta = with lib; { description = "Bird Looking Glass"; From b5d942b84f961a3dda3d2d418dfffe5d27c3dea1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 May 2022 16:02:19 +0000 Subject: [PATCH 05/70] =?UTF-8?q?gnome.seahorse:=2041.0=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/seahorse/-/compare/41.0...42.0 --- pkgs/desktops/gnome/apps/seahorse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 8265636344fc..6387f6caefd5 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-5u7AnoEESClfVH8YwdV3K2XD7cHZ5aJZXxC13eaJKfU="; + hash = "sha256-xQys6/jeen4uXx2uC5gjIRR0Epar6NVD45I9YqFT1jA="; }; nativeBuildInputs = [ From 275b2f85ec3844ea0f949e5ca8e2e85c5b9a287d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 May 2022 16:03:51 +0000 Subject: [PATCH 06/70] =?UTF-8?q?orca:=2042.0=20=E2=86=92=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_42_0...ORCA_42_1 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 63923188db7b..b2c34a883510 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "42.0"; + version = "42.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "LCUXmrQbJgsY8f+Jm+uv5olDi0nf/SEd78l2olCT9zo="; + sha256 = "6p6dLehwg4ewUqe+FqXmnOqfZ2jfrrRee9meRmNxYt4="; }; patches = [ From 2f87de7b08a1de5b8f9c501b03c81bcc1e4d9a7e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 May 2022 16:03:54 +0000 Subject: [PATCH 07/70] =?UTF-8?q?shotwell:=200.30.15=20=E2=86=92=200.30.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/shotwell/-/compare/shotwell-0.30.15...shotwell-0.30.16 --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 098d330f004a..9720b88be870 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.15"; + version = "0.30.16"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-OlKtYLEC2g31902wMcRdTM8mNRPJVGFu4WZL9PTpvck="; + sha256 = "sha256-yYgs+9rTA8uBYbFJrLtMYX++fKn2q24i0XTiRH51GPo="; }; nativeBuildInputs = [ From e337e4ea5f5563fa3a0d916482ffdcf56e500e57 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 May 2022 11:38:08 +0000 Subject: [PATCH 08/70] =?UTF-8?q?evince:=2042.2=20=E2=86=92=2042.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/42.2...42.3 --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index cda0abaf2f75..8f5a81f0bf55 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "42.2"; + version = "42.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "/3+B8wjPjUlW7Zf7ckp+SUSMIUvuq5mIEu+e+7ON+K4="; + sha256 = "Sa7PhFyUbJbbF7qJ11yAAsWuiWP1BKmwYm0SZ1kUZF4="; }; postPatch = '' From 9925507b45d51c36065d40529bba9d3d751f18b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 May 2022 11:39:54 +0000 Subject: [PATCH 09/70] =?UTF-8?q?gupnp-tools:=200.10.2=20=E2=86=92=200.10.?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gupnp-tools/-/compare/gupnp-tools-0.10.2...gupnp-tools-0.10.3 --- pkgs/tools/networking/gupnp-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index c29d2c501df8..967bb66256dc 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gupnp-tools"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "beSe9LN1uKFk90t2YWixGE4NKBlrawek9TQfCN/YXWw="; + sha256 = "RX9Nkjk1sHhBXNK6iNeNtgB5tyWSa37hBuRWXv4yBN4="; }; nativeBuildInputs = [ From e3e91f0c33757126568adba98a3844d1f86bcdbc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 May 2022 13:52:20 +0200 Subject: [PATCH 10/70] seahorse: fix missing icons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recent `wrapGAppsHook` change stopped `gcr` from being added to `XDG_DATA_DIRS`: https://github.com/NixOS/nixpkgs/commit/b1e73fa2e086f1033a33d93524ae2a1781d12b95 But gcr installs icons expected by Seahorse to the hicolor theme so we need to add it back. Also drop adwaita-icon-theme since whether it will be used depends on user’s environment. --- pkgs/desktops/gnome/apps/seahorse/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 6387f6caefd5..60b1e2d572ed 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { gcr gsettings-desktop-schemas gnupg - gnome.adwaita-icon-theme gpgme libsecret avahi @@ -78,6 +77,13 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR ''; + preFixup = '' + gappsWrapperArgs+=( + # Pick up icons from Gcr + --prefix XDG_DATA_DIRS : "${gcr}/share" + ) + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From b5917a7ff46c7d45a7b99570248553277cbc62b5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 23 May 2022 16:15:15 +0200 Subject: [PATCH 11/70] maintainers: add GaetanLepage --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d8eaff4a0d8d..be927055f86f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4519,6 +4519,12 @@ fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; }]; }; + GaetanLepage = { + email = "gaetan@glepage.com"; + github = "GaetanLepage"; + githubId = 33058747; + name = "Gaetan Lepage"; + }; gal_bolle = { email = "florent.becker@ens-lyon.org"; github = "FlorentBecker"; From 22e0c737ad4807c0eee671dc3f020812606e5187 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 23 May 2022 16:15:33 +0200 Subject: [PATCH 12/70] mprocs: init at 0.2.2 --- pkgs/tools/misc/mprocs/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/mprocs/default.nix diff --git a/pkgs/tools/misc/mprocs/default.nix b/pkgs/tools/misc/mprocs/default.nix new file mode 100644 index 000000000000..2a14f252f4ad --- /dev/null +++ b/pkgs/tools/misc/mprocs/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "mprocs"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "pvolok"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9wac2jlh8MLggcYuEHVUPYPjhfzGN+4o1XT8B9pj4f8="; + }; + + cargoSha256 = "sha256-vGhoM5VMJO+ppLk8DetNZ8UteU6ifdtRe1HNJ0dSB+0="; + + meta = with lib; { + description = "A TUI tool to run multiple commands in parallel and show the output of each command separately"; + homepage = "https://github.com/pvolok/mprocs"; + license = licenses.mit; + maintainers = [ maintainers.GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f46e86606e3a..fb3e081aea16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1176,6 +1176,8 @@ with pkgs; midimonster = callPackage ../tools/audio/midimonster { }; + mprocs = callPackage ../tools/misc/mprocs { }; + nominatim = callPackage ../servers/nominatim { }; pferd = callPackage ../tools/misc/pferd {}; From 2d6c4410424e75048144b147cb3e6ad51432fd82 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 24 May 2022 15:46:14 +0000 Subject: [PATCH 13/70] =?UTF-8?q?gnome.gnome-keyring:=2040.0=20=E2=86=92?= =?UTF-8?q?=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-keyring/-/compare/40.0...42.1 The systemd-activation support does not appear to me to be ready yet: https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/35 --- pkgs/desktops/gnome/core/gnome-keyring/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index afbec6f8c5d1..22a94de5e84d 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -10,6 +10,7 @@ , libxslt , gettext , gcr +, autoreconfHook , libcap_ng , libselinux , p11-kit @@ -22,19 +23,21 @@ stdenv.mkDerivation rec { pname = "gnome-keyring"; - version = "40.0"; + version = "42.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0cdrlcw814zayhvlaxqs1sm9bqlfijlp22dzzd0g5zg2isq4vlm3"; + sha256 = "x/TQQMx2prf+Z+CO+RBpEcPIDUD8iMv8jiaEpMlG4+Y="; }; nativeBuildInputs = [ pkg-config gettext libxslt + # Upstream uses ancient autotools to pre-generate the scripts. + autoreconfHook docbook-xsl-nons docbook_xml_dtd_43 wrapGAppsHook From b79667a20dfbb937311aec77123213387679f765 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 24 May 2022 20:45:37 +0200 Subject: [PATCH 14/70] nixos-generators: 1.5.0 -> 1.6.0 --- pkgs/tools/nix/nixos-generators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index a33833a230d5..ffbb5e0882fc 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nixos-generators"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-generators"; rev = version; - sha256 = "sha256-Icz/2Jl3eO4JnatU1iAFiMzVAQR9IDrsiqhOIvMkCS4="; + sha256 = "sha256-dpim9Mtd57Yj6qt7p7UKwjWm6NnOU3S7jaEyEscSyPE="; }; nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=$(out)" ]; From 0cb780d900438e3d5030e92e4b4627e24800506b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 May 2022 00:20:52 +0200 Subject: [PATCH 15/70] python310Packages.archinfo: 9.2.4 -> 9.2.5 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index da139209577a..78bdce887407 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.4"; + version = "9.2.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-d5SP9pnDWXEzjBXKeqnuKK6+lrFRWYwmiV4MjfqORwk="; + hash = "sha256-U++Ly+UwY2CiyKdHpPWRpURqxVv4dgVylZD7ERVzUCA="; }; checkInputs = [ From 2c0b4624a0e9c6ace093452c4f7ffbf450a0ac40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 May 2022 00:21:04 +0200 Subject: [PATCH 16/70] python310Packages.ailment: 9.2.4 -> 9.2.5 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 2a66a332c398..2bc2d1b63bcb 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.4"; + version = "9.2.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-YsH9QAKoM4WILabgLvEZMJXPfpkfn/h4tofNIcGJY+k="; + hash = "sha256-eETl1AMDdY55okPUVDv7L2zZMtDfA4dRi11z37xAM58="; }; propagatedBuildInputs = [ From c4f9745f39ff8e0e3baab2a87feafe663f6d0e09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 May 2022 00:21:32 +0200 Subject: [PATCH 17/70] python310Packages.pyvex: 9.2.4 -> 9.2.5 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 095de81b2619..629fa6c5025b 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.4"; + version = "9.2.5"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-r+dmf5qIjiN5vmdzBmPORnPWPrjLKGks+OAdZXdAbOc="; + hash = "sha256-zQbIhl5MW/RYXV5EgL2Q7eKEwHNXVe+p6LPmIDbokwc="; }; propagatedBuildInputs = [ From 4c0e9d324613012c44c0a53839bd523f2fd7e332 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 May 2022 00:21:41 +0200 Subject: [PATCH 18/70] python310Packages.claripy: 9.2.4 -> 9.2.5 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 49d82215e7cf..8f2944c2d369 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.4"; + version = "9.2.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-nP2mqBmgpn7zFtMd9suH3kfEqKtzIjaZl6ALsvihVgE="; + hash = "sha256-o5aNHYysIpccWhf09xuJ1WT2Hac4OPyztnKqPne1Vng="; }; propagatedBuildInputs = [ From 829a56d63c57483b36063ee748fd134b95563f22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 May 2022 00:21:50 +0200 Subject: [PATCH 19/70] python310Packages.cle: 9.2.4 -> 9.2.5 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 2c7b80b524da..f2de74c1cf37 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.4"; + version = "9.2.5"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-SlYayKfosSicMxMZszZpxJ3ewKScyLpv6s5ayoVE9Ko="; + hash = "sha256-tBiabSbi4LKXA1Ou7MURRG2eGq1m1TutaHba+hq6DhQ="; }; propagatedBuildInputs = [ From 04352ee92fd71b1adcd9aec4670a781a6ceaf3f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 May 2022 00:22:01 +0200 Subject: [PATCH 20/70] python310Packages.angr: 9.2.4 -> 9.2.5 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index bbfdcb43732f..ca15c795a4a7 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.4"; + version = "9.2.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-3iw1tk2r6Ee302AMjgsRi6EL5py+4Blf47EWrWyiqNk="; + hash = "sha256-uXH/7Qfs4VxG53819TG/Y2M0taIcE4uC06rdfBe22O0="; }; propagatedBuildInputs = [ From e4f65282482cf338102da7f408bfc034e1c90a7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 May 2022 00:22:10 +0200 Subject: [PATCH 21/70] python310Packages.angrop: 9.2.4 -> 9.2.5 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 8c40a51ff438..d7ea31a0bcfa 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.2.4"; + version = "9.2.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-EMW2RxImYoPSnkBG027g5o5K3WT40F/Dj+GzqS8/K6g="; + hash = "sha256-APm7+V0eLvgnPRzojQsfDPleEfrIssbgeUh5eugKiLM="; }; propagatedBuildInputs = [ From c17811628972327357e717988c85aeff0a1e95de Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 25 May 2022 00:45:59 +0200 Subject: [PATCH 22/70] lincity: mark broken on darwin --- pkgs/games/lincity/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index 397ca0cfe8ef..057f78f26ded 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -29,5 +29,8 @@ stdenv.mkDerivation rec { description = "City simulation game"; license = licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/lincity"; + maintainers = with maintainers; [ ]; + # ../lcintl.h:14:10: fatal error: 'libintl.h' file not found + broken = stdenv.isDarwin; }; } From 65bd6b2faa640314cdbee5c04a86f7b5bc1f484a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 01:21:20 +0000 Subject: [PATCH 23/70] ani-cli: 2.1 -> 2.2 --- pkgs/applications/video/ani-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 720df51a34ef..85f2e4b8ad89 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - sha256 = "sha256-A1c7YdBh2VOhw/xTvhNV50j9n+SELyRTHI5w+AeiWDs="; + sha256 = "sha256-B/bIGrSQmKZFh3PpsbwivR2QKLMHIypWLxWuufiFHw4="; }; nativeBuildInputs = [ makeWrapper ]; From 3688fe70f4ddece54a8a468fa90209066675f0e0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 May 2022 09:51:34 +0800 Subject: [PATCH 24/70] qt6: remove all references to aliases --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 4 ++-- pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index f5ca3497a242..bf210633fc4f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -37,7 +37,7 @@ , libdrm , libdatrie , lttng-ust -, epoxy +, libepoxy , libiconv , dbus , fontconfig @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { xorg.libXdmcp xorg.libXtst xorg.xcbutilcursor - epoxy + libepoxy ] ++ (with unixODBCDrivers; [ psql sqlite diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 88254ab15890..400fe6aba125 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -63,7 +63,7 @@ , libxslt , lcms2 , re2 -, kerberos +, libkrb5 , enableProprietaryCodecs ? true }: @@ -215,7 +215,7 @@ qtModule rec { # Pipewire pipewire - kerberos + libkrb5 ]; buildInputs = [ From becc3bd5cba478aea91d42102a9839365797fc4a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 24 May 2022 19:02:52 -0700 Subject: [PATCH 25/70] plexRaw: 1.26.1.5798-99a4a6ac9 -> 1.26.2.5797-5bd057d2b --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6d7466afd863..bdecf19c42ca 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.26.1.5798-99a4a6ac9"; + version = "1.26.2.5797-5bd057d2b"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - hash = "sha256-Y2LW7NNdwD4t/R7dHOAEG2mxC4qFV6Z8VUh0APo8QNM="; + sha256 = "1wcscq5n98b37j9rm10kcdv3fjaf82hx4zgk4vfhkbs9lh9349rz"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - hash = "sha256-Chu4IULIvkmfMEV0LSg50i6usZJZI3UWOgCHQakbhaY="; + sha256 = "08nqqp9i346f6i4xypba441by000fc8xsm93q9bzc96kslid3f2d"; }; outputs = [ "out" "basedb" ]; From 85ff3bfe63259f377e3926a1f424096f6ab3abf6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 03:41:51 +0000 Subject: [PATCH 26/70] _1password: 2.2.0 -> 2.3.1 --- pkgs/applications/misc/1password/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 080d7b0c9fb0..5fe1bff41b55 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,11 +12,11 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.2.0"; + version = "2.3.1"; sources = rec { aarch64-linux = fetch "linux_arm64" "sha256-fKW2qSQkkC4GcnHcLLszX1pcqK67SaofVX017/cIkD0=" "zip"; i686-linux = fetch "linux_386" "sha256-TmQ3nWG12DTpAJaxbK+hnJak0RrFhhw6rJWfV7q8wb4=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-66kFScxPmy4WgK9p1W6qBoAeYJwungHgGkTurjEJy+4=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-r8yl9dDiiIQBooePrq/dGw2RU9tJXmeblx+qk3qq5Ys=" "zip"; aarch64-darwin = fetch "apple_universal" "sha256-DD1j093SjnaPtkQ4XuU1zkRi6XPXtwnBxiqC6wZbV+w=" "pkg"; x86_64-darwin = aarch64-darwin; }; From 240e967264f6024b088b2e44826bba9477bbb543 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Wed, 25 May 2022 15:52:00 +1200 Subject: [PATCH 27/70] header-file-mode: unstable-2022-05-13 -> unstable-2022-05-25 * Add post-build script to generate autoloads file. * Bump upstream revision to get a critical bugfix that prevented this library's main function from executing. --- .../emacs/elisp-packages/header-file-mode/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix index 139bddffa87a..df3b2a56519e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix @@ -5,19 +5,23 @@ trivialBuild { pname = "header-file-mode"; - version = "unstable-2022-05-13"; + version = "unstable-2022-05-25"; src = fetchFromGitHub { owner = "aidalgol"; repo = "header-file-mode"; - rev = "bcfd19a2c70030ebf5fa68e87aca4b3db8fad13e"; - sha256 = "sha256-XMXOU+vWJ/0e0ny4Dz3DxWpdEfSNXGzm03sBke32Dwc="; + rev = "cf6ce33b436ae9631aece1cd30a459cb0f89d1cd"; + sha256 = "sha256-+TDJubmBc0Hl+2ms58rnOf3hTaQE3ayrIpGWl4j39GQ="; }; postUnpack = '' sourceRoot="$sourceRoot/lisp" ''; + postBuild = '' + emacs -L . --batch -l package --eval '(package-generate-autoloads "header-file" ".")' + ''; + meta = { description = '' A major mode that, when associated with the .h file extension, will put From 393557ebef4a8494a794102f27777917d390cfad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 05:29:16 +0000 Subject: [PATCH 28/70] python310Packages.mwoauth: 0.3.7 -> 0.3.8 --- pkgs/development/python-modules/mwoauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 0a12052abc7e..3d22e99275a3 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mwoauth"; - version = "0.3.7"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ng1wofpvRSWE3hy4U65sEfQSM1SfeDnPuHn5lBD2rUY="; + hash = "sha256-CNr07auqD5WoRfmOVwfecxaoODqWJfIK52iwNZkcNqw="; }; propagatedBuildInputs = [ From 285520c567e1b642d7024bb3e323a52eafb8088f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 May 2022 08:44:34 +0200 Subject: [PATCH 29/70] python310Packages.mwoauth: remove stale substituteInPlace --- pkgs/development/python-modules/mwoauth/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 3d22e99275a3..1fcd7123ea75 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -29,12 +29,6 @@ buildPythonPackage rec { six ]; - postPatch = '' - # https://github.com/mediawiki-utilities/python-mwoauth/pull/43 - substituteInPlace setup.py \ - --replace "PyJWT>=1.0.1,<2.0.0" "PyJWT>=1.0.1" - ''; - # PyPI source has no tests included # https://github.com/mediawiki-utilities/python-mwoauth/issues/44 doCheck = false; From 5ef52123d83dec8e9085de9c364040359f83a426 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 May 2022 08:56:03 +0200 Subject: [PATCH 30/70] python310Packages.exceptiongroup: 1.0.0rc5 -> 1.0.0rc7 --- pkgs/development/python-modules/exceptiongroup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index b2a355e94d27..cc6a45c5117f 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.0.0rc5"; + version = "1.0.0rc7"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZlQiVQuWU6zUbpzTXZM/KMUVjKTAWMU2Gc+hEpFc1p4="; + hash = "sha256-IBnm6dbvhP9lxcfEUbdYAsZi1TvLEkq/R60RjTn5oco="; }; nativeBuildInputs = [ From 21fb960580db43a064f95c3674923ba2d9490eda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 09:25:56 +0000 Subject: [PATCH 31/70] python310Packages.atlassian-python-api: 3.20.0 -> 3.24.0 --- .../python-modules/atlassian-python-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 4ecf893c1b94..a29a28e5f7e5 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.20.0"; + version = "3.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "atlassian-api"; repo = pname; - rev = version; - sha256 = "sha256-yTRJz5zLt5eV+IHrVVLmVZnkbf0FBLM7CiCQ28X1cgc="; + rev = "refs/tags/${version}"; + sha256 = "sha256-N/pJFZSBs3yzswtg6XMjv8KKJLLeTnA6O38d4u5SP9Y="; }; propagatedBuildInputs = [ From e8a1d8a019038a1e64bb125b610b2ea22f41c2cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 09:50:49 +0000 Subject: [PATCH 32/70] cloud-nuke: 0.11.3 -> 0.11.6 --- pkgs/development/tools/cloud-nuke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 719e13a5e12a..7f98d9ee3767 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.11.3"; + version = "0.11.6"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iMPTRPsULrwXbx1xQ9db1s0p9a6YejXkwp7sqZ1ayYU="; + sha256 = "sha256-wsCe32Ui+czM0+qpMxgTahJ7FlcnFMkueEkrcwm1sdE="; }; vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI="; From dc51978b7858e0a62ec118de38d5c6da4ae832a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 11:47:23 +0000 Subject: [PATCH 33/70] docker-compose_2: 2.5.0 -> 2.5.1 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 1b58b4ee9cf6..af83200b4946 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-gb2XFIzYU1dZh8WPheb4073AOLdfT7CbBD89HxobY9Y="; + sha256 = "sha256-8YS0bTcjKQ9VOXPXDHPlU/m1JxEXlnV+Kkum9HNmSfc="; }; - vendorSha256 = "sha256-2pWBMXVnmKE4D7JXaKOqtuCz7nsX2a/58lyLp58OTYI="; + vendorSha256 = "sha256-XffTZvjRayn6qta2uU8bq0KDadazZm278iX3jis6y+s="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From 3740bcad4539b26961f65a8a081b8c6c42cb638e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 11:53:37 +0000 Subject: [PATCH 34/70] docker-credential-gcr: 2.1.2 -> 2.1.4 --- pkgs/tools/admin/docker-credential-gcr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index c13c62c62cd5..149fe7e4b3bf 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-gb9c8qTHQWUOlaXAKfpwm0Pwa/N4iu48jWIwPYXD00k="; + sha256 = "sha256-1AUs8Gt2Qw8BJk2zwRcazVl+POkPSy9e1jW9Mk/0rx8="; }; vendorSha256 = "sha256-e7XNTizZYp/tS7KRvB9KxY3Yurphnm6Ehz4dHZNReK8="; From d2e921713c62d9c43e43bfeb8e24709b57e1334a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 12:00:02 +0000 Subject: [PATCH 35/70] pyradio: 0.8.9.17 -> 0.8.9.20 --- pkgs/applications/audio/pyradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 3a0a3f0a4cf2..a5d218ff7d72 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.17"; + version = "0.8.9.20"; propagatedBuildInputs = with python3Packages; [ requests @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-lfDSD1+xbA6tAKeHKciq/n6YHWS4JTOvjIqOn+FQ2yA="; + sha256 = "sha256-wSu6vTvBkH7vC2c+jj6zaRaR1Poarsgxa5i2mN0dnoE="; }; checkPhase = '' From e0cd6799b74d7e9222dcd3d607628395f474195f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 12:13:45 +0000 Subject: [PATCH 36/70] python310Packages.PyChromecast: 12.1.2 -> 12.1.3 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index f547b2d160fd..584462035eb9 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "12.1.2"; + version = "12.1.3"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "sha256-a+Ym5bovb/rvvBPdzthOi2Cp7xsBL3EDn8D3oLy0vaY="; + sha256 = "sha256-7dZ7bSPV0GSlbJfNkOpmH6j/12cgvxmbWhJsaGn4HgE="; }; propagatedBuildInputs = [ From b36ba49e88271d475a902360c9c4aab4b8a22ee9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 15:13:48 +0000 Subject: [PATCH 37/70] linuxPackages.vendor-reset: patch for Linux 5.18 --- pkgs/os-specific/linux/vendor-reset/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index e1395bd33c07..f0a47b9e7518 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel, lib }: +{ stdenv, fetchFromGitHub, fetchpatch, kernel, lib }: stdenv.mkDerivation rec { pname = "vendor-reset"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-xa7P7+mRk4FVgi+YYCcsFLfyNqPmXvy3xhGoTDVqPxw="; }; + patches = [ + # Fix build with Linux 5.18. + # https://github.com/gnif/vendor-reset/pull/58 + (fetchpatch { + url = "https://github.com/gnif/vendor-reset/commit/5bbffcd6fee5348e8808bdbfcb5b21d455b02f55.patch"; + sha256 = "sha256-L1QxVpcZAVYiaMFCBfL2EJgeMyOR8sDa1UqF1QB3bns="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; From 7519523f8364e3ecd16cb378afa428e7e3917f91 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 15:14:01 +0000 Subject: [PATCH 38/70] linuxPackages.vendor-reset: enable parallel building Tested at -j48. --- pkgs/os-specific/linux/vendor-reset/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index f0a47b9e7518..d82c5ff58b41 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { install -D vendor-reset.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Linux kernel vendor specific hardware reset module"; homepage = "https://github.com/gnif/vendor-reset"; From 76024420f236299e6bc02fbafa0c90e66d4eaa8b Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 25 May 2022 14:28:48 +0200 Subject: [PATCH 39/70] hwi: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/hwi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index 873138cddb34..fabe8c3f95df 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "hwi"; - version = "2.1.0"; + version = "2.1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "HWI"; rev = version; - sha256 = "sha256-ih4k58OdH5taf/7fvqLeWLrMzR38uPpDSGE4KU8sEAk="; + sha256 = "sha256-jsJjGezf2JrPYr3YNZGx23Jo14DbmM1S6bu7+xgZh58="; }; propagatedBuildInputs = [ From 3bd018e6b00696a35222f4f0ac2635ff693617b5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:00:14 +0000 Subject: [PATCH 40/70] linuxPackages.akvcam: mark broken on Linux 5.18 --- pkgs/os-specific/linux/akvcam/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 0724118431ce..6d916e0ff7fc 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ freezeboy ]; platforms = platforms.linux; license = licenses.gpl2Only; + broken = kernel.kernelAtLeast "5.18"; }; } From fe564f56b4311cec381bfb9b1c1c6b3e387aa344 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:00:53 +0000 Subject: [PATCH 41/70] linuxPackages.bbswitch: mark broken on Linux 5.18 --- pkgs/os-specific/linux/bbswitch/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 4d081225f11e..4f19c29e1c38 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation { homepage = "https://github.com/Bumblebee-Project/bbswitch"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2Plus; + broken = kernel.kernelAtLeast "5.18"; }; } From 515938fed67bfb4cd57e51729d1f09f2387fa6b9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:01:03 +0000 Subject: [PATCH 42/70] linuxPackages.dddvb: mark broken on Linux 5.18 --- pkgs/os-specific/linux/dddvb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/dddvb/default.nix b/pkgs/os-specific/linux/dddvb/default.nix index 7db444bff0f4..a69947227562 100644 --- a/pkgs/os-specific/linux/dddvb/default.nix +++ b/pkgs/os-specific/linux/dddvb/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ hexa ]; platforms = platforms.linux; + broken = kernel.kernelAtLeast "5.18"; }; } From fefb777b3868d51ef2cc20baf44c0d8cad057b9c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:01:28 +0000 Subject: [PATCH 43/70] linuxPackages.dpdk-kmods: mark broken on Linux 5.18 --- pkgs/os-specific/linux/dpdk-kmods/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index 694e508dcd01..14c4855cf364 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.mic92 ]; platforms = platforms.linux; + broken = kernel.kernelAtLeast "5.18"; }; } From 9aa6f61df9a1551e27c245fa9fff402f834fee60 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:01:38 +0000 Subject: [PATCH 44/70] linuxPackages.dpdk: mark broken on Linux 5.18 --- pkgs/os-specific/linux/dpdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 2f06401d49af..d9f446f7a2dc 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -91,5 +91,6 @@ in stdenv.mkDerivation rec { license = with licenses; [ lgpl21 gpl2 bsd2 ]; platforms = platforms.linux; maintainers = with maintainers; [ magenbluten orivej mic92 zhaofengli ]; + broken = mod && kernel.kernelAtLeast "5.18"; }; } From 5bf6048f372c462bc4b56521ee7aaa7258999597 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:01:51 +0000 Subject: [PATCH 45/70] linuxPackages.facetimehd: mark broken on Linux 5.18 --- pkgs/os-specific/linux/facetimehd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 27bbfcc67671..28abc20ea3f3 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ womfoo grahamc kraem ]; platforms = [ "i686-linux" "x86_64-linux" ]; + broken = kernel.kernelAtLeast "5.18"; }; } From 791ef2e3eb4d8f4605cab8316f41b66f29102a2f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:02:01 +0000 Subject: [PATCH 46/70] linuxPackages.intel-speed-select: mark broken on Linux 5.18 --- pkgs/os-specific/linux/intel-speed-select/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/intel-speed-select/default.nix b/pkgs/os-specific/linux/intel-speed-select/default.nix index 89b4feff7a50..2caad335d57c 100644 --- a/pkgs/os-specific/linux/intel-speed-select/default.nix +++ b/pkgs/os-specific/linux/intel-speed-select/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific + broken = kernel.kernelAtLeast "5.18"; }; } From d4ee5c657190a02eb71bd8b5262035809d73d28d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:02:19 +0000 Subject: [PATCH 47/70] linuxPackages.kvdo: mark broken on Linux 5.17+ --- pkgs/os-specific/linux/kvdo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kvdo/default.nix b/pkgs/os-specific/linux/kvdo/default.nix index 74895e11bd5a..3e0936cc8a95 100644 --- a/pkgs/os-specific/linux/kvdo/default.nix +++ b/pkgs/os-specific/linux/kvdo/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dm-vdo/kvdo"; description = "A pair of kernel modules which provide pools of deduplicated and/or compressed block storage"; platforms = platforms.linux; + broken = kernel.kernelOlder "5.15" || kernel.kernelAtLeast "5.17"; }; } From 93212d08c796d1b46d4bf3c4565004c8bdbfc4ff Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:02:28 +0000 Subject: [PATCH 48/70] linuxPackages.kvmfr: mark broken on Linux 5.18 --- pkgs/os-specific/linux/kvmfr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix index ed9c58d26266..4bb20a9b62ae 100644 --- a/pkgs/os-specific/linux/kvmfr/default.nix +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ j-brn ]; platforms = [ "x86_64-linux" ]; - broken = kernel.kernelOlder "5.3"; + broken = kernel.kernelOlder "5.3" && kernel.kernelAtLeast "5.18"; }; } From 5b5c1f8cd11efd878111aca815dd2e731b320480 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:02:38 +0000 Subject: [PATCH 49/70] linuxPackages.lttng-modules: mark broken on Linux 5.18 --- pkgs/os-specific/linux/lttng-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 706ee95fb70a..0b522f2aef02 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + broken = kernel.kernelAtLeast "5.18"; }; } From d156a9eca3f2dbd2defb917889c2aaca7941485a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:02:54 +0000 Subject: [PATCH 50/70] linuxPackages.nvidiabl: mark broken on Linux 5.18 --- pkgs/os-specific/linux/nvidiabl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index 3e6b47ccef2e..0f4d485a4edc 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ yorickvp ]; + broken = kernel.kernelAtLeast "5.18"; }; } From b3f626f6a06bc16f35ddd228f713c075b984f0a8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:03:08 +0000 Subject: [PATCH 51/70] linuxPackages.rtl8192eu: mark broken on Linux 5.18 --- pkgs/os-specific/linux/rtl8192eu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index de4dd52e511c..1f2559e06374 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/Mange/rtl8192eu-linux-driver"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = stdenv.hostPlatform.isAarch64; + broken = stdenv.hostPlatform.isAarch64 || kernel.kernelAtLeast "5.18"; maintainers = with maintainers; [ troydm ]; }; } From 651ee5ecf53321d849d32fdcad6cc576a72e39c1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:03:22 +0000 Subject: [PATCH 52/70] linuxPackages.rtl8821ce: mark broken on Linux 5.18 --- pkgs/os-specific/linux/rtl8821ce/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 039d4b3fb7bb..7a6171841f95 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tomaspinho/rtl8821ce"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.isAarch64 || kernel.kernelAtLeast "5.18"; maintainers = with maintainers; [ hhm ivar ]; }; } From 3557c0f450dd7cf59ffce62541000fd1e41e18ad Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:03:32 +0000 Subject: [PATCH 53/70] linuxPackages.rtl88xxau-aircrack: mark broken on Linux 5.18 --- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index f975cc2b420b..de5c79a56013 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.jethro ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + broken = kernel.kernelAtLeast "5.18"; }; } From bd1aebae22e51872669894a30af7c697d200e437 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:03:49 +0000 Subject: [PATCH 54/70] linuxPackages.virtualbox: mark broken on Linux 5.18 --- pkgs/os-specific/linux/virtualbox/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index 3aae58933c8f..47d7aa4a4dc6 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { meta = virtualbox.meta // { description = virtualbox.meta.description + " (kernel modules)"; + broken = kernel.kernelAtLeast "5.18"; }; } From 3aa1b44629a80feb98a83c327bc573465b97e59c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:03:59 +0000 Subject: [PATCH 55/70] linuxPackages.vmware: mark broken on Linux 5.18 --- pkgs/os-specific/linux/vmware/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix index aa77a10015e6..5fd6bb12e1ab 100644 --- a/pkgs/os-specific/linux/vmware/default.nix +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mkubecek/vmware-host-modules"; license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; - broken = kernel.kernelOlder "5.5" && kernel.isHardened; + broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.18"; maintainers = with maintainers; [ deinferno ]; }; } From 4c83012f83eecaa1d052dafe00e903d384e1163d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:05:02 +0000 Subject: [PATCH 56/70] linuxPackages.openafs: mark broken on Linux 5.18 --- pkgs/servers/openafs/1.8/module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index c8be2eec27a8..6e738d025ea0 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -103,6 +103,6 @@ stdenv.mkDerivation { license = licenses.ipl10; platforms = platforms.linux; maintainers = with maintainers; [ maggesi spacefrogg ]; - broken = kernel.isHardened; + broken = kernel.isHardened || kernel.kernelAtLeast "5.18"; }; } From 78cf42b90dae40c5525d1b8dd2c004ba9ac124ea Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 11 May 2022 17:11:36 +0000 Subject: [PATCH 57/70] cgiserver: init at 1.0.0 --- pkgs/servers/http/cgiserver/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/servers/http/cgiserver/default.nix diff --git a/pkgs/servers/http/cgiserver/default.nix b/pkgs/servers/http/cgiserver/default.nix new file mode 100644 index 000000000000..a9662a2916eb --- /dev/null +++ b/pkgs/servers/http/cgiserver/default.nix @@ -0,0 +1,21 @@ +{ lib, buildGoModule, fetchzip, zstd }: + +buildGoModule rec { + pname = "cgiserver"; + version = "1.0.0"; + + src = fetchzip { + url = "https://src.anomalous.eu/cgiserver/snapshot/cgiserver-${version}.tar.zst"; + nativeBuildInputs = [ zstd ]; + sha256 = "14bp92sw0w6n5dzs4f7g4fcklh25nc9k0xjx4ia0gi7kn5jwx2mq"; + }; + + vendorSha256 = "00jslxzf6p8zs1wxdx3qdb919i80xv4w9ihljd40nnydasshqa4v"; + + meta = with lib; { + homepage = "https://src.anomalous.eu/cgiserver/about/"; + description = "Lightweight web server for sandboxing CGI applications"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.osl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a77c9c51e19e..0d248bcd2a99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21614,6 +21614,8 @@ with pkgs; cayley = callPackage ../servers/cayley { }; + cgiserver = callPackage ../servers/http/cgiserver { }; + charybdis = callPackage ../servers/irc/charybdis { autoreconfHook = buildPackages.autoreconfHook269; }; From d28b794ef09fc7794fb61c0e1cfc140662b41297 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 13:24:40 +0000 Subject: [PATCH 58/70] linuxPackages.pktgen: 21.11.0 -> 22.04.1 21.11.0 didn't build with our version of DPDK. --- pkgs/os-specific/linux/pktgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 36dea8ed6e0e..0ddda99bf592 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pktgen"; - version = "21.11.0"; + version = "22.04.1"; src = fetchFromGitHub { owner = "pktgen"; repo = "Pktgen-DPDK"; rev = "pktgen-${version}"; - sha256 = "sha256-3z5DSkggHTwjzsRzRG5zzZTcNsn/5YankJT8CKSN8b4="; + sha256 = "0gbag98i2jq0p2hpvfgc3fiqy2sark1dm72hla4sxmn3gljy3p70"; }; nativeBuildInputs = [ meson ninja pkg-config ]; From 2b22a409c36807d453fe2b27444441acc5b6833e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 14:19:15 +0000 Subject: [PATCH 59/70] linuxPackages.netatop: fix build with Linux 5.18 With 5.18, implicit fallthrough is an error, and netatop hasn't caught up yet. --- pkgs/os-specific/linux/netatop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index dec1399d1695..b892292477ce 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation { buildInputs = [ kmod zlib ]; hardeningDisable = [ "pic" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; patches = [ # fix paths in netatop.service From ff7d60fdcfc64347d1d512b3d5efb820ca095121 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 14:37:32 +0000 Subject: [PATCH 60/70] coredns: 1.9.1 -> 1.9.2 --- pkgs/servers/dns/coredns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 66298866dbcf..7b45f4a85b6d 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-1lJrbazEgsRHI10qIgA9KgglsxpnMIdxEWpu6RiJ0pQ="; + sha256 = "sha256-6ABcXRuPEkzhjVZcltPoWGAc+fs6FwmgQCMRuLmhXxo="; }; - vendorSha256 = "sha256-ueEuduZ76FUs2wE8oiHGON9+s91jaHhS6gOKr7MNh8g="; + vendorSha256 = "sha256-0S77748voNlIuY6yUAa669pB09h35THojCyQKUm5VFc="; postPatch = '' substituteInPlace test/file_cname_proxy_test.go \ From 2836cfa1b14937cbc9eb100ff29b1059942d478c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 May 2022 00:13:31 +1000 Subject: [PATCH 61/70] gh: 2.11.1 -> 2.11.2 https://github.com/cli/cli/releases/tag/v2.11.2 --- .../version-management/git-and-tools/gh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9c81e2f7fa67..fb985c2e0c9d 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-bDPcU898ceARV06AADNj08D1eKD6yp39D6Ahs70d+kU="; + sha256 = "sha256-eumNYEjMDtnpvs5nP2o6w4aSymfme7OhOER+rmaFxDw="; }; vendorSha256 = "sha256-soNQXtpQ217scP606UA05+r9WIrUAMOCDBsfLKrVD+Q="; From 6ce1097662b5b574701a46d934342276a48d99d2 Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 25 May 2022 16:05:33 +0200 Subject: [PATCH 62/70] unifi7: 7.1.65 -> 7.1.66 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 24c922018f19..d6f2750875a9 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -65,7 +65,7 @@ in rec { }; unifi7 = generic { - version = "7.1.65"; - sha256 = "sha256-ilC4L59rui8WBKkWrzTFuEePo6L3wLC27Z5/Ef0MX7k="; + version = "7.1.66"; + sha256 = "sha256-lLpudaDUWdUM3HKn8yLJJh2XrqfQv7QYwYTV21iFZ7k="; }; } From 3bb35474b69085e10886a399d53434f9b9a97ce6 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Tue, 24 May 2022 15:48:06 -0700 Subject: [PATCH 63/70] transmission-remote-gtk: 1.4.1 -> 1.5.1 --- .../p2p/transmission-remote-gtk/default.nix | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index c89e53977067..6c6cc99f5a1a 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,40 +1,30 @@ -{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkg-config -, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }: - +{ lib, stdenv, wrapGAppsHook, fetchFromGitHub, pkg-config, gtk3, json-glib, curl +, glib, appstream-glib, desktop-file-utils, meson, ninja, geoip, gettext +, libappindicator, libmrss, libproxy }: stdenv.mkDerivation rec { pname = "transmission-remote-gtk"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "transmission-remote-gtk"; repo = "transmission-remote-gtk"; rev = version; - sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk"; + sha256 = "4/ID12JukDDvJzWupc76r7W8Us5erwv8oXZhDnB6VDk="; }; - patches = [ - (fetchpatch { - url = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/commit/0f5cc8a9942e220ea0f7d0b17db4a78d094e3b65.patch"; - sha256 = "195rsjpbc0gzmr9bycvq4mra7abp3hd9by3a5vvcmxsh5ipikycf"; - }) - ]; + nativeBuildInputs = + [ desktop-file-utils wrapGAppsHook meson ninja pkg-config appstream-glib ]; - preConfigure = "./autogen.sh"; + buildInputs = + [ gtk3 json-glib curl glib gettext libmrss geoip libproxy libappindicator ]; - nativeBuildInputs= [ - autoconf automake libtool wrapGAppsHook - pkg-config intltool autoconf-archive - appstream-glib - ]; - - buildInputs = [ gtk3 json-glib curl glib ]; - - doCheck = false; # fails with style validation error + doCheck = false; # Requires network access meta = with lib; { description = "GTK remote control for the Transmission BitTorrent client"; - homepage = "https://github.com/ajf8/transmission-remote-gtk"; + homepage = + "https://github.com/transmission-remote-gtk/transmission-remote-gtk"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; From 5e880240cddf43a67012b8331bfcd2d3a784b1a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 11:10:11 +0000 Subject: [PATCH 64/70] picard: 2.7.3 -> 2.8 --- pkgs/applications/audio/picard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 340ba32a53d5..aff62e96576a 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -18,13 +18,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.7.3"; + version = "2.8"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; - rev = "release-${version}"; - sha256 = "1f589nc2zxl9cjw0qh164z9sfq4xl052ihf2gn2dgr35g3ny16kh"; + rev = "refs/tags/release-${version}"; + sha256 = "sha256-DG5b3mw6AL4HSF3diGXOqIeH/eXGqLOsbcnPbD6kznE="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] From df1f9ecd9b83a1a3cb440d771f644f1a88416bc1 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Wed, 25 May 2022 17:14:26 +0100 Subject: [PATCH 65/70] python3Packages.aiohttp: remove trustme test dependency on aarch64-darwin This is an optional test dependency dependency is no longer needed, and makes the package unbuildable on aarch64-darwin, as it transitively depends on pyopenssl, which is marked broken. --- pkgs/development/python-modules/aiohttp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 660e205fb482..bca1f6002f4e 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -67,6 +67,9 @@ buildPythonPackage rec { pytest-mock pytestCheckHook re-assert + ] ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ + # Optional test dependency. Depends indirectly on pyopenssl, which is + # broken on aarch64-darwin. trustme ]; From 15fc26bb3e2002e6ad401fd46fc2f99f164df96b Mon Sep 17 00:00:00 2001 From: NANASHI0X74 Date: Wed, 25 May 2022 18:17:23 +0200 Subject: [PATCH 66/70] slack: 4.25.1 -> 4.26.1 (#174085) --- .../networking/instant-messengers/slack/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index f4574e02a49d..86ed37e54dc0 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -44,14 +44,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.25.0"; - x86_64-darwin-sha256 = "1ffg003ic0jhkis9ai2873axwzqj9yvjab8212zwhvr3a23zzr5c"; + x86_64-darwin-version = "4.26.1"; + x86_64-darwin-sha256 = "0883nnnwjaii89x6idqcl68acw1fbijyhhrwy7inwgrdw233qqcd"; - x86_64-linux-version = "4.25.1"; - x86_64-linux-sha256 = "sha256-ndDVipgcLELRZ2siIAurq7umL62+g3yRL0U311DC8Ik="; + x86_64-linux-version = "4.26.1"; + x86_64-linux-sha256 = "0nw3cfypinzp8csli1myh3b9hvv2pg1d8p9izg7znfpnlwps8gy1"; - aarch64-darwin-version = "4.25.0"; - aarch64-darwin-sha256 = "0s4c66bzi42y2r1c94r4ds5fyzzgvzkvrria0z45ysa47lnldp0f"; + aarch64-darwin-version = "4.26.1"; + aarch64-darwin-sha256 = "1p5qn5zyibpyiv5is70g1la9y6wc038j3sxjyxflgqsdvania7vq"; version = { x86_64-darwin = x86_64-darwin-version; From f21fb9441f7fdb48fb5ee4463a082d9fda3474c9 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 25 May 2022 18:28:00 +0200 Subject: [PATCH 67/70] docker: 20.10.15 -> 20.10.16 - https://docs.docker.com/engine/release-notes/#201016 - https://github.com/docker/cli/releases/tag/v20.10.16 - https://github.com/moby/moby/releases/tag/v20.10.16 --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 125061bedaf2..68f1ff45d144 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -243,14 +243,14 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.15"; + version = "20.10.16"; rev = "v${version}"; - sha256 = "sha256-uzwnXDomho5/Px4Ou/zP8Vedo2J9hVfcaFzM9vWh2Mo="; + sha256 = "sha256-Sktjh1JabeXrmWljLe5G934cxgChN0u3vdmQXasEFro="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-+Eds5WI+Ujz/VxkWb1ToaGLk7wROTwWwJYpiZRIxAf0"; + sha256 = "sha256-3dog2aGbFKiYzsPTXkG+bo9xjTWZYlmWxtrqXjdzO2s="; }; runcRev = "v1.1.1"; runcSha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY="; From c571a647c1f868e53fbf01a868906ec72c9aeaa2 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 25 May 2022 18:36:20 +0200 Subject: [PATCH 68/70] curl: fix curl-gnutls build on darwin --- pkgs/tools/networking/curl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 879f8e2e38f1..e961fa152f78 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -171,9 +171,9 @@ stdenv.mkDerivation rec { '' + lib.optionalString scpSupport '' sed '/^dependency_libs/s|${lib.getDev libssh2}|${lib.getLib libssh2}|' -i "$out"/lib/*.la '' + lib.optionalString gnutlsSupport '' - ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so - ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4 - ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0 + ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary} + ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4 + ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4.4.0 ''; passthru = { From dbed75d12d0b78cdc7b486160648839a10ce0317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 25 May 2022 19:33:32 +0200 Subject: [PATCH 69/70] go-camo: remove tests which require network --- pkgs/servers/http/go-camo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/http/go-camo/default.nix b/pkgs/servers/http/go-camo/default.nix index 2d1e09aa2775..8a5351d7bf29 100644 --- a/pkgs/servers/http/go-camo/default.nix +++ b/pkgs/servers/http/go-camo/default.nix @@ -15,6 +15,11 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; + preCheck = '' + # requires network access + rm pkg/camo/proxy_{,filter_}test.go + ''; + meta = with lib; { description = "A camo server is a special type of image proxy that proxies non-secure images over SSL/TLS"; homepage = "https://github.com/cactus/go-camo"; From d113661156581c835df4fe5521ffc64128772f18 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Fri, 19 Feb 2021 19:34:30 +0100 Subject: [PATCH 70/70] coqPackages: etc - put `findlib` in `buildInputs` of `mkCoqDerivation` to make sure `coq` packages find their ocaml plugin dependencies, - use `propagatedBuildInputs` to make sure ocaml plugin dependencies are in path, - updated `coqPackage.heq` (broken url), - fixed use of `DESTDIR` and `COQMF_COQLIB` in mkCoqDerivation, - adding `COQCORELIB` environement variable to put ocaml plugin files in the right place, - make `metaFetch` available from `coqPackages` --- doc/languages-frameworks/coq.section.md | 15 ++++--- .../science/logic/coq/default.nix | 13 +++--- .../science/logic/why3/default.nix | 7 ++-- pkgs/build-support/coq/default.nix | 40 +++++++++++++------ .../development/coq-modules/CoLoR/default.nix | 2 +- pkgs/development/coq-modules/HoTT/default.nix | 2 +- .../coq-modules/QuickChick/default.nix | 3 +- pkgs/development/coq-modules/VST/default.nix | 2 +- .../coq-modules/bignums/default.nix | 2 +- .../coq-modules/compcert/default.nix | 13 ++++-- .../coq-modules/coq-bits/default.nix | 32 ++++----------- .../coq-modules/coq-elpi/default.nix | 4 +- .../coq-modules/coqeal/default.nix | 3 +- .../coq-modules/coqhammer/default.nix | 6 ++- .../coq-modules/coqprime/default.nix | 1 - .../coq-modules/coqtail-math/default.nix | 4 +- .../coq-modules/coquelicot/default.nix | 4 +- .../coq-modules/dpdgraph/default.nix | 4 +- pkgs/development/coq-modules/fiat/HEAD.nix | 4 +- .../development/coq-modules/flocq/default.nix | 4 +- .../coq-modules/gappalib/default.nix | 2 +- pkgs/development/coq-modules/heq/default.nix | 16 +++++--- .../coq-modules/hierarchy-builder/default.nix | 5 +-- .../coq-modules/interval/default.nix | 8 ++-- .../coq-modules/itauto/default.nix | 2 +- .../development/coq-modules/ltac2/default.nix | 1 - .../coq-modules/math-classes/default.nix | 2 +- .../coq-modules/mathcomp/default.nix | 9 +++-- .../coq-modules/metacoq/default.nix | 6 +-- .../coq-modules/metalib/default.nix | 1 - .../coq-modules/semantics/default.nix | 4 +- .../coq-modules/simple-io/default.nix | 6 +-- .../coq-modules/smtcoq/default.nix | 8 ++-- .../ocaml-modules/elpi/default.nix | 9 +++-- pkgs/top-level/coq-packages.nix | 5 ++- 35 files changed, 131 insertions(+), 118 deletions(-) diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index 9a692104a041..11777b5eef42 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -29,14 +29,19 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags, * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers, * `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, -* `extraNativeBuildInputs` (optional), by default `nativeBuildInputs` just contains `coq`, this allows to add more native build inputs, `nativeBuildInputs` are executables and `buildInputs` are libraries and dependencies, -* `extraBuildInputs` (optional), this allows to add more build inputs, -* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against. -* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, +* `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune2`, `useDune2ifVersion` and `mlPlugin` are set). +* `extraNativeBuildInputs` (optional, deprecated), an additional list of derivation to add to `nativeBuildInputs`, +* `overrideNativeBuildInputs` (optional) replaces the default list of derivation to which `nativeBuildInputs` and `extraNativeBuildInputs` adds extra elements, +* `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ coq ]`, +* `extraBuildInputs` (optional, deprecated), an additional list of derivation to add to `buildInputs`, +* `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements, +* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environements of subsequent derivation, which is necessary for Coq packages to work correctly, +* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Coq was built against. +* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2ifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, * `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. * `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build. * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it. -* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. +* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variables `DESTDIR` and `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. * `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`, * `useMelquiondRemake` (optional, default to `null`) is an attribute set, which, if given, overloads the `preConfigurePhases`, `configureFlags`, `buildPhase`, and `installPhase` attributes of the derivation for a specific use in libraries using `remake` as set up by Guillaume Melquiond for `flocq`, `gappalib`, `interval`, and `coquelicot` (see the corresponding derivation for concrete examples of use of this option). For backward compatibility, the attribute `useMelquiondRemake.logpath` must be set to the logical root of the library (otherwise, one can pass `useMelquiondRemake = {}` to activate this without backward compatibility). * `dropAttrs`, `keepAttrs`, `dropDerivationAttrs` are all optional and allow to tune which attribute is added or removed from the final call to `mkDerivation`. diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index c078287b85ee..768178e6e158 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -70,9 +70,9 @@ let { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } ] ocamlPackages_4_12; - ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] - ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2; - ocamlBuildInputs = [] + ocamlNativeBuildInputs = with ocamlPackages; [ ocaml findlib ] + ++ optional (coqAtLeast "8.14") dune_2; + ocamlPropagatedBuildInputs = [ ] ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!coqAtLeast "8.13") ocamlPackages.num ++ optional (coqAtLeast "8.13") ocamlPackages.zarith; @@ -82,7 +82,8 @@ self = stdenv.mkDerivation { passthru = { inherit coq-version; - inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs; + inherit ocamlPackages ocamlNativeNuildInputs; + inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs; # For compatibility inherit (ocamlPackages) ocaml camlp5 findlib num ; emacsBufferSetup = pkgs: '' @@ -136,13 +137,15 @@ self = stdenv.mkDerivation { ++ optional buildIde copyDesktopItems ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook ++ optional (!coqAtLeast "8.6") gnumake42; - buildInputs = [ ncurses ] ++ ocamlBuildInputs + buildInputs = [ ncurses ] ++ optionals buildIde (if coqAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ; + propagatedBuildInputs = ocamlPropagatedBuildInputs; + postPatch = '' UNAME=$(type -tp uname) RM=$(type -tp rm) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 8917135b2c88..ab5006e424e1 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { # WebIDE js_of_ocaml js_of_ocaml-ppx # S-expression output for why3pp - ppx_deriving ppx_sexp_conv + ppx_deriving ppx_sexp_conv ] + ++ # Coq Support - coqPackages.coq coqPackages.flocq - ]; + (with coqPackages; [ coq flocq ]) + ; propagatedBuildInputs = with ocamlPackages; [ camlzip menhirLib num re sexplib ]; diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index a681bbda5575..52ef17f05c00 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, coqPackages, coq, fetchzip }@args: +{ lib, stdenv, coqPackages, coq, which, fetchzip }@args: let lib = import ./extra-lib.nix {inherit (args) lib;}; in with builtins; with lib; let @@ -15,8 +15,12 @@ in releaseRev ? (v: v), displayVersion ? {}, release ? {}, + buildInputs ? [], + nativeBuildInputs ? [], extraBuildInputs ? [], extraNativeBuildInputs ? [], + overrideBuildInputs ? [], + overrideNativeBuildInputs ? [], namePrefix ? [ "coq" ], enableParallelBuilding ? true, extraInstallFlags ? [], @@ -35,7 +39,11 @@ let args-to-remove = foldl (flip remove) ([ "version" "fetcher" "repo" "owner" "domain" "releaseRev" "displayVersion" "defaultVersion" "useMelquiondRemake" - "release" "extraBuildInputs" "extraNativeBuildInputs" "extraPropagatedBuildInputs" "namePrefix" + "release" + "buildInputs" "nativeBuildInputs" + "extraBuildInputs" "extraNativeBuildInputs" + "overrideBuildInputs" "overrideNativeBuildInputs" + "namePrefix" "meta" "useDune2ifVersion" "useDune2" "opam-name" "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; @@ -57,9 +65,16 @@ let ] "") + optionalString (v == null) "-broken"; append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; prefix-name = foldl append-version "" namePrefix; - var-coqlib-install = - (optionalString (versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev") "COQMF_") + "COQLIB"; useDune2 = args.useDune2 or (useDune2ifVersion fetched.version); + coqlib-flags = switch coq.coq-version [ + { case = v: versions.isLe "8.6" v && v != "dev" ; + out = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; } + ] [ "COQLIBINSTALL=$(out)/lib/coq/${coq.coq-version}/user-contrib" + "COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)" ]; + docdir-flags = switch coq.coq-version [ + { case = v: versions.isLe "8.6" v && v != "dev"; + out = [ "DOCDIR=$(out)/share/coq/${coq.coq-version}/" ]; } + ] [ "COQDOCINSTALL=$(out)/share/coq/${coq.coq-version}/user-contrib" ]; in stdenv.mkDerivation (removeAttrs ({ @@ -68,12 +83,13 @@ stdenv.mkDerivation (removeAttrs ({ inherit (fetched) version src; - nativeBuildInputs = [ coq ] - ++ optionals useDune2 [coq.ocaml coq.ocamlPackages.dune_2] - ++ optionals mlPlugin coq.ocamlNativeBuildInputs - ++ extraNativeBuildInputs; - buildInputs = optionals mlPlugin coq.ocamlBuildInputs - ++ extraBuildInputs; + nativeBuildInputs = args.overrideNativeBuildInputs + or ([ which coq.ocamlPackages.findlib ] + ++ optional useDune2 coq.ocamlPackages.dune_2 + ++ optional (useDune2 || mlPlugin) coq.ocaml + ++ (args.nativeBuildInputs or []) ++ extraNativeBuildInputs); + buildInputs = args.overrideBuildInputs + or ([ coq ] ++ (args.buildInputs or []) ++ extraBuildInputs); inherit enableParallelBuilding; meta = ({ platforms = coq.meta.platforms; } // @@ -88,9 +104,7 @@ stdenv.mkDerivation (removeAttrs ({ // (optionalAttrs setCOQBIN { COQBIN = "${coq}/bin/"; }) // (optionalAttrs (!args?installPhase && !args?useMelquiondRemake) { installFlags = - [ "${var-coqlib-install}=$(out)/lib/coq/${coq.coq-version}/" ] ++ - optional (match ".*doc$" (args.installTargets or "") != null) - "DOCDIR=$(out)/share/coq/${coq.coq-version}/" ++ + [ "DESTDIR=$(out)" ] ++ coqlib-flags ++ docdir-flags ++ extraInstallFlags; }) // (optionalAttrs useDune2 { diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 9270609c6b2f..0fdcb49d7300 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -20,7 +20,7 @@ with lib; mkCoqDerivation { release."1.4.0".rev = "168c6b86c7d3f87ee51791f795a8828b1521589a"; release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm"; - extraBuildInputs = [ bignums ]; + propagatedBuildInputs = [ bignums ]; enableParallelBuilding = false; meta = { diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index 706943cf8d02..f6e9b3daca2d 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -8,7 +8,7 @@ with lib; mkCoqDerivation { release."20170921".rev = "e3557740a699167e6adb1a65855509d55a392fa1"; release."20170921".sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v"; - extraBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake ]; preConfigure = '' patchShebangs ./autogen.sh diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index db3227c1770e..c2e6a5431c91 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -36,8 +36,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; mlPlugin = true; - extraNativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild; - extraBuildInputs = lib.optional recent coq.ocamlPackages.num; + nativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild; propagatedBuildInputs = [ ssreflect ] ++ lib.optionals recent [ coq-ext-lib simple-io ]; extraInstallFlags = [ "-f Makefile.coq" ]; diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index a5dee94d045d..8bf8a8680237 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -31,7 +31,7 @@ mkCoqDerivation { release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf"; release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0="; releaseRev = v: "v${v}"; - extraBuildInputs = [ ITree ]; + buildInputs = [ ITree ]; propagatedBuildInputs = [ compcert ]; preConfigure = '' diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 0001ae1ded4d..a53b8199fe96 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -5,7 +5,7 @@ with lib; mkCoqDerivation { owner = "coq"; displayVersion = { bignums = ""; }; inherit version; - defaultVersion = if versions.isGe "8.5" coq.coq-version + defaultVersion = if versions.isGe "8.6" coq.coq-version then "${coq.coq-version}.0" else null; release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns"; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 092bb58d174f..847ef8af23fe 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchzip, mkCoqDerivation, coq, flocq, compcert +{ lib, fetchzip, mkCoqDerivation +, coq, flocq, compcert , ocamlPackages, fetchpatch, makeWrapper, coq2html , stdenv, tools ? stdenv.cc , version ? null @@ -15,9 +16,9 @@ let compcert = mkCoqDerivation rec { releaseRev = v: "v${v}"; defaultVersion = with versions; switch coq.version [ - { case = range "8.8" "8.11"; out = "3.8"; } + { case = range "8.13" "8.15"; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } - { case = range "8.12" "8.15"; out = "3.10"; } + { case = range "8.8" "8.11"; out = "3.8"; } ] null; release = { @@ -48,9 +49,13 @@ let compcert = mkCoqDerivation rec { ''; installTargets = "documentation install"; + installFlags = []; # trust ./configure + preInstall = '' + mkdir -p $out/share/man + mkdir -p $man/share + ''; postInstall = '' # move man into place - mkdir -p $man/share mv $out/share/man/ $man/share/ # move docs into place diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 6cb6bb3c813e..f604db4ecdf7 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -1,34 +1,18 @@ -{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: with lib; mkCoqDerivation { pname = "coq-bits"; repo = "bits"; inherit version; - defaultVersion = - if versions.isGe "8.10" coq.version - then "1.1.0" - else if versions.isGe "8.7" coq.version - then "1.0.0" - else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.10"; out = "1.1.0"; } + { case = isGe "8.7"; out = "1.0.0"; } + ] null; - release = { - "1.0.0" = { - rev = "1.0.0"; - sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - }; - "1.1.0" = { - rev = "1.1.0"; - sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; - }; - }; + release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; + release."1.0.0".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - extraBuildInputs = [ mathcomp.ssreflect mathcomp.fingroup ]; - propagatedBuildInputs = [ mathcomp.algebra ]; - - installPhase = '' - make -f Makefile CoqMakefile - make -f CoqMakefile COQLIB=$out/lib/coq/${coq.coq-version}/ install - ''; + propagatedBuildInputs = [ mathcomp-algebra ]; meta = { description = "A formalization of bitset operations in Coq"; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 55423047caa7..03fe8c32d5c3 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -7,7 +7,7 @@ with builtins; with lib; let { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} { case = "8.15"; out = { version = "1.14.1"; };} - ] {}); + ] { version = "1.14.1"; } ); in mkCoqDerivation { pname = "elpi"; repo = "coq-elpi"; @@ -48,8 +48,8 @@ in mkCoqDerivation { release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; releaseRev = v: "v${v}"; - extraNativeBuildInputs = [ which elpi ]; mlPlugin = true; + propagatedBuildInputs = [ elpi ]; meta = { description = "Coq plugin embedding ELPI."; diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 3b8b23618d23..563e2dc22d6d 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -1,6 +1,6 @@ { coq, mkCoqDerivation, mathcomp, bignums, paramcoq, multinomials, mathcomp-real-closed, - lib, which, version ? null }: + lib, version ? null }: with lib; @@ -22,7 +22,6 @@ with lib; release."1.0.4".sha256 = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk"; release."1.0.3".sha256 = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; - extraBuildInputs = [ which ]; propagatedBuildInputs = [ mathcomp.algebra bignums paramcoq multinomials ]; meta = { diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 66a3dd222dd5..853e77990b6e 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -28,8 +28,10 @@ with lib; mkCoqDerivation { release."1.3-coq8.12".sha256 = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8"; release."1.3-coq8.11".sha256 = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b"; release."1.3-coq8.10".sha256 = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd"; - release."1.1.1-coq8.9".sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9"; - release."1.1-coq8.8".sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; + release."1.1.1-coq8.9" = { sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9"; + rev = "f8b4d81a213aa1f25afbe53c7c9ca1b15e3d42bc"; }; + release."1.1-coq8.8" = { sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; + rev = "c3cb54b4d5f33fab372d33c7189861368a08fa22"; }; release."1.3.1-coq8.13".version = "1.3.1"; release."1.3.1-coq8.12".version = "1.3.1"; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 46ede02a57e6..26988b81e1a6 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -20,7 +20,6 @@ with lib; mkCoqDerivation { release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; releaseRev = v: "v${v}"; - extraBuildInputs = [ which ]; propagatedBuildInputs = [ bignums ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/coqtail-math/default.nix b/pkgs/development/coq-modules/coqtail-math/default.nix index 3491e6b21f2f..a4f7ca405f71 100644 --- a/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/pkgs/development/coq-modules/coqtail-math/default.nix @@ -14,9 +14,7 @@ mkCoqDerivation { release."8.14".sha256 = "sha256:1k8f8idjnx0mf4z479vcx55iz42rjxrbplbznv80m2famxakq03c"; release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; - - extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml findlib ]; - + mlPlugin = true; meta = { license = licenses.lgpl3Only; maintainers = [ maintainers.siraben ]; diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 1a6dba9b0c08..09dd65df41d2 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, which, autoconf, +{ lib, mkCoqDerivation, autoconf, coq, ssreflect, version ? null }: with lib; mkCoqDerivation { @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl"; releaseRev = v: "coquelicot-${v}"; - extraNativeBuildInputs = [ which autoconf ]; + nativeBuildInputs = [ autoconf ]; propagatedBuildInputs = [ ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 7cf6132bf6a9..fcc1303e8276 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -39,9 +39,9 @@ mkCoqDerivation { release."0.6".sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; releaseRev = v: "v${v}"; - extraNativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; mlPlugin = true; - extraBuildInputs = [ coq.ocamlPackages.ocamlgraph ]; + buildInputs = [ coq.ocamlPackages.ocamlgraph ]; # dpd_compute.ml uses deprecated Pervasives.compare # Versions prior to 0.6.5 do not have the WARN_ERR build flag diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index 47f097a34b2e..d94dc03b6377 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -8,10 +8,10 @@ with lib; mkCoqDerivation rec { inherit version; defaultVersion = if coq.coq-version == "8.5" then "2016-10-24" else null; release."2016-10-24".rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a"; - release."2016-10-24".sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64"; + release."2016-10-24".sha256 = "16y57vibq3f5i5avgj80f4i3aw46wdwzx36k5d3pf3qk17qrlrdi"; mlPlugin = true; - extraBuildInputs = [ python27 ]; + buildInputs = [ python27 ]; prePatch = "patchShebangs etc/coq-scripts"; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index f13aec883e76..a0f4a3ecae82 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,4 +1,4 @@ -{ lib, which, autoconf, automake, +{ lib, bash, autoconf, automake, mkCoqDerivation, coq, version ? null }: with lib; mkCoqDerivation { @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj"; releaseRev = v: "flocq-${v}"; - nativeBuildInputs = [ which autoconf ]; + nativeBuildInputs = [ bash autoconf ]; mlPlugin = true; useMelquiondRemake.logpath = "Flocq"; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 23cbd46743b1..903b3518e5d6 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -13,7 +13,7 @@ with lib; mkCoqDerivation { release."1.4.4".sha256 = "114q2hgw64j6kqa9mg3qcp1nlf0ia46z2xadq81fnkxqm856ml7l"; releaseRev = v: "gappalib-coq-${v}"; - extraNativeBuildInputs = [ which autoconf ]; + nativeBuildInputs = [ autoconf ]; mlPlugin = true; propagatedBuildInputs = [ flocq ]; useMelquiondRemake.logpath = "Gappa"; diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index 4bf9139b4947..c3a815eb5c87 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -1,22 +1,26 @@ {lib, fetchzip, mkCoqDerivation, coq, version ? null }: +let fetcher = {rev, repo, owner, sha256, domain, ...}: + fetchzip { + url = "https://${domain}/${owner}/${repo}/download/${repo}-${rev}.zip"; + inherit sha256; + }; in with lib; mkCoqDerivation { pname = "heq"; repo = "Heq"; - owner = "gil"; - domain = "mpi-sws.org"; + owner = "gil.hur"; + domain = "sf.snu.ac.kr"; inherit version fetcher; defaultVersion = if versions.isLt "8.8" coq.coq-version then "0.92" else null; release."0.92".sha256 = "0cf8y6728n81wwlbpq3vi7l2dbzi7759klypld4gpsjjp1y1fj74"; mlPlugin = true; - propagatedBuildInputs = [ coq ]; - - extraInstallFlags = [ "COQLIB=$out/lib/coq/${coq.coq-version}" ]; preBuild = "cd src"; + extraInstallFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + meta = { - homepage = "https://www.mpi-sws.org/~gil/Heq/"; + homepage = "https://ropas.snu.ac.kr/~gil.hur/Heq/"; description = "Heq : a Coq library for Heterogeneous Equality"; maintainers = with maintainers; [ jwiegley ]; }; diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index c0fa2d7c8e00..6f15fc80388e 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, which, coq, coq-elpi, version ? null }: +{ lib, mkCoqDerivation, coq, coq-elpi, version ? null }: with lib; let hb = mkCoqDerivation { pname = "hierarchy-builder"; @@ -17,13 +17,10 @@ with lib; let hb = mkCoqDerivation { release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; releaseRev = v: "v${v}"; - extraNativeBuildInputs = [ which ]; - propagatedBuildInputs = [ coq-elpi ]; mlPlugin = true; - installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ]; extraInstallFlags = [ "VFILES=structures.v" ]; meta = { diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 375fae5b074c..1a47478bda15 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,4 +1,5 @@ -{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, mathcomp-ssreflect, mathcomp-fingroup, bignums ? null, gnuplot_qt, version ? null }: +{ lib, mkCoqDerivation, autoconf, coq, coquelicot, flocq, + mathcomp-ssreflect, mathcomp-fingroup, bignums ? null, gnuplot_qt, version ? null }: mkCoqDerivation rec { pname = "interval"; @@ -20,8 +21,9 @@ mkCoqDerivation rec { release."3.3.0".sha256 = "0lz2hgggzn4cvklvm8rpaxvwaryf37i8mzqajqgdxdbd8f12acsz"; releaseRev = v: "interval-${v}"; - extraNativeBuildInputs = [ which autoconf ]; - propagatedBuildInputs = [ bignums coquelicot flocq mathcomp-ssreflect mathcomp-fingroup ] + nativeBuildInputs = [ autoconf ]; + propagatedBuildInputs = lib.optional (lib.versions.isGe "8.6" coq.coq-version) bignums + ++ [ coquelicot flocq mathcomp-ssreflect mathcomp-fingroup ] ++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ]; useMelquiondRemake.logpath = "Interval"; mlPlugin = true; diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index 4993a76b4f08..151a0511c806 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -17,7 +17,7 @@ mkCoqDerivation rec { ] null; mlPlugin = true; - extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); enableParallelBuilding = false; meta = { diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index 1d0d03fb7f7c..c938a7ad0279 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -17,7 +17,6 @@ with lib; mkCoqDerivation { release."0.1-8.7".rev = "v0.1-8.7"; release."0.1-8.7".sha256 = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0"; - nativeBuildInputs = [ which ]; mlPlugin = true; meta = { diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 0a78191d8b72..2504e852bafd 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby"; release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw"; - extraBuildInputs = [ bignums ]; + propagatedBuildInputs = [ bignums ]; meta = { homepage = "https://math-classes.github.io"; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 0f562fec287c..a19d8b8dcc79 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -10,9 +10,9 @@ # See the documentation at doc/languages-frameworks/coq.section.md. # ############################################################################ -{ lib, ncurses, which, graphviz, lua, fetchzip, +{ lib, ncurses, graphviz, lua, fetchzip, mkCoqDerivation, recurseIntoAttrs, withDoc ? false, single ? false, - coqPackages, coq, ocamlPackages, version ? null }@args: + coqPackages, coq, version ? null }@args: with builtins // lib; let repo = "math-comp"; @@ -60,8 +60,9 @@ let inherit version pname defaultVersion release releaseRev repo owner; mlPlugin = versions.isLe "8.6" coq.coq-version; - extraNativeBuildInputs = [ which ] ++ optionals withDoc [ graphviz lua ]; - extraBuildInputs = [ ncurses ] ++ mathcomp-deps; + nativeBuildInputs = optionals withDoc [ graphviz lua ]; + buildInputs = [ ncurses ]; + propagatedBuildInputs = mathcomp-deps; buildFlags = optional withDoc "doc"; diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index 583d8b7adb91..09327f46b86d 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -1,4 +1,4 @@ -{ lib, which, fetchzip, +{ lib, fetchzip, mkCoqDerivation, recurseIntoAttrs, single ? false, coqPackages, coq, equations, version ? null }@args: with builtins // lib; @@ -36,10 +36,8 @@ let derivation = mkCoqDerivation ({ inherit version pname defaultVersion release releaseRev repo owner; - extraNativeBuildInputs = [ which ]; mlPlugin = true; - extraBuildInputs = [ coq.ocamlPackages.zarith ]; - propagatedBuildInputs = [ equations ] ++ metacoq-deps; + propagatedBuildInputs = [ equations coq.ocamlPackages.zarith ] ++ metacoq-deps; patchPhase = '' patchShebangs ./configure.sh diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 26bd38f72df1..83333b3e1bf0 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -13,7 +13,6 @@ with lib; mkCoqDerivation { release."8.10".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; sourceRoot = "source/Metalib"; - installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}"; meta = { license = licenses.mit; diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix index e112512ec5c7..cbf1469e1f03 100644 --- a/pkgs/development/coq-modules/semantics/default.nix +++ b/pkgs/development/coq-modules/semantics/default.nix @@ -24,8 +24,8 @@ mkCoqDerivation rec { ] null; mlPlugin = true; - extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); - extraBuildInputs = (with coq.ocamlPackages; [ num ]); + nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + propagatedBuildInputs = (with coq.ocamlPackages; [ num ]); postPatch = '' for p in Make Makefile.coq.local diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index bcc391c4f724..ca7325711e25 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -11,11 +11,9 @@ with lib; mkCoqDerivation { ] null; release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci"; release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; - extraNativeBuildInputs = (with coq.ocamlPackages; [ cppo zarith ]); - propagatedBuildInputs = [ coq-ext-lib ] - ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]); - mlPlugin = true; + nativeBuildInputs = [ coq.ocamlPackages.cppo ]; + propagatedBuildInputs = [ coq-ext-lib coq.ocamlPackages.ocamlbuild ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index 0389b45fb5cd..ebaebe6974e3 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -13,9 +13,11 @@ mkCoqDerivation { { case = isEq "8.13"; out = "itp22"; } ] null; - propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ]; - extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml ocamlbuild ]; - extraBuildInputs = with coq.ocamlPackages; [ findlib num zarith ]; + propagatedBuildInputs = [ trakt cvc4 ] + ++ lib.optionals (!stdenv.isDarwin) [ veriT ] + ++ (with coq.ocamlPackages; [ num zarith ]); + mlPlugin = true; + nativeBuildInputs = with coq.ocamlPackages; [ ocamlbuild ]; meta = { description = "Communication between Coq and SAT/SMT solvers "; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 0770f3a48d48..40d1c3d9b31c 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,12 +1,13 @@ -{ stdenv, lib, fetchzip, buildDunePackage, camlp5 +{ lib +, buildDunePackage, camlp5 , re, perl, ncurses , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 +, coqPackages , version ? "1.14.1" }: with lib; -let fetched = import ../../../build-support/coq/meta-fetch/default.nix - {inherit lib stdenv fetchzip; } ({ +let fetched = coqPackages.metaFetch ({ release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r"; release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka"; @@ -27,7 +28,7 @@ buildDunePackage rec { buildInputs = [ perl ncurses ]; propagatedBuildInputs = [ camlp5 re ] - ++ (if lib.versionAtLeast version "1.13" + ++ (if lib.versionAtLeast version "1.13" || version == "dev" then [ ppxlib ppx_deriving ] else [ ppxlib_0_15 ppx_deriving_0_15 ] ); diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 9c3e666c5b3b..6cfd34aa279b 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 +{ lib, stdenv, fetchzip +, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 , ocamlPackages_4_10, ocamlPackages_4_12, fetchpatch, makeWrapper, coq2html }@args: let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in @@ -8,6 +9,8 @@ let inherit coq lib; coqPackages = self; + metaFetch = import ../build-support/coq/meta-fetch/default.nix + {inherit lib stdenv fetchzip; }; mkCoqDerivation = callPackage ../build-support/coq {}; contribs = recurseIntoAttrs