Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-08-21 06:01:17 +00:00 committed by GitHub
commit a6c886b7fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 4533 additions and 3640 deletions

View File

@ -36,7 +36,7 @@ rec {
forEach = xs: f: map f xs;
/* right fold a binary function `op` between successive elements of
`list` with `nul' as the starting value, i.e.,
`list` with `nul` as the starting value, i.e.,
`foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))`.
Type: foldr :: (a -> b -> b) -> b -> [a] -> b

View File

@ -188,7 +188,11 @@ in {
inherit (pkgs.plausible.meta) description;
documentation = [ "https://plausible.io/docs/self-hosting" ];
wantedBy = [ "multi-user.target" ];
after = optionals cfg.database.postgres.setup [ "postgresql.service" "plausible-postgres.service" ];
after = optional cfg.database.clickhouse.setup "clickhouse.service"
++ optionals cfg.database.postgres.setup [
"postgresql.service"
"plausible-postgres.service"
];
requires = optional cfg.database.clickhouse.setup "clickhouse.service"
++ optionals cfg.database.postgres.setup [
"postgresql.service"

View File

@ -1,6 +1,6 @@
{
"TrueZen-nvim": {
"date": "2022-07-27",
"date": "2022-08-20",
"new": "true-zen-nvim"
},
"compe-tmux": {

File diff suppressed because it is too large Load Diff

View File

@ -152,7 +152,7 @@ https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD,
https://github.com/wincent/command-t/,,
https://github.com/numtostr/comment.nvim/,,
https://github.com/rhysd/committia.vim/,,
https://github.com/tami5/compe-conjure/,,
https://github.com/hrsh7th/compe-conjure/,,
https://github.com/GoldsteinE/compe-latex-symbols/,,
https://github.com/tzachar/compe-tabnine/,,
https://github.com/tamago324/compe-zsh/,,
@ -322,6 +322,7 @@ https://github.com/latex-box-team/latex-box/,,
https://github.com/kdheepak/lazygit.nvim/,,
https://github.com/Julian/lean.nvim/,,
https://github.com/leanprover/lean.vim/,,
https://github.com/mrjones2014/legendary.nvim/,HEAD,
https://github.com/camspiers/lens.vim/,,
https://github.com/thirtythreeforty/lessspace.vim/,,
https://github.com/cohama/lexima.vim/,,
@ -343,6 +344,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,,
https://github.com/ldelossa/litee-symboltree.nvim/,,
https://github.com/ldelossa/litee.nvim/,,
https://github.com/folke/lsp-colors.nvim/,,
https://github.com/lukas-reineke/lsp-format.nvim/,HEAD,
https://github.com/ahmedkhalf/lsp-rooter.nvim/,,
https://github.com/nvim-lua/lsp-status.nvim/,,
https://github.com/nvim-lua/lsp_extensions.nvim/,,
@ -497,6 +499,7 @@ https://github.com/navarasu/onedark.nvim/,,
https://github.com/joshdick/onedark.vim/,,
https://github.com/olimorris/onedarkpro.nvim/,,
https://github.com/sonph/onehalf/,,
https://github.com/rmehri01/onenord.nvim/,main,
https://github.com/tyru/open-browser-github.vim/,,
https://github.com/tyru/open-browser.vim/,,
https://github.com/nvim-orgmode/orgmode/,,

View File

@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "04jmp9z9b8gqq1nxfw186fnyd0glcp0s8iiy5g2zy2y7jsllm5qi";
x86_64-darwin = "119k1q1dnnhzdyv3wx13ghpwvsrmb1s8ira50ldlac3dr54rhjc9";
aarch64-linux = "0sr9q4rm63p6lgg3qq86hmkcyg4i6znijw1k5h0sv1qc9hrlq6gv";
aarch64-darwin = "0n742ka8ap35klx5yiba08fyqfq5077l8f8b8r5if91rcdwmkwm1";
armv7l-linux = "0a5wd91ksdgabalgmk9pwjjl2haxdidyxz3bnrmrvr1hnlylq1mh";
x86_64-linux = "1b2603fcb28479dajwg9q2ck083fym6khjv02ax3l0p6jazjyc70";
x86_64-darwin = "0xggqfmsm7zzbn43mjmmk8wg75nr2nvkiaddcgwq3a2xn1x90jb5";
aarch64-linux = "1wfrfap840a9azik1dbzp7kib04amc3y2m6s45v3qa3c0kw1162a";
aarch64-darwin = "1nfv5ysri6p2sfp47786alv7b8rrn7mxsaisdlz970r8d79mrp5n";
armv7l-linux = "185ayjvahyqxqab7dkpygxd68adxai25sw4fcw00x5c4l5lgmvhl";
}.${system} or throwSystem;
sourceRoot = if stdenv.isDarwin then "" else ".";
@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.70.1.22228";
version = "1.70.2.22230";
pname = "vscodium";
executableName = "codium";

View File

@ -73,14 +73,14 @@ let
six
];
in mkDerivation rec {
version = "3.22.9";
version = "3.22.10";
pname = "qgis-ltr-unwrapped";
src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "sha256-QHdcK34e7tC0AUstE8pbsBHzHXbmOd3gI2/zqsxb6X4=";
hash = "sha256-v/PshUZpf8fVW2PrGBiuAMfyfC/osOkR9GcnNOyg0l4=";
};
passthru = {

View File

@ -73,14 +73,14 @@ let
six
];
in mkDerivation rec {
version = "3.26.1";
version = "3.26.2";
pname = "qgis-unwrapped";
src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "sha256-FjMe/5uEbmSeQrAtkKvoGh4VlPkbGMHNzlCpn27C5CQ=";
hash = "sha256-WU1yamZM/UVhtZjoZ/5J8gt7FOHEHi0D2Z9BWEl4br0=";
};
passthru = {

View File

@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.6.1";
version = "2.6.2";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-udKcojp7CUz5mXIFeLiXKJ7X1A/fejoeLUc+2zlnlKo=" "zip";
i686-linux = fetch "linux_386" "sha256-gJpwZrtgzC+fD8dqc2hgfsAiYmVkAY3xSmIQnsC5naw=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-X+VyoXg7HRq70b9qRhk2N/UvBlhIkvCWM6kadaGDhsU=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-Z8MKp9fQBsvg1nQ0QSrnMV0Bxy6LmnwHb5WIrhGjxv8=" "pkg";
aarch64-linux = fetch "linux_arm64" "sha256-3R2afGRSrwffhZNNJAszzmrwfHJ0/wy4/6j2cpvMosA=" "zip";
i686-linux = fetch "linux_386" "sha256-QhUIm+RAmPIS7HBUE/AxPvlx2s3Pk8KeIV9tEJ22+8c=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-/8iuQAyCA4srH/mUlbo7W5VdlR4At7TlFCVPaqH45og=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-HMGR2oBTzB7TwresCN0SYHqM7fcMSiMEu8aw7BN6wyI=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;

View File

@ -1,30 +1,27 @@
{ stdenv, lib, fetchFromGitHub, jq }:
{ stdenv, lib, fetchurl, fetchFromGitHub, jq, wofi, wtype, wl-clipboard }:
let
emojiJSON = fetchFromGitHub {
owner = "github";
repo = "gemoji";
sha256 = "sha256-Tn0vba129LPlX+MRcCBA9qp2MU1ek1jYzVCqoNxCL/w=";
rev = "v4.0.0.rc2";
};
in stdenv.mkDerivation rec {
let emojiJSON = fetchurl {
url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.6/dist/emoji-en-US.json";
sha256 = "sha256-wf7zsIEbX/diLwmVvnN2Goxh2V5D3Z6nbEMSb5pSGt0=";
};
in
stdenv.mkDerivation rec {
pname = "wofi-emoji";
version = "unstable-2021-05-24";
version = "unstable-2022-08-19";
src = fetchFromGitHub {
owner = "dln";
repo = pname;
rev = "bfe35c1198667489023109f6843217b968a35183";
sha256 = "sha256-wMIjTUCVn4uF0cpBkPfs76NRvwS0WhGGJRy9vvtmVWQ=";
rev = "c5ecb4f0f164aedb046f52b5eacac889609c8522";
sha256 = "1wq276bhf9x24ds13b2dwa69cjnr207p6977hr4bsnczryg609rh";
};
nativeBuildInputs = [ jq ];
buildInputs = [ wofi wtype wl-clipboard ];
postPatch = ''
cp "${emojiJSON}/db/emoji.json" .
substituteInPlace build.sh \
--replace 'curl https://raw.githubusercontent.com/github/gemoji/master/db/emoji.json' 'cat emoji.json'
--replace 'curl ${emojiJSON.url}' 'cat emoji-en-US.json'
'';
buildPhase = ''

View File

@ -4,6 +4,8 @@
, rustPlatform
, pkg-config
, openssl
, CoreServices
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "zine";
@ -23,9 +25,9 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
meta = with lib; {
description = "A simple and opinionated tool to build your own magazine";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kn";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "knative";
repo = "client";
rev = "knative-v${version}";
sha256 = "sha256-3qH7L0tOsAnAAPIzTd5MIVMPM/M2SJAkxXfyMijHuRs=";
sha256 = "sha256-LCO59gfwbFzhF1ZkbnAO7W3AquaT55YzMR2P2YIVweY=";
};
vendorSha256 = null;

View File

@ -105,10 +105,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v4.26.0",
"sha256": "sha256-LC1Q1IjGXjCAQ1P2QdAiVaX/bW0m8w8obDd6ItKhcQo=",
"vendorSha256": "sha256-iNVG54Nuq7oWXpLRxDSgiVVreJ6kbPA6cDBy8XA0B4o=",
"version": "4.26.0"
"rev": "v4.27.0",
"sha256": "sha256-JqGRfuc7vyZK0xfkLhtNwGn6fEO6Cgbch98gSiPaypU=",
"vendorSha256": "sha256-ccvj/uEAcH6zNfWU0NriQXgEPBndoXC9hPX/RHjpc1I=",
"version": "4.27.0"
},
"azuread": {
"owner": "hashicorp",
@ -123,10 +123,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v3.18.0",
"sha256": "sha256-OmOmbPEkrwRm6AhvJRKGvZCVVspYKMKMgmhdqBq9aJI=",
"rev": "v3.19.1",
"sha256": "sha256-ESQZpljRxGd+F0ki5uJ7B0LEFSWWrcr3kXGBPLWL75U=",
"vendorSha256": null,
"version": "3.18.0"
"version": "3.19.1"
},
"azurestack": {
"owner": "hashicorp",
@ -151,10 +151,10 @@
"owner": "F5Networks",
"provider-source-address": "registry.terraform.io/F5Networks/bigip",
"repo": "terraform-provider-bigip",
"rev": "v1.15.0",
"sha256": "sha256-AjAXZzTTyizeR/SO8MolaL2TdogAA/ydeaGd3pf5CYo=",
"rev": "v1.15.1",
"sha256": "sha256-fh1RRl+NLKTLLFUGK5gkWqWMCzUwHBFk69Tc0JIuFgs=",
"vendorSha256": null,
"version": "1.15.0"
"version": "1.15.1"
},
"bitbucket": {
"owner": "DrFaust92",
@ -361,10 +361,10 @@
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/equinix",
"repo": "terraform-provider-equinix",
"rev": "v1.8.0",
"sha256": "sha256-U/6d7cfiYjVZ8VIvIBXoM3rsfySlpWOSxwVTcaR7uKQ=",
"rev": "v1.8.1",
"sha256": "sha256-eEYNCeft5gCjNRCJLIE58v8pNAdehP+KAQFYlinS9cU=",
"vendorSha256": "sha256-dB0asOYl4JUtsdmcuWhcX2WioqB4DI3MTJf5ynJOMVA=",
"version": "1.8.0"
"version": "1.8.1"
},
"exoscale": {
"owner": "exoscale",
@ -671,10 +671,10 @@
"owner": "linode",
"provider-source-address": "registry.terraform.io/linode/linode",
"repo": "terraform-provider-linode",
"rev": "v1.29.1",
"sha256": "sha256-eZ13kVQplnIQNT4KecUeLAfrCime1WNEdG0yuv3dBWk=",
"vendorSha256": "sha256-PBnMIEuMGcb+qeFO4e17e9sg58DmL6BEAZJeTTVjS1g=",
"version": "1.29.1"
"rev": "v1.29.2",
"sha256": "sha256-gysdJOGUmhwFoRpR0Yp2p/Vjb69k+fDzcWatOgA+/AQ=",
"vendorSha256": "sha256-Sp/e3QVdUeQGflDGYLSMPGqxcMWoIY8Q9nZUteFIryo=",
"version": "1.29.2"
},
"linuxbox": {
"owner": "numtide",
@ -743,20 +743,20 @@
"owner": "aminueza",
"provider-source-address": "registry.terraform.io/aminueza/minio",
"repo": "terraform-provider-minio",
"rev": "v1.5.3",
"sha256": "sha256-AWVBRrQ90XoJodRsBvqJYjkXSqbQBxWk748na9pTnEk=",
"vendorSha256": "sha256-0c8Pj4Ga6yNX1UcZXIhmDXhdZOTY3h/WdGdYo4Hmltc=",
"version": "1.5.3"
"rev": "v1.6.0",
"sha256": "sha256-57wks4TYv7+kUPEhlj8V/X1fQ0/J/kbsuFQFlPxXwns=",
"vendorSha256": "sha256-0pWW7CDVwVombuKqAwzmkJmLpB1RCuV2SEoQnWppA1M=",
"version": "1.6.0"
},
"mongodbatlas": {
"owner": "mongodb",
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
"proxyVendor": true,
"repo": "terraform-provider-mongodbatlas",
"rev": "v1.4.3",
"sha256": "sha256-0Fwu9fnPVydiQ/A4ebmMcFDyZCc7JxPxqzILIFoYZ4A=",
"vendorSha256": "sha256-s55ErNhQ5Yw8a8R+a1ratSkBdwe9NMhtWAsEy/jEjr8=",
"version": "1.4.3"
"rev": "v1.4.4",
"sha256": "sha256-QFiaFxCg4pYgMkC2+HAxlyWv2DL1Riqk3nRZqI6ie1k=",
"vendorSha256": "sha256-nBBr6Uqa2VHSaEWfvFVotlF9DvTApgztS/wAgbj9OL0=",
"version": "1.4.4"
},
"namecheap": {
"owner": "namecheap",
@ -835,10 +835,10 @@
"owner": "oracle",
"provider-source-address": "registry.terraform.io/oracle/oci",
"repo": "terraform-provider-oci",
"rev": "v4.88.1",
"sha256": "sha256-c0/CYp8FY6M8+qZ32vO0WfTxPpD50WzVQl+Fi6M6l0E=",
"rev": "v4.89.0",
"sha256": "sha256-D+vPeiCH1T5kdrO+MJ25TIZnx0Fz9f0yAfBV4v0UCRw=",
"vendorSha256": null,
"version": "4.88.1"
"version": "4.89.0"
},
"okta": {
"owner": "okta",
@ -880,10 +880,10 @@
"owner": "opentelekomcloud",
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.31.0",
"sha256": "sha256-I3Oku5sNlPlRlYcagz2C4LCZI4N3mwlLK6xAWNn7iVo=",
"rev": "v1.31.1",
"sha256": "sha256-88xh0cXAhne8ruVy+Ak7HmMEOjRQ2H/RXNyyEkEGb40=",
"vendorSha256": "sha256-mLroGI3X9nLufz4LT4KCbVoPUZimtMaQ3rI108SKURE=",
"version": "1.31.0"
"version": "1.31.1"
},
"opsgenie": {
"owner": "opsgenie",
@ -907,10 +907,10 @@
"owner": "PagerDuty",
"provider-source-address": "registry.terraform.io/PagerDuty/pagerduty",
"repo": "terraform-provider-pagerduty",
"rev": "v2.5.2",
"sha256": "sha256-2+GFn8LO/PUFuYzzvSIcKXdJ++SAuo7Mfh2GkGyksTE=",
"rev": "v2.6.0",
"sha256": "sha256-U3lmGvkqNtSsX60qO+6ZBIlSay6w5FCcqR7yhzu6Nw4=",
"vendorSha256": null,
"version": "2.5.2"
"version": "2.6.0"
},
"panos": {
"owner": "PaloAltoNetworks",
@ -934,10 +934,10 @@
"owner": "cyrilgdn",
"provider-source-address": "registry.terraform.io/cyrilgdn/postgresql",
"repo": "terraform-provider-postgresql",
"rev": "v1.16.0",
"sha256": "sha256-nueqs2SJZxGNzm/gv/mBo8geXI8nZqmDFQ0e539oV2M=",
"rev": "v1.17.1",
"sha256": "sha256-pi3st4phjCRq2jlRIW2Z4jt9qp7a1ghmlkjAQSbxhI4=",
"vendorSha256": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=",
"version": "1.16.0"
"version": "1.17.1"
},
"powerdns": {
"owner": "pan-net",
@ -1042,10 +1042,10 @@
"owner": "splunk-terraform",
"provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
"repo": "terraform-provider-signalfx",
"rev": "v6.14.0",
"sha256": "sha256-29yN8n/m/1kSl9xRlf5dae9KOL16FvfZJuM1fLqWPd4=",
"vendorSha256": "sha256-I9fWw6wJiytEuiT8gQVSTKuQggXCMENn4RBxPsenZOY=",
"version": "6.14.0"
"rev": "v6.15.0",
"sha256": "sha256-uosY3WsLtGmQeb0KxNo1GcmFO7SpHI6aZTqM3QJcV0Y=",
"vendorSha256": "sha256-hxYQF1sZOS5x6sZtUJg13A6SPZG6Ql20vAs8VDQegqQ=",
"version": "6.15.0"
},
"skytap": {
"owner": "skytap",
@ -1187,10 +1187,10 @@
"owner": "cloudposse",
"provider-source-address": "registry.terraform.io/cloudposse/utils",
"repo": "terraform-provider-utils",
"rev": "0.17.28",
"sha256": "sha256-8Ep4eYpFSJtIA7twOpUI5ns4/lqSnM07MflQJLnC8eU=",
"vendorSha256": "sha256-6ELd3Cxc460TY+XY1AcDQamYg76hWad6bO9BzTEWleU=",
"version": "0.17.28"
"rev": "1.0.0",
"sha256": "sha256-52uoe7OLPVUdJ4eg6ulQ3bSOCIjUgjF22HvRpN1RHFQ=",
"vendorSha256": "sha256-cwpVqzONyKwJ5nzkYoqTTtr0rGMWbvL5nJ3d+bbni34=",
"version": "1.0.0"
},
"vault": {
"owner": "hashicorp",

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:
let
pname = "geogebra";
version = "5-0-706-0";
version = "5-0-723-0";
srcIcon = fetchurl {
url = "http://static.geogebra.org/images/geogebra-logo.svg";
@ -45,9 +45,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
"https://web.archive.org/web/20220516130744/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
"https://web.archive.org/web/20220807021654/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
];
sha256 = "d18f3d20baff693606331f035fa4bf73e7418d28090f038054da98444b06f69b";
sha256 = "fc05e2ae35b91f2d30650df08da0c20e060f559ef1fac1375cb70093c1d20507";
};
nativeBuildInputs = [ makeWrapper ];
@ -76,9 +76,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"
"https://web.archive.org/web/20220516132502/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"
"https://web.archive.org/web/20220807021931/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"
];
sha256 = "0070ec8d8d5f79c921b5d7433048c2c114ec4b812d839bb04e67848fce24ee0a";
sha256 = "83aa702625c88be00ee005b40bdac0822af37dc1bba7dbf0ba6c4f547d7387d7";
};
dontUnpack = true;

View File

@ -1,7 +1,7 @@
{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }:
let
pname = "geogebra";
version = "6-0-676-0";
version = "6-0-723-0";
srcIcon = geogebra.srcIcon;
desktopItem = geogebra.desktopItem;
@ -18,9 +18,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
"https://web.archive.org/web/20211123222708/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
"https://web.archive.org/web/20220807022226/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
];
sha256 = "0wn90n2nd476rkf83gk9vvcpbjflkrvyri50pnmv52j76n023hmm";
sha256 = "f0b8a5bdadd3599489872ffe8e0bfd9e42ce3d28b1f6072001cc74f7d3e9e647";
};
dontConfigure = true;
@ -53,9 +53,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
"https://web.archive.org/web/20211124143625/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
"https://web.archive.org/web/20220807022337/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
];
sha256 = "1dwv2f94a1c2y10lmy0i66cafynalp7dkqgnpk4f0mk6pir2fdgj";
sha256 = "463ca067c5187e0b639b72bef577b2f1bf73c394c9a1a88071c547e3e1c1888c";
};
dontUnpack = true;

View File

@ -78,6 +78,7 @@ buildPythonApplication rec {
"test_breaking_change_content_v1"
"test_breaking_change_content_v1_beta"
"test_breaking_change_content_v1_multiline"
"test_bump_command_increment_option"
"test_bump_command_prelease"
"test_bump_dry_run"
"test_bump_files_only"
@ -95,23 +96,35 @@ buildPythonApplication rec {
"test_bump_with_changelog_arg"
"test_bump_with_changelog_config"
"test_bump_with_changelog_to_stdout_arg"
"test_bump_with_changelog_to_stdout_dry_run_arg"
"test_changelog_config_flag_increment"
"test_changelog_config_start_rev_option"
"test_changelog_from_rev_first_version_from_arg"
"test_changelog_from_rev_latest_version_dry_run"
"test_changelog_from_rev_latest_version_from_arg"
"test_changelog_from_rev_range_version_not_found"
"test_changelog_from_rev_single_version_not_found"
"test_changelog_from_rev_version_range_from_arg"
"test_changelog_from_rev_version_range_including_first_tag"
"test_changelog_from_rev_version_with_big_range_from_arg"
"test_changelog_from_start"
"test_changelog_from_version_zero_point_two"
"test_changelog_hook"
"test_changelog_incremental_angular_sample"
"test_changelog_incremental_keep_a_changelog_sample"
"test_changelog_incremental_keep_a_changelog_sample_with_annotated_tag"
"test_changelog_incremental_newline_separates_new_content_from_old"
"test_changelog_incremental_with_release_candidate_version"
"test_changelog_is_persisted_using_incremental"
"test_changelog_multiple_incremental_do_not_add_new_lines"
"test_changelog_replacing_unreleased_using_incremental"
"test_changelog_with_different_cz"
"test_changelog_with_filename_as_empty_string"
"test_get_commits"
"test_get_commits_author_and_email"
"test_get_commits_with_signature"
"test_get_latest_tag_name"
"test_invalid_subject_is_skipped"
"test_is_staging_clean_when_updating_file"
"test_none_increment_should_not_call_git_tag_and_error_code_is_not_zero"
"test_prevent_prerelease_when_no_increment_detected"

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.9.0";
version = "2.10.0";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
sha256 = "sha256-CbYlu7dOpHGceGLFkI3p494SNlFL3JyBv+/yy0PRkPY=";
sha256 = "sha256-SXmYf1IvHXzNLP6w8MzFx6W2kX4yIICuACOJ8Yu/HWE=";
};
vendorSha256 = "sha256-9ec34jpDA7MUoAhWZMGCmXkOi/iK9mdJpFZ1qu9QgrU=";
vendorSha256 = "sha256-nqfCdvgK2JF4XNnA14KJNngP2M/OKThawdTo+iPjRNM=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

View File

@ -327,6 +327,7 @@ stdenv.mkDerivation ({
maintainers = with lib.maintainers; [ veprbl ];
platforms = lib.platforms.unix;
badPlatforms = [ "aarch64-darwin" ];
};
}

View File

@ -1,15 +1,17 @@
{ lib, stdenv, fetchFromGitHub, llvmPackages, ncurses, cmake, libxml2
, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false }:
, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false
, libobjc, Cocoa, Foundation
}:
let
luajitRev = "6053b04815ecbc8eec1e361ceb64e68fb8fac1b3";
luajitRev = "50936d784474747b4569d988767f1b5bab8bb6d0";
luajitBase = "LuaJIT-${luajitRev}";
luajitArchive = "${luajitBase}.tar.gz";
luajitSrc = fetchFromGitHub {
owner = "LuaJIT";
repo = "LuaJIT";
rev = luajitRev;
sha256 = "1caxm1js877mky8hci1km3ycz2hbwpm6xbyjha72gfc7lr6pc429";
sha256 = "1g87pl014b5v6z2nnhiwn3wf405skawszfr5wdzyfbx00j3kgxd0";
};
llvmMerged = symlinkJoin {
@ -30,17 +32,19 @@ let
in stdenv.mkDerivation rec {
pname = "terra";
version = "1.0.4";
version = "1.0.5";
src = fetchFromGitHub {
owner = "terralang";
repo = "terra";
rev = "release-${version}";
sha256 = "07715qsc316h0mmsjifr1ja5fbp216ji70hpq665r0v5ikiqjfsv";
sha256 = "080h718y3r3ca6jlxc985g3dac4q5ysqcalg3h0jl9bxm6rssv50";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ llvmMerged ncurses libxml2 ] ++ lib.optional enableCUDA cuda;
buildInputs = [ llvmMerged ncurses libxml2 ]
++ lib.optionals enableCUDA [ cuda ]
++ lib.optionals stdenv.isDarwin [ libobjc Cocoa Foundation ];
cmakeFlags = [
"-DHAS_TERRA_VERSION=0"
@ -80,10 +84,9 @@ in stdenv.mkDerivation rec {
'';
meta = with lib; {
broken = stdenv.isDarwin;
description = "A low-level counterpart to Lua";
homepage = "https://terralang.org/";
platforms = platforms.x86_64;
platforms = platforms.x86_64 ++ platforms.linux;
maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ];
license = licenses.mit;
};

View File

@ -6,51 +6,43 @@
, withFonts ? true, freetype
}:
with lib;
# Info on how to use:
# https://wiki.archlinux.org/index.php/BluRay
stdenv.mkDerivation rec {
pname = "libbluray";
version = "1.3.1";
version = "1.3.2";
src = fetchurl {
url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-wksPQcW3N7u2XFRP5jSVY3p3HBClGd/IAudp8RK0O3U=";
url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-RWgU258Hwe7N736ED8uyCXbvgU34dUKL+4Hs9FhR8XA=";
};
patches = [
./BDJ-JARFILE-path.patch
./libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
];
nativeBuildInputs = [ pkg-config autoreconfHook ]
++ optionals withJava [ ant ];
++ lib.optionals withJava [ ant ];
buildInputs = [ fontconfig ]
++ optional withJava jdk
++ optional withMetadata libxml2
++ optional withFonts freetype
++ optional stdenv.isDarwin DiskArbitration
;
++ lib.optional withJava jdk
++ lib.optional withMetadata libxml2
++ lib.optional withFonts freetype
++ lib.optional stdenv.isDarwin DiskArbitration;
propagatedBuildInputs = optional withAACS libaacs;
propagatedBuildInputs = lib.optional withAACS libaacs;
NIX_LDFLAGS = toString [
(optionalString withAACS "-L${libaacs}/lib -laacs")
(optionalString withBDplus "-L${libbdplus}/lib -lbdplus")
];
NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs"
+ lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus";
preConfigure = ''
${optionalString withJava ''export JDK_HOME="${jdk.home}"''}
preConfigure = lib.optionalString withJava ''
export JDK_HOME="${jdk.home}"
'';
configureFlags = with lib;
optional (! withJava) "--disable-bdjava-jar"
++ optional (! withMetadata) "--without-libxml2"
++ optional (! withFonts) "--without-freetype"
;
configureFlags = lib.optional (!withJava) "--disable-bdjava-jar"
++ lib.optional (!withMetadata) "--without-libxml2"
++ lib.optional (!withFonts) "--without-freetype";
meta = with lib; {
homepage = "http://www.videolan.org/developers/libbluray.html";

View File

@ -1,25 +0,0 @@
From 8f26777b1ce124ff761f80ef52d6be10bcea323e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 25 Apr 2022 14:28:58 +0300
Subject: [PATCH] Fix build failure after Oracle Java CPU for April 2022
--- a/src/libbluray/bdj/java/java/io/BDFileSystem.java
+++ b/src/libbluray/bdj/java/java/io/BDFileSystem.java
@@ -227,6 +227,17 @@ public abstract class BDFileSystem extends FileSystem {
return fs.isAbsolute(f);
}
+ public boolean isInvalid(File f) {
+ try {
+ Method m = fs.getClass().getDeclaredMethod("isInvalid", new Class[] { File.class });
+ Object[] args = new Object[] {(Object)f};
+ Boolean result = (Boolean)m.invoke(fs, args);
+ return result.booleanValue();
+ } finally {
+ return false;
+ }
+ }
+
public String resolve(File f) {
if (!booted)
return fs.resolve(f);

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lhapdf";
version = "6.5.1";
version = "6.5.2";
src = fetchurl {
url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
sha256 = "sha256-ElZBniIn0aT5M4f+HagF5kg1FBfTdV6K9aMKNaamZ1E=";
sha256 = "sha256-YIonU0VeBnqZQLXBa8hqtsR+LHSbyd0ZeWmW60NSsv0=";
};
# The Apple SDK only exports locale_t from xlocale.h whereas glibc

View File

@ -171,6 +171,7 @@
, "ijavascript"
, "inliner"
, "imapnotify"
, "immich"
, "indium"
, "insect"
, "intelephense"

File diff suppressed because it is too large Load Diff

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pyml";
version = "20211015";
version = "20220615";
src = fetchFromGitHub {
owner = "thierry-martinez";
repo = pname;
rev = version;
sha256 = "sha256-GCO6KlRhJmADFjQ5QF4naMQBskF63yqnJnLnuQsagEk=";
sha256 = "sha256-my/xn9vrYTcHyjXGBNamgqpBz2/6bTyQHuE9ViVGLjw=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, boto3
, moto
}:
buildPythonPackage rec {
pname = "bucketstore";
version = "0.2.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jpetrucciani";
repo = "bucketstore";
rev = version;
sha256 = "sha256-BtoyGqFbeBhGQeXnmeSfiuJLZtXFrK26WO0SDlAtKG4=";
};
propagatedBuildInputs = [ boto3 ];
checkInputs = [
pytestCheckHook
moto
];
pythonImportsCheck = [
"bucketstore"
];
meta = with lib; {
description = "Library for interacting with Amazon S3";
homepage = "https://github.com/jpetrucciani/bucketstore";
license = licenses.mit;
maintainers = with maintainers; [ jpetrucciani ];
};
}

View File

@ -0,0 +1,54 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, isodate
, docstring-parser
, colorlog
, websocket-client
, pytestCheckHook
, fetchpatch
}:
buildPythonPackage rec {
pname = "chat-downloader";
version = "0.2.0";
# PyPI tarball is missing files
src = fetchFromGitHub {
owner = "xenova";
repo = "chat-downloader";
rev = "v${version}";
sha256 = "sha256-SVZyDTma6qAgmOz+QsPnudPrX1Eswtc0IKFRx1HnWLY=";
};
patches = [
# Remove argparse from dependencies. https://github.com/xenova/chat-downloader/pull/167
(fetchpatch {
url = "https://github.com/xenova/chat-downloader/commit/cdaca5e3a334c8db1b37bebe191d181ebdfa576c.patch";
sha256 = "sha256-AgH305dJmNRZy23lAf1h40klDE67RSwEL8o2gxX0VGA=";
})
];
propagatedBuildInputs = [
requests
isodate
docstring-parser
colorlog
websocket-client
];
# Tests try to access the network.
doCheck = false;
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "chat_downloader" ];
meta = with lib; {
description = "A simple tool used to retrieve chat messages from livestreams, videos, clips and past broadcasts";
homepage = "https://github.com/xenova/chat-downloader";
license = licenses.mit;
maintainers = with maintainers; [ marsam ];
};
}

View File

@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "codespell";
version = "2.1.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "codespell-project";
repo = "codespell";
rev = "v${version}";
sha256 = "sha256-BhYVztSr2MalILEcOcvMl07CObYa73o3kW8S/idqAO8=";
sha256 = "sha256-H/istsEt6kYzwvwy8GlOH0fkMTWbEdXVF1P1qO6sITs=";
};
postPatch = ''
@ -23,8 +23,12 @@ buildPythonApplication rec {
export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell"
'';
# tries to run not fully installed script
disabledTests = [ "test_command" ];
disabledTests = [
# tries to run not fully installed script
"test_command"
# error 'dateset' should not be in aspell dictionaries (en, en_GB, en_US, en_CA, en_AU) for dictionary /build/source/codespell_lib/tests/../data/dictionary.txt
"test_dictionary_formatting"
];
pythonImportsCheck = [ "codespell_lib" ];

View File

@ -3,23 +3,32 @@
, fetchFromGitHub
, six
, pytestCheckHook
, mock
}:
buildPythonPackage rec {
pname = "imapclient";
version = "2.2.0";
version = "2.3.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "mjs";
repo = "imapclient";
rev = version;
sha256 = "sha256-q/8LFKHgrY3pQV7Coz+5pZAw696uABMTEkYoli6C2KA=";
hash = "sha256-aHWRhQOEjYiLlWTiuYo/a4pOhfLF7jz+ltG+yOqgfKI=";
};
propagatedBuildInputs = [ six ];
checkInputs = [ pytestCheckHook mock ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [
"imapclient"
"imapclient.response_types"
"imapclient.exceptions"
"imapclient.testable_imapclient"
"imapclient.tls"
];
meta = with lib; {
homepage = "https://imapclient.readthedocs.io";

View File

@ -248,16 +248,16 @@ let
done
substituteInPlace ../output/external/org_tensorflow/tensorflow/compiler/xla/python/pprof_profile_builder.cc \
--replace "status.message()" "std::string{status.message()}"
substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \
--replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool"
substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \
--replace "/usr/bin/libtool" "${cctools}/bin/libtool"
'' + lib.optionalString cudaSupport ''
patchShebangs ../output/external/org_tensorflow/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
'' + lib.optionalString stdenv.isDarwin ''
# Framework search paths aren't added by bintools hook
# https://github.com/NixOS/nixpkgs/pull/41914
export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks"
substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \
--replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool"
substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \
--replace "/usr/bin/libtool" "${cctools}/bin/libtool"
'' + (if stdenv.cc.isGNU then ''
sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD

View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, mock
, jinja2
}:
buildPythonPackage rec {
pname = "lizard";
version = "1.17.10";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "terryyin";
repo = "lizard";
rev = version;
sha256 = "sha256-4jq6gXpI1hFtX7ka2c/qQ+S6vZCThKOGhQwJ2FOYItY=";
};
propagatedBuildInputs = [ jinja2 ];
checkInputs = [
pytestCheckHook
mock
];
pythonImportsCheck = [
"lizard"
];
meta = with lib; {
description = "Code analyzer without caring the C/C++ header files";
homepage = "http://www.lizard.ws";
license = licenses.mit;
maintainers = with maintainers; [ jpetrucciani ];
};
}

View File

@ -0,0 +1,50 @@
{ lib
, python-dateutil
, python-socketio
, requests
, jsonschema
, pythonOlder
, pytestCheckHook
, buildPythonPackage
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "ripe-atlas-cousteau";
version = "1.5.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "RIPE-NCC";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EHZt9Po/1wDwDacXUCVGcuVSOwcIkPCT2JCKGchu8G4=";
};
postPatch = ''
substituteInPlace setup.py \
--replace 'python-socketio[client]<5' 'python-socketio[client]<6'
'';
propagatedBuildInputs = [
python-dateutil
requests
python-socketio
];
checkInputs = [
pytestCheckHook
jsonschema
];
pythonImportsCheck = [
"ripe.atlas.cousteau"
];
meta = with lib; {
description = "Python client library for RIPE ATLAS API";
homepage = "https://github.com/RIPE-NCC/ripe-atlas-cousteau";
license = licenses.gpl3Only;
maintainers = with maintainers; [ raitobezarius ];
};
}

View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }:
{ lib, fetchFromGitHub, fetchpatch, buildPythonPackage, six, pyudev, pygobject3 }:
buildPythonPackage rec {
pname = "rtslib";
@ -11,6 +11,14 @@ buildPythonPackage rec {
sha256 = "sha256-qBlr4K+LeJIC6Hwy6dN9n/VjHIUYCy8pLlRtPvooWyE=";
};
patches = [
# <https://github.com/open-iscsi/rtslib-fb/pull/187>
(fetchpatch {
url = "https://github.com/zhaofengli/rtslib-fb/commit/1c3c8257940a88e65676f4333363ddf259a06723.patch";
sha256 = "sha256-nDzL8pUKwKIej+6rOg7Om5AkwkClKk6qKlImbpoufz4=";
})
];
propagatedBuildInputs = [ six pyudev pygobject3 ];
meta = with lib; {

View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-redis";
version = "4.3.14";
version = "4.3.15";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-qllV/18QuHqQIcAx6wAqVEpBoKYoAITsB1ioqBKjdcQ=";
sha256 = "sha256-vPLIUsLQ9vmZ8QGAvfytC7+pchdYJs7XCl71i3EAS2w=";
};
# Module doesn't have tests

View File

@ -14,13 +14,13 @@
buildGoModule rec {
pname = "wails";
version = "2.0.0-beta.43";
version = "2.0.0-beta.44.2";
src = fetchFromGitHub {
owner = "wailsapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IX60xXU1sV39EI2nC/oL+s/RfE0apSJ2nMza6Av864I=";
sha256 = "sha256-RBl/RlNxowKrtLRSMK8KW9vEB58XPK455nqC6Urfdpk=";
} + "/v2";
vendorSha256 = "sha256-KB6fzyeeHCl164ZnDIy9auUC7Qzm8rVMo3XxXbeYCgY=";

View File

@ -2,9 +2,9 @@
, tiles ? true, Cocoa
, debug ? false
, useXdgDir ? false
, version ? "2021-07-03"
, rev ? "9017808252e1e149446c8f8bd7a6582ce0f95285"
, sha256 ? "0qrvkbyg098jb9hv69sg5093b1vj8f4n75p73v01jnmyxlz3ax28"
, version ? "2022-08-20"
, rev ? "f65b2bc4c6dea24bd9a993b8df146e5698e7e36f"
, sha256 ? "sha256-00Tp9OmsM39PYwAJXKKRS9zmn7KsGQ9s1eVmEqghkpw="
}:
let
@ -22,6 +22,11 @@ let
inherit rev sha256;
};
patches = [
# Unconditionally look for translation files in $out/share/locale
./locale-path-git.patch
];
makeFlags = common.makeFlags ++ [
"VERSION=git-${version}-${lib.substring 0 8 src.rev}"
];
@ -29,8 +34,6 @@ let
meta = common.meta // {
maintainers = with lib.maintainers;
common.meta.maintainers ++ [ rardiol ];
# /nix/store/s8xaq3x7mcysvd752in2nihb1nr6svsl-SDL2-2.0.20-dev/include/SDL2/SDL_events.h:645:65: error: use of old-style cast [-Werror,-Wold-style-cast]
broken = (stdenv.isDarwin && stdenv.isx86_64);
};
});
in

View File

@ -0,0 +1,18 @@
diff --git a/src/translations.cpp b/src/translations.cpp
index 76bdfd0..6dd6109 100644
--- a/src/translations.cpp
+++ b/src/translations.cpp
@@ -61,13 +61,11 @@ std::string locale_dir()
#define BSD
#endif
-#if !defined(__ANDROID__) && ((defined(__linux__) || defined(BSD) || (defined(MACOSX) && !defined(TILES))))
if( !PATH_INFO::base_path().empty() ) {
loc_dir = PATH_INFO::base_path() + "share/locale";
} else {
loc_dir = PATH_INFO::langdir();
}
-#endif
#endif // LOCALIZE
return loc_dir;
}

View File

@ -1,20 +1,27 @@
{ lib, stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_gfx, SDL_mixer, autoreconfHook,
libpng, glew, makeDesktopItem }:
{ lib, stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_gfx, SDL_mixer, libpng
, glew, dejavu_fonts, makeDesktopItem }:
stdenv.mkDerivation rec {
pname = "hyperrogue";
version = "11.3o";
version = "12.0u";
src = fetchFromGitHub {
owner = "zenorogue";
repo = "hyperrogue";
rev = "v${version}";
sha256 = "0bijgbqpc867pq8lbwwvcnc713gm51mmz625xb5br0q2qw09nkyh";
sha256 = "sha256-zG8Z+wpwr5z2r2CcjNxKOdiqXUN0AFChZcihUWel68A=";
};
CPPFLAGS = "-I${lib.getDev SDL}/include/SDL";
CXXFLAGS = [
"-I${lib.getDev SDL}/include/SDL"
"-DHYPERPATH='\"${placeholder "out"}/share/hyperrogue/\"'"
"-DRESOURCEDESTDIR=HYPERPATH"
"-DHYPERFONTPATH='\"${dejavu_fonts}/share/fonts/truetype/\"'"
];
HYPERROGUE_USE_GLEW = 1;
HYPERROGUE_USE_PNG = 1;
buildInputs = [ autoreconfHook SDL SDL_ttf SDL_gfx SDL_mixer libpng glew ];
buildInputs = [ SDL SDL_ttf SDL_gfx SDL_mixer libpng glew ];
desktopItem = makeDesktopItem {
name = "hyperrogue";
@ -26,7 +33,14 @@ stdenv.mkDerivation rec {
categories = [ "Game" "AdventureGame" ];
};
postInstall = ''
installPhase = ''
install -d $out/share/hyperrogue/{sounds,music}
install -m 555 -D hyperrogue $out/bin/hyperrogue
install -m 444 -D hyperrogue-music.txt *.dat $out/share/hyperrogue
install -m 444 -D music/* $out/share/hyperrogue/music
install -m 444 -D sounds/* $out/share/hyperrogue/sounds
install -m 444 -D ${desktopItem}/share/applications/hyperrogue.desktop \
$out/share/applications/hyperrogue.desktop
install -m 444 -D hyperroid/app/src/main/res/drawable-ldpi/icon.png \

View File

@ -2,7 +2,7 @@
{ stdenv, lib, fetchurl, makeWrapper, pkg-config
, ijs, zlib
, gimp2Support ? false, gimp
, cupsSupport ? true, cups, libusb-compat-0_1, perl
, cupsSupport ? true, cups, libusb1, perl
}:
stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ ijs zlib ]
++ lib.optionals gimp2Support [ gimp.gtk gimp ]
++ lib.optionals cupsSupport [ cups libusb-compat-0_1 perl ];
++ lib.optionals cupsSupport [ cups libusb1 perl ];
configureFlags = lib.optionals cupsSupport [
"--disable-static-genppd" # should be harmless on NixOS

View File

@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "libcgroup";
version = "0.42.2";
version = "2.0.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1h8s70lm6g7r0wj7j3xgj2g3j9fifvsy2pna6w0j3i5hh42qfms4";
fetchSubmodules = true;
hash = "sha256-o9eXbsgtGhODEbpbEn30RbYfYpXo6xkU5ptU1och5tU=";
};
buildInputs = [ pam bison flex ];
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Library and tools to manage Linux cgroups";
homepage = "http://libcg.sourceforge.net/";
homepage = "https://github.com/libcgroup/libcgroup";
license = lib.licenses.lgpl2;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.thoughtpolice ];

View File

@ -30,11 +30,11 @@ rustPlatform.buildRustPackage {
meilisearch = nixosTests.meilisearch;
};
meta = with lib; {
broken = stdenv.isDarwin;
broken = (stdenv.isDarwin && stdenv.isx86_64);
description = "Powerful, fast, and an easy to use search engine ";
homepage = "https://docs.meilisearch.com/";
license = licenses.mit;
maintainers = with maintainers; [ happysalada ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ];
};
}

View File

@ -29,15 +29,13 @@
, libnotify ? null
, enableUI ? true
, withWayland ? false
, libxkbcommon ? null
, wayland ? null
, libxkbcommon
, wayland
, buildPackages
, runtimeShell
, nixosTests
}:
assert withWayland -> wayland != null && libxkbcommon != null;
with lib;
let

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, python ? null
, swig
@ -10,24 +9,15 @@
stdenv.mkDerivation rec {
pname = "plfit";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "ntamas";
repo = "plfit";
rev = version;
hash = "sha256-y4n6AlGtuuUuA+33oF7lGOYuKSqea4GMSJlv9PaSpQ8=";
hash = "sha256-hnmP/56P2anR0S8zQyQqN1lbge5GgK+P8Lx8bRkwSxA=";
};
patches = [
# https://github.com/ntamas/plfit/pull/41
(fetchpatch {
name = "use-cmake-install-full-dir.patch";
url = "https://github.com/ntamas/plfit/commit/d0e77c80e6e899298240e6be465cf580603f6ee2.patch";
hash = "sha256-wi3qCp6ZQtrKuM7XDA6xCXunCiqsyhnkxmg2eSmxjYM=";
})
];
nativeBuildInputs = [
cmake
] ++ lib.optionals (!isNull python) [
@ -48,6 +38,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Fitting power-law distributions to empirical data";
homepage = "https://github.com/ntamas/plfit";
changelog = "https://github.com/ntamas/plfit/blob/${src.rev}/CHANGELOG.md";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dotlambda ];
};

View File

@ -18,9 +18,7 @@ python3.pkgs.buildPythonApplication rec {
};
nativeBuildInputs = with python3.pkgs; [
flake8
nose2
pep8-naming
setuptools-scm
yapf
];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "smartdns";
version = "37";
version = "37.1";
src = fetchFromGitHub {
owner = "pymumu";
repo = pname;
rev = "Release${version}";
sha256 = "sha256-zmcLXhqgwP9SKTyUUhOehQRJk6uX7iwgu9WP2TVhsR8=";
sha256 = "sha256-fj9NA8HLF/FdYNoS2g9KKDvqr3m41P+VU0eiVm7ku8A=";
};
buildInputs = [ openssl ];

View File

@ -2,13 +2,13 @@
let
pname = "jadx";
version = "1.4.3";
version = "1.4.4";
src = fetchFromGitHub {
owner = "skylot";
repo = pname;
rev = "v${version}";
hash = "sha256-5Cx5rwXUNnVSbLjkpB6qeudRHI4RVzl6T4zo7Dg9geo=";
hash = "sha256-ku82SHCJhrruJEiojH6Rp7FUWvM8KtvDivL8CE5C8gc=";
};
deps = stdenv.mkDerivation {
@ -40,7 +40,7 @@ let
'';
outputHashMode = "recursive";
outputHash = "sha256-Q7eGZQJZObLyZlp8JyodA3gEAgfh7ub+BNQh/LEm2Nk=";
outputHash = "sha256-nGejkCScX45VMT2nNArqG+fqOGvDwzeH9Xob4XMtdow=";
};
in stdenv.mkDerivation {
inherit pname version src;

View File

@ -226,7 +226,9 @@ with pkgs;
anders = callPackage ../applications/science/logic/anders { };
ankisyncd = callPackage ../servers/ankisyncd { };
ankisyncd = callPackage ../servers/ankisyncd {
python3 = python39;
};
ani-cli = callPackage ../applications/video/ani-cli { };
@ -5921,6 +5923,8 @@ with pkgs;
zoekt = callPackage ../tools/text/zoekt { };
zonemaster-cli = perlPackages.ZonemasterCLI;
zoxide = callPackage ../tools/misc/zoxide { };
zzuf = callPackage ../tools/security/zzuf { };
@ -14564,7 +14568,9 @@ with pkgs;
tbb = callPackage ../development/libraries/tbb { };
terra = callPackage ../development/compilers/terra {
llvmPackages = llvmPackages_10;
llvmPackages = llvmPackages_11;
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
};
teyjus = callPackage ../development/compilers/teyjus (
@ -32021,7 +32027,9 @@ with pkgs;
zim = callPackage ../applications/office/zim { };
zine = callPackage ../applications/misc/zine { };
zine = callPackage ../applications/misc/zine {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { };
@ -32499,7 +32507,7 @@ with pkgs;
angband = callPackage ../games/angband { };
anki = python3Packages.callPackage ../games/anki {
anki = python39Packages.callPackage ../games/anki {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
};
anki-bin = callPackage ../games/anki/bin.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; };

View File

@ -1507,6 +1507,20 @@ let
};
};
BHooksOPAnnotation = buildPerlPackage {
pname = "B-Hooks-OP-Annotation";
version = "0.44";
src = fetchurl {
url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/B-Hooks-OP-Annotation-0.44.tar.gz";
sha256 = "6e26f99367f4ea944169cf6e05cf4d067832082424ca8ecefccb7b5a63217b16";
};
propagatedBuildInputs = [ ExtUtilsDepends ];
meta = {
description = "Annotate and delegate hooked OPs";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
BHooksOPCheck = buildPerlPackage {
pname = "B-Hooks-OP-Check";
version = "0.22";
@ -14588,6 +14602,21 @@ let
};
};
ModuleInstallXSUtil = buildPerlPackage {
pname = "Module-Install-XSUtil";
version = "0.45";
src = fetchurl {
url = "mirror://cpan/authors/id/G/GF/GFUJI/Module-Install-XSUtil-0.45.tar.gz";
sha256 = "fe71e53320bee13197749a0b17609aa263f71ff46e5e2c130e94742ea6abdf56";
};
buildInputs = [ BHooksOPAnnotation ];
propagatedBuildInputs = [ ModuleInstall ];
meta = {
description = "Utility functions for XS modules";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
ModuleManifest = buildPerlPackage {
pname = "Module-Manifest";
version = "1.09";
@ -23968,6 +23997,19 @@ let
buildInputs = [ TestException ];
};
TextReflow = buildPerlPackage {
pname = "Text-Reflow";
version = "1.17";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MW/MWARD/Text-Reflow-1.17.tar.gz";
sha256 = "4bf2139ff617d6e59cc0e59cdecd7cb723ecfd28d5ac387afb553ffdc071b860";
};
meta = {
description = "Reflow text files using Knuth's paragraphing algorithm";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
TextReform = buildPerlModule {
pname = "Text-Reform";
version = "1.20";
@ -26064,6 +26106,73 @@ let
};
};
ZonemasterCLI = buildPerlPackage {
pname = "Zonemaster-CLI";
version = "4.0.1";
src = fetchurl {
url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v4.0.1.tar.gz";
sha256 = "edd34f7b8137e492e6ce8474c45a550572dca5056abdefc45c076df9d6965ca0";
};
propagatedBuildInputs = [
JSONXS
MooseXGetopt
TextReflow
ZonemasterEngine
ZonemasterLDNS
libintl-perl
];
preConfigure = ''
patchShebangs script/
'';
meta = {
description = "Run Zonemaster tests from the command line";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ qbit ];
};
};
ZonemasterEngine = buildPerlPackage {
pname = "Zonemaster-Engine";
version = "4.5.1";
src = fetchurl {
url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v4.5.1.tar.gz";
sha256 = "45d204c6dad7cd90176084bf2427baa8ce503684a5699ebeb236e4d33bc0ba86";
};
buildInputs = [ PodCoverage TestDifferences TestException TestFatal TestNoWarnings TestPod ];
propagatedBuildInputs = [ ClassAccessor Clone EmailValid FileShareDir FileSlurp IOSocketInet6 ListMoreUtils ModuleFind Moose MooseXSingleton NetIP Readonly TextCSV ZonemasterLDNS libintl-perl ];
preCheck = ''
# disable dnssec test as it fails
rm -f t/Test-dnssec.t t/manifest.t
'';
meta = {
description = "A tool to check the quality of a DNS zone";
license = lib.licenses.bsd3;
};
};
ZonemasterLDNS = buildPerlPackage {
pname = "Zonemaster-LDNS";
version = "2.2.2";
src = fetchurl {
url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-2.2.2.tar.gz";
sha256 = "e0a71c3e35aa761909be323d4101823d7fc1f2f4541b0f75794520c611e4efcf";
};
NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include -I${pkgs.libidn2}.dev}/include";
NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2";
makeMakerFlags = "--prefix-openssl=${pkgs.openssl.dev}";
buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl pkgs.pkg-config ];
meta = {
description = "Perl wrapper for the ldns DNS library";
license = lib.licenses.bsd3;
};
};
} // lib.optionalAttrs config.allowAliases {
autodie = null; # part of Perl
AutoLoader = null; # part of Perl 5.22

View File

@ -1517,6 +1517,8 @@ in {
btrfsutil = toPythonModule (pkgs.btrfs-progs.override { python3 = self.python; });
bucketstore = callPackage ../development/python-modules/bucketstore { };
bugsnag = callPackage ../development/python-modules/bugsnag { };
bugwarrior = callPackage ../development/python-modules/bugwarrior { };
@ -1733,6 +1735,8 @@ in {
chart-studio = callPackage ../development/python-modules/chart-studio { };
chat-downloader = callPackage ../development/python-modules/chat-downloader { };
check-manifest = callPackage ../development/python-modules/check-manifest { };
cheetah3 = callPackage ../development/python-modules/cheetah3 { };
@ -5248,6 +5252,8 @@ in {
livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { };
lizard = callPackage ../development/python-modules/lizard { };
llfuse = callPackage ../development/python-modules/llfuse {
inherit (pkgs) fuse;
};
@ -9516,6 +9522,8 @@ in {
ring-doorbell = callPackage ../development/python-modules/ring-doorbell { };
ripe-atlas-cousteau = callPackage ../development/python-modules/ripe-atlas-cousteau { };
riprova = callPackage ../development/python-modules/riprova { };
ripser = callPackage ../development/python-modules/ripser { };