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]
2023-09-04 12:01:12 +00:00
committed by GitHub
parent da2be4f90e 7a46ca5ed0
commit 0a1690dd6b
74 changed files with 1310 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+13
View File
@@ -10889,6 +10889,12 @@
githubId = 613740;
name = "Martin Baillie";
};
mbalatsko = {
email = "mbalatsko@gmail.com";
github = "mbalatsko";
githubId = 15967073;
name = "Maksym Balatsko";
};
mbbx6spp = {
email = "me@susanpotter.net";
github = "mbbx6spp";
@@ -13844,6 +13850,13 @@
fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18";
}];
};
p-rintz = {
email = "nix@rintz.net";
github = "p-rintz";
githubId = 13933258;
name = "Philipp Rintz";
matrix = "@philipp:srv.icu";
};
ProducerMatt = {
name = "Matthew Pherigo";
email = "ProducerMatt42@gmail.com";
pkgs/applications/blockchains/ledger-live-desktop/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.64.2";
version = "2.66.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-8cb5FA/Ogd6GI0AclxHicZGV3K5bVsZuIl/3A03r5qQ=";
hash = "sha256-Du2bvtlNjxtkJ31RCKZmGtWxOEIjohbmEC5o3VvFGlY=";
};
pkgs/applications/networking/cluster/habitat/Cargo.lock
Generated
+968 -576
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/cluster/habitat/default.nix
+4 -4
View File
@@ -12,20 +12,20 @@
rustPlatform.buildRustPackage rec {
pname = "habitat";
version = "1.6.652";
version = "1.6.848";
src = fetchFromGitHub {
owner = "habitat-sh";
repo = "habitat";
rev = version;
hash = "sha256-aWQ4A8NxTOauwad1q58Q4IFDUImX/L/4YTCeVLaq8gw=";
hash = "sha256-oK9ZzENwpEq6W1qnhSgkr7Rhy7Fxt/BS4U5nxecyPu8=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"clap-2.33.1" = "sha256-ixyNr91VNB2ce2cIr0CdPmvKYRlckhKLeaSbqxouIAY=";
"configopt-0.1.0" = "sha256-DvpC4WDIzknN5A6+68H7p8bG5lwZ2f+kc9yYhTl16ZM=";
"configopt-0.1.0" = "sha256-76MeSoRD796ZzBqX3CoDJnunekVo2XfctpxrpspxmAU=";
"rants-0.6.0" = "sha256-B8uDoiqddCki3j7aC8kilEcmJjvB4ICjZjjTun2UEkY=";
"retry-1.0.0" = "sha256-ZaHnzOCelV4V0+MTIbH3DXxdz8QZVgcMq2YeV0S6X6o=";
"structopt-0.3.15" = "sha256-0vIX7J7VktKytT3ZnOm45qPRMHDkdJg20eU6pZBIH+Q=";
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://www.habitat.sh";
changelog = "https://github.com/habitat-sh/habitat/blob/${src.rev}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ rushmorem ];
maintainers = with maintainers; [ rushmorem qjoly ];
mainProgram = "hab";
platforms = [ "x86_64-linux" ];
};
pkgs/applications/networking/cluster/k8sgpt/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "k8sgpt";
version = "0.3.13";
version = "0.3.14";
src = fetchFromGitHub {
owner = "k8sgpt-ai";
repo = "k8sgpt";
rev = "v${version}";
hash = "sha256-JXKM39tODHg5jRE5p0u5xETPFDZrQgFri3FrYJFVUZU=";
hash = "sha256-n1bWAx3BQxgiuhDdTb2HU1DSEBQqOP/ek9bJBZlbWEM=";
};
vendorHash = "sha256-L8/GLhjCI93R9S1fE+wgXyPObIXRMkj5MF71iWAZVQk=";
vendorHash = "sha256-FUgIziVI99kL3dLJLqVFPEmQqLKXxAMie2q46sp0PeU=";
CGO_ENABLED = 0;
pkgs/applications/networking/cluster/kaniko/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "kaniko";
version = "1.14.0";
version = "1.15.0";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "kaniko";
rev = "v${version}";
hash = "sha256-sDZg2eKTwy3Y7Uaky4rz7EuU1EKY/S4VAEaj7GMN6Uo=";
hash = "sha256-PNAqdeB/ya3i1hRbagpfmpwS0tNRZbWBm9YIXME1HMc=";
};
vendorHash = null;
pkgs/applications/networking/cluster/karmor/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "karmor";
version = "0.13.13";
version = "0.13.15";
src = fetchFromGitHub {
owner = "kubearmor";
repo = "kubearmor-client";
rev = "v${version}";
hash = "sha256-3lgbJ6bxKirb2KR9e4yI0gqkXfpgCdnX0smyMS5BBKA=";
hash = "sha256-irpfZFswZjowKDnHmoutTo6960jl5C3Dq+NurjOk3p8=";
};
vendorHash = "sha256-raMR27DqgT/Hjp3yAMAKLbfOjIZs0K0XsncgmIP6vxk=";
pkgs/applications/networking/cluster/yor/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "yor";
version = "0.1.183";
version = "0.1.185";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-OMwDqBZPzjeG47CKk/heRo0JxyN7E7qh/dnV8cAzUfo=";
hash = "sha256-5CBOLbqsEVzYyU67c7QTGTe471XQlEC/826wYCPHzEo=";
};
vendorHash = "sha256-ZeTjGmlu8LndD2DKNncPzlpECdvkOjfwaVvV6S3sL9E=";
pkgs/applications/office/treesheets/default.nix
+3 -3
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "unstable-2023-08-17";
version = "unstable-2023-08-31";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "e88dd955bf1346b560da3c34234f9206463baf0b";
sha256 = "DOvCJiZ76CzlJF6f0V8ABHi5uUJo4XCzJDUoikKkpMI=";
rev = "7f68776a9e072520c735479929efecd0d58f362d";
sha256 = "AO0+Jqt2bEr3pwv417wey9zZWNX9rg0kDoO7qT+YPDg=";
};
nativeBuildInputs = [
pkgs/applications/science/logic/coq/default.nix
+2 -1
View File
@@ -55,6 +55,7 @@ let
"8.16.1".sha256 = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc=";
"8.17.0".sha256 = "sha256-TGwm7S6+vkeZ8cidvp8pkiAd9tk008jvvPvYgfEOXhM=";
"8.17.1".sha256 = "sha256-x+RwkbxMg9aR0L3WSCtpIz8jwA5cJA4tXAtHMZb20y4=";
"8.18+rc1".sha256 = "sha256-TmV0lzfzhpSnBoVyfTfVFUyBrXpUWSnyN1Le7b8IPTs=";
};
releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix
@@ -73,7 +74,7 @@ let
'';
ocamlPackages = if customOCamlPackages != null then customOCamlPackages
else with versions; switch coq-version [
{ case = range "8.16" "8.17"; out = ocamlPackages_4_14; }
{ case = range "8.16" "8.18"; out = ocamlPackages_4_14; }
{ case = range "8.14" "8.15"; out = ocamlPackages_4_12; }
{ case = range "8.11" "8.13"; out = ocamlPackages_4_10; }
{ case = range "8.7" "8.10"; out = ocamlPackages_4_09; }
pkgs/applications/science/logic/cvc5/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cvc5";
version = "1.0.6";
version = "1.0.7";
src = fetchFromGitHub {
owner = "cvc5";
repo = "cvc5";
rev = "cvc5-${version}";
hash = "sha256-pZiXAO92cwnYtaVMDFBEmk+NzDf4eKdc0eY0RltofPA=";
hash = "sha256-0uT2Lzz0ZbfNWZBptjaGI1fN0mMniBz41eEwipGc5fc=";
};
nativeBuildInputs = [ pkg-config cmake flex ];
pkgs/applications/version-management/gex/default.nix
+3 -3
View File
@@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec {
pname = "gex";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "Piturnah";
repo = pname;
rev = "v${version}";
hash = "sha256-iCK3fiVchbfQh5JPHzBN/b24dkoXKW5dJdCsyoG0Kvw=";
hash = "sha256-ADVF+Kb0DDiR3dS43uzhefFFEg1O8IC22i5fmziEp6I=";
};
nativeBuildInputs = [ pkg-config ];
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
libgit2_1_6
];
cargoHash = "sha256-5w8VzYoevWesMGQJe4rDbugCFQrE1LDNb69CaJ2bQ0w=";
cargoHash = "sha256-XBBZ56jvBtYI5J/sSc4ckk/KXzCHNgM9A4jGolGKh2E=";
meta = with lib; {
description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit";
pkgs/applications/version-management/git-up/default.nix
+14 -7
View File
@@ -6,26 +6,33 @@
pythonPackages.buildPythonApplication rec {
pname = "git-up";
version = "1.6.1";
version = "2.2.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za";
pname = "git_up";
inherit version;
hash = "sha256-GTX2IWLQ48yWfPnmtEa9HJ5umQLttqgTlgZQlaWgeE4=";
};
nativeBuildInputs = with pythonPackages; [
poetry-core
];
# git should be on path for tool to work correctly
propagatedBuildInputs = [
git
] ++ (with pythonPackages; [
click
colorama
docopt
gitpython
six
termcolor
]);
nativeCheckInputs = [ git pythonPackages.nose ]; # git needs to be on path
nativeCheckInputs = [
git
pythonPackages.pytestCheckHook
];
# 1. git fails to run as it cannot detect the email address, so we set it
# 2. $HOME is by default not a valid dir, so we have to set that too
# https://github.com/NixOS/nixpkgs/issues/12591
pkgs/applications/virtualization/qemu/default.nix
+3 -5
View File
@@ -47,11 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString xenSupport "-xen"
+ lib.optionalString hostCpuOnly "-host-cpu-only"
+ lib.optionalString nixosTestRunner "-for-vm-tests";
version = "8.0.4";
version = "8.1.0";
src = fetchurl {
url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
hash = "sha256-gcgX3aOK+Vi+W+8abPVbZYuy0/uHwealcd5reyxEUWw=";
hash = "sha256-cQwQEZjjNNR2Lu9l9km8Q/qKXddTA1VLis/sPrJfDlU=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ]
@@ -153,9 +153,6 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-tools"
"--localstatedir=/var"
"--sysconfdir=/etc"
# Always use our Meson, not the bundled version, which doesn't
# have our patches and will be subtly broken because of that.
"--meson=meson"
"--cross-prefix=${stdenv.cc.targetPrefix}"
(lib.enableFeature guestAgentSupport "guest-agent")
] ++ lib.optional numaSupport "--enable-numa"
@@ -219,6 +216,7 @@ stdenv.mkDerivation (finalAttrs: {
# point tests towards correct binaries
substituteInPlace ../tests/unit/test-qga.c \
--replace '/bin/bash' "$(type -P bash)" \
--replace '/bin/echo' "$(type -P echo)"
substituteInPlace ../tests/unit/test-io-channel-command.c \
--replace '/bin/socat' "$(type -P socat)"
pkgs/applications/virtualization/singularity/packages.nix
+6 -6
View File
@@ -7,20 +7,20 @@ let
apptainer = callPackage
(import ./generic.nix rec {
pname = "apptainer";
version = "1.1.7";
version = "1.2.2";
projectName = "apptainer";
src = fetchFromGitHub {
owner = "apptainer";
repo = "apptainer";
rev = "v${version}";
hash = "sha256-3F8qwP27IXcnnEYMnLzkCOxQDx7yej6QIZ40Wb5pk34=";
hash = "sha256-CpNuoG+QykP+HDCyFuIbZKYez5XnYrE75SWFoWu34rg=";
};
# Update by running
# nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules"
# at the root directory of the Nixpkgs repository
vendorHash = "sha256-PfFubgR/W1WBXIsRO+Kg7hA6ebeAcRiJlTlAZbnl19A=";
vendorHash = "sha256-Y0gOqg+WGgssXGEYHc9IFwiIpkb3hetlQI89vseAQPc=";
extraDescription = " (previously known as Singularity)";
extraMeta.homepage = "https://apptainer.org";
@@ -38,20 +38,20 @@ let
singularity = callPackage
(import ./generic.nix rec {
pname = "singularity-ce";
version = "3.11.1";
version = "3.11.4";
projectName = "singularity";
src = fetchFromGitHub {
owner = "sylabs";
repo = "singularity";
rev = "v${version}";
hash = "sha256-gdgg6VN3Ily+2Remz6dZBhhfWIxyaBa4bIlFcgrA/uY=";
hash = "sha256-v8iHbn2OzK/egP2Go76BI74iX8izfy2PM4Uo8LsE8FY=";
};
# Update by running
# nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules"
# at the root directory of the Nixpkgs repository
vendorHash = "sha256-mBhlH6LSmcJuc6HbU/3Q9ii7vJkW9jcikBWCl8oeMOk=";
vendorHash = "sha256-24Hnpq6LRh3JgaiJWCmHfJKoWLxsbceCdJutjPqZsX8=";
# Do not build conmon from the Git submodule source,
# Use Nixpkgs provided version
pkgs/data/misc/v2ray-domain-list-community/default.nix
+2 -2
View File
@@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20230825070717";
version = "20230902035830";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
hash = "sha256-xB+8WhFnaQ8YD99FcihqI58R8fxiBAzQK5b4VVdWbMo=";
hash = "sha256-xrx0+Zf9c5TYMWVKsAOJvI8x/ZoElnpjzLCPbkZjrzw=";
};
vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
meta = with lib; {
pkgs/development/compilers/elm/packages/lamdera.nix
+5 -5
View File
@@ -7,16 +7,16 @@ let
arch = if stdenv.isAarch64 then "arm64" else "x86_64";
hashes =
{
"x86_64-linux" = "443a763487366fa960120bfe193441e6bbe86fdb31baeed7dbb17d410dee0522";
"aarch64-linux" = "f11bec3b094df0c0958a8f1e07af5570199e671a882ad5fe979f1e7e482e986d";
"x86_64-darwin" = "d05a88d13e240fdbc1bf64bd1a4a9ec4d3d53c95961bb9e338449b856df91853";
"aarch64-darwin" = "bb105e7aebae3c637b761017c6fb49d9696eba1022f27ec594aac9c2dbffd907";
"x86_64-linux" = "b13110bacc3f71c2a3e12c52172a821a85cc13243a95249ca18c8beb296c0ce8";
"aarch64-linux" = "afbc71f0570b86215942d1b4207fe3de0299e6fdfd2e6caac78bf688c81b9bd1";
"x86_64-darwin" = "50a3df09b02b34e1653beb1507c6de0f332674e088ded7c66af4e5987753304e";
"aarch64-darwin" = "174a5bfec355361c4f030861405513818be25fd7e4325f7221aa71ebd27475d3";
};
in
stdenv.mkDerivation rec {
pname = "lamdera";
version = "1.1.0";
version = "1.2.0";
src = fetchurl {
url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}";
pkgs/development/coq-modules/Cheerios/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ mkCoqDerivation {
owner = "uwplse";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.14" "8.17"; out = "20230107"; }
{ case = range "8.14" "8.18"; out = "20230107"; }
{ case = range "8.6" "8.16"; out = "20200201"; }
] null;
release."20230107".rev = "bad8ad2476e14df6b5a819b7aaddc27a7c53fb69";
pkgs/development/coq-modules/CoLoR/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ mkCoqDerivation {
owner = "fblanqui";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{case = range "8.14" "8.17"; out = "1.8.4"; }
{case = range "8.14" "8.18"; out = "1.8.4"; }
{case = range "8.12" "8.16"; out = "1.8.2"; }
{case = range "8.10" "8.11"; out = "1.7.0"; }
{case = range "8.8" "8.9"; out = "1.6.0"; }
pkgs/development/coq-modules/HoTT/default.nix
+3 -2
View File
@@ -6,19 +6,20 @@ mkCoqDerivation {
owner = "HoTT";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.14" "8.17"; out = coq.coq-version; }
{ case = range "8.14" "8.18"; out = coq.coq-version; }
] null;
releaseRev = v: "V${v}";
release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0=";
release."8.15".sha256 = "sha256-JfeiRZVnrjn3SQ87y6dj9DWNwCzrkK3HBogeZARUn9g=";
release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY=";
release."8.17".sha256 = "sha256-GjTUpzL9UzJm4C2ilCaYEufLG3hcj7rJPc5Op+OMal8=";
release."8.18".sha256 = "sha256-URoUoQOsG0432wg9i6pTRomWQZ+ewutq2+V29TBrVzc=";
# versions of HoTT for Coq 8.17 and onwards will use dune
# opam-name = if lib.versions.isLe "8.17" coq.coq-version then "coq-hott" else null;
opam-name = "coq-hott";
useDune = lib.versions.isGe "8.17" coq.coq-version;
patchPhase = ''
patchShebangs etc
'';
pkgs/development/coq-modules/InfSeqExt/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ mkCoqDerivation {
owner = "DistributedComponents";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.9" "8.17"; out = "20230107"; }
{ case = range "8.9" "8.18"; out = "20230107"; }
{ case = range "8.5" "8.16"; out = "20200131"; }
] null;
release."20230107".rev = "601e89ec019501c48c27fcfc14b9a3c70456e408";
pkgs/development/coq-modules/LibHyps/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ mkCoqDerivation {
pname = "LibHyps";
owner = "Matafou";
inherit version;
defaultVersion = if (lib.versions.range "8.11" "8.17") coq.version then "2.0.4.1" else null;
defaultVersion = if (lib.versions.range "8.11" "8.18") coq.version then "2.0.4.1" else null;
release = {
"2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h";
};
pkgs/development/coq-modules/StructTact/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ mkCoqDerivation {
owner = "uwplse";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.9" "8.17"; out = "20230107"; }
{ case = range "8.9" "8.18"; out = "20230107"; }
{ case = range "8.6" "8.16"; out = "20210328"; }
{ case = range "8.5" "8.13"; out = "20181102"; }
] null;
pkgs/development/coq-modules/Verdi/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ mkCoqDerivation {
owner = "uwplse";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.9" "8.17"; out = "20230503"; }
{ case = range "8.9" "8.18"; out = "20230503"; }
{ case = range "8.7" "8.16"; out = "20211026"; }
{ case = range "8.7" "8.14"; out = "20210524"; }
{ case = range "8.7" "8.13"; out = "20200131"; }
pkgs/development/coq-modules/aac-tactics/default.nix
+2
View File
@@ -5,6 +5,7 @@ mkCoqDerivation {
releaseRev = v: "v${v}";
release."8.18.0".sha256 = "sha256-Vpe79qCyFLOdOtFFvLKR0N+MMpGD661Q01yx4gxRhZo=";
release."8.17.0".sha256 = "sha256-c8DtD21QFDZEVyCQc7ScPZEMTmolxlT3+Db3gStofF8=";
release."8.16.0".sha256 = "sha256-sE1w8q/60adNF9yMJQO70CEk3D8QUopvgiszdHt5Wsw=";
release."8.15.1".sha256 = "sha256:0k2sl3ns897a5ll11bazgpv4ppgi1vmx4n89v2dnxabm5dglyglp";
@@ -22,6 +23,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = "8.18"; out = "8.18.0"; }
{ case = "8.17"; out = "8.17.0"; }
{ case = "8.16"; out = "8.16.0"; }
{ case = "8.15"; out = "8.15.1"; }
pkgs/development/coq-modules/addition-chains/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.13" "8.17"; out = "0.6"; }
{ case = range "8.13" "8.18"; out = "0.6"; }
{ case = range "8.11" "8.12"; out = "0.4"; }
] null;
pkgs/development/coq-modules/autosubst/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.10" "8.13"; out = "1.7"; }
{ case = range "8.14" "8.17"; out = "1.8"; }
{ case = range "8.14" "8.18"; out = "1.8"; }
] null;
propagatedBuildInputs = [ mathcomp-ssreflect ];
pkgs/development/coq-modules/bignums/default.nix
+2 -1
View File
@@ -5,10 +5,11 @@ mkCoqDerivation {
owner = "coq";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.13" "8.17"; out = "9.0.0+coq${coq.coq-version}"; }
{ case = range "8.13" "8.18"; out = "9.0.0+coq${coq.coq-version}"; }
{ case = range "8.6" "8.17"; out = "${coq.coq-version}.0"; }
] null;
release."9.0.0+coq8.18".sha256 = "sha256-vLeJ0GNKl4M84Uj2tAwlrxJOSR6VZoJQvdlDhxJRge8=";
release."9.0.0+coq8.17".sha256 = "sha256-Mn85LqxJKPDIfpxRef9Uh5POwOKlTQ7jsMVz1wnQwuY=";
release."9.0.0+coq8.16".sha256 = "sha256-pwFTl4Unr2ZIirAB3HTtfhL2YN7G/Pg88RX9AhKWXbE=";
release."9.0.0+coq8.15".sha256 = "sha256-2oGOANn3XULHNIlyqjZ5ppQTQa2QF1zzf3YjHAd/pjo=";
pkgs/development/coq-modules/ceres/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.14" "8.17"; out = "0.4.1"; }
{ case = range "8.14" "8.18"; out = "0.4.1"; }
{ case = range "8.8" "8.16"; out = "0.4.0"; }
] null;
release."0.4.1".sha256 = "sha256-9vyk8/8IVsqNyhw3WPzl8w3L9Wu7gfaMVa3n2nWjFiA=";
pkgs/development/coq-modules/coq-elpi/default.nix
+3
View File
@@ -9,6 +9,7 @@ with builtins; with lib; let
{ case = "8.15"; out = { version = "1.15.0"; };}
{ case = "8.16"; out = { version = "1.17.0"; };}
{ case = "8.17"; out = { version = "1.17.0"; };}
{ case = "8.18"; out = { version = "1.17.0"; };}
] {} );
in mkCoqDerivation {
pname = "elpi";
@@ -16,6 +17,7 @@ in mkCoqDerivation {
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.18"; out = "1.19.0"; }
{ case = "8.17"; out = "1.18.0"; }
{ case = "8.16"; out = "1.15.6"; }
{ case = "8.15"; out = "1.14.0"; }
@@ -24,6 +26,7 @@ in mkCoqDerivation {
{ case = "8.12"; out = "1.8.3_8.12"; }
{ case = "8.11"; out = "1.6.3_8.11"; }
] null;
release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ=";
release."1.18.0".sha256 = "sha256-2fCOlhqi4YkiL5n8SYHuc3pLH+DArf9zuMH7IhpBc2Y=";
release."1.17.0".sha256 = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM=";
release."1.15.6".sha256 = "sha256-qc0q01tW8NVm83801HHOBHe/7H1/F2WGDbKO6nCXfno=";
pkgs/development/coq-modules/coq-ext-lib/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ mkCoqDerivation rec {
owner = "coq-ext-lib";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.11" "8.17"; out = "0.11.8"; }
{ case = range "8.11" "8.18"; out = "0.11.8"; }
{ case = range "8.8" "8.16"; out = "0.11.6"; }
{ case = range "8.8" "8.14"; out = "0.11.4"; }
{ case = range "8.8" "8.13"; out = "0.11.3"; }
pkgs/development/coq-modules/coq-record-update/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@
owner = "tchajed";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.10" "8.17"; out = "0.3.1"; }
{ case = range "8.10" "8.18"; out = "0.3.1"; }
] null;
release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk=";
release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z";
pkgs/development/coq-modules/coqeal/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.15" "8.17") (isGe "1.15.0") ]; out = "1.1.3"; }
{ cases = [ (range "8.15" "8.18") (isGe "1.15.0") ]; out = "1.1.3"; }
{ cases = [ (range "8.13" "8.17") (isGe "1.13.0") ]; out = "1.1.1"; }
{ cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; }
{ cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; }
pkgs/development/coq-modules/coqprime/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ mkCoqDerivation {
owner = "thery";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.14" "8.17"; out = "8.17"; }
{ case = range "8.14" "8.18"; out = "8.17"; }
{ case = range "8.12" "8.16"; out = "8.15"; }
{ case = range "8.10" "8.11"; out = "8.10"; }
{ case = range "8.8" "8.9"; out = "8.8"; }
pkgs/development/coq-modules/coquelicot/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ mkCoqDerivation {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.12" "8.17"; out = "3.4.0"; }
{ case = range "8.12" "8.18"; out = "3.4.0"; }
{ case = range "8.12" "8.17"; out = "3.3.0"; }
{ case = range "8.8" "8.16"; out = "3.2.0"; }
{ case = range "8.8" "8.13"; out = "3.1.0"; }
pkgs/development/coq-modules/deriving/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.11" "8.17"; out = "0.1.1"; }
{ case = range "8.11" "8.18"; out = "0.1.1"; }
] null;
releaseRev = v: "v${v}";
pkgs/development/coq-modules/equations/default.nix
+3
View File
@@ -6,6 +6,7 @@
repo = "Coq-Equations";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.18"; out = "1.3+8.18"; }
{ case = "8.17"; out = "1.3+8.17"; }
{ case = "8.16"; out = "1.3+8.16"; }
{ case = "8.15"; out = "1.3+8.15"; }
@@ -57,6 +58,8 @@
release."1.3+8.16".sha256 = "sha256-zyMGeRObtSGWh7n3WCqesBZL5EgLvKwmnTy09rYpxyE=";
release."1.3+8.17".rev = "v1.3-8.17";
release."1.3+8.17".sha256 = "sha256-yNotSIxFkhTg3reZIchGQ7cV9WmTJ7p7hPfKGBiByDw=";
release."1.3+8.18".rev = "v1.3-8.18";
release."1.3+8.18".sha256 = "sha256-8MZO9vWdr8wlAov0lBTYMnde0RuMyhaiM99zp7Zwfao=";
mlPlugin = true;
pkgs/development/coq-modules/extructures/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [
{ cases = [(range "8.11" "8.17") (isGe "1.12.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.18") (isGe "1.12.0") ]; out = "0.3.1"; }
{ cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; }
{ cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; }
] null;
pkgs/development/coq-modules/fourcolor/default.nix
+3 -1
View File
@@ -9,10 +9,12 @@ mkCoqDerivation {
release."1.2.3".sha256 = "sha256-gwKfUa74fIP7j+2eQgnLD7AswjCtOFGHGaIWb4qI0n4=";
release."1.2.4".sha256 = "sha256-iSW2O1kuunvOqTolmGGXmsYTxo2MJYCdW3BnEhp6Ksg=";
release."1.2.5".sha256 = "sha256-3qOPNCRjGK2UdHGMSqElpIXhAPVCklpeQgZwf9AFals=";
release."1.3.0".sha256 = "sha256-h9pa6vaKT6jCEaIdEdcu0498Ou5kEXtZdb9P7WXK1DQ=";
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (isGe "8.11") (isGe "1.12") ]; out = "1.2.5"; }
{ cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.0"; }
{ cases = [ (isGe "8.11") (range "1.12" "1.17") ]; out = "1.2.5"; }
{ cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; }
{ cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; }
] null;
pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@ mkCoqDerivation {
defaultVersion = with lib.versions;
lib.switch [ coq.coq-version mathcomp-algebra.version ] [
{ cases = [ (range "8.16" "8.17") (isGe "1.15") ]; out = "1.1.1"; }
{ cases = [ (range "8.16" "8.18") (isGe "1.15") ]; out = "1.1.1"; }
{ cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; }
] null;
pkgs/development/coq-modules/mathcomp-bigenough/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ mkCoqDerivation {
};
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.10" "8.17"; out = "1.0.1"; }
{ case = range "8.10" "8.18"; out = "1.0.1"; }
{ case = range "8.5" "8.14"; out = "1.0.0"; }
] null;
pkgs/development/coq-modules/mathcomp-finmap/default.nix
+4 -2
View File
@@ -7,8 +7,9 @@ mkCoqDerivation {
owner = "math-comp";
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.13" "8.17") (isGe "1.12") ]; out = "1.5.2"; }
{ cases = [ (isGe "8.10") (isGe "1.11") ]; out = "1.5.1"; }
{ cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "2.0.0"; }
{ cases = [ (range "8.13" "8.18") (range "1.12" "1.17") ]; out = "1.5.2"; }
{ cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; }
{ cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; }
{ cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; }
{ cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ]; out = "1.4.0"; }
@@ -17,6 +18,7 @@ mkCoqDerivation {
{ cases = [ (range "8.6" "8.7") (range "1.6.1" "1.7") ]; out = "1.0.0"; }
] null;
release = {
"2.0.0".sha256 = "sha256-0Wr1ZUYVuZH74vawO4EZlZ+K3kq+s1xEz/BfzyKj+wk=";
"1.5.2".sha256 = "sha256-0KmmSjc2AlUo6BKr9RZ4FjL9wlGISlTGU0X1Eu7l4sw=";
"1.5.1".sha256 = "0ryfml4pf1dfya16d8ma80favasmrygvspvb923n06kfw9v986j7";
"1.5.0".sha256 = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq";
pkgs/development/coq-modules/mathcomp-tarjan/default.nix
+7 -3
View File
@@ -9,9 +9,13 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions;
lib.switch [ coq.version mathcomp-ssreflect.version ] [{
cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.0.0";
}] null;
lib.switch [ coq.version mathcomp-ssreflect.version ] [
{ cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.0.2"; }
{ cases = [ (range "8.12" "8.18") (range "1.12.0" "1.17.0") ]; out = "1.0.1"; }
{ cases = [ (range "8.10" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.0"; }
] null;
release."1.0.2".sha256 = "sha256-U20xgA+e9KTRdvILD1cxN6ia+dlA8uBTIbc4QlKz9ss=";
release."1.0.1".sha256 = "sha256-utNjFCAqC5xOuhdyKhfMZkRYJD0xv9Gt6U3ZdQ56mek=";
release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1";
propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-fingroup ];
pkgs/development/coq-modules/mathcomp-word/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.12" "8.17") (isGe "1.12") ]; out = "2.1"; }
{ cases = [ (range "8.12" "8.18") (isGe "1.12") ]; out = "2.1"; }
] null;
propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ];
pkgs/development/coq-modules/mathcomp-zify/default.nix
+4 -2
View File
@@ -9,13 +9,15 @@ mkCoqDerivation rec {
defaultVersion = with lib.versions;
lib.switch [ coq.coq-version mathcomp-algebra.version ] [
{ cases = [ (range "8.13" "8.17") (isGe "1.12") ]; out = "1.3.0+1.12+8.13"; }
{ cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; }
{ cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; }
{ cases = [ (range "8.13" "8.18") (range "1.12" "1.17.0") ]; out = "1.3.0+1.12+8.13"; }
{ cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; }
] null;
release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k";
release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr";
release."1.3.0+1.12+8.13".sha256 = "sha256-ebfY8HatP4te44M6o84DSLpDCkMu4IroPCy+HqzOnTE=";
release."1.5.0+2.0+8.16".sha256 = "sha256-boBYGvXdGFc6aPnjgSZYSoW4kmN5khtNrSV3DUv9DqM=";
propagatedBuildInputs = [ mathcomp-algebra mathcomp-ssreflect mathcomp-fingroup ];
pkgs/development/coq-modules/mathcomp/default.nix
+2 -2
View File
@@ -20,8 +20,8 @@ let
withDoc = single && (args.withDoc or false);
defaultVersion = with versions; lib.switch coq.coq-version [
{ case = isGe "8.15"; out = "1.17.0"; }
{ case = range "8.16" "8.17"; out = "2.0.0"; }
{ case = range "8.13" "8.17"; out = "1.16.0"; }
{ case = range "8.16" "8.18"; out = "2.0.0"; }
{ case = range "8.13" "8.18"; out = "1.16.0"; }
{ case = range "8.14" "8.16"; out = "1.15.0"; }
{ case = range "8.11" "8.15"; out = "1.14.0"; }
{ case = range "8.11" "8.15"; out = "1.13.0"; }
pkgs/development/coq-modules/metalib/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@
owner = "plclub";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.14" "8.17"; out = "8.15"; }
{ case = range "8.14" "8.18"; out = "8.15"; }
{ case = range "8.10" "8.13"; out = "8.10"; }
] null;
releaseRev = v: "coq${v}";
pkgs/development/coq-modules/multinomials/default.nix
+4 -2
View File
@@ -9,8 +9,9 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (isGe "8.15") (isGe "1.15.0") ]; out = "1.6.0"; }
{ cases = [ (isGe "8.10") (isGe "1.13.0") ]; out = "1.5.6"; }
{ cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; }
{ cases = [ (isGe "8.15") (range "1.15.0" "1.17.0") ]; out = "1.6.0"; }
{ cases = [ (isGe "8.10") (range "1.13.0" "1.17.0") ]; out = "1.5.6"; }
{ cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.5.5"; }
{ cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; }
{ cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; }
@@ -19,6 +20,7 @@
{ cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; }
] null;
release = {
"2.0.0".sha256 = "sha256-2zWHzMBsO2j8EjN7CgCmKQcku9Be8aVlme0LD5p4ab8=";
"1.6.0".sha256 = "sha256-lEM+sjqajIOm1c3lspHqcSIARgMR9RHbTQH4veHLJfU=";
"1.5.6".sha256 = "sha256-cMixgc34T9Ic6v+tYmL49QUNpZpPV5ofaNuHqblX6oY=";
"1.5.5".sha256 = "sha256-VdXA51vr7DZl/wT/15YYMywdD7Gh91dMP9t7ij47qNQ=";
pkgs/development/coq-modules/paco/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ mkCoqDerivation {
owner = "snu-sf";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.13" "8.17"; out = "4.2.0"; }
{ case = range "8.13" "8.18"; out = "4.2.0"; }
{ case = range "8.12" "8.17"; out = "4.1.2"; }
{ case = range "8.9" "8.13"; out = "4.1.1"; }
{ case = range "8.6" "8.13"; out = "4.0.2"; }
pkgs/development/coq-modules/paramcoq/default.nix
+2 -1
View File
@@ -4,10 +4,11 @@ mkCoqDerivation {
pname = "paramcoq";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.10" "8.17"; out = "1.1.3+coq${coq.coq-version}"; }
{ case = range "8.10" "8.18"; out = "1.1.3+coq${coq.coq-version}"; }
{ case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; }
] null;
displayVersion = { paramcoq = "..."; };
release."1.1.3+coq8.18".sha256 = "sha256-hNBaj9hB+OzwXsOX+TOXtDLjA5oP4EmEgseLwxFxW+I=";
release."1.1.3+coq8.17".sha256 = "sha256-m8QGGuwj1lHzDprf4LHgAuzwfoblxtDIHunHBdpmiuM=";
release."1.1.3+coq8.16".sha256 = "sha256-K7/8hXH6DwiW7Gw41sgQF8UDAO3c32xBGWQQapzG8Mo=";
release."1.1.3+coq8.15".sha256 = "0sl7ihznwz05d2x2v78w1zd4q55c1sgy06vxasbcls4v2pkw53hl";
pkgs/development/coq-modules/parsec/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.14" "8.17"; out = "0.1.2"; }
{ case = range "8.14" "8.18"; out = "0.1.2"; }
{ case = range "8.12" "8.16"; out = "0.1.1"; }
{ case = range "8.12" "8.13"; out = "0.1.0"; }
] null;
pkgs/development/coq-modules/reglang/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.10" "8.17"; out = "1.1.3"; }
{ case = range "8.10" "8.18"; out = "1.1.3"; }
] null;
pkgs/development/coq-modules/semantics/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ mkCoqDerivation rec {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.10" "8.17"; out = "8.14.0"; }
{ case = range "8.10" "8.18"; out = "8.14.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }
pkgs/development/coq-modules/simple-io/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@
repo = "coq-simple-io";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.11" "8.17"; out = "1.8.0"; }
{ case = range "8.11" "8.18"; out = "1.8.0"; }
{ case = range "8.7" "8.13"; out = "1.3.0"; }
] null;
release."1.8.0".sha256 = "sha256-3ADNeXrBIpYRlfUW+LkLHUWV1w1HFrVc/TZISMuwvRY=";
pkgs/development/coq-modules/topology/default.nix
+2
View File
@@ -5,6 +5,7 @@ mkCoqDerivation rec {
releaseRev = v: "v${v}";
release."10.2.0".sha256 = "sha256-xLi3uRQBKL9KiLd4FBnbTPxh8TjdN8IEW/1D7n2B+xY=";
release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c";
release."8.12.0".sha256 = "sha256-ypHmHwzwZ6MQPYwuS3QyZmVOEPUCSbO2lhVaA6TypgQ=";
release."8.10.0".sha256 = "sha256-mCLF3JYIiO3AEW9yvlcLeF7zN4SjW3LG+Y5vYB0l55A=";
@@ -15,6 +16,7 @@ mkCoqDerivation rec {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.12" "8.18"; out = "10.2.0"; }
{ case = range "8.10" "8.16"; out = "9.0.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
pkgs/development/coq-modules/trakt/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version ] [
{ cases = [ (range "8.15" "8.17") ]; out = "1.2"; }
{ cases = [ (range "8.15" "8.18") ]; out = "1.2"; }
{ cases = [ (isEq "8.13") ]; out = "1.2+8.13"; }
{ cases = [ (range "8.13" "8.17") ]; out = "1.1"; }
] null;
pkgs/development/coq-modules/zorns-lemma/default.nix
+3
View File
@@ -2,9 +2,11 @@
(mkCoqDerivation {
pname = "zorns-lemma";
repo = "topology";
releaseRev = v: "v${v}";
release."10.2.0".sha256 = "sha256-xLi3uRQBKL9KiLd4FBnbTPxh8TjdN8IEW/1D7n2B+xY=";
release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c";
release."8.11.0".sha256 = "sha256-2Hf7YwRcFmP/DqwFtF1p78MCNV50qUWfMVQtZbwKd0k=";
release."8.10.0".sha256 = "sha256-qLPLK2ZLJQ4SmJX2ADqFiP4kgHuQFJTeNXkBbjiFS+4=";
@@ -16,6 +18,7 @@
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.12" "8.18"; out = "10.2.0"; }
{ case = range "8.10" "8.16"; out = "9.0.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
pkgs/development/libraries/elementary-cmake-modules/default.nix
-29
View File
@@ -1,29 +0,0 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config }:
stdenv.mkDerivation {
pname = "elementary-cmake-modules";
version = "0.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "cmake-modules";
rev = "319ec5336e9f05f3f22b886cc2053ef3d4b6599e";
sha256 = "191hhvdxyqvh9axzndaqld7vrmv7xkn0czks908zhb2zpjhv9rby";
};
prePatch = ''
substituteInPlace CMakeLists.txt \
--replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake"
'';
propagatedBuildInputs = [ cmake pkg-config ];
setupHook = ./setup-hook.sh;
meta = with lib; {
platforms = platforms.linux ++ platforms.darwin;
homepage = "https://github.com/elementary/cmake-modules";
license = licenses.gpl3Plus;
maintainers = [ maintainers.samdroid-apps ];
};
}
pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh
-4
View File
@@ -1,4 +0,0 @@
_elementaryCMakeEnvHook() {
cmakeFlagsArray+=(-DCMAKE_MODULE_PATH=@out@/lib/cmake)
}
addEnvHooks "$targetOffset" _elementaryCMakeEnvHook
pkgs/development/python-modules/beautiful-date/default.nix
+39
View File
@@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, python-dateutil
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "beautiful-date";
version = "2.2.0";
format = "setuptools";
disable = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kuzmoyev";
repo = "beautiful-date";
rev = "v${version}";
hash = "sha256-5xRmHaAPf1ps75cOINHkHT1aYb5UGLZGl0OHVQaMES0=";
};
propagatedBuildInputs = [
python-dateutil
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "beautiful_date" ];
meta = with lib; {
description = "Simple and beautiful way to create date and datetime objects in Python";
homepage = "https://github.com/kuzmoyev/beautiful-date";
license = licenses.mit;
maintainers = with maintainers; [ mbalatsko ];
};
}
pkgs/development/python-modules/bytecode/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "bytecode";
version = "0.14.2";
version = "0.15.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "vstinner";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-HBXtpUl8Lcx3yCVnk9kVU0+AUVdgy1HQBV4rHEndiek=";
hash = "sha256-A8S3U07P4Olq9f7/q20aHOPAQsQp3OuGHtIAs8B8VEQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
+7
View File
@@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, fetchpatch
@@ -48,6 +49,12 @@ buildPythonPackage rec {
twisted
];
# Fails in Darwin's sandbox
postPatch = lib.optionalString stdenv.isDarwin ''
echo 'LogRequests.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py
echo 'WebSocketAPI.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py
'';
checkPhase = ''
trial -j$NIX_BUILD_CORES wormhole_mailbox_server
'';
pkgs/development/python-modules/magic-wormhole/default.nix
+25
View File
@@ -56,6 +56,31 @@ buildPythonPackage rec {
disabledTests = [
# Expected: (<class 'wormhole.errors.WrongPasswordError'>,) Got: Failure instance: Traceback (failure with no frames): <class 'wormhole.errors.LonelyError'>:
"test_welcome"
] ++ lib.optionals stdenv.isDarwin [
# These tests doesn't work within Darwin's sandbox
"test_version"
"test_text"
"test_receiver"
"test_sender"
"test_sender_allocation"
"test_text_wrong_password"
"test_override"
"test_allocate_port"
"test_allocate_port_no_reuseaddr"
"test_ignore_localhost_hint"
"test_ignore_localhost_hint_orig"
"test_keep_only_localhost_hint"
"test_get_direct_hints"
"test_listener"
"test_success_direct"
"test_direct"
"test_relay"
];
disabledTestPaths = lib.optionals stdenv.isDarwin [
# These tests doesn't work within Darwin's sandbox
"src/wormhole/test/test_xfer_util.py"
"src/wormhole/test/test_wormhole.py"
];
postPatch = lib.optionalString stdenv.isLinux ''
pkgs/development/python-modules/python-swiftclient/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "python-swiftclient";
version = "4.3.0";
version = "4.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-Hj3fmYzL6n3CWqbfjrPffTi/S8lrBl8vhEMeglmBezM=";
hash = "sha256-p32Xqw5AEsZ4cy5XW9/u0oKzSJuRdegsRqR6yEke7oQ=";
};
# remove duplicate script that will be created by setuptools from the
pkgs/development/python-modules/steamship/default.nix
+2 -2
View File
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "steamship";
version = "2.17.22";
version = "2.17.27";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-PQI6r2DoarswjTc8jp+nrJqkmckQ6+eGuI0MU8kvnM8=";
hash = "sha256-Wgz0jkMaMUTM7ubb/TsGaQm8UbdPtEvzapl0h4xrqq0=";
};
pythonRelaxDeps = [
pkgs/development/tools/ldid-procursus/default.nix
+16 -1
View File
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, installShellFiles
, pkg-config
, libplist
, openssl
@@ -9,17 +10,31 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ldid-procursus";
version = "2.1.5-procursus7";
src = fetchFromGitHub {
owner = "ProcursusTeam";
repo = "ldid";
rev = "v${finalAttrs.version}";
hash = "sha256-QnSmWY9zCOPYAn2VHc5H+VQXjTCyr0EuosxvKGGpDtQ=";
};
nativeBuildInputs = [ pkg-config libplist openssl ];
nativeBuildInputs = [ pkg-config installShellFiles ];
buildInputs = [ libplist openssl ];
stripDebugFlags = [ "--strip-unneeded" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
postPatch = ''
substituteInPlace Makefile \
--replace "pkg-config" "$PKG_CONFIG"
'';
postInstall = ''
installShellCompletion --cmd ldid --zsh _ldid
'';
meta = with lib; {
mainProgram = "ldid";
description = "Put real or fake signatures in a Mach-O binary";
homepage = "https://github.com/ProcursusTeam/ldid";
maintainers = with maintainers; [ keto ];
pkgs/development/tools/misc/editorconfig-checker/default.nix
+3 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "editorconfig-checker";
version = "2.7.0";
version = "2.7.1";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = version;
hash = "sha256-8qGRcyDayXx3OflhE9Kw2AXM702/2pYB3JgfpQ0UYR8=";
hash = "sha256-TycKc6Zgf9QFTH3lfNC+/O52cp2xhKsKflxuQTac794=";
};
vendorHash = "sha256-S93ZvC92V9nrBicEv1yQ3DEuf1FmxtvFoKPR15e8VmA=";
@@ -28,6 +28,7 @@ buildGoModule rec {
};
meta = with lib; {
changelog = "https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/${src.rev}";
description = "A tool to verify that your files are in harmony with your .editorconfig";
homepage = "https://editorconfig-checker.github.io/";
license = licenses.mit;
pkgs/development/tools/misc/strace/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "strace";
version = "6.4";
version = "6.5";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-J5h9usV/39JgxttNyDKN81yVxoZ8ij1DcdWc3PTrkjg=";
sha256 = "sha256-37BRcCOJ4ZeaFRiStZAa/J6Tu8HHDYTJBq3jIkypGYA=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
pkgs/tools/games/pocket-updater-utility/add-runtime-identifier.patch
+31
View File
@@ -0,0 +1,31 @@
From ccbe5c0401d6965a6daaa0b7bb022f63908c8942 Mon Sep 17 00:00:00 2001
From: Philipp Rintz <git@rintz.net>
Date: Mon, 28 Aug 2023 19:19:41 +0200
Subject: [PATCH] uncommited
---
pocket_updater.csproj | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pocket_updater.csproj b/pocket_updater.csproj
index 11f604c..410bd47 100644
--- a/pocket_updater.csproj
+++ b/pocket_updater.csproj
@@ -12,6 +12,7 @@
<Authors>Matt Pannella</Authors>
<Product>Analogue Pocket Updater Utility</Product>
<RepositoryUrl>https://github.com/mattpannella/pocket-updater-utility</RepositoryUrl>
+ <RuntimeIdentifier>@RuntimeIdentifier@</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
@@ -26,4 +27,4 @@
<ItemGroup>
<RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true" />
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
--
2.40.1
pkgs/tools/games/pocket-updater-utility/default.nix
+59
View File
@@ -0,0 +1,59 @@
{ pkgs ? import <nixpkgs> { system = builtins.currentSystem; }
, stdenv ? pkgs.stdenv
, lib ? pkgs.lib
, fetchFromGitHub ? pkgs.fetchFromGitHub
, buildDotnetModule ? pkgs.buildDotnetModule
, dotnetCorePackages ? pkgs.dotnetCorePackages
, openssl ? pkgs.openssl
, zlib ? pkgs.zlib
, targetPlatform ? pkgs.targetPlatform
}:
buildDotnetModule rec {
pname = "pocket-updater-utility";
version = "2.31.0";
src = fetchFromGitHub {
owner = "mattpannella";
repo = "${pname}";
rev = "${version}";
hash = "sha256-z90YITAW2Nv+Mq2q56As4PoHqGPEnvDUPH73bhz/xnw=";
};
buildInputs = [
stdenv.cc.cc.lib
zlib
openssl
];
# See https://github.com/NixOS/nixpkgs/pull/196648/commits/0fb17c04fe34ac45247d35a1e4e0521652d9c494
patches = [ ./add-runtime-identifier.patch ];
postPatch = ''
substituteInPlace pocket_updater.csproj \
--replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid targetPlatform.system}"
'';
projectFile = "pocket_updater.csproj";
nugetDeps = ./deps.nix;
selfContainedBuild = true;
executables = [ "pocket_updater" ];
dotnetFlags = [
"-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}"
];
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
meta = with lib; {
homepage = "https://github.com/mattpannella/pocket-updater-utility";
description = "Analogue Pocket Updater Utility";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ p-rintz ];
mainProgram = "pocket_updater";
};
}
pkgs/tools/games/pocket-updater-utility/deps.nix
Generated
+9
View File
@@ -0,0 +1,9 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
(fetchNuGet { pname = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; })
]
pkgs/top-level/all-packages.nix
+3 -2
View File
@@ -1933,6 +1933,8 @@ with pkgs;
pferd = callPackage ../tools/misc/pferd { };
pocket-updater-utility = callPackage ../tools/games/pocket-updater-utility { };
polygon-cli = callPackage ../tools/networking/polygon-cli { };
proycon-wayout = callPackage ../tools/wayland/proycon-wayout { };
@@ -22053,8 +22055,6 @@ with pkgs;
gnote = callPackage ../applications/office/gnote { };
elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };
gtk2 = callPackage ../development/libraries/gtk/2.x.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
@@ -39724,6 +39724,7 @@ with pkgs;
coqPackages_8_15 coq_8_15
coqPackages_8_16 coq_8_16
coqPackages_8_17 coq_8_17
coqPackages_8_18 coq_8_18
coqPackages coq
;
pkgs/top-level/coq-packages.nix
+2
View File
@@ -181,6 +181,7 @@ in rec {
coq_8_15 = mkCoq "8.15";
coq_8_16 = mkCoq "8.16";
coq_8_17 = mkCoq "8.17";
coq_8_18 = mkCoq "8.18";
coqPackages_8_5 = mkCoqPackages coq_8_5;
coqPackages_8_6 = mkCoqPackages coq_8_6;
@@ -195,6 +196,7 @@ in rec {
coqPackages_8_15 = mkCoqPackages coq_8_15;
coqPackages_8_16 = mkCoqPackages coq_8_16;
coqPackages_8_17 = mkCoqPackages coq_8_17;
coqPackages_8_18 = mkCoqPackages coq_8_18;
coqPackages = recurseIntoAttrs coqPackages_8_17;
coq = coqPackages.coq;
pkgs/top-level/python-packages.nix
+2
View File
@@ -1336,6 +1336,8 @@ self: super: with self; {
beartype = callPackage ../development/python-modules/beartype { };
beautiful-date = callPackage ../development/python-modules/beautiful-date { };
beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 {
inherit (python.pythonForBuild.pkgs) sphinxHook; # hook splicing broken since #194205
};