alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-06-08 18:01:21 +00:00 committed by GitHub
parent 6bab56cd98 97bdf4893d
commit 53ca59a8a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 183 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CONTRIBUTING.md
View file

@ -104,10 +104,10 @@ This also works for PR's that have already been merged, and might take a couple
You can also create the backport manually:
1. Take note of the commits in which the change was introduced into `master` branch.
2. Check out the target _release branch_, e.g. `release-21.11`. Do not use a _channel branch_ like `nixos-21.11` or `nixpkgs-21.11-darwin`.
2. Check out the target _release branch_, e.g. `release-22.05`. Do not use a _channel branch_ like `nixos-22.05` or `nixpkgs-22.05-darwin`.
3. Create a branch for your change, e.g. `git checkout -b backport`.
4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-21.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[21.11]`.
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.05`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.05]`.
6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier.
## Criteria for Backporting changes

2
lib/systems/examples.nix
View file

@ -306,8 +306,6 @@ rec {
# BSDs
amd64-netbsd = lib.warn "The amd64-netbsd system example is deprecated. Use x86_64-netbsd instead." x86_64-netbsd;
x86_64-netbsd = {
config = "x86_64-unknown-netbsd";
libc = "nblibc";

6
maintainers/maintainer-list.nix
View file

@ -9093,6 +9093,12 @@
githubId = 3747396;
name = "Nathan Isom";
};
necrophcodr = {
email = "nc@scalehost.eu";
github = "necrophcodr";
githubId = 575887;
name = "Steffen Rytter Postas";
};
neilmayhew = {
email = "nix@neil.mayhew.name";
github = "neilmayhew";

2
nixos/modules/i18n/input-method/ibus.nix
View file

@ -67,7 +67,7 @@ in
programs.dconf.packages = [ ibusPackage ];
services.dbus.packages = [
ibusAutostart
ibusPackage
];
environment.variables = {

2
nixos/modules/services/system/localtime.nix
View file

@ -5,6 +5,8 @@ with lib;
let
cfg = config.services.localtimed;
in {
imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ];
options = {
services.localtimed = {
enable = mkOption {

50
nixos/modules/virtualisation/amazon-ec2-amis.nix
View file

@ -440,5 +440,53 @@ let self = {
"21.11".ap-east-1.aarch64-linux.hvm-ebs = "ami-0aa3b50a4f2822a00";
"21.11".sa-east-1.aarch64-linux.hvm-ebs = "ami-00f68eff453d3fe69";
latest = self."21.11";
# 22.05.342.a634c8f6c1f
"22.05".eu-west-1.x86_64-linux.hvm-ebs = "ami-00badba5cfa0a0c0d";
"22.05".af-south-1.x86_64-linux.hvm-ebs = "ami-0d3a6166c1ea4d7b4";
"22.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-06445325c360470d8";
"22.05".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-009c422293bcf3721";
"22.05".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0bfc0397525a67ed8";
"22.05".ap-northeast-3.x86_64-linux.hvm-ebs = "ami-0a1fb4d4e08a6065e";
"22.05".ap-south-1.x86_64-linux.hvm-ebs = "ami-07ad258dcc69239d2";
"22.05".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0f59f7f33cba8b1a4";
"22.05".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0d1e49fe30aec165d";
"22.05".ap-southeast-3.x86_64-linux.hvm-ebs = "ami-0f5cb24a1e3fc62dd";
"22.05".ca-central-1.x86_64-linux.hvm-ebs = "ami-0551a595ba7916462";
"22.05".eu-central-1.x86_64-linux.hvm-ebs = "ami-0702eee2e75d541d1";
"22.05".eu-north-1.x86_64-linux.hvm-ebs = "ami-0fc6838942cb7d9cb";
"22.05".eu-south-1.x86_64-linux.hvm-ebs = "ami-0df9463b8965cdb80";
"22.05".eu-west-2.x86_64-linux.hvm-ebs = "ami-08f3c1eb533a42ac1";
"22.05".eu-west-3.x86_64-linux.hvm-ebs = "ami-04b50c79dc4009c97";
"22.05".me-south-1.x86_64-linux.hvm-ebs = "ami-05c52087afab7024d";
"22.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-0732aa0f0c28f281b";
"22.05".us-east-1.x86_64-linux.hvm-ebs = "ami-0223db08811f6fb2d";
"22.05".us-east-2.x86_64-linux.hvm-ebs = "ami-0a743534fa3e51b41";
"22.05".us-west-1.x86_64-linux.hvm-ebs = "ami-0d72ab697beab5ea5";
"22.05".us-west-2.x86_64-linux.hvm-ebs = "ami-034946f0c47088751";
"22.05".eu-west-1.aarch64-linux.hvm-ebs = "ami-08114069426233360";
"22.05".af-south-1.aarch64-linux.hvm-ebs = "ami-0a9b83913abd61694";
"22.05".ap-east-1.aarch64-linux.hvm-ebs = "ami-03966ad4547f532b7";
"22.05".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-0eb7e152c8d5aae7d";
"22.05".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-08369e00c5528762b";
"22.05".ap-northeast-3.aarch64-linux.hvm-ebs = "ami-0fa14b8d48cdd57c3";
"22.05".ap-south-1.aarch64-linux.hvm-ebs = "ami-0f2ca3b542ff0913b";
"22.05".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-087def0511ef2687d";
"22.05".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-0aa90985199011f04";
"22.05".ap-southeast-3.aarch64-linux.hvm-ebs = "ami-0c86c52790deefa23";
"22.05".ca-central-1.aarch64-linux.hvm-ebs = "ami-06e932cc9c20403e4";
"22.05".eu-central-1.aarch64-linux.hvm-ebs = "ami-07680df1026a9b54c";
"22.05".eu-north-1.aarch64-linux.hvm-ebs = "ami-0cbe9f2725e4de706";
"22.05".eu-south-1.aarch64-linux.hvm-ebs = "ami-01a83c3892925765f";
"22.05".eu-west-2.aarch64-linux.hvm-ebs = "ami-049024d086d039b54";
"22.05".eu-west-3.aarch64-linux.hvm-ebs = "ami-0c0ebe20ebfc635a1";
"22.05".me-south-1.aarch64-linux.hvm-ebs = "ami-0d662fcaac553e945";
"22.05".sa-east-1.aarch64-linux.hvm-ebs = "ami-0888c8f703e00fdb8";
"22.05".us-east-1.aarch64-linux.hvm-ebs = "ami-03536a13324333073";
"22.05".us-east-2.aarch64-linux.hvm-ebs = "ami-067611519fa817aaa";
"22.05".us-west-1.aarch64-linux.hvm-ebs = "ami-0f96be48071c13ab2";
"22.05".us-west-2.aarch64-linux.hvm-ebs = "ami-084bc5d777585adfb";
latest = self."22.05";
}; in self

4
pkgs/applications/audio/picard/default.nix
View file

@ -18,13 +18,13 @@ let
in
pythonPackages.buildPythonApplication rec {
pname = "picard";
version = "2.8";
version = "2.8.1";
src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "refs/tags/release-${version}";
sha256 = "sha256-DG5b3mw6AL4HSF3diGXOqIeH/eXGqLOsbcnPbD6kznE=";
sha256 = "sha256-KEKOouTNmmZiPyKo8xCQv6Zkreidtz2DaEbHjuwJJvY=";
};
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]

4
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -2364,8 +2364,8 @@ let
mktplcRef = {
name = "vspacecode";
publisher = "VSpaceCode";
version = "0.10.1";
sha256 = "sha256-H7SCC/ZhDswMQjLX+qpQa6A1N83MobJRPC4pyIbZ1kA=";
version = "0.10.9";
sha256 = "sha256-16oC2BghY7mB/W0niTDtKGMAC9pt6m0utSOJ0lgbpAU=";
};
meta = {
license = lib.licenses.mit;

28
pkgs/applications/graphics/inkscape/default.nix
View file

@ -5,7 +5,6 @@
, cairo
, cmake
, fetchurl
, fetchpatch
, gettext
, ghostscript
, glib
@ -44,20 +43,25 @@
let
python3Env = python3.withPackages
(ps: with ps; [
appdirs
beautifulsoup4
cachecontrol
numpy
lxml
pillow
scour
pyserial
]);
requests
pygobject3
] ++ inkex.propagatedBuildInputs);
in
stdenv.mkDerivation rec {
pname = "inkscape";
version = "1.1.2";
version = "1.2";
src = fetchurl {
url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE=";
url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz";
sha256 = "jZsxFCVUlFZk7f7+LWtVkQpQmXZfcXanEQfDTx3N5q0=";
};
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
@ -73,20 +77,6 @@ stdenv.mkDerivation rec {
# e.g., those from the "Effects" menu.
python3 = "${python3Env}/bin/python";
})
# Fix build with poppler 22.03
# https://gitlab.com/inkscape/inkscape/-/merge_requests/4187
(fetchpatch {
url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch";
sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg=";
})
# Fix build with poppler 22.04
# https://gitlab.com/inkscape/inkscape/-/merge_requests/4266
(fetchpatch {
url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch";
sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE=";
})
];
postPatch = ''

6
pkgs/applications/misc/ydict/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ydict";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "ydict";
rev = "v${version}";
sha256 = "sha256-zhjsXZsRk0UNijjqjGjZh4TiPxAM5p+ic3JMx2wrPeY=";
sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M=";
};
vendorSha256 = "sha256-O6czDfKD18rGVMIZv6II09oQu1w0ijQRuZRGt2gj9Cs=";
vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];

14
pkgs/applications/networking/cluster/tgswitch/default.nix
View file

@ -1,5 +1,5 @@
{ buildGoPackage, lib, fetchFromGitHub }:
buildGoPackage rec {
{ buildGoModule, lib, fetchFromGitHub }:
buildGoModule rec {
pname = "tgswitch";
version = "0.5.389";
@ -10,7 +10,14 @@ buildGoPackage rec {
sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0=";
};
goPackagePath = "github.com/warrensbox/tgswitch";
vendorSha256 = null;
ldflags = [ "-s" "-w" ];
# There are many modifications need to be done to make tests run. For example:
# 1. Network access
# 2. Operation on `/var/empty` not permitted on macOS
doCheck= false;
meta = with lib; {
description = "A command line tool to switch between different versions of terragrunt";
@ -19,3 +26,4 @@ buildGoPackage rec {
maintainers = with maintainers; [ psibi ];
};
}

4
pkgs/applications/office/appflowy/default.nix
View file

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.0.3";
version = "0.0.4";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz";
sha256 = "sha256-m9vfgytSKnWLf6hwKjIGcU/7OCmIBiF4hJ/yIRBdSpQ=";
sha256 = "sha256-ke3cuRi+ZlBSWawg66cGrV928dOBp0EniNakitmgUso=";
};
nativeBuildInputs = [

12
pkgs/applications/science/astronomy/gpredict/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, intltool
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool
, gtk3, glib, curl, goocanvas2, gpsd
, hamlib, wrapGAppsHook
}:
@ -14,6 +14,16 @@ in stdenv.mkDerivation {
sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7";
};
patches = [
# Pull upstream fix for -fno-common toolchains:
# https://github.com/csete/gpredict/issues/195
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch";
sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a";
})
];
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ];

1
pkgs/applications/science/logic/coq/default.nix
View file

@ -49,6 +49,7 @@ let
"8.15.0".sha256 = "sha256:1ma76wfrpfsl72yh10w1ys2a0vi0mdc2jc79kdc8nrmxkhpw1nxx";
"8.15.1".sha256 = "sha256:1dsa04jzkx5pw69pmxn0l55q4w88lg6fvz7clbga0bazzsfnsgd6";
"8.15.2".sha256 = "sha256:0gn8dz69scxnxaq6ycb3x34bjfk9wlp1y2xn8w69kg9fm4b6gkc7";
"8.16+rc1".sha256 = "sha256-dU+E0Mz7MVntbQIeG9I59ANBaHaXXSrjCRdoqZ5TO60=";
};
releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix

43
pkgs/development/compilers/gmqcc/default.nix Normal file
View file

@ -0,0 +1,43 @@
{ lib
, pkgs
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "gmqcc";
version = "unstable-2021-07-09";
src = fetchFromGitHub {
owner = "graphitemaster";
repo = "gmqcc";
rev = "297eab9e5e2c9cc4f41201b68821593a5cf9a725";
sha256 = "1hl2qn7402ia03kjkblj4q4wfypxkil99sivsyk2vrnwwpdp4nzx";
};
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -m755 gmqcc $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://graphitemaster.github.io/gmqcc/";
description = "A modern QuakeC compiler";
longDescription = ''
For an enduring period of time the options for a decent compiler for
the Quake C programming language were confined to a specific compiler
known as QCC. Attempts were made to extend and improve upon the design
of QCC, but many foreseen the consequences of building on a broken
foundation. The solution was obvious, a new compiler; one born from
the NIH realm of sarcastic wit.
We welcome you. You won't find a better Quake C compiler.
'';
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ necrophcodr ];
platforms = platforms.linux;
};
}

1
pkgs/development/coq-modules/bignums/default.nix
View file

@ -8,6 +8,7 @@ with lib; mkCoqDerivation {
defaultVersion = if versions.isGe "8.6" coq.coq-version
then "${coq.coq-version}.0" else null;
release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4=";
release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns";
release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06";
release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y";

3
pkgs/development/libraries/libosinfo/default.nix
View file

@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU=";
};
outputs = [ "out" "dev" "devdoc" ];
outputs = [ "out" "dev" ]
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc";
nativeBuildInputs = [
pkg-config

6
pkgs/development/python-modules/inkex/default.nix
View file

@ -1,6 +1,9 @@
{ buildPythonPackage
, inkscape
, cssselect
, lxml
, numpy
, pygobject3
, python
}:
@ -11,7 +14,10 @@ buildPythonPackage {
format = "other";
propagatedBuildInputs = [
cssselect
lxml
numpy
pygobject3
];
# We just copy the files.

1
pkgs/development/tools/apksigner/default.nix
View file

@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
cat >> build.gradle <<EOF
apply plugin: 'application'
mainClassName = "com.android.apksigner.ApkSignerTool"
sourceSets.main.java.srcDirs = [ 'src/apksigner/java', 'src/main/java' ]
jar {
manifest { attributes "Main-Class": "com.android.apksigner.ApkSignerTool" }

4
pkgs/development/tools/metals/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
version = "0.11.5";
version = "0.11.6";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-kw+8688E1b7XjEb7AqOExSVu88NqPprKaCuINWqL2wk=";
outputHash = "sha256-/tFc7xAuUtx2JgEMLhGaq2FXpt7KQNMi82ODr/gTfhM=";
};
nativeBuildInputs = [ makeWrapper setJavaClassPath ];

13
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View file

@ -1,11 +1,16 @@
{system ? builtins.currentSystem}:
let
make = crossSystem: import ./make-bootstrap-tools.nix {
localSystem = { inherit system; };
inherit crossSystem;
inherit (releaseLib) lib;
releaseLib = import ../../top-level/release-lib.nix {
# We're not using any functions from release-lib.nix that look at
# supportedSystems.
supportedSystems = [];
};
make = crossSystem: import ./make-bootstrap-tools.nix {
pkgs = releaseLib.pkgsForCross crossSystem system;
};
lib = import ../../../lib;
in lib.mapAttrs (n: make) (with lib.systems.examples; {
armv5tel = sheevaplug;
pogoplug4 = pogoplug4;

8
pkgs/tools/misc/mprocs/default.nix
View file

@ -2,21 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "mprocs";
version = "0.2.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "pvolok";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9wac2jlh8MLggcYuEHVUPYPjhfzGN+4o1XT8B9pj4f8=";
sha256 = "sha256-IzaXcEm4eUpLWsn59ZSiIJ0mCegLhBiA3ONKI1Djemk=";
};
cargoSha256 = "sha256-vGhoM5VMJO+ppLk8DetNZ8UteU6ifdtRe1HNJ0dSB+0=";
cargoSha256 = "sha256-nTFCFmmS3IIm+D2PjvDxUKQGTn2h0ajXtxLuosa9rRY=";
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 ];
maintainers = with maintainers; [ GaetanLepage thehedgeh0g ];
};
}

8
pkgs/tools/misc/zellij/default.nix
View file

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "zellij";
version = "0.29.1";
version = "0.30.0";
src = fetchFromGitHub {
owner = "zellij-org";
repo = "zellij";
rev = "v${version}";
sha256 = "sha256-KuelmMQdCazwTlolH5xvvNXZfzHQDUV6rrlk037GFb8=";
sha256 = "sha256-T2mkkE7z6AhHnn/77HcrvbY+32EOwE8jjh+veVOE1CY=";
};
cargoSha256 = "sha256-He8rMY8n15ZSF/GcbuYTx2JfZgqQnsZLfqP+lUYxnzw=";
cargoSha256 = "sha256-XTaQbMK7R43CE03niUaBzlYN4xRo7pUFdNYvUeA+MwA=";
nativeBuildInputs = [
mandown
@ -61,6 +61,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://zellij.dev/";
changelog = "https://github.com/zellij-org/zellij/blob/v${version}/Changelog.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ therealansh _0x4A6F abbe ];
maintainers = with maintainers; [ therealansh _0x4A6F abbe thehedgeh0g ];
};
}

4
pkgs/tools/text/ispell/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ispell";
version = "3.4.04";
version = "3.4.05";
src = fetchurl {
url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz";
sha256 = "sha256-h7zW8FIdhaCjp4NCFZVtdOvEkxRMx8eR+HvmhyzP4T4=";
sha256 = "sha256-zwxt7eP9JfraQ3XYasr+WDy5bY/lRt50apLrtt+JVgI=";
};
buildInputs = [ bison ncurses ];

3
pkgs/top-level/all-packages.nix
View file

@ -13023,6 +13023,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
gmqcc = callPackage ../development/compilers/gmqcc {};
gtk-server = callPackage ../development/interpreters/gtk-server {};
# Haskell and GHC
@ -33247,6 +33249,7 @@ with pkgs;
coqPackages_8_13 coq_8_13
coqPackages_8_14 coq_8_14
coqPackages_8_15 coq_8_15
coqPackages_8_16 coq_8_16
coqPackages coq
;

2
pkgs/top-level/coq-packages.nix
View file

@ -151,6 +151,7 @@ in rec {
coq_8_13 = mkCoq "8.13";
coq_8_14 = mkCoq "8.14";
coq_8_15 = mkCoq "8.15";
coq_8_16 = mkCoq "8.16";
coqPackages_8_5 = mkCoqPackages coq_8_5;
coqPackages_8_6 = mkCoqPackages coq_8_6;
@ -163,6 +164,7 @@ in rec {
coqPackages_8_13 = mkCoqPackages coq_8_13;
coqPackages_8_14 = mkCoqPackages coq_8_14;
coqPackages_8_15 = mkCoqPackages coq_8_15;
coqPackages_8_16 = mkCoqPackages coq_8_16;
coqPackages = recurseIntoAttrs coqPackages_8_15;
coq = coqPackages.coq;

7
pkgs/top-level/perl-packages.nix
View file

@ -22117,10 +22117,10 @@ let
TestLWPUserAgent = buildPerlPackage {
pname = "Test-LWP-UserAgent";
version = "0.034";
version = "0.036";
src = fetchurl {
url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.034.tar.gz";
sha256 = "1ybhl9zpxkz77d25h96kbgh16zy9f27n95p6j9jg52kvdg0r2lbp";
url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.036.tar.gz";
sha256 = "sha256-BTJ1MNNGuAphpulD+9dJmGvcqJIRpOswHAjC0XkxThE=";
};
propagatedBuildInputs = [ LWP SafeIsa namespaceclean ];
buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ];
@ -22128,7 +22128,6 @@ let
description = "A LWP::UserAgent suitable for simulating and testing network calls";
license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/karenetheridge/Test-LWP-UserAgent";
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestLWPUserAgent.x86_64-darwin
};
};