gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2022-05-25 18:01:17 +00:00
committed by GitHub
parent 74c55da0c0 f905feccd0
commit 78e53cddde
113 changed files with 698 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/languages-frameworks/coq.section.md
+10 -5
View File
@@ -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`.
maintainers/maintainer-list.nix
+6
View File
@@ -4525,6 +4525,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";
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+7
View File
@@ -190,6 +190,13 @@
<link linkend="opt-services.aesmd.enable">services.aesmd</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/xddxdd/bird-lg-go">bird-lg</link>,
a BGP looking glass for Bird Routing. Available as
<link linkend="opt-services.bird-lg.package">services.bird-lg</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://docs.docker.com/engine/security/rootless/">rootless
nixos/doc/manual/release-notes/rl-2205.section.md
+2
View File
@@ -61,6 +61,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).
nixos/modules/module-list.nix
+1
View File
@@ -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
nixos/modules/services/networking/bird-lg.nix
+269
View File
@@ -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 <link xlink:href=\"https://github.com/xddxdd/bird-lg-go#frontend\">here</link>.
";
};
};
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 <link xlink:href=\"https://github.com/xddxdd/bird-lg-go#proxy\">here</link>.
";
};
};
};
};
###### 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;
};
};
};
}
pkgs/applications/audio/picard/default.nix
+3 -3
View File
@@ -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 ]
pkgs/applications/audio/pyradio/default.nix
+2 -2
View File
@@ -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 = ''
pkgs/applications/audio/spotify/default.nix
+2 -2
View File
@@ -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
pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix
+7 -3
View File
@@ -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
pkgs/applications/graphics/shotwell/default.nix
+2 -2
View File
@@ -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 = [
pkgs/applications/misc/1password/default.nix
+2 -2
View File
@@ -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;
};
pkgs/applications/misc/orca/default.nix
+2 -2
View File
@@ -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 = [
pkgs/applications/misc/robo3t/default.nix
+1 -5
View File
@@ -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";
pkgs/applications/networking/instant-messengers/slack/default.nix
+6 -6
View File
@@ -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;
pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+12 -22
View File
@@ -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;
pkgs/applications/science/logic/coq/default.nix
+8 -5
View File
@@ -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)
pkgs/applications/science/logic/why3/default.nix
+4 -3
View File
@@ -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 ];
pkgs/applications/version-management/git-and-tools/gh/default.nix
+2 -2
View File
@@ -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=";
pkgs/applications/version-management/gitkraken/default.nix
+1 -2
View File
@@ -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.5.0";
pkgs/applications/video/ani-cli/default.nix
+2 -2
View File
@@ -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 ];
pkgs/applications/video/filebot/default.nix
+1 -7
View File
@@ -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";
pkgs/applications/virtualization/docker/compose.nix
+3 -3
View File
@@ -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" ];
pkgs/applications/virtualization/docker/default.nix
+3 -3
View File
@@ -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=";
pkgs/build-support/appimage/default.nix
+1 -1
View File
@@ -108,7 +108,7 @@ rec {
xorg.libICE
gnome2.GConf
freetype
(curl.override { gnutlsSupport = true; opensslSupport = false; })
curlWithGnuTls
nspr
nss
fontconfig
pkgs/build-support/coq/default.nix
+27 -13
View File
@@ -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 {
pkgs/desktops/gnome/apps/seahorse/default.nix
+9 -3
View File
@@ -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 = [
@@ -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;
pkgs/desktops/gnome/core/evince/default.nix
+2 -2
View File
@@ -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 = ''
pkgs/desktops/gnome/core/gnome-keyring/default.nix
+5 -2
View File
@@ -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
pkgs/development/compilers/scala/dotty-bare.nix → pkgs/development/compilers/scala/bare.nix
+1 -1
View File
@@ -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";
pkgs/development/compilers/scala/default.nix
+24
View File
@@ -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;
}
pkgs/development/compilers/scala/dotty.nix
-24
View File
@@ -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;
}
pkgs/development/coq-modules/CoLoR/default.nix
+1 -1
View File
@@ -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 = {
pkgs/development/coq-modules/HoTT/default.nix
+1 -1
View File
@@ -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
pkgs/development/coq-modules/QuickChick/default.nix
+1 -2
View File
@@ -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" ];
pkgs/development/coq-modules/VST/default.nix
+1 -1
View File
@@ -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 = ''
pkgs/development/coq-modules/bignums/default.nix
+1 -1
View File
@@ -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";
pkgs/development/coq-modules/compcert/default.nix
+9 -4
View File
@@ -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
pkgs/development/coq-modules/coq-bits/default.nix
+8 -24
View File
@@ -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";
pkgs/development/coq-modules/coq-elpi/default.nix
+2 -2
View File
@@ -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.";
pkgs/development/coq-modules/coqeal/default.nix
+1 -2
View File
@@ -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 = {
pkgs/development/coq-modules/coqhammer/default.nix
+4 -2
View File
@@ -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";
pkgs/development/coq-modules/coqprime/default.nix
-1
View File
@@ -20,7 +20,6 @@ with lib; mkCoqDerivation {
release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
releaseRev = v: "v${v}";
extraBuildInputs = [ which ];
propagatedBuildInputs = [ bignums ];
meta = with lib; {
pkgs/development/coq-modules/coqtail-math/default.nix
+1 -3
View File
@@ -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 ];
pkgs/development/coq-modules/coquelicot/default.nix
+2 -2
View File
@@ -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";
pkgs/development/coq-modules/dpdgraph/default.nix
+2 -2
View File
@@ -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
pkgs/development/coq-modules/fiat/HEAD.nix
+2 -2
View File
@@ -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";
pkgs/development/coq-modules/flocq/default.nix
+2 -2
View File
@@ -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";
pkgs/development/coq-modules/gappalib/default.nix
+1 -1
View File
@@ -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";
pkgs/development/coq-modules/heq/default.nix
+10 -6
View File
@@ -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 ];
};
pkgs/development/coq-modules/hierarchy-builder/default.nix
+1 -4
View File
@@ -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 = {
pkgs/development/coq-modules/interval/default.nix
+5 -3
View File
@@ -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;
pkgs/development/coq-modules/itauto/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ mkCoqDerivation rec {
] null;
mlPlugin = true;
extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
enableParallelBuilding = false;
meta = {
pkgs/development/coq-modules/ltac2/default.nix
-1
View File
@@ -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 = {
pkgs/development/coq-modules/math-classes/default.nix
+1 -1
View File
@@ -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";
pkgs/development/coq-modules/mathcomp/default.nix
+5 -4
View File
@@ -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";
pkgs/development/coq-modules/metacoq/default.nix
+2 -4
View File
@@ -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
pkgs/development/coq-modules/metalib/default.nix
-1
View File
@@ -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;
pkgs/development/coq-modules/semantics/default.nix
+2 -2
View File
@@ -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
pkgs/development/coq-modules/simple-io/default.nix
+2 -4
View File
@@ -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";
pkgs/development/coq-modules/smtcoq/default.nix
+5 -3
View File
@@ -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 ";
pkgs/development/libraries/qt-6/modules/qtbase.nix
+2 -2
View File
@@ -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
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+2 -2
View File
@@ -63,7 +63,7 @@
, libxslt
, lcms2
, re2
, kerberos
, libkrb5
, enableProprietaryCodecs ? true
}:
@@ -215,7 +215,7 @@ qtModule rec {
# Pipewire
pipewire
kerberos
libkrb5
];
buildInputs = [
pkgs/development/ocaml-modules/elpi/default.nix
+5 -4
View File
@@ -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 ]
);
pkgs/development/python-modules/ailment/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/aiohttp/default.nix
+3
View File
@@ -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
];
pkgs/development/python-modules/angr/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/angrop/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/archinfo/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/atlassian-python-api/default.nix
+3 -3
View File
@@ -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 = [
pkgs/development/python-modules/claripy/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/cle/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/exceptiongroup/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/hwi/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/mwoauth/default.nix
+2 -8
View File
@@ -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 = [
@@ -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;
pkgs/development/python-modules/pychromecast/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/pyvex/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/tools/cloud-nuke/default.nix
+2 -2
View File
@@ -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=";
pkgs/games/lincity/default.nix
+3
View File
@@ -35,5 +35,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;
};
}
pkgs/games/steam/fhsenv.nix
+1 -1
View File
@@ -155,7 +155,7 @@ in buildFHSUserEnv rec {
xorg.libSM
xorg.libICE
gnome2.GConf
(curl.override { gnutlsSupport = true; opensslSupport = false; })
curlWithGnuTls
nspr
nss
cups
pkgs/os-specific/linux/akvcam/default.nix
+1
View File
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ freezeboy ];
platforms = platforms.linux;
license = licenses.gpl2Only;
broken = kernel.kernelAtLeast "5.18";
};
}
pkgs/os-specific/linux/bbswitch/default.nix
+1
View File
@@ -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";
};
}
pkgs/os-specific/linux/dddvb/default.nix
+1
View File
@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = with maintainers; [ hexa ];
platforms = platforms.linux;
broken = kernel.kernelAtLeast "5.18";
};
}
pkgs/os-specific/linux/dpdk-kmods/default.nix
+1
View File
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = [ maintainers.mic92 ];
platforms = platforms.linux;
broken = kernel.kernelAtLeast "5.18";
};
}
pkgs/os-specific/linux/dpdk/default.nix
+1
View File
@@ -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";
};
}
pkgs/os-specific/linux/facetimehd/default.nix
+1
View File
@@ -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";
};
}
pkgs/os-specific/linux/intel-speed-select/default.nix
+1
View File
@@ -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";
};
}
pkgs/os-specific/linux/kvdo/default.nix
+1
View File
@@ -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";
};
}
pkgs/os-specific/linux/kvmfr/default.nix
+1 -1
View File
@@ -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";
};
}
pkgs/os-specific/linux/lttng-modules/default.nix
+1
View File
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
license = with licenses; [ lgpl21Only gpl2Only mit ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
broken = kernel.kernelAtLeast "5.18";
};
}
pkgs/os-specific/linux/netatop/default.nix
+1
View File
@@ -16,6 +16,7 @@ stdenv.mkDerivation {
buildInputs = [ kmod zlib ];
hardeningDisable = [ "pic" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ];
patches = [
# fix paths in netatop.service
pkgs/os-specific/linux/nvidiabl/default.nix
+1
View File
@@ -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";
};
}
pkgs/os-specific/linux/pktgen/default.nix
+2 -2
View File
@@ -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 ];
pkgs/os-specific/linux/rtl8192eu/default.nix
+1 -1
View File
@@ -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 ];
};
}
pkgs/os-specific/linux/rtl8821ce/default.nix
+1 -1
View File
@@ -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 ];
};
}
pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix
+1
View File
@@ -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";
};
}
pkgs/os-specific/linux/vendor-reset/default.nix
+12 -1
View File
@@ -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" ];
@@ -24,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";
pkgs/os-specific/linux/virtualbox/default.nix
+1
View File
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
meta = virtualbox.meta // {
description = virtualbox.meta.description + " (kernel modules)";
broken = kernel.kernelAtLeast "5.18";
};
}
pkgs/os-specific/linux/vmware/default.nix
+1 -1
View File
@@ -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 ];
};
}
pkgs/servers/bird-lg/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ buildGoModule, fetchFromGitHub, lib, symlinkJoin }:
let
generic = { modRoot, vendorSha256 }:
buildGoModule rec {
pname = "bird-lg-${modRoot}";
version = "unstable-2022-05-08";
src = fetchFromGitHub {
owner = "xddxdd";
repo = "bird-lg-go";
rev = "348295b9aa954a92df2cf6b1179846a9486dafc0";
sha256 = "sha256-2t8ZP9Uc0sJlqWiJMq3MVoARfMKsuTXJkuOid0oWgyY=";
};
doDist = false;
ldflags = [
"-s"
"-w"
];
inherit modRoot vendorSha256;
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 ]; }

Some files were not shown because too many files have changed in this diff Show More