forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
commit
22e7031b28
|
@ -11977,6 +11977,15 @@
|
||||||
github = "ony";
|
github = "ony";
|
||||||
githubId = 11265;
|
githubId = 11265;
|
||||||
};
|
};
|
||||||
|
ooliver1 = {
|
||||||
|
name = "Oliver Wilkes";
|
||||||
|
email = "oliverwilkes2006@icloud.com";
|
||||||
|
github = "ooliver1";
|
||||||
|
githubId = 34910574;
|
||||||
|
keys = [{
|
||||||
|
fingerprint = "D055 8A23 3947 B7A0 F966 B07F 0B41 0348 9833 7273";
|
||||||
|
}];
|
||||||
|
};
|
||||||
opeik = {
|
opeik = {
|
||||||
email = "sandro@stikic.com";
|
email = "sandro@stikic.com";
|
||||||
github = "opeik";
|
github = "opeik";
|
||||||
|
|
|
@ -18,6 +18,8 @@
|
||||||
|
|
||||||
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
|
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
|
||||||
|
|
||||||
|
- `writeTextFile` now requires `executable` to be boolean, values like `null` or `""` will now fail to evaluate.
|
||||||
|
|
||||||
- The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`.
|
- The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`.
|
||||||
|
|
||||||
- `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`.
|
- `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`.
|
||||||
|
|
|
@ -275,9 +275,8 @@ in
|
||||||
default = {};
|
default = {};
|
||||||
description = lib.mdDoc "public inboxes";
|
description = lib.mdDoc "public inboxes";
|
||||||
type = types.submodule {
|
type = types.submodule {
|
||||||
# Keeping in line with the tradition of unnecessarily specific types, allow users to set
|
# Support both global options like `services.public-inbox.settings.publicinbox.imapserver`
|
||||||
# freeform settings either globally under the `publicinbox` section, or for specific
|
# and inbox specific options like `services.public-inbox.settings.publicinbox.foo.address`.
|
||||||
# inboxes through additional nesting.
|
|
||||||
freeformType = with types; attrsOf (oneOf [ iniAtom (attrsOf iniAtom) ]);
|
freeformType = with types; attrsOf (oneOf [ iniAtom (attrsOf iniAtom) ]);
|
||||||
|
|
||||||
options.css = mkOption {
|
options.css = mkOption {
|
||||||
|
@ -285,12 +284,24 @@ in
|
||||||
default = [];
|
default = [];
|
||||||
description = lib.mdDoc "The local path name of a CSS file for the PSGI web interface.";
|
description = lib.mdDoc "The local path name of a CSS file for the PSGI web interface.";
|
||||||
};
|
};
|
||||||
|
options.imapserver = mkOption {
|
||||||
|
type = with types; listOf str;
|
||||||
|
default = [];
|
||||||
|
example = [ "imap.public-inbox.org" ];
|
||||||
|
description = lib.mdDoc "IMAP URLs to this public-inbox instance";
|
||||||
|
};
|
||||||
options.nntpserver = mkOption {
|
options.nntpserver = mkOption {
|
||||||
type = with types; listOf str;
|
type = with types; listOf str;
|
||||||
default = [];
|
default = [];
|
||||||
example = [ "nntp://news.public-inbox.org" "nntps://news.public-inbox.org" ];
|
example = [ "nntp://news.public-inbox.org" "nntps://news.public-inbox.org" ];
|
||||||
description = lib.mdDoc "NNTP URLs to this public-inbox instance";
|
description = lib.mdDoc "NNTP URLs to this public-inbox instance";
|
||||||
};
|
};
|
||||||
|
options.pop3server = mkOption {
|
||||||
|
type = with types; listOf str;
|
||||||
|
default = [];
|
||||||
|
example = [ "pop.public-inbox.org" ];
|
||||||
|
description = lib.mdDoc "POP3 URLs to this public-inbox instance";
|
||||||
|
};
|
||||||
options.wwwlisting = mkOption {
|
options.wwwlisting = mkOption {
|
||||||
type = with types; enum [ "all" "404" "match=domain" ];
|
type = with types; enum [ "all" "404" "match=domain" ];
|
||||||
default = "404";
|
default = "404";
|
||||||
|
|
|
@ -14,7 +14,7 @@ in
|
||||||
|
|
||||||
meta.maintainers = with pkgs.lib.maintainers; [ julm ];
|
meta.maintainers = with pkgs.lib.maintainers; [ julm ];
|
||||||
|
|
||||||
machine = { config, pkgs, nodes, ... }: let
|
nodes.machine = { config, pkgs, nodes, ... }: let
|
||||||
inherit (config.services) gitolite public-inbox;
|
inherit (config.services) gitolite public-inbox;
|
||||||
# Git repositories paths in Gitolite.
|
# Git repositories paths in Gitolite.
|
||||||
# Only their baseNameOf is used for configuring public-inbox.
|
# Only their baseNameOf is used for configuring public-inbox.
|
||||||
|
@ -221,7 +221,7 @@ in
|
||||||
# Delete a mail.
|
# Delete a mail.
|
||||||
# Note that the use of an extension not listed in the addresses
|
# Note that the use of an extension not listed in the addresses
|
||||||
# require to use --all
|
# require to use --all
|
||||||
machine.succeed("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all")
|
machine.succeed("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all")
|
||||||
machine.fail("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'")
|
machine.fail("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'")
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|
|
@ -22,13 +22,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "yoshimi";
|
pname = "yoshimi";
|
||||||
version = "2.2.3";
|
version = "2.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Yoshimi";
|
owner = "Yoshimi";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-zVIOHm84wx6ZFK0seS9fWZfujDz259AXTv7zljbwrUk=";
|
hash = "sha256-rVlwOxp8C/A56JDd6Bzi2smblJVqQWZiFqIP4oRhElM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "source/src";
|
sourceRoot = "source/src";
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "stellar-core";
|
pname = "stellar-core";
|
||||||
version = "19.10.0";
|
version = "19.11.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stellar";
|
owner = "stellar";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-BcZsj2TbeJW91aiZ2I7NbDa+rgjfs6lQUsWOnhFQXtw=";
|
sha256 = "sha256-48fEVbK5yswPkTwlfemXB2ieAs2+SIM6dspqOBiRKCU=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cobalt";
|
pname = "cobalt";
|
||||||
version = "0.18.4";
|
version = "0.18.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cobalt-org";
|
owner = "cobalt-org";
|
||||||
repo = "cobalt.rs";
|
repo = "cobalt.rs";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-O7qFpp7Xr6K82o/KUMP0J5y2B32op+QBGUXo9Q5R5LQ=";
|
sha256 = "sha256-Y1rWKoh4cjLOvBJy4bXIHsvGtLmTu9n0aqf6PdflH6E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-ZBAF4BqQ+JMZ3Rpg2RxUhhVvPE5pN68qljVl0o2/VNA=";
|
cargoHash = "sha256-r0nxsDcdXNiZn9dVMTOAxlI/kd0nZFh7JvB2JYDR2aw=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||||
|
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "mob";
|
pname = "mob";
|
||||||
version = "4.4.2";
|
version = "4.4.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "remotemobprogramming";
|
owner = "remotemobprogramming";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-muKlzOrqtegy35QcGJvwYqIJ9XZsaAvyofsrWPqCi7k=";
|
sha256 = "sha256-XWXoY/e/xceO3sOGvA2hrdvbdb8nomMg7AGUW090I74=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = null;
|
vendorHash = null;
|
||||||
|
|
|
@ -19,22 +19,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"beta": {
|
"beta": {
|
||||||
"version": "114.0.5735.45",
|
"version": "115.0.5790.13",
|
||||||
"sha256": "1z7z4mq3yw9i17xprza3v33wx28zpk7s3g8xcgapdydw0rgxz30v",
|
"sha256": "0ias5jn8lwpds3gsmjps0rlks58ln5znwx52h767f8mc9y24fagx",
|
||||||
"sha256bin64": "1387x7mab2sh3wg39z48gl8fjhq39jllbcgzic8rdzpbhlcgs7br",
|
"sha256bin64": "11v374p82k8xbak37c377km9y2hvy8avw6mjl9az5kzb2am3g566",
|
||||||
"deps": {
|
|
||||||
"gn": {
|
|
||||||
"version": "2023-04-19",
|
|
||||||
"url": "https://gn.googlesource.com/gn",
|
|
||||||
"rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
|
|
||||||
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"dev": {
|
|
||||||
"version": "115.0.5790.3",
|
|
||||||
"sha256": "1haai0jabghwl37k929138s4l6izmifssdvn2wgsig9jhiihxz29",
|
|
||||||
"sha256bin64": "12avl8ilvhmlvbag045yhnx0bbbsyx5d3jqh5af07pmbcxksgf96",
|
|
||||||
"deps": {
|
"deps": {
|
||||||
"gn": {
|
"gn": {
|
||||||
"version": "2023-05-19",
|
"version": "2023-05-19",
|
||||||
|
@ -44,6 +31,19 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"dev": {
|
||||||
|
"version": "116.0.5803.2",
|
||||||
|
"sha256": "0s3l0wvbvy0wcwxipbl9vlbp1441yfj8ylrwhlh7gy898ajl9q0j",
|
||||||
|
"sha256bin64": "0qgp0m67bpaali7w6bxy1jzw0aig4iiqqgg023k1q32712s192cs",
|
||||||
|
"deps": {
|
||||||
|
"gn": {
|
||||||
|
"version": "2023-05-26",
|
||||||
|
"url": "https://gn.googlesource.com/gn",
|
||||||
|
"rev": "e3978de3e8dafb50a2b11efa784e08699a43faf8",
|
||||||
|
"sha256": "17hwbcxmqsq3yfnafl4bbysdkk957mvqsn34iipzb61gyjbj7i6j"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"ungoogled-chromium": {
|
"ungoogled-chromium": {
|
||||||
"version": "113.0.5672.126",
|
"version": "113.0.5672.126",
|
||||||
"sha256": "14rdvidabbh0abp932m747iribvpfcha8hhxh9spck9hjkaprvqd",
|
"sha256": "14rdvidabbh0abp932m747iribvpfcha8hhxh9spck9hjkaprvqd",
|
||||||
|
|
|
@ -51,11 +51,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "opera";
|
pname = "opera";
|
||||||
version = "98.0.4759.39";
|
version = "99.0.4788.31";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||||
hash = "sha256-3HVgEOscds+VBn9ajmkRnPdqNi9lLItJrb3uRH6L96Q=";
|
hash = "sha256-73A47Yl454ZyOkglLvnp10zjoE1bf8v5tm4Rng3UBac=";
|
||||||
};
|
};
|
||||||
|
|
||||||
unpackPhase = "dpkg-deb -x $src .";
|
unpackPhase = "dpkg-deb -x $src .";
|
||||||
|
|
|
@ -23,7 +23,7 @@ let
|
||||||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "vivaldi";
|
pname = "vivaldi";
|
||||||
version = "6.0.2979.18";
|
version = "6.0.2979.22";
|
||||||
|
|
||||||
suffix = {
|
suffix = {
|
||||||
aarch64-linux = "arm64";
|
aarch64-linux = "arm64";
|
||||||
|
@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
|
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
|
||||||
hash = {
|
hash = {
|
||||||
aarch64-linux = "sha256-S3b0mmWsQhWDKPz34Gzb50q+wAURAFNEt6IvCqo8CMs=";
|
aarch64-linux = "sha256-x7wBbd7BdurnWGFeHD5kYb5t0/zGEXQaUwbHnNA4iME=";
|
||||||
x86_64-linux = "sha256-uqhXL7kndmGoOOalyQ6mVxRB3k8L11UJzADCnNakj64=";
|
x86_64-linux = "sha256-uN2nBWlullxpOZP2PzVCwKcNmO9XmDS3WiFOcp0dOqg=";
|
||||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -19,13 +19,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gabutdm";
|
pname = "gabutdm";
|
||||||
version = "2.1.5";
|
version = "2.1.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gabutakut";
|
owner = "gabutakut";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-8fV7STYSpmNnLyoAjz+RuF/0nFeNiu8AIxkON1MbWr4=";
|
hash = "sha256-ai5LsoK21XwXqL4LRuKsOR1/JV6LnP+1ZJ9fMHpj178=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Simple and faster download manager";
|
description = "Simple and fast download manager";
|
||||||
homepage = "https://github.com/gabutakut/gabutdm";
|
homepage = "https://github.com/gabutakut/gabutdm";
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
mainProgram = "com.github.gabutakut.gabutdm";
|
mainProgram = "com.github.gabutakut.gabutdm";
|
||||||
|
|
|
@ -27,13 +27,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "whatsapp-for-linux";
|
pname = "whatsapp-for-linux";
|
||||||
version = "1.6.2";
|
version = "1.6.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "eneshecan";
|
owner = "eneshecan";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-odE5syAFasGosc1WMU/pvQtk3YxuCci1YevZqNKfzYw=";
|
sha256 = "sha256-YmiEzemoGLwCUVfnuTmruSkI0oBg7yNuodWmXTMGh8g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "cloudlog";
|
pname = "cloudlog";
|
||||||
version = "2.4.2";
|
version = "2.4.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "magicbug";
|
owner = "magicbug";
|
||||||
repo = "Cloudlog";
|
repo = "Cloudlog";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-btfHHrb7m6ITWe/18u2pmZiZKpKebKMThqcXFIvO/P8=";
|
sha256 = "sha256-2L+Yp8yxhmoVh34cW1s5Xy1f0X2xUo3UP32XcAV2LsM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPath = ''
|
postPath = ''
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "diamond";
|
pname = "diamond";
|
||||||
version = "2.1.6";
|
version = "2.1.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bbuchfink";
|
owner = "bbuchfink";
|
||||||
repo = "diamond";
|
repo = "diamond";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-2FxJTF/fF/Xi0TglXDlf3sSwncv2f6gc129nTbk8YU0=";
|
sha256 = "sha256-5AjP7zH0WZhJqhcjgQjeK/WPCqy1Tl1gXXqRsHbqkys=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -141,7 +141,7 @@ rec {
|
||||||
runCommand name
|
runCommand name
|
||||||
{ inherit text executable checkPhase allowSubstitutes preferLocalBuild;
|
{ inherit text executable checkPhase allowSubstitutes preferLocalBuild;
|
||||||
passAsFile = [ "text" ];
|
passAsFile = [ "text" ];
|
||||||
meta = lib.optionalAttrs (toString executable != "" && matches != null) {
|
meta = lib.optionalAttrs (executable && matches != null) {
|
||||||
mainProgram = lib.head matches;
|
mainProgram = lib.head matches;
|
||||||
} // meta;
|
} // meta;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cista";
|
pname = "cista";
|
||||||
version = "0.13";
|
version = "0.14";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "felixguendling";
|
owner = "felixguendling";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-dQOVmKRXfApN0QRx/PmLVzeCGppFJBnNWIOoLbDbrds=";
|
sha256 = "sha256-E2B+dNFk0ssKhT9dULNFzpa8auRQ9Q0czuUjX6hxWPw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -12,13 +12,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wxsqlite3";
|
pname = "wxsqlite3";
|
||||||
version = "4.9.3";
|
version = "4.9.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "utelle";
|
owner = "utelle";
|
||||||
repo = "wxsqlite3";
|
repo = "wxsqlite3";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-HdsPCdZF1wMTGYFaXzq+f4bUFjgCAklsKhhdyMKaxp8=";
|
hash = "sha256-aM79DI/Kj1QEIJ1HMttlfqK/WZER9RJhQbrnbPto57U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "frigidaire";
|
pname = "frigidaire";
|
||||||
version = "0.18.12";
|
version = "0.18.13";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||||
owner = "bm1549";
|
owner = "bm1549";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-U6ko6P5/ANGy84GQDuSQq+YArou0TrXH5SIc5x4euvU=";
|
hash = "sha256-FikBV4KjutQfupGPXcVT1h+BfQ099WRrmbrEJOaVCQI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -13,14 +13,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "plumbum";
|
pname = "plumbum";
|
||||||
version = "1.8.1";
|
version = "1.8.2";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tomerfiliba";
|
owner = "tomerfiliba";
|
||||||
repo = "plumbum";
|
repo = "plumbum";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-5nRI9y2Y7itkqDdLRSX4qWfh96WmhqdP1Eo7HLoRHaQ=";
|
hash = "sha256-b8JcGRHiZSv/ViyEogpLgGXOMHHSC+cjWT0FqhkolcA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -9,14 +9,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pydelijn";
|
pname = "pydelijn";
|
||||||
version = "1.0.0";
|
version = "1.1.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "c5b6565c50d4f97d28baca9faf487281c2a5db635060b69f659e27c28a1a6e93";
|
sha256 = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -13,7 +13,9 @@
|
||||||
, platformdirs
|
, platformdirs
|
||||||
, pybind11
|
, pybind11
|
||||||
, pytest
|
, pytest
|
||||||
|
, pytestCheckHook
|
||||||
, pytools
|
, pytools
|
||||||
|
, setuptools
|
||||||
, six
|
, six
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -22,9 +24,17 @@ let
|
||||||
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
|
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
|
||||||
in buildPythonPackage rec {
|
in buildPythonPackage rec {
|
||||||
pname = "pyopencl";
|
pname = "pyopencl";
|
||||||
version = "2022.3.1";
|
version = "2023.1";
|
||||||
|
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
hash = "sha256-2d5gcnKRmlB6nCTD3+7q/nLAX3zWyeN7IRno7jxTqJE=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ setuptools ];
|
||||||
|
|
||||||
nativeCheckInputs = [ pytest ];
|
|
||||||
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
|
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -38,15 +48,7 @@ in buildPythonPackage rec {
|
||||||
six
|
six
|
||||||
];
|
];
|
||||||
|
|
||||||
src = fetchPypi {
|
nativeCheckInputs = [ pytestCheckHook ];
|
||||||
inherit pname version;
|
|
||||||
hash = "sha256-Sj2w/mG1zclSZ1Jt7r1xp+HXlWlNSw/idh8GMLzKNiE=";
|
|
||||||
};
|
|
||||||
|
|
||||||
# py.test is not needed during runtime, so remove it from `install_requires`
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace setup.py --replace "pytest>=2" ""
|
|
||||||
'';
|
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
export HOME=$(mktemp -d)
|
export HOME=$(mktemp -d)
|
||||||
|
@ -55,6 +57,8 @@ in buildPythonPackage rec {
|
||||||
# gcc: error: pygpu_language_opencl.cpp: No such file or directory
|
# gcc: error: pygpu_language_opencl.cpp: No such file or directory
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "pyopencl" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python wrapper for OpenCL";
|
description = "Python wrapper for OpenCL";
|
||||||
homepage = "https://github.com/pyopencl/pyopencl";
|
homepage = "https://github.com/pyopencl/pyopencl";
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "dbmate";
|
pname = "dbmate";
|
||||||
version = "2.3.0";
|
version = "2.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "amacneil";
|
owner = "amacneil";
|
||||||
repo = "dbmate";
|
repo = "dbmate";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-bWmRdrULXXVIaO5f3rntsVURnyojYFbhbZ43WvGzoZk=";
|
hash = "sha256-EwGyRDgd9di1gjefq9G3u+lVD2XEfdCULuLhtDAFDkY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-m1Nbu1bE04iOXnxW5kJfI9W95FU87eRKkOzg+YVvRsg=";
|
vendorHash = "sha256-t5GPbDBwq92erEpbkfIc/RMWkDr6Mb4oQ4BWmhCLrSc=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "analysis"
|
name = "analysis"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"config",
|
"config",
|
||||||
"diagnostic",
|
"diagnostic",
|
||||||
|
@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chain-map"
|
name = "chain-map"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fast-hash",
|
"fast-hash",
|
||||||
"str-util",
|
"str-util",
|
||||||
|
@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-syntax"
|
name = "cm-syntax"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lex-util",
|
"lex-util",
|
||||||
"paths",
|
"paths",
|
||||||
|
@ -138,9 +138,19 @@ dependencies = [
|
||||||
"fast-hash",
|
"fast-hash",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "codespan-reporting"
|
||||||
|
version = "0.11.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
|
||||||
|
dependencies = [
|
||||||
|
"termcolor",
|
||||||
|
"unicode-width",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "config"
|
name = "config"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fast-hash",
|
"fast-hash",
|
||||||
"serde",
|
"serde",
|
||||||
|
@ -385,7 +395,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "input"
|
name = "input"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cm-syntax",
|
"cm-syntax",
|
||||||
"config",
|
"config",
|
||||||
|
@ -444,7 +454,7 @@ checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lang-srv"
|
name = "lang-srv"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"analysis",
|
"analysis",
|
||||||
"anyhow",
|
"anyhow",
|
||||||
|
@ -472,7 +482,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lex-util"
|
name = "lex-util"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
|
@ -547,9 +557,10 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "millet-cli"
|
name = "millet-cli"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"analysis",
|
"analysis",
|
||||||
|
"codespan-reporting",
|
||||||
"config",
|
"config",
|
||||||
"diagnostic",
|
"diagnostic",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
|
@ -558,11 +569,13 @@ dependencies = [
|
||||||
"paths",
|
"paths",
|
||||||
"pico-args",
|
"pico-args",
|
||||||
"sml-naive-fmt",
|
"sml-naive-fmt",
|
||||||
|
"text-pos",
|
||||||
|
"text-size-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "millet-ls"
|
name = "millet-ls"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
|
@ -591,7 +604,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mlb-hir"
|
name = "mlb-hir"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fast-hash",
|
"fast-hash",
|
||||||
"paths",
|
"paths",
|
||||||
|
@ -602,7 +615,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mlb-statics"
|
name = "mlb-statics"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"config",
|
"config",
|
||||||
"diagnostic",
|
"diagnostic",
|
||||||
|
@ -626,7 +639,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mlb-syntax"
|
name = "mlb-syntax"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lex-util",
|
"lex-util",
|
||||||
"paths",
|
"paths",
|
||||||
|
@ -698,7 +711,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "panic-hook"
|
name = "panic-hook"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"better-panic",
|
"better-panic",
|
||||||
]
|
]
|
||||||
|
@ -892,7 +905,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "slash-var-path"
|
name = "slash-var-path"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fast-hash",
|
"fast-hash",
|
||||||
"str-util",
|
"str-util",
|
||||||
|
@ -900,14 +913,14 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-comment"
|
name = "sml-comment"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"sml-syntax",
|
"sml-syntax",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-dynamics"
|
name = "sml-dynamics"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fast-hash",
|
"fast-hash",
|
||||||
"fmt-util",
|
"fmt-util",
|
||||||
|
@ -918,7 +931,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-dynamics-tests"
|
name = "sml-dynamics-tests"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"config",
|
"config",
|
||||||
"sml-dynamics",
|
"sml-dynamics",
|
||||||
|
@ -933,7 +946,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-file-syntax"
|
name = "sml-file-syntax"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"config",
|
"config",
|
||||||
"elapsed",
|
"elapsed",
|
||||||
|
@ -947,7 +960,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-fixity"
|
name = "sml-fixity"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fast-hash",
|
"fast-hash",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
|
@ -956,7 +969,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-hir"
|
name = "sml-hir"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"la-arena",
|
"la-arena",
|
||||||
"sml-lab",
|
"sml-lab",
|
||||||
|
@ -967,7 +980,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-hir-lower"
|
name = "sml-hir-lower"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"config",
|
"config",
|
||||||
"diagnostic",
|
"diagnostic",
|
||||||
|
@ -981,14 +994,14 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-lab"
|
name = "sml-lab"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"str-util",
|
"str-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-lex"
|
name = "sml-lex"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"diagnostic",
|
"diagnostic",
|
||||||
"lex-util",
|
"lex-util",
|
||||||
|
@ -1002,7 +1015,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#7ae671a607a143fd8529e34019
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-naive-fmt"
|
name = "sml-naive-fmt"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fast-hash",
|
"fast-hash",
|
||||||
"sml-comment",
|
"sml-comment",
|
||||||
|
@ -1011,11 +1024,11 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-namespace"
|
name = "sml-namespace"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-parse"
|
name = "sml-parse"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"diagnostic",
|
"diagnostic",
|
||||||
"event-parse",
|
"event-parse",
|
||||||
|
@ -1027,14 +1040,14 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-path"
|
name = "sml-path"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"str-util",
|
"str-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-scon"
|
name = "sml-scon"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"num-bigint",
|
"num-bigint",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
|
@ -1043,7 +1056,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-statics"
|
name = "sml-statics"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chain-map",
|
"chain-map",
|
||||||
"config",
|
"config",
|
||||||
|
@ -1065,7 +1078,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-statics-types"
|
name = "sml-statics-types"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chain-map",
|
"chain-map",
|
||||||
"code-h2-md-map",
|
"code-h2-md-map",
|
||||||
|
@ -1082,7 +1095,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-symbol-kind"
|
name = "sml-symbol-kind"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"sml-namespace",
|
"sml-namespace",
|
||||||
"sml-statics-types",
|
"sml-statics-types",
|
||||||
|
@ -1090,7 +1103,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-syntax"
|
name = "sml-syntax"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"char-name",
|
"char-name",
|
||||||
"code-h2-md-map",
|
"code-h2-md-map",
|
||||||
|
@ -1103,7 +1116,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sml-ty-var-scope"
|
name = "sml-ty-var-scope"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fast-hash",
|
"fast-hash",
|
||||||
"sml-hir",
|
"sml-hir",
|
||||||
|
@ -1171,7 +1184,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tests"
|
name = "tests"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"analysis",
|
"analysis",
|
||||||
"cm-syntax",
|
"cm-syntax",
|
||||||
|
@ -1505,7 +1518,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "xtask"
|
name = "xtask"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"flate2",
|
"flate2",
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "millet";
|
pname = "millet";
|
||||||
version = "0.10.0";
|
version = "0.10.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "azdavis";
|
owner = "azdavis";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-QAXvkSGC7IydFXcWdrVf9QlMBlJVFDLNgfXu+P6yWlE=";
|
hash = "sha256-f5vftRc/hI0erXZiU+0HbNHPqNUUz6Df2+uIGsRu2+M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoLock = {
|
cargoLock = {
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "re-flex";
|
pname = "re-flex";
|
||||||
version = "3.3.3";
|
version = "3.3.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Genivia";
|
owner = "Genivia";
|
||||||
repo = "RE-flex";
|
repo = "RE-flex";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-pfCszi75TAo9ibpuWlfIDm5OO7Eo6joNPIer4JoDJRw=";
|
sha256 = "sha256-Fb6Z3LejlWY1L7PkITRh4bCVKpzuwpGOeTc2ZoLxRO0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ boost autoconf automake ];
|
nativeBuildInputs = [ boost autoconf automake ];
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hyperrogue";
|
pname = "hyperrogue";
|
||||||
version = "12.1o";
|
version = "12.1q";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zenorogue";
|
owner = "zenorogue";
|
||||||
repo = "hyperrogue";
|
repo = "hyperrogue";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-p7F+A7+wjHb17nJqsULhBZMs2P64s9gDOk2Oh4dc/lQ=";
|
sha256 = "sha256-dYkeAQBpnETbJiXZSejFPJVhXt3kJBBv6qBKPb7t9fU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
CXXFLAGS = [
|
CXXFLAGS = [
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
{ lib, fetchurl, lilypond }:
|
{ lib, fetchurl, lilypond }:
|
||||||
|
|
||||||
lilypond.overrideAttrs (oldAttrs: rec {
|
lilypond.overrideAttrs (oldAttrs: rec {
|
||||||
version = "2.25.4";
|
version = "2.25.5";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
|
url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
|
||||||
sha256 = "sha256-O7YQc00774Nz6KIGC1Za1HBvKaHmUjXeKkZs0YR1HUA=";
|
sha256 = "sha256-QgFGiNKqfC7Q7E0/yhsXFwKZoj+/07c0GwTPWiDz/u4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru.updateScript = {
|
passthru.updateScript = {
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jetty";
|
pname = "jetty";
|
||||||
version = "11.0.14";
|
version = "11.0.15";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz";
|
url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz";
|
||||||
sha256 = "sha256-lmS9B5dXJAc9j/RVs2sqMRaj1C5CN2trTszUXfPfHI4=";
|
sha256 = "sha256-bDg3CYPAGryqRv/gcPdeZKucXx6YTkkNd0Cu1+zIjto=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "imgproxy";
|
pname = "imgproxy";
|
||||||
version = "3.17.0";
|
version = "3.18.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
sha256 = "sha256-7kNBXMjkOs8fLDUBdQJHOjwJhYYAbGPZZDA0NLFirH8=";
|
sha256 = "sha256-c85G76u0qLyRbiXEWpYKZerrkZmHkq+VmCdHJk6pH9M=";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
, gnumake
|
, gnumake
|
||||||
, highlight
|
, highlight
|
||||||
, libgit2
|
, libgit2
|
||||||
|
, libxcrypt
|
||||||
, man
|
, man
|
||||||
, openssl
|
, openssl
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -17,30 +18,33 @@
|
||||||
, EmailAddressXS
|
, EmailAddressXS
|
||||||
, EmailMIME
|
, EmailMIME
|
||||||
, IOSocketSSL
|
, IOSocketSSL
|
||||||
|
# FIXME: to be packaged
|
||||||
|
#, IOSocketSocks
|
||||||
, IPCRun
|
, IPCRun
|
||||||
, Inline
|
, Inline
|
||||||
, InlineC
|
, InlineC
|
||||||
, LinuxInotify2
|
, LinuxInotify2
|
||||||
, MailIMAPClient
|
, MailIMAPClient
|
||||||
|
# FIXME: to be packaged
|
||||||
|
#, NetNetrc
|
||||||
|
# FIXME: to be packaged
|
||||||
|
#, NetNNTP
|
||||||
, ParseRecDescent
|
, ParseRecDescent
|
||||||
, Plack
|
, Plack
|
||||||
, PlackMiddlewareReverseProxy
|
, PlackMiddlewareReverseProxy
|
||||||
|
, PlackTestExternalServer
|
||||||
, SearchXapian
|
, SearchXapian
|
||||||
|
, TestSimple13
|
||||||
, TimeDate
|
, TimeDate
|
||||||
, URI
|
, URI
|
||||||
|
, XMLTreePP
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
skippedTests = [
|
skippedTests = [
|
||||||
# These tests would fail, and produce "Operation not permitted"
|
# fatal: Could not make /tmp/pi-search-9188-DGZM/a.git/branches/ writable by group
|
||||||
# errors from git, because they use git init --shared. This tries
|
"search"
|
||||||
# to set the setgid bit, which isn't permitted inside build
|
|
||||||
# sandboxes.
|
|
||||||
#
|
|
||||||
# These tests were indentified with
|
|
||||||
# grep -r shared t/
|
|
||||||
"convert-compact" "search" "v2writable" "www_listing"
|
|
||||||
# perl5.32.0-public-inbox> t/eml.t ...................... 1/? Cannot parse parameter '=?ISO-8859-1?Q?=20charset=3D=1BOF?=' at t/eml.t line 270.
|
# perl5.32.0-public-inbox> t/eml.t ...................... 1/? Cannot parse parameter '=?ISO-8859-1?Q?=20charset=3D=1BOF?=' at t/eml.t line 270.
|
||||||
# perl5.32.0-public-inbox> # Failed test 'got wide character by assuming utf-8'
|
# perl5.32.0-public-inbox> # Failed test 'got wide character by assuming utf-8'
|
||||||
# perl5.32.0-public-inbox> # at t/eml.t line 272.
|
# perl5.32.0-public-inbox> # at t/eml.t line 272.
|
||||||
|
@ -67,6 +71,8 @@ let
|
||||||
# expected: anything else
|
# expected: anything else
|
||||||
# waiting for child to reap grandchild...
|
# waiting for child to reap grandchild...
|
||||||
"spawn"
|
"spawn"
|
||||||
|
# Failed to connect to 127.0.0.1
|
||||||
|
"v2mirror"
|
||||||
];
|
];
|
||||||
|
|
||||||
testConditions = with lib;
|
testConditions = with lib;
|
||||||
|
@ -76,11 +82,11 @@ in
|
||||||
|
|
||||||
buildPerlPackage rec {
|
buildPerlPackage rec {
|
||||||
pname = "public-inbox";
|
pname = "public-inbox";
|
||||||
version = "1.8.0";
|
version = "1.9.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://public-inbox.org/public-inbox.git/snapshot/public-inbox-${version}.tar.gz";
|
url = "https://public-inbox.org/public-inbox.git/snapshot/public-inbox-${version}.tar.gz";
|
||||||
sha256 = "sha256-laJOOCk5NecIGWesv4D30cLGfijQHVkeo55eNqNKzew=";
|
sha256 = "sha256-ENnT2YK7rpODII9TqiEYSCp5mpWOnxskeSuAf8Ilqro=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "devdoc" "sa_config" ];
|
outputs = [ "out" "devdoc" "sa_config" ];
|
||||||
|
@ -99,12 +105,15 @@ buildPerlPackage rec {
|
||||||
DBDSQLite
|
DBDSQLite
|
||||||
DBI
|
DBI
|
||||||
EmailAddressXS
|
EmailAddressXS
|
||||||
EmailMIME
|
|
||||||
highlight
|
highlight
|
||||||
IOSocketSSL
|
IOSocketSSL
|
||||||
|
#IOSocketSocks
|
||||||
IPCRun
|
IPCRun
|
||||||
Inline
|
Inline
|
||||||
InlineC
|
InlineC
|
||||||
|
MailIMAPClient
|
||||||
|
#NetNetrc
|
||||||
|
#NetNNTP
|
||||||
ParseRecDescent
|
ParseRecDescent
|
||||||
Plack
|
Plack
|
||||||
PlackMiddlewareReverseProxy
|
PlackMiddlewareReverseProxy
|
||||||
|
@ -117,13 +126,16 @@ buildPerlPackage rec {
|
||||||
|
|
||||||
doCheck = !stdenv.isDarwin;
|
doCheck = !stdenv.isDarwin;
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
MailIMAPClient
|
|
||||||
curl
|
curl
|
||||||
git
|
git
|
||||||
openssl
|
openssl
|
||||||
pkg-config
|
pkg-config
|
||||||
sqlite
|
sqlite
|
||||||
xapian
|
xapian
|
||||||
|
EmailMIME
|
||||||
|
PlackTestExternalServer
|
||||||
|
TestSimple13
|
||||||
|
XMLTreePP
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
LinuxInotify2
|
LinuxInotify2
|
||||||
];
|
];
|
||||||
|
@ -137,12 +149,14 @@ buildPerlPackage rec {
|
||||||
installTargets = [ "install" ];
|
installTargets = [ "install" ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
for prog in $out/bin/*; do
|
for prog in $out/bin/*; do
|
||||||
wrapProgram $prog --prefix PATH : ${lib.makeBinPath [
|
wrapProgram $prog \
|
||||||
git
|
--set NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt} -I${lib.getDev libxcrypt}/include \
|
||||||
/* for InlineC */
|
--prefix PATH : ${lib.makeBinPath [
|
||||||
gnumake
|
git
|
||||||
stdenv.cc.cc
|
/* for InlineC */
|
||||||
]}
|
gnumake
|
||||||
|
stdenv.cc
|
||||||
|
]}
|
||||||
done
|
done
|
||||||
|
|
||||||
mv sa_config $sa_config
|
mv sa_config $sa_config
|
||||||
|
|
|
@ -9,12 +9,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "realvnc-vnc-viewer";
|
pname = "realvnc-vnc-viewer";
|
||||||
version = "7.1.0";
|
version = "7.5.0";
|
||||||
|
|
||||||
src = {
|
src = {
|
||||||
"x86_64-linux" = fetchurl {
|
"x86_64-linux" = fetchurl {
|
||||||
url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
|
url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
|
||||||
sha256 = "sha256-Mn4K2HICK7owHcXH85IJUncnpPZ56zNybkHZNiqYkHY=";
|
sha256 = "sha256-XemifIWeoi3Qdjv8HfEjtTYJvfi0eCXeQUXVld6aR9A=";
|
||||||
};
|
};
|
||||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
{ rustPlatform, lib, fetchFromGitHub, nixosTests }:
|
{ rustPlatform, lib, fetchFromGitHub, nixosTests }:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "envfs";
|
pname = "envfs";
|
||||||
version = "1.0.0";
|
version = "1.0.1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Mic92";
|
owner = "Mic92";
|
||||||
repo = "envfs";
|
repo = "envfs";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-aF8V1LwPGifFWoVxM0ydOnTX1pDVJ6HXevTxADJ/rsw=";
|
hash = "sha256-ttW1NUCtwnjAoiu7QgLGrlAB2PyY4oXm91LpWhbz8qk=";
|
||||||
};
|
};
|
||||||
cargoHash = "sha256-kw56tbe5zvWY5bI//dUqR1Rlumz8kOG4HeXiyEyL0I0=";
|
cargoHash = "sha256-BgXKwKD6w/GraBQEq61D7S7m2Q9TnkXNFJEIgDYo9L4=";
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
envfs = nixosTests.envfs;
|
envfs = nixosTests.envfs;
|
||||||
|
|
34
pkgs/tools/misc/eludris/default.nix
Normal file
34
pkgs/tools/misc/eludris/default.nix
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
{ lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, rustPlatform
|
||||||
|
, openssl
|
||||||
|
, pkg-config
|
||||||
|
, stdenv
|
||||||
|
, Security
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "eludris";
|
||||||
|
version = "0.3.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "eludris";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-TVYgimkGUSITB3IaMlMd10PWomqyJRvONvJwiW85U4M=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-5B9D19jFh5+eNTjiho22CFsn51nmwLry08zSDWvs1OU=";
|
||||||
|
|
||||||
|
cargoBuildFlags = [ "-p eludris" ];
|
||||||
|
cargoTestFlags = [ "-p eludris" ];
|
||||||
|
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||||
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A simple CLI to help you with setting up and managing your Eludris instance";
|
||||||
|
homepage = "https://github.com/eludris/eludris/tree/main/cli";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ ooliver1 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "hyperfine";
|
pname = "hyperfine";
|
||||||
version = "0.17.0";
|
version = "1.17.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sharkdp";
|
owner = "sharkdp";
|
||||||
|
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
hash = "sha256-IUjOklkEiy/U2HjjMt1X1uSpIkTAYOPiPQ+70xvvxKA=";
|
hash = "sha256-IUjOklkEiy/U2HjjMt1X1uSpIkTAYOPiPQ+70xvvxKA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-cm6opZrdSEY4qsYQzgCJ8wx6iIIuytySWh3F3Roo/JQ=";
|
cargoHash = "sha256-VjkcQueBODEADHdWOts2f3Zjar43hi0UXzVhvkK4o8I=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||||
|
|
23
pkgs/tools/system/epilys-bb/default.nix
Normal file
23
pkgs/tools/system/epilys-bb/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
{ lib, fetchFromGitHub, rustPlatform }:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "epilys-bb";
|
||||||
|
version = "unstable-2020-12-04";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "epilys";
|
||||||
|
repo = "bb";
|
||||||
|
rev = "c903d4c2975509299fd3d2600a0c4c2102f445d0";
|
||||||
|
hash = "sha256-KOXK+1arUWtu/QU7dwXhojIM0faMtwNN3AqVbofq1lY=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-+aCMwKOg+3HDntG14gjJLec8XD51wuTyYyzLjuW6lbY=";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A clean, simple, and fast process viewer";
|
||||||
|
homepage = "https://nessuent.xyz/bb.html";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = with maintainers; [ cafkafk ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dos2unix";
|
pname = "dos2unix";
|
||||||
version = "7.4.4";
|
version = "7.5.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz";
|
url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-KKhB2wvVgn1kXKup2AFeOnGYPcbjmAcLUofuE3rkQ24=";
|
sha256 = "sha256-ejsB0B4hTWLCs+BMOpLg3ccoo4VWbkwDVu+mb9brla8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ perl gettext ];
|
nativeBuildInputs = [ perl gettext ];
|
||||||
|
|
|
@ -557,6 +557,10 @@ with pkgs;
|
||||||
|
|
||||||
efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { };
|
efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { };
|
||||||
|
|
||||||
|
eludris = callPackage ../tools/misc/eludris {
|
||||||
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
|
};
|
||||||
|
|
||||||
enumer = callPackage ../tools/misc/enumer { };
|
enumer = callPackage ../tools/misc/enumer { };
|
||||||
|
|
||||||
evans = callPackage ../development/tools/evans { };
|
evans = callPackage ../development/tools/evans { };
|
||||||
|
@ -26673,6 +26677,8 @@ with pkgs;
|
||||||
|
|
||||||
b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { };
|
b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { };
|
||||||
|
|
||||||
|
epilys-bb = callPackage ../tools/system/epilys-bb { };
|
||||||
|
|
||||||
below = callPackage ../os-specific/linux/below { };
|
below = callPackage ../os-specific/linux/below { };
|
||||||
|
|
||||||
bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { };
|
bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { };
|
||||||
|
|
|
@ -10912,6 +10912,7 @@ with self; {
|
||||||
url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Hash-SharedMem-0.005.tar.gz";
|
url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Hash-SharedMem-0.005.tar.gz";
|
||||||
hash = "sha256-Mkd2gIYC973EStqpN4lTZUVAKakm+mEfMhyb9rlAu14=";
|
hash = "sha256-Mkd2gIYC973EStqpN4lTZUVAKakm+mEfMhyb9rlAu14=";
|
||||||
};
|
};
|
||||||
|
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-mno-outline-atomics";
|
||||||
buildInputs = [ ScalarString ];
|
buildInputs = [ ScalarString ];
|
||||||
meta = {
|
meta = {
|
||||||
description = "Efficient shared mutable hash";
|
description = "Efficient shared mutable hash";
|
||||||
|
|
Loading…
Reference in a new issue