Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-01-26 06:01:24 +00:00 committed by GitHub
commit d7e7d75f99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 2096 additions and 863 deletions

View file

@ -1621,6 +1621,16 @@
githubId = 45811; githubId = 45811;
name = "Svein Ove Aas"; name = "Svein Ove Aas";
}; };
Bauke = {
name = "Bauke";
email = "me@bauke.xyz";
matrix = "@baukexyz:matrix.org";
github = "Bauke";
githubId = 19501722;
keys = [{
fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558";
}];
};
bb010g = { bb010g = {
email = "me@bb010g.com"; email = "me@bb010g.com";
matrix = "@bb010g:matrix.org"; matrix = "@bb010g:matrix.org";
@ -5172,6 +5182,15 @@
githubId = 3217744; githubId = 3217744;
name = "Peter Ferenczy"; name = "Peter Ferenczy";
}; };
ggwpaiushtha = {
name = "Ivan";
email = "ggwpaiushtha@gmail.com";
github = "GGwpAiushtha";
githubId = 6987136;
keys = [{
fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940";
}];
};
ghostbuster91 = { ghostbuster91 = {
name = "Kasper Kondzielski"; name = "Kasper Kondzielski";
email = "kghost0@gmail.com"; email = "kghost0@gmail.com";

View file

@ -294,6 +294,14 @@
<literal>i18n.inputMethod.kime</literal> instead. <literal>i18n.inputMethod.kime</literal> instead.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>tut</literal> has been updated from 1.0.34 to 2.0.0,
and now uses the TOML format for the configuration file
instead of INI. Additional information can be found
<link xlink:href="https://github.com/RasmusLindroth/tut/releases/tag/2.0.0">here</link>.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
<literal>llvmPackages_rocm.llvm</literal> will not contain <literal>llvmPackages_rocm.llvm</literal> will not contain

View file

@ -75,6 +75,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- Kime has been updated from 2.5.6 to 3.0.2 and the `i18n.inputMethod.kime.config` option has been removed. Users should use `daemonModules`, `iconColor`, and `extraConfig` options under `i18n.inputMethod.kime` instead. - Kime has been updated from 2.5.6 to 3.0.2 and the `i18n.inputMethod.kime.config` option has been removed. Users should use `daemonModules`, `iconColor`, and `extraConfig` options under `i18n.inputMethod.kime` instead.
- `tut` has been updated from 1.0.34 to 2.0.0, and now uses the TOML format for the configuration file instead of INI. Additional information can be found [here](https://github.com/RasmusLindroth/tut/releases/tag/2.0.0).
- `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`. - `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`.
- The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2.

View file

@ -8,7 +8,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
nodes.machine = { pkgs, ... }: { nodes.machine = { pkgs, ... }: {
services.stratis.enable = true; services.stratis.enable = true;
virtualisation.emptyDiskImages = [ 1024 1024 1024 1024 ]; virtualisation.emptyDiskImages = [ 2048 1024 1024 1024 ];
}; };
testScript = '' testScript = ''

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ft2-clone"; pname = "ft2-clone";
version = "1.62"; version = "1.63";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "8bitbubsy"; owner = "8bitbubsy";
repo = "ft2-clone"; repo = "ft2-clone";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-PHDkCE30sVAFXHjG8d/4ETSDS2KO/j43iMMW0PhCFgI="; sha256 = "sha256-uDAW97lTeL15PPpR5vlIS371EZ7BBNd86ETPEB8joSU=";
}; };
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pt2-clone"; pname = "pt2-clone";
version = "1.56"; version = "1.57";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "8bitbubsy"; owner = "8bitbubsy";
repo = "pt2-clone"; repo = "pt2-clone";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-NetzlQdhbyClnVQTrHoX9QpVtoj8a8FoDue+uxhgrlA="; sha256 = "sha256-YUGTcL/k+MbAnB/kcWPEmrGxGF/kSHdIgdBVUqCsDWM=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -2921,6 +2921,22 @@ let
}; };
}; };
vscode-icons-team.vscode-icons = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-icons";
publisher = "vscode-icons-team";
version = "12.2.0";
sha256 = "12s5br0s9n99vjn6chivzdsjb71p0lai6vnif7lv13x497dkw4rz";
};
meta = with lib; {
description = "Bring real icons to your Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscode-icons-team.vscode-icons";
homepage = "https://github.com/vscode-icons/vscode-icons";
license = licenses.mit;
maintainers = with maintainers; [ ggwpaiushtha ];
};
};
vscodevim.vim = buildVscodeMarketplaceExtension { vscodevim.vim = buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
name = "vim"; name = "vim";

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "drawio"; pname = "drawio";
version = "20.7.4"; version = "20.8.10";
src = fetchurl { src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "sha256-gmC8s+0eef09wcLE9fBiG82rRPXijRyR1WTlp4gYPq4="; sha256 = "118e9c9a328c92aeeda3c5925c8d8ed50d0993c07715726447ee720699958626";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cubiomes-viewer"; pname = "cubiomes-viewer";
version = "3.0.0"; version = "3.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Cubitect"; owner = "Cubitect";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-yT8PDmMntnd5meDPJm1rekfDVgmWFSZTNFEH03AKCy0="; sha256 = "sha256-UPphXaxq/Hnt1U3J+lgwa0lp3vX1B/Ou8eqD9rHe3sw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -19,13 +19,13 @@
mkDerivation rec { mkDerivation rec {
pname = "organicmaps"; pname = "organicmaps";
version = "2022.11.24-3"; version = "2023.01.25-3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "organicmaps"; owner = "organicmaps";
repo = "organicmaps"; repo = "organicmaps";
rev = "${version}-android"; rev = "${version}-android";
sha256 = "sha256-4RW7/sCtOXxA8n0Jx4ksNGRg7r8ErujmyzbnA1pi6ng="; sha256 = "sha256-4nlD/GFOoBOCXVWtC7i6SUquEbob5++GyagZOTznygU=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "tut"; pname = "tut";
version = "1.0.34"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RasmusLindroth"; owner = "RasmusLindroth";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-AnuPTv9W+2yDcM803DZaNIn4S7A78JEv6S8pA18whVA="; sha256 = "sha256-Oypl80UsYRRSIMvHDPSS6rrvzjlxZ/UKDNDGc2Yan+w=";
}; };
vendorHash = "sha256-go7eZHhrQ1ZcLOn56a3Azn3eRyAesAkgLabPbwzKtds="; vendorHash = "sha256-qeYgkF9sIJ0slRarXbCHZ+1JmtZwXDnrJIpRKGOoW5Q=";
meta = with lib; { meta = with lib; {
description = "A TUI for Mastodon with vim inspired keys"; description = "A TUI for Mastodon with vim inspired keys";

View file

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "brave"; pname = "brave";
version = "1.47.171"; version = "1.47.186";
src = fetchurl { src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "sha256-0hKosta1fxth9ScDRmrrt8BH4CTIRm0ghetY4Jkuco8="; sha256 = "sha256-47LkjcC+fEE+cn2m434+9fQ+N2yZSc1eF0gDO7jGfPI=";
}; };
dontConfigure = true; dontConfigure = true;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kubedb-cli"; pname = "kubedb-cli";
version = "0.29.0"; version = "0.30.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubedb"; owner = "kubedb";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-MVvhXvf/R7Cku8S4zbs1MlH4NuEwkxCsbbc2ASCF67c="; sha256 = "sha256-i8kv/YzEWAFQJwIkwot2huIEAZYMUGQqSak4nUMRjn4=";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -1,25 +1,35 @@
{ lib, buildGoPackage, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoPackage rec { buildGoModule rec {
pname = "drive"; pname = "drive";
version = "0.3.8.1"; version = "0.4.0";
goPackagePath = "github.com/odeke-em/drive";
subPackages = [ "cmd/drive" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "odeke-em"; owner = "odeke-em";
repo = "drive"; repo = "drive";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b9cgc148rg5irg4jas10zv9i2km75x1zin25hld340dmpjcpi82"; hash = "sha256-mNOeOB0Tn5eqULFJZuE18PvLoHtnspv4AElmgEQKXcU=";
}; };
goDeps = ./deps.nix; vendorHash = "sha256-F/ikdr7UCVlNv2yiEemyB7eIkYi3mX+rJvSfX488RFc=";
patches = [
# Add Go Modules support
(fetchpatch {
url = "https://github.com/odeke-em/drive/commit/0fb4bb2cf83a7293d9a33b00f8fc07e1c8dd8b7c.patch";
hash = "sha256-4PxsgfufhTfmy/7N5QahIhmRa0rb2eUDXJ66pYb6jFg=";
})
];
subPackages = [ "cmd/drive" ];
ldflags = [ "-s" "-w" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/odeke-em/drive"; homepage = "https://github.com/odeke-em/drive";
description = "Google Drive client for the commandline"; description = "Google Drive client for the commandline";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ aaronjheng ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -1,192 +0,0 @@
# This file was generated by go2nix.
[
{
goPackagePath = "cloud.google.com/go";
fetch = {
type = "git";
url = "https://code.googlesource.com/gocloud";
rev = "7450882a75c8d2600748666d1ed16e0a5afa532d";
sha256 = "1hl2lsf9m1imdszf5mww4h6qrcjfdjghwh6l2kqsy85d32vbkjgd";
};
}
{
goPackagePath = "github.com/boltdb/bolt";
fetch = {
type = "git";
url = "https://github.com/boltdb/bolt";
rev = "074dffcc83e9f421e261526d297cd93f22a34080";
sha256 = "1kkmsby74n9czqx4mvng9x1cvnm4qgjl3dp6b4mfmg2b00fwbqnv";
};
}
{
goPackagePath = "github.com/cheggaaa/pb";
fetch = {
type = "git";
url = "https://github.com/cheggaaa/pb";
rev = "ad4efe000aa550bb54918c06ebbadc0ff17687b9";
sha256 = "0w6dl2s0vzb64q85yfy1hd5z2fq2vzwygiwl65is6hwa4vkc7hi3";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
};
}
{
goPackagePath = "github.com/odeke-em/cache";
fetch = {
type = "git";
url = "https://github.com/odeke-em/cache";
rev = "baf8e436bc97557118cb0bf118ab8ac6aeeda381";
sha256 = "00nvrnp40w4m1ld89k3s3gwi9qcfjxwi8hnp62zggnvqqyc4fyz1";
};
}
{
goPackagePath = "github.com/odeke-em/cli-spinner";
fetch = {
type = "git";
url = "https://github.com/odeke-em/cli-spinner";
rev = "610063bb4aeef25f7645b3e6080456655ec0fb33";
sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c";
};
}
{
goPackagePath = "github.com/odeke-em/command";
fetch = {
type = "git";
url = "https://github.com/odeke-em/command";
rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561";
sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62";
};
}
{
goPackagePath = "github.com/odeke-em/exponential-backoff";
fetch = {
type = "git";
url = "https://github.com/odeke-em/exponential-backoff";
rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09";
sha256 = "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6";
};
}
{
goPackagePath = "github.com/odeke-em/extractor";
fetch = {
type = "git";
url = "https://github.com/odeke-em/extractor";
rev = "801861aedb854c7ac5e1329e9713023e9dc2b4d4";
sha256 = "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1";
};
}
{
goPackagePath = "github.com/odeke-em/go-utils";
fetch = {
type = "git";
url = "https://github.com/odeke-em/go-utils";
rev = "d915395a7a46a9fe73d93f4daeff5953eeac5ef2";
sha256 = "0c1z4vmz69vxak8ldw4qjcgwia5ph969gj80az7a3824gia7zhbh";
};
}
{
goPackagePath = "github.com/odeke-em/go-uuid";
fetch = {
type = "git";
url = "https://github.com/odeke-em/go-uuid";
rev = "b211d769a9aaba5b2b8bdbab5de3c227116f3c39";
sha256 = "086l4xmwkjl5qcylcb5iwy9ksk9k5g43xwfbkcgvmhpz5mq3wmz2";
};
}
{
goPackagePath = "github.com/odeke-em/log";
fetch = {
type = "git";
url = "https://github.com/odeke-em/log";
rev = "cad53c4565a0b0304577bd13f3862350bdc5f907";
sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
};
}
{
goPackagePath = "github.com/odeke-em/meddler";
fetch = {
type = "git";
url = "https://github.com/odeke-em/meddler";
rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570";
sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x";
};
}
{
goPackagePath = "github.com/odeke-em/pretty-words";
fetch = {
type = "git";
url = "https://github.com/odeke-em/pretty-words";
rev = "9d37a7fcb4ae6f94b288d371938482994458cecb";
sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl";
};
}
{
goPackagePath = "github.com/odeke-em/semalim";
fetch = {
type = "git";
url = "https://github.com/odeke-em/semalim";
rev = "9c88bf5f9156ed06ec5110a705d41b8580fd96f7";
sha256 = "0nq93dcl84cmlvg31rdk281ndlc2452zlh5s7i40hasi0z0kmn1k";
};
}
{
goPackagePath = "github.com/odeke-em/statos";
fetch = {
type = "git";
url = "https://github.com/odeke-em/statos";
rev = "6f7e4db337bc11fc46d9b0456a93836cbbfe5141";
sha256 = "1lijz3cxqxd78sl0nzfgvs675dg7q99jqwvhgisnk9n84ic4ffzj";
};
}
{
goPackagePath = "github.com/skratchdot/open-golang";
fetch = {
type = "git";
url = "https://github.com/skratchdot/open-golang";
rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c";
sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3";
sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc";
};
}
{
goPackagePath = "golang.org/x/oauth2";
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "1e695b1c8febf17aad3bfa7bf0a819ef94b98ad5";
sha256 = "1sfgrc63jwslczkld7bsfipw1jm1rn06228dx0vc5gggd52155ys";
};
}
{
goPackagePath = "google.golang.org/api";
fetch = {
type = "git";
url = "https://code.googlesource.com/google-api-go-client";
rev = "eb84d1a029af1654777e7ba65c979085305c3e38";
sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l";
};
}
]

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
patchShebangs $out/bin/update.sh patchShebangs $out/bin/update.sh
wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs}
''; '';
phases = [ "installPhase" ]; dontUnpack = true;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ buildInputs = [

View file

@ -1,21 +1,62 @@
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner { lib
, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam, mesa , stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, scdoc
, wayland-scanner
, aml
, jansson
, libxkbcommon
, mesa
, neatvnc
, pam
, pixman
, wayland
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wayvnc"; pname = "wayvnc";
version = "0.5.0"; version = "0.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "any1"; owner = "any1";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-/OKkQKt43lR0UCmQeSDMl1hXh03k+dX3UweigMWEUx4="; sha256 = "sha256-WKtflN6DyzumOMEx+iX0AoIyGRN4nXUckmW/9Z2EW+Q=";
}; };
depsBuildBuild = [ pkg-config ]; strictDeps = true;
nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ];
buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam mesa ]; depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
scdoc
wayland-scanner
];
buildInputs = [
aml
jansson
libxkbcommon
mesa
neatvnc
pam
pixman
wayland
];
mesonFlags = [
(lib.mesonBool "tests" true)
];
doCheck = true;
meta = with lib; { meta = with lib; {
description = "A VNC server for wlroots based Wayland compositors"; description = "A VNC server for wlroots based Wayland compositors";

View file

@ -83,6 +83,11 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true; dontWrapQtApps = true;
dontWrapGApps = true; dontWrapGApps = true;
preFixup = ''
# The following libraries need libtiff.so.5, but nixpkgs provides libtiff.so.6
patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so}
'';
postFixup = '' postFixup = ''
for f in "$out"/bin/*; do for f in "$out"/bin/*; do
echo "Wrapping $f" echo "Wrapping $f"

View file

@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
name = "cloudlog"; name = "cloudlog";
version = "2.3"; version = "2.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "magicbug"; owner = "magicbug";
repo = "Cloudlog"; repo = "Cloudlog";
rev = version; rev = version;
sha256 = "sha256-IepCeV/mYy/GEzRTXf67LYQQaN5Rj5Z77KaF2l30r60="; sha256 = "sha256-9m7BuUNdGeKqi8pzeW2J9zpxShulpynCwJJGkRFkBa4=";
}; };
postPath = '' postPath = ''

View file

@ -26,14 +26,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "boinc"; pname = "boinc";
version = "7.20.5"; version = "7.22.0";
src = fetchFromGitHub { src = fetchFromGitHub {
name = "${pname}-${version}-src"; name = "${pname}-${version}-src";
owner = "BOINC"; owner = "BOINC";
repo = "boinc"; repo = "boinc";
rev = "client_release/${lib.versions.majorMinor version}/${version}"; rev = "client_release/${lib.versions.majorMinor version}/${version}";
hash = "sha256-KqD986Q7npKTnh0DdNgMHro+1M/UQHiNsXaRl9WjONw="; hash = "sha256-AVWgFsxeuHADEat83XQLLeQkzw3kaUdPL0rp8b6Rxyk=";
}; };
nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "got"; pname = "got";
version = "0.81"; version = "0.82";
src = fetchurl { src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
sha256 = "sha256-ayPXOtqJIJAzDTY1T4rw9GF7KvfI2XJ/c9uo4Fs8db8="; sha256 = "sha256-Lb0WZ4gTuG/GBAnEh9ff/K0ciwjDX3cmEhItMyJ/lmI=";
}; };
nativeBuildInputs = [ pkg-config bison ]; nativeBuildInputs = [ pkg-config bison ];

View file

@ -9,8 +9,8 @@ in {
} {}; } {};
sublime-merge-dev = common { sublime-merge-dev = common {
buildVersion = "2078"; buildVersion = "2081";
x64sha256 = "33oJOnsOUr9W+OGMetafaGtXUa+CHxxLjmtDoZliw0k="; x64sha256 = "QzJP25KxczmrR5PZ9ujRSM3V+TrKqiH82plo1bTv48s=";
dev = true; dev = true;
} {}; } {};
} }

View file

@ -16,6 +16,8 @@
obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { }; obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { };
obs-livesplit-one = callPackage ./obs-livesplit-one { };
obs-move-transition = callPackage ./obs-move-transition.nix { }; obs-move-transition = callPackage ./obs-move-transition.nix { };
obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { }; obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { };

View file

@ -0,0 +1,38 @@
{ lib
, fetchFromGitHub
, rustPlatform
, cmake
, fontconfig
, obs-studio
, pkg-config
}:
rustPlatform.buildRustPackage rec {
pname = "obs-livesplit-one";
version = "0.2.0";
src = fetchFromGitHub {
owner = "CryZe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-C1u4z7iQUETM84kf6S6obw+C0ox8J9gMJoVP3/3ZoYw=";
};
cargoHash = "sha256-mQ0TR4DL4bA5u4IL3RY9aLxU5G6qQ5W5xuNadiXGeB0=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fontconfig obs-studio ];
postInstall = ''
mkdir $out/lib/obs-plugins/
mv $out/lib/libobs_livesplit_one.so $out/lib/obs-plugins/obs-livesplit-one.so
'';
meta = with lib; {
description = "OBS Studio plugin for adding LiveSplit One as a source";
homepage = "https://github.com/CryZe/obs-livesplit-one";
license = with licenses; [ asl20 mit ];
maintainers = [ maintainers.Bauke ];
platforms = obs-studio.meta.platforms;
};
}

View file

@ -11,7 +11,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "${name}-bin"; pname = "${name}-bin";
version = "17.0.4"; version = "17.1.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

View file

@ -1,95 +1,95 @@
# This file was autogenerated. DO NOT EDIT! # This file was autogenerated. DO NOT EDIT!
{ {
iosevka = "1765nh5502m1blmnxmfpbc6qwscp3h78c361sz2libypiwsh20fl"; iosevka = "0lxcyg93max17fqm6yvxwvr79jz9bggxcmv6qx8sknvjmq89l0pf";
iosevka-aile = "0jnkaln0yyvj2cvh7ckwi181hzpw67lvyk9zclwjhzbmqy1w289c"; iosevka-aile = "0pljy65m5zaxbajfmhc3gayz73rbp8vzaqzqcrlm2ir9yxaz21qc";
iosevka-curly = "0m9qq02wfvd42zg4b33jvz6aiy4hlpvd25a812hd231763i3nixa"; iosevka-curly = "0svf6hm0cspydgzjg39f5rp7mrcabb0vc2088r1msipaw8naajqf";
iosevka-curly-slab = "16xnrzmarrk90gphbmn4cp7hvqba5j8w8lhxb5p9vjp9avg81bvy"; iosevka-curly-slab = "1afk0ijfciwh9pjy2qsawxw7gq7jxr52li2nwggcq04c9ybh62pg";
iosevka-etoile = "0dwnysyaf1ig8pdfbd16gv3lssivnwyx0mqvx24r42yvg6f4k043"; iosevka-etoile = "07zihk9q1ff93ms9gj92hbf2fzw7h4fl28szhrfll3p96y9f81q7";
iosevka-slab = "0724dz6q4hlxgakbqhzr5cxrlap16kqrr4m04rdvmnml606g3msh"; iosevka-slab = "18hrv0kc82hfb6ivbdg5k9179k37anjigm8ddh5waiq2is6gmh8l";
iosevka-ss01 = "09i8f2mzbsz211nypr3c6k4mkpng53p5xspxd0srnix48hn0yl16"; iosevka-ss01 = "127zki1wcd2wjpqr1n2zf57iq44pwcrg2vlrspi3b9lhmxw0rlz9";
iosevka-ss02 = "1ar36zm8x4s5wspis4mmk0bl0lgyj75dkhpx9h3hg8gk0y7rd2kl"; iosevka-ss02 = "0ig7y86c2d9y4bg5cqibbn0wqwwzm5d5qxd8vwhvd323mg3gh6bg";
iosevka-ss03 = "1m66m6hangpzxbdmcpzqnrx79sc7w9id8c7w3l6lik3xkhwlqj9q"; iosevka-ss03 = "0zp2nkrl39pvidn846706dp8l12ac66kd9wsyh4cnn08mmm6gl4i";
iosevka-ss04 = "096h5zgv69j96a4ylyzjiy94qiyyk411n27by7dsxmj0kfzcrlyx"; iosevka-ss04 = "0r0ylsxj2j9akpxchnldwyddm7vrlpn82sxkgmjhr81hn3q08bgc";
iosevka-ss05 = "0r9xln2zmzns4abrxaznv9qi6y2sdaq957sh0v5w866bkgcbdrd6"; iosevka-ss05 = "0r9mdhdjndxgm68fg59dbd810ggrpmpkvgcypyqf92l8sf1h55hj";
iosevka-ss06 = "0dhj8hqf5ja1zyqlsw7blw4al713014khdbh5mm44qilgxzp5s2p"; iosevka-ss06 = "1c6ga4jaglfp5mx980qy1alkifr1d1lq4qj69xfq6sx4146xn20f";
iosevka-ss07 = "0d8sycqnfvw1v4b5smj1nbwf1n7bkjqky4m6f0a0xmbgbd50aaz3"; iosevka-ss07 = "0h1x2p9finl4482vx6lvs45x5258bpw5avkpgmg66wn16kd95zfq";
iosevka-ss08 = "1psrg7dmkgyg47a96p1k5izsnhnw6jqp9zkv91r92yxx6dlag6fd"; iosevka-ss08 = "1n5m11dlv49jj63s771ny77qpiz178iyvn7pfnhv2mzqwimz5sl2";
iosevka-ss09 = "0mws0jakjybkj6bh9fsksi1mam642ravlcyz7j8q9h301ibkbm07"; iosevka-ss09 = "1rbs15xsk7fajrm81nacixf18jjx08bpg26fw7pmxjv727zafv05";
iosevka-ss10 = "1rz8qxjydcvr124rrvdd2hn0ykcwhpvyv40rs5kqc8saz9v60wcv"; iosevka-ss10 = "1rdpiq5pyzrnxhnsvf08zg0vjhln25vqkyknnv4xf34wr8r9xcc0";
iosevka-ss11 = "1bz2lbp0d31222b1mxj7s5vr9irfb1iy4pfq8fhh24gfdgnznr73"; iosevka-ss11 = "0l9454vx90pj0yva864qfj06ggplia0qdkv3nr14s3wmv5khh9gw";
iosevka-ss12 = "00xnqbpdgklxlkr7vnznrqh65zwn7szs4pb4bhd3z9mx6rb6ai7a"; iosevka-ss12 = "0cafszj0c7nkcxpbqsrqy5l2v0nzfph6i22w1iayg8bqvpip3x5m";
iosevka-ss13 = "162xr2kgq5sv7c3lnb8wvxzb5ddw20njy52q8p6mvyak47h1wh0k"; iosevka-ss13 = "1mlxh6qikrl0g82difr85lpkxdr83z5iymf0brmgdxkmyig3psr7";
iosevka-ss14 = "17vlj4z8y0i9q7cb6b4h35wj82cv3cq7x0wyjnm0amzsn3xvv09j"; iosevka-ss14 = "1330p52h94fgr76gll396hb0qalamm8z79hw73ci4ph22dpsd4ni";
iosevka-ss15 = "1czw0r76b9414vk098rzaf204z3a37xsvwy919ibiszd2pc9fsyl"; iosevka-ss15 = "0cc5a1187i9idgvz7zhs0byya8c69f0g4pkqlivh37ffj07yv47v";
iosevka-ss16 = "08bc0qj1dcgnmhj1x07xncy82bi6mzhx1wl9x0s9bfkjx69cf9rk"; iosevka-ss16 = "052nypjppbrbkhjq85nwmx8469prfsbc9f05kw0vi30c8mpcjqwf";
iosevka-ss17 = "1q239m4xz7whdf61ic8n56ymvqmk7f1ab898zs6x1ylv65ai9ixz"; iosevka-ss17 = "0k5p1qvx8vi8ic7yayky7zdi1hrkwli698ydlfhnk4yx10l0xq8j";
iosevka-ss18 = "0ccicy1862rpmgihdaj0624437cbjci24ivlqlj9k61p5zrg0gn9"; iosevka-ss18 = "16diyrfpz1kp9vcyq61pbdrrv4pl96kzn8ckv7wb5cnwxwa336c7";
sgr-iosevka = "0jc6j2lzh3qj72wi5wp7b7adk865nmfb4jxlj7mgn14ni0chd3sx"; sgr-iosevka = "0b92jmai9cgxdah74jmks7fwbyb1m722ablf3qaiizc597y031wv";
sgr-iosevka-aile = "0vx2rx09749f28xbi0i2ml9hfk1rhr2wx4afsg151gx37slvrc4w"; sgr-iosevka-aile = "1z5jg74aspkvhw41ihwzbfs4f075gs8ny76m30adp0n3v877nhjz";
sgr-iosevka-curly = "18lpx5rxl2c5mg69wym63nggaq2vgi84b071ikjz3z77zv7ykdy8"; sgr-iosevka-curly = "06bm6jg16sgvxnqbayqa92lvr0bc5vdjybbi467yx57hi83w860q";
sgr-iosevka-curly-slab = "0g2x2v9ld536c8qrxwmdw9gv8lbg3g5xmmd9zpmqlc302v43arpz"; sgr-iosevka-curly-slab = "08kg8imp29sww57mdpfmi86046vqwd4a2ayijcvs511v8nhl478r";
sgr-iosevka-etoile = "172003jxpf5867x7yr1741561k7lbmn152djjf54313273s62imc"; sgr-iosevka-etoile = "0gybfn95n2b8kn3bvi8pjkps5bmndnbbq9jbfbm81fims0s0496b";
sgr-iosevka-fixed = "08cwln0q0w2sf9kjngq21150azp4550np9lmxg07bvj7r1h1x8yg"; sgr-iosevka-fixed = "15q4y8cm8cwxcbmjzknc19gyqmd4nb928b26nswm8m17p85zlcq0";
sgr-iosevka-fixed-curly = "1fnxxxrnqdgm3c5f0n8sbv53x4drmmjcwy03fwax2zsmhx8v545i"; sgr-iosevka-fixed-curly = "1faci2m7w8cf65mjkigqlyh838r5mqvg7ai4nfdidms6ilhhsf37";
sgr-iosevka-fixed-curly-slab = "1n6fcmnwbxcrylh9dkidd0sdn4sw8b3xymh9dr521acnnp4zcbmc"; sgr-iosevka-fixed-curly-slab = "019m3nvsy6vwgf6f0z2l0wxxkqbl30y55jfgi2bsmxhizwzl3csc";
sgr-iosevka-fixed-slab = "08pyarvnwnkf4yvmnls60ydbnkrkkvm91fkvc7hj237hi11ka3mh"; sgr-iosevka-fixed-slab = "1ps1xi334h7by3nihn3n6d76sbzcvv03dwy4iy5wixlz0lr8id5i";
sgr-iosevka-fixed-ss01 = "0gfffkjpqwhcazcr4p287fhi81rlb3pdxxljpx8m08anq5g8lzb9"; sgr-iosevka-fixed-ss01 = "18qdd6qbk8dy6z36lsy89a7g6l1asdzqvlc82j9vk437yjm59vwi";
sgr-iosevka-fixed-ss02 = "1k0433d552j7j7bdaq9vink6v2kkbfhj66f3riw6a6bfcda15j7b"; sgr-iosevka-fixed-ss02 = "0xm1k1f5hbhjbksshlv7bcdigdrxxhfpc8pgv7dvz7zpy7cx2y4y";
sgr-iosevka-fixed-ss03 = "1i11pgx8ifp654y08m5wjvzlghvcaf47946s6rv0x0n4v3ybjnan"; sgr-iosevka-fixed-ss03 = "1741k3p2mncq9kp1wshpl6dkwqvvg2bpakl91k6ssvj1z63r2zhq";
sgr-iosevka-fixed-ss04 = "1jlghxl8ca4yx3w9m1v6y8abyh7pi1chnrmfn4xjxnrmchn6zjvc"; sgr-iosevka-fixed-ss04 = "0sw65088yihk2sk2mcdr4cd8rl9l954l2sc3y7dil3jkgw6kf0wq";
sgr-iosevka-fixed-ss05 = "1xkz9vw6qk1al3brxy9ay3dny5s0bi3vjhg9j10igs4n5m2gba1a"; sgr-iosevka-fixed-ss05 = "1cc71vidcljh6k6pw6z5yygi0kir7n235l19as8y1qazmc8kh0ip";
sgr-iosevka-fixed-ss06 = "1bch2vm22s9hv8njvwkjz5bsf4529q911k0p76pwmx389hqm2dcm"; sgr-iosevka-fixed-ss06 = "0s2f0j0z4dyd23z5mldih03cg8vqwvpqrmagbpx02v2krzn2vb27";
sgr-iosevka-fixed-ss07 = "0is0pg745kyvy78la73zaic9bp44xd2d3gcqy1bj0hncj573m0zc"; sgr-iosevka-fixed-ss07 = "07nfdx7bdbsxrmylsja8bvr1n2a116qyfg8pk1wpcax3vf56jamh";
sgr-iosevka-fixed-ss08 = "1a3jpfcix555pkm6ifvb6zqwhq9vbg7rv3q6w826wzkmvcbc94wx"; sgr-iosevka-fixed-ss08 = "0ys6gw2p7vpdv8csxzxjx09m8k0h4s28w7i98iq27ak47xcm8xd7";
sgr-iosevka-fixed-ss09 = "0wfpwljxrqrrjm3c9salbwz628qqz7j0hvwwqkjr0cva4gqwrzjy"; sgr-iosevka-fixed-ss09 = "0vn6vc0byakggyrd6d9mv1l9d4h5g7wcbkkmxzqfjr6xp3k96r88";
sgr-iosevka-fixed-ss10 = "0pcpi1cycdj41b4m2h2aa39aak673d4hp8gbs9j665c2749mfllq"; sgr-iosevka-fixed-ss10 = "0llqjvv7m1imvqw41xvmcw9y9c9wsnv2i8swnszr9r5khx3kbp6h";
sgr-iosevka-fixed-ss11 = "0jiv860lr20v67b2w1dss5qm10ydpkl82857rx9bq6jc3a5wld06"; sgr-iosevka-fixed-ss11 = "1wwjp1fgl2gxhjkmsz6k0a59kjcapby9y8j5m763ap4ig5djbv8r";
sgr-iosevka-fixed-ss12 = "1wsidq0v01ww8ylkv2fxy518k96gqmfgfd8f7j0nb63a0qh1iqlf"; sgr-iosevka-fixed-ss12 = "1k9ak5dc3s024iz6rp4yz9b73752v93n0kldcnwi0lvbh4hp358k";
sgr-iosevka-fixed-ss13 = "19wvawm8ygkr7h5nsgln4vmkxdq5g35j035l8rbfsvbn6hb0znnn"; sgr-iosevka-fixed-ss13 = "0rgj38jkj6d7g44wn02k6ycixkwq6lwy756vp9w01aqqn5flw6s1";
sgr-iosevka-fixed-ss14 = "1jvj70n5qj7mriczy6l7fn94d4mk3kkljg0f62n3bhp749n4h28j"; sgr-iosevka-fixed-ss14 = "0lbpwnc40lswlmfwqziz7n3kn95kc5rn4fbq5nxa1z8cxz9dkhvh";
sgr-iosevka-fixed-ss15 = "07lnaask7qrl6fjvf4ddxl8ijisga34h3prydhm4h2v4l1hwhiyg"; sgr-iosevka-fixed-ss15 = "034h7af7876q0ni8idj5dhkq1cpl91gvxhwxyw17pgnz8i51a261";
sgr-iosevka-fixed-ss16 = "06hg2mfb9kvn7s34vd7jkvr4mhsrs3z0xaw8ny2g4bx4nwb3cwsz"; sgr-iosevka-fixed-ss16 = "0i00nxj0j7yr57b4ccd2yc4x7k8zw1xxpdwfwlm0n38c05iqbvj9";
sgr-iosevka-fixed-ss17 = "0ggx0g673d1kb8pxn9iyixqidi2kniggvaadkqryn22xxppvyn72"; sgr-iosevka-fixed-ss17 = "1z21han7l7nwz0qfi6fzvwdiadd9brpna51p24drdi8y3915b8n9";
sgr-iosevka-fixed-ss18 = "0yiii5jf76dqrs5ivnnf5dk8lyf8snrl2iycpfyrfp2mi786qw8l"; sgr-iosevka-fixed-ss18 = "0fjdsx66al0h3spgdivryiw5d871s93s2lbmh7nxwf19lylrkv19";
sgr-iosevka-slab = "10m4p6vgkbvk5m0y10bpxm8v913k1xrm50f6c6gghsgvsd5954wc"; sgr-iosevka-slab = "0j42hxgcwy5abf5jv5aqjri6h21k2nkgjj7527f68rgcnl9d980b";
sgr-iosevka-ss01 = "0rmjdx4cigazb47cismx51qni7kvb5zylhl504gq0l7rw4f941mw"; sgr-iosevka-ss01 = "1m7c8zb3rhxnf9h4v55jv7ns6x74bwfsl6f4sl2b1gkfl50ibwqg";
sgr-iosevka-ss02 = "18i85pbcz2ikaa0k52gslmh4pnirdmwg50rxqcw5dpf3sfd64k1s"; sgr-iosevka-ss02 = "05cc3p8lkxl1s27wmgspk93fz8f51daqcfid8vpsvnqw75abivc9";
sgr-iosevka-ss03 = "0466l4kdfyy6qga0gw0iihlx4jh3zsw3nscgr0mp5rff8kxrllyv"; sgr-iosevka-ss03 = "0bmh1ijdalss96lkji0dcyl00wc2yw7a3lx0nqbbjl4m0l2mz4yp";
sgr-iosevka-ss04 = "0h8zji83q4c12bs0dnllb78s66c852ffqwr377ma4clk0d70qgdx"; sgr-iosevka-ss04 = "1jc1y9rgw8hnd7zqrn98b35r01kmr2nykqip63h6qal7l456m4s2";
sgr-iosevka-ss05 = "0gnlpf4j0d01a7ihv94ac5rlskzpcdyrxzy38d7fg7x8z13bi507"; sgr-iosevka-ss05 = "06acxqhzfxlhqd083s57b15sx2vgq0r6pl9myp8syh1d9azbk899";
sgr-iosevka-ss06 = "0q8q8q83p95yrgszcm8yk0vqrmi5g8psymvx8lrl9caskjyf5gk1"; sgr-iosevka-ss06 = "0g3zaxy9363p28kcv6a52dqb1swnrn3rwl6pfvanz92vrrjspr7n";
sgr-iosevka-ss07 = "1n9k9nk1izx9rw3c17bvr1fhj7nqq1sl1j3r9v9s7wh99wliwzvb"; sgr-iosevka-ss07 = "1bmdparw1hg3i8lnx8vwd467pwf4q94q80a62fcy87hppy3afryg";
sgr-iosevka-ss08 = "0b6gm4aq21lf60dmw0bbi0wm37qf5yd5x53fvd1zd3iqk9jcr4jb"; sgr-iosevka-ss08 = "16kgj158nhmlql0gkkfya04dy1gp9an4gk691f28n0mqhi7hygcr";
sgr-iosevka-ss09 = "17iwjzh5dg4gsnzihakbriwwyqnb8rk0z33ay4zn2hml0b7g03kv"; sgr-iosevka-ss09 = "144x84qmh9pycn9v36q4z074vmnngn0chlyb8a8hyhgsyfqf7q7h";
sgr-iosevka-ss10 = "1jj8fy5l96dfd5fn3v1dqzpiyqimhqh6cplzgg7mzp94pabwrrrx"; sgr-iosevka-ss10 = "0i9hsmw78yg75a3m80jlmdn2rn72snz69m0abvz7z94b7c99ffsb";
sgr-iosevka-ss11 = "02hw77qwi5gazpf153cfhkf24ngsfjfkxn4mjxxr89b1z6jsbkv6"; sgr-iosevka-ss11 = "05a9azf7f64jdr5wwiy7djlmarl01mg6rfmzvrdd8a1a0nfcz1iz";
sgr-iosevka-ss12 = "1365v9chsg93lyjsv1p239kr9p11x9cz87s9l0pzdx1liaby6zdl"; sgr-iosevka-ss12 = "1nqa88csh170gs3bggs6v5ssaqljvpw1zxaclhmzdvyhcphrwd19";
sgr-iosevka-ss13 = "1bzl0zr4g0rxkwbkgpdqxw6l01g0wlqi868c0b9lzkf14dpl4g7f"; sgr-iosevka-ss13 = "1klhp2w99znj9qyz95z8jq3g23fs8jznya9dfzfy2i4hivw2gxv0";
sgr-iosevka-ss14 = "0iksdqrylgbyykixa4h5ajwrsjd818l626f176kih4cwl1l31hlh"; sgr-iosevka-ss14 = "1w84mqg0x46fbr8v72ccxc9a7sp52g4qb0x6l84wr8cm1fn7n21f";
sgr-iosevka-ss15 = "018wl1pv1phq0msw16wc8h77vhpmx30z7z85i09lwi5lsa8k6sqh"; sgr-iosevka-ss15 = "05kdxmghhdyvlnc3wxzc5yyp00ybrq63fzh2kz3s4rwh11hhf0lq";
sgr-iosevka-ss16 = "1843xvzppkssaz7w43gqk606c3qv5gkj83s91gv1zcj5dkw7r6s4"; sgr-iosevka-ss16 = "0a9i7plsfy8fawip70p5w3dkmjh4sy61iwi9pnl0ara7z23783dq";
sgr-iosevka-ss17 = "1x8i1ixs99wwvxs0hpvjw87dzwix0kllnvkbyj9mikdprlaj5fv0"; sgr-iosevka-ss17 = "1xmaqs54jhag7s18gfll94g0ixjqp2z5s69kwk48nznzpbfbpdsb";
sgr-iosevka-ss18 = "0jday3yxajg79xkf346rak7qk34fil7bm4821j84nlpx2pv9hnl8"; sgr-iosevka-ss18 = "09nq0a7b4hkiyi1prxpf6vwms9cnmby2dzn9k4y0xcax7m464531";
sgr-iosevka-term = "1a5j06ch0sbbbg5gka4anlx7jdgdma0imbd69jkcp6wimdr5scjh"; sgr-iosevka-term = "1zr8cyq6578n8f3y9yyc0phs26hda1bf0bsd417wqcwsn88wfmx8";
sgr-iosevka-term-curly = "1ba099crsfljg8isvc7bvwxg6w4nv98q9451b92vwr6szmz18a6v"; sgr-iosevka-term-curly = "0xlwljc2gmwh119x83p2pic5zwjqdymg7pbl2ginzilsrgjl2k0q";
sgr-iosevka-term-curly-slab = "0linlp56r1zxjk5517npy92flnw2iy2pdjpzklhm6f42yzpkz6a0"; sgr-iosevka-term-curly-slab = "1vmpdws71sf1pf8nz3w7y0a64a5c3mp8f9w57bqmcn9vr22ymcl7";
sgr-iosevka-term-slab = "1m19gxb5cyvswmdccyskfy9b0ymgibcnxsmcrn56k5df15hlb12f"; sgr-iosevka-term-slab = "1wkqdgy9nd4mvy4rsssvpis1r17ikpbl8mfx6bp80fh0lai97mxw";
sgr-iosevka-term-ss01 = "1b1ixxjv0ryyahm17w4cr9cydwq41vg4nzyii4pj6agzpi28yczg"; sgr-iosevka-term-ss01 = "1ly5ic5ihj00apb87am3kl38mywns8jizc7f4hniyrd9xhy1186z";
sgr-iosevka-term-ss02 = "1155c7gcfcrb6i5w2qbwicnvbhda9vg753wghkwc6fbzyg95236c"; sgr-iosevka-term-ss02 = "09lisy461dvppfv6sdk4i6vfrqhxyx558zdaflv9vskmfq8iq66d";
sgr-iosevka-term-ss03 = "14nm4nn3szvj3is3c0b88li6ks7yizr4fjgw2jj0sl76ypj4if8z"; sgr-iosevka-term-ss03 = "0nm84l4xk53l1q96hx8q63nbflgmivj3cq7z5mysv1z8jdp7isx3";
sgr-iosevka-term-ss04 = "0j58sbffmmwa7i4b0slz789j5lrlqaizxbmfg8qzgccwp75q1s4a"; sgr-iosevka-term-ss04 = "1y9kkasxmpm4n1vs5plsa25cgwvdi4jahn3ggdlxpl35yi4kxnr3";
sgr-iosevka-term-ss05 = "0jmiiacpjp3x5x70sybbhnnjqsmjhs4l1pgj4baqxc0lgj2j5xxl"; sgr-iosevka-term-ss05 = "1drngqgcibv6kfwjn3s2bik286ypj613q4p3fz0b7incniaz372j";
sgr-iosevka-term-ss06 = "1w8b708njfhjcv36vpagnxvsij81gylmlwhn69ahnw17wvhw63c5"; sgr-iosevka-term-ss06 = "1rkqnj59hv1lzsplss3jk0jgz6q68qkg4a3200hv10rs9i2w2qxk";
sgr-iosevka-term-ss07 = "1v7545d84jraa7mxm9k2yx7ik5wp1hy6r4lfpwsxd3n8x5kgvbcr"; sgr-iosevka-term-ss07 = "1z6jh8qmc2063zgwbd00xi258grdillkc1nja69awdxiamv6hgf9";
sgr-iosevka-term-ss08 = "10v9c4rmb2932zsh7qz9ij1q04r0d7y08rxlnjr8w6g57kn7mmd9"; sgr-iosevka-term-ss08 = "022qw6frmmmpwbq6af8rysm8pbq713fiw92hkqi5k3j4v8dwl9v2";
sgr-iosevka-term-ss09 = "0j12j6qwnrvkyh46qvzgzip4jpkxcbg80bfkplrskrwglcdxig68"; sgr-iosevka-term-ss09 = "1c32p4d46q3izif68ka6gr1hmq10snrlga5d7ypphmm8yxvavd9c";
sgr-iosevka-term-ss10 = "1racjzqllhlz6xpad5cnms0m8psmrv3b4flqivdh4w8r6alpavpw"; sgr-iosevka-term-ss10 = "1p497kqa386q5rvsfigzxdr0009agiw4bv4xxmb83pg3sl8bf7z9";
sgr-iosevka-term-ss11 = "1vn3s084z46sszil1g5mf2z31hndxpb7a835b306rklnrsv87h3k"; sgr-iosevka-term-ss11 = "19kfvmwijd1kyw4bln0m5z7wpch9h44ny13ccxx0qmiv5y7wwm94";
sgr-iosevka-term-ss12 = "0pm9c06vfx9c322zqyq54ibfmrhnfmn8yqa682z3y4sss20gw2nb"; sgr-iosevka-term-ss12 = "1pnr7yd431xnym12vnlww6rxm1vfd9x24kqpx0323q3n61yjqzd6";
sgr-iosevka-term-ss13 = "1ixd92l81hanzkdmkgvz302ghjdx9x96rcl4j5qf4amxa77hn341"; sgr-iosevka-term-ss13 = "04nhps95s360vv4qr1pbzs1aj8zdalzv4ajdkawdssxaz1xs57c7";
sgr-iosevka-term-ss14 = "108l7wb90fyimfzzxc08rw0z67iabvd9mliybsqp4cv73d408lni"; sgr-iosevka-term-ss14 = "1xvdpx8sa4ifgy9a3y65qcxj8cavisw4h7hjfivq4y0il79sl7nw";
sgr-iosevka-term-ss15 = "0knhyvjy9wsrd209sy5h3q4mrkj49kgr76fdzgn4j4mmssnjkvp2"; sgr-iosevka-term-ss15 = "03rs8b8yb7n1f7cp6zffgr7x20vx6hiag7a22ysx0zr2i4zp37i6";
sgr-iosevka-term-ss16 = "1hydhyhd25gpj0r3xlv2n3m34vbx0nfqgy07vibywhq0pm29ywkr"; sgr-iosevka-term-ss16 = "1s86hmr7a6qwyf5m9q0npzzd25nvh9k1nlja1b8fnnlgchycwfbw";
sgr-iosevka-term-ss17 = "1j84529d54kxvxf7xlilh6xpn1nrv8ablkyg829y5v2ad06db14m"; sgr-iosevka-term-ss17 = "0y5i99iy7r3z4cv87s3v3mxbadp3np16a3c65w41pjv86llkc30g";
sgr-iosevka-term-ss18 = "03vvcmvrhkb4rsj1vvvnvprawzwk71s4756wvr0dfngc838nrmg5"; sgr-iosevka-term-ss18 = "0s5hdh61y5v17jrdpajgkzzrg0cqgcad6gvs9m8v55xi2zlqfxip";
} }

View file

@ -25,11 +25,11 @@ let
in in
builder rec { builder rec {
pname = "guile"; pname = "guile";
version = "3.0.8"; version = "3.0.9";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-2qcGClbygE6bdMjX5/6L7tErQ6qyeJo4WFGD/MF7ihM="; sha256 = "sha256-GiYlrHKyNm6VeS8/51j9Lfd1tARKkKSpeHMm5mwNdQ0=";
}; };
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];

View file

@ -6,6 +6,7 @@
, SDL2 , SDL2
, libiconv , libiconv
, Cocoa , Cocoa
, autoSignDarwinBinariesHook
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported , openglSupport ? libGLSupported
, libGL , libGL
@ -27,7 +28,8 @@ stdenv.mkDerivation rec {
hash = "sha256-8b9rFI4iRpBJqeJ2KRJ9vRyv9gYwa9jRWCuXRfA3x50="; hash = "sha256-8b9rFI4iRpBJqeJ2KRJ9vRyv9gYwa9jRWCuXRfA3x50=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ]
++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ];
propagatedBuildInputs = [ SDL2 ] propagatedBuildInputs = [ SDL2 ]
++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ] ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ]

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aml"; pname = "aml";
version = "0.2.2"; version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "any1"; owner = "any1";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-WhhjK9uzKyvnzpGtAWXXo0upfZTPINHVk0qmzNXwobE="; sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q=";
}; };
nativeBuildInputs = [ meson pkg-config ninja ]; nativeBuildInputs = [ meson pkg-config ninja ];

View file

@ -10,13 +10,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "librime"; pname = "librime";
version = "1.7.3"; version = "1.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rime"; owner = "rime";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-GzNMwyJR9PgJN0eGYbnBW6LS3vo4SUVLdyNG9kcEE18="; sha256 = "sha256-tPuDDVV4ZeBva/oHcw0rNjkzYmCtT2vLCdwCukBM28w=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libunibreak"; pname = "libunibreak";
version = "5.0"; version = "5.1";
src = let src = let
rev_version = lib.replaceStrings ["."] ["_"] version; rev_version = lib.replaceStrings ["."] ["_"] version;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "adah1972"; owner = "adah1972";
repo = pname; repo = pname;
rev = "libunibreak_${rev_version}"; rev = "libunibreak_${rev_version}";
sha256 = "sha256-ju+DNCzwD+y/ebLVBU96iNpE1Wt7/K0qLcZHzWGzrWQ="; sha256 = "sha256-hjgT5DCQ6KFXKlxk9LLzxGHz6B71X/3Ot7ipK3KY85A=";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

View file

@ -1,20 +1,52 @@
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja { lib
, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml, mesa, ffmpeg , stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, aml
, ffmpeg
, gnutls
, libjpeg_turbo
, mesa
, pixman
, zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "neatvnc"; pname = "neatvnc";
version = "0.5.4"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "any1"; owner = "any1";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-IZUCNHhlDhq0KlUjkp3Yh5ysJsThlGw1FLHSaFe4Z0Q="; sha256 = "sha256-3hNdgfAJGJkMXdB86+u3bKwrvXoMei1YCFXDG4ObkU4=";
}; };
nativeBuildInputs = [ meson pkg-config ninja ]; strictDeps = true;
buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml mesa ffmpeg ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
aml
ffmpeg
gnutls
libjpeg_turbo
mesa
pixman
zlib
];
mesonFlags = [
(lib.mesonBool "tests" true)
];
doCheck = true;
meta = with lib; { meta = with lib; {
description = "A VNC server library"; description = "A VNC server library";

View file

@ -174,10 +174,11 @@ let
cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult
''; '';
inherit (darwin) cctools xnu; inherit (darwin) cctools xnu;
inherit (darwin.apple_sdk_11_0) libunwind; inherit (darwin.apple_sdk_11_0) libpm libunwind;
inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.libs) sandbox;
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit
ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication
MediaPlayer MediaAccessibility SecurityInterface Vision CoreML;
libobjc = darwin.apple_sdk_11_0.objc4; libobjc = darwin.apple_sdk_11_0.objc4;
}; };
qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};

View file

@ -14,9 +14,10 @@
, systemd , systemd
, enableProprietaryCodecs ? true , enableProprietaryCodecs ? true
, gn , gn
, cctools, libobjc, libunwind, sandbox, xnu , cctools, libobjc, libpm, libunwind, sandbox, xnu
, ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit , ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit
, ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication
, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML
, cups, openbsm, runCommand, xcbuild, writeScriptBin , cups, openbsm, runCommand, xcbuild, writeScriptBin
, ffmpeg_4 ? null , ffmpeg_4 ? null
, lib, stdenv, fetchpatch , lib, stdenv, fetchpatch
@ -94,6 +95,11 @@ qtModule {
--replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]"
substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \
--replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]"
# ld: warning: directory not found for option '-L/nix/store/...-xcodebuild-0.1.2-pre/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/lib'
# ld: fatal warning(s) induced error (-fatal_warnings)
substituteInPlace src/3rdparty/chromium/build/config/compiler/BUILD.gn \
--replace "-Wl,-fatal_warnings" ""
'') + postPatch; '') + postPatch;
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
@ -105,8 +111,6 @@ qtModule {
"-march=westmere" "-march=westmere"
] ++ lib.optionals stdenv.cc.isClang [ ] ++ lib.optionals stdenv.cc.isClang [
"-Wno-elaborated-enum-base" "-Wno-elaborated-enum-base"
] ++ lib.optionals stdenv.isDarwin [
"-Wno-elaborated-enum-base"
]; ];
preConfigure = '' preConfigure = ''
@ -177,6 +181,11 @@ qtModule {
Quartz Quartz
Cocoa Cocoa
LocalAuthentication LocalAuthentication
MediaPlayer
MediaAccessibility
SecurityInterface
Vision
CoreML
openbsm openbsm
libunwind libunwind
@ -184,6 +193,7 @@ qtModule {
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
cups cups
libpm
sandbox sandbox
# `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py`
@ -235,6 +245,7 @@ qtModule {
(isMips && isLittleEndian)))) (isMips && isLittleEndian))))
(map (plat: plat.system)) (map (plat: plat.system))
]; ];
broken = stdenv.isDarwin && stdenv.isx86_64;
# This build takes a long time; particularly on slow architectures # This build takes a long time; particularly on slow architectures
timeout = 24 * 3600; timeout = 24 * 3600;

View file

@ -4,7 +4,7 @@
, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv , enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv
, enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." , enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given."
# Darwin support # Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc
}: }:
@ -34,6 +34,7 @@ in stdenv.mkDerivation rec {
libXt libXt
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
xpc xpc
AGL
Cocoa Cocoa
CoreServices CoreServices
DiskArbitration DiskArbitration

View file

@ -3,11 +3,11 @@
buildDunePackage rec { buildDunePackage rec {
pname = "cairo2"; pname = "cairo2";
version = "0.6.2"; version = "0.6.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";
sha256 = "sha256-a7P1kiVmIwT6Fhtwxs29ffgO4iexsulxUoc9cnJmEK4="; sha256 = "sha256-QDVzUtcgXTpXNYVWQ4MMs0Xy24OP+dGaUyAYdg1GigU=";
}; };
minimalOCamlVersion = "4.02"; minimalOCamlVersion = "4.02";

View file

@ -6,13 +6,13 @@ else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-ctypes"; pname = "ocaml${ocaml.version}-ctypes";
version = "0.20.0"; version = "0.20.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocamllabs"; owner = "ocamllabs";
repo = "ocaml-ctypes"; repo = "ocaml-ctypes";
rev = version; rev = version;
sha256 = "sha256-fr60H/hiSVjEg11qM8LF1Y5CotS3FEyFdCcIh0A0uI4="; sha256 = "sha256-H1QR0MJCqRdXxRufCA663wzTNWQ8MYYAy2nz/XHCn0Y=";
}; };
nativeBuildInputs = [ pkg-config ocaml findlib ]; nativeBuildInputs = [ pkg-config ocaml findlib ];

View file

@ -3,24 +3,25 @@
, faraday , faraday
, fetchurl , fetchurl
, lib , lib
, ke
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "gluten"; pname = "gluten";
version = "0.2.1"; version = "0.3.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz";
sha256 = "1pl0mpcprz8hmaiv28p7w51qfcx7s76zdkak0vm5cazbjl38nc46"; hash = "sha256-9jctX3G/nQJTGJ7ClSBEiXwxeu0GcT9N+EmPfLuSFOU=";
}; };
minimalOCamlVersion = "4.06"; minimalOCamlVersion = "4.08";
duneVersion = "3";
useDune2 = true;
propagatedBuildInputs = [ propagatedBuildInputs = [
bigstringaf bigstringaf
faraday faraday
ke
]; ];
doCheck = false; # No tests doCheck = false; # No tests

View file

@ -7,7 +7,9 @@
buildDunePackage rec { buildDunePackage rec {
pname = "gluten-lwt-unix"; pname = "gluten-lwt-unix";
inherit (gluten) doCheck meta src useDune2 version; inherit (gluten) doCheck meta src version;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
faraday-lwt-unix faraday-lwt-unix

View file

@ -5,7 +5,9 @@
buildDunePackage rec { buildDunePackage rec {
pname = "gluten-lwt"; pname = "gluten-lwt";
inherit (gluten) doCheck meta src useDune2 version; inherit (gluten) doCheck meta src version;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
gluten gluten

View file

@ -2,11 +2,11 @@
buildDunePackage rec { buildDunePackage rec {
minimalOCamlVersion = "4.07"; minimalOCamlVersion = "4.07";
version = "0.2.0"; version = "0.3.0";
pname = "optint"; pname = "optint";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/optint/releases/download/v${version}/optint-${version}.tbz"; url = "https://github.com/mirage/optint/releases/download/v${version}/optint-${version}.tbz";
sha256 = "sha256-HcvgtrYDH3fbMwKMhxOP2zv5D5KRXjtmKd3rMKDTAAs="; sha256 = "sha256-KVz/LBNLA4WxO6gdUAXZ+EG6QNSlAq7RDJl/I57xFHs=";
}; };
meta = { meta = {

View file

@ -2,7 +2,7 @@
, buildDunePackage , buildDunePackage
, ocaml , ocaml
, dune-site , dune-site
, fetchzip , fetchurl
, gluten-lwt-unix , gluten-lwt-unix
, lib , lib
, logs , logs
@ -22,9 +22,11 @@ buildDunePackage rec {
pname = "piaf"; pname = "piaf";
version = "0.1.0"; version = "0.1.0";
src = fetchzip { duneVersion = "3";
src = fetchurl {
url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz"; url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz";
sha256 = "0d431kz3bkwlgdamvsv94mzd9631ppcjpv516ii91glzlfdzh5hz"; hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU=";
}; };
postPatch = '' postPatch = ''

View file

@ -5,8 +5,8 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.3";
pname = "scripttest"; pname = "scripttest";
version = "1.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
@ -20,8 +20,8 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "A library for testing interactive command-line applications"; description = "A library for testing interactive command-line applications";
homepage = "https://pypi.python.org/pypi/ScriptTest/"; homepage = "https://pypi.org/project/scripttest/";
maintainers = with maintainers; [ ];
license = licenses.mit; license = licenses.mit;
}; };
} }

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "air"; pname = "air";
version = "1.40.4"; version = "1.41.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cosmtrek"; owner = "cosmtrek";
repo = "air"; repo = "air";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-MipTBepFLcP3TJQtCLi/33D6HCJu4oX48tGnSGG5qho="; hash = "sha256-31C1iNiYokClAZlk9KOVE12lFdOKJBSOwQK+zOp082k=";
}; };
vendorSha256 = "sha256-+hZpCIDASPerI7Wetpx+ah2H5ODjoeyoqUi+uFwR/9A="; vendorHash = "sha256-i3bXf/EsPAJOg2aWh4mANtNeRXnie4jtuLCd/01DB/0=";
ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ]; ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "micronaut"; pname = "micronaut";
version = "3.8.1"; version = "3.8.2";
src = fetchzip { src = fetchzip {
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
sha256 = "sha256-DBWPKy17pYU5VWEOxnaP2AKoiskNCBbt9QqO6xxf7eI="; sha256 = "sha256-a07vFya7c8ai0YjNvXCAWSoQLH81U4cIr0QsgX3WcJY=";
}; };
nativeBuildInputs = [ makeWrapper installShellFiles ]; nativeBuildInputs = [ makeWrapper installShellFiles ];

View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/"; homepage = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/";
description = "Pahole and other DWARF utils"; description = "Shows, manipulates, and pretty-prints debugging information in DWARF, CTF, and BTF formats";
license = licenses.gpl2Only; license = licenses.gpl2Only;
platforms = platforms.linux; platforms = platforms.linux;

View file

@ -2,16 +2,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rsass"; pname = "rsass";
version = "0.26.0"; version = "0.27.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; pname = "rsass-cli";
sha256 = "sha256-Ksub+VYTbaWbFpHJFrMr6Dnx6LOnEOUlI2qHhCfbS40="; inherit version;
sha256 = "sha256-IaXfxccRRY868waEPI7qbWp1SSAhJlRqgeEiRNddC/c=";
}; };
cargoSha256 = "sha256-ugG4ivQ2NzLJeZss7h9TME2Aipurl1LZBgxt1cYaK2E="; cargoSha256 = "sha256-2owdX9ePHcAXpE43Svan252lAa5ICk0/DrDeADegZ6U=";
buildFeatures = [ "commandline" ];
meta = with lib; { meta = with lib; {
description = "Sass reimplemented in rust with nom"; description = "Sass reimplemented in rust with nom";

1080
pkgs/development/tools/reshape/Cargo.lock generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,50 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, fetchpatch
, git
, postgresqlTestHook
, postgresql
}:
rustPlatform.buildRustPackage rec {
pname = "reshape";
version = "0.6.1";
src = fetchFromGitHub {
owner = "fabianlindfors";
repo = pname;
rev = "v${version}";
hash = "sha256-iX8qhDk0PP0AB3bJ6ck8AZ9SCErFH416ggAkgK8O900=";
};
nativeCheckInputs = [
postgresqlTestHook
postgresql
];
dontUseCargoParallelTests = true;
postgresqlTestSetupPost = ''
export POSTGRES_CONNECTION_STRING="user=$PGUSER dbname=$PGDATABASE host=$PGHOST"
'';
postgresqlTestUserOptions = "LOGIN SUPERUSER";
# upstream doesn't ship a Cargo.lock, is generated by the update script
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
cargoLock.lockFile = ./Cargo.lock;
cargoHash = "sha256-UL/vP8055JRbbf5bqf0V3wGh+iF9ztVhyoMrtNs/c+4=";
meta = with lib; {
description = "An easy-to-use, zero-downtime schema migration tool for Postgres";
homepage = "https://github.com/fabianlindfors/reshape";
license = licenses.mit;
maintainers = with maintainers; [ ilyakooo0 ];
};
}

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ruff"; pname = "ruff";
version = "0.0.233"; version = "0.0.235";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charliermarsh"; owner = "charliermarsh";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-d+JF5CUswlqx0S3W9W2B2Pgt/hj3hHky1p4OF3eqr84="; sha256 = "sha256-pa1q2OY9jwWktcQVmk8EQjb3WUtPb7SFecQ16A+3C6c=";
}; };
cargoSha256 = "sha256-ZuBbgf4CYQpN8TgfEnAl54/SnkkbssoCSdB+2ZZPenk="; cargoSha256 = "sha256-gYyVa615ujV5xuiC3bhscje9sP43iQV8WolClcF372Q=";
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.CoreServices

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wesnoth"; pname = "wesnoth";
version = "1.16.6"; version = "1.16.7";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = version; rev = version;
owner = "wesnoth"; owner = "wesnoth";
repo = "wesnoth"; repo = "wesnoth";
sha256 = "sha256-oQRjVjVjLIvCCafLr0FXvLwnKDjJY2FU20dYGLtNFiU="; sha256 = "sha256-YcBF/iNr6Q5NaA+G55xa0SOCCHW2BCoJlmXsTtkF1fk=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

View file

@ -23,68 +23,30 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "MoltenVK"; pname = "MoltenVK";
version = "1.2.0"; version = "1.2.1";
buildInputs = [ AppKit Foundation Metal QuartzCore cereal ] buildInputs = [
++ lib.attrValues finalAttrs.passthru; AppKit
Foundation
Metal
QuartzCore
cereal
glslang
spirv-cross
spirv-headers
spirv-tools
vulkan-headers
];
nativeBuildInputs = [ cctools sigtool xcbuild ]; nativeBuildInputs = [ cctools sigtool xcbuild ];
outputs = [ "out" "bin" "dev" ]; outputs = [ "out" "bin" "dev" ];
# MoltenVK requires specific versions of its dependencies.
# Pin them here except for cereal, which is four years old and has several CVEs.
passthru = {
glslang = (glslang.overrideAttrs (old: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "5755de46b07e4374c05fb1081f65f7ae1f8cca81";
hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk=";
};
patches = [ ];
})).override { inherit (finalAttrs.passthru) spirv-headers spirv-tools; };
spirv-cross = spirv-cross.overrideAttrs (old: {
cmakeFlags = (old.cmakeFlags or [ ])
++ [ "-DSPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross" ];
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Cross";
rev = "f09ba2777714871bddb70d049878af34b94fa54d";
hash = "sha256-yVpLW1DbcHDuM9Bm3uGhAC0v9XjmpBoU9x7kmWdg6/o=";
};
});
spirv-headers = spirv-headers.overrideAttrs (_: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "spirv-headers";
rev = "85a1ed200d50660786c1a88d9166e871123cce39";
hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30=";
};
});
spirv-tools = (spirv-tools.overrideAttrs (old: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "spirv-tools";
rev = "eb0a36633d2acf4de82588504f951ad0f2cecacb";
hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0=";
};
})).override { inherit (finalAttrs.passthru) spirv-headers; };
vulkan-headers = vulkan-headers.overrideAttrs (old: {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
rev = "98f440ce6868c94f5ec6e198cc1adda4760e8849";
hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g=";
};
});
};
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "MoltenVK"; repo = "MoltenVK";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-PqrKGNGw7nJbirRgIargIV6Jbgoblu+2fn5qdHKI6BI="; hash = "sha256-JqHPKLSFq+8hyOjVZbjh4AsHM8zSF7ZVxlEePmnEC2w=";
}; };
patches = [ patches = [
@ -98,6 +60,11 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \
--replace '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \ --replace '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \
--replace '$(git rev-parse HEAD)' ${finalAttrs.src.rev} --replace '$(git rev-parse HEAD)' ${finalAttrs.src.rev}
# Use the SPIRV-Cross packaged in nixpkgs instead of one built specifically for MoltenVK.
substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \
--replace SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross
substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \
--replace SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross
# Adding all of `usr/include` from the SDK results in header conflicts with `libcxx.dev`. # Adding all of `usr/include` from the SDK results in header conflicts with `libcxx.dev`.
# Work around it by symlinking just the SIMD stuff needed by MoltenVK. # Work around it by symlinking just the SIMD stuff needed by MoltenVK.
mkdir -p build/include mkdir -p build/include
@ -108,8 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
"-isystem ${lib.getDev libcxx}/include/c++/v1" "-isystem ${lib.getDev libcxx}/include/c++/v1"
"-I${finalAttrs.passthru.spirv-cross}/include/spirv_cross" "-I${lib.getDev spirv-cross}/include/spirv_cross"
"-I${finalAttrs.passthru.spirv-headers}/include/spirv/unified1/" "-I${lib.getDev spirv-headers}/include/spirv/unified1/"
]; ];
buildPhase = '' buildPhase = ''

View file

@ -297,8 +297,9 @@ let
}; };
}); });
# home-assistant-frontend does not exist in python3.pkgs # internal python packages only consumed by home-assistant itself
home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-frontend = self.callPackage ./frontend.nix { };
home-assistant-intents = self.callPackage ./intents.nix { };
}) })
]; ];
@ -496,6 +497,7 @@ in python.pkgs.buildPythonApplication rec {
getPackages getPackages
python python
supportedComponentsWithTests; supportedComponentsWithTests;
intents = python.pkgs.home-assistant-intents;
tests = { tests = {
nixos = nixosTests.home-assistant; nixos = nixosTests.home-assistant;
components = callPackage ./tests.nix { }; components = callPackage ./tests.nix { };

View file

@ -0,0 +1,67 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, setuptools
# build
, hassil
, jinja2
, pyyaml
, regex
, voluptuous
, python
# tests
, pytest-xdist
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "home-assistant-intents";
version = "2023.1.25";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "home-assistant";
repo = "intents";
rev = "refs/tags/${version}";
hash = "sha256-nMEcN2b0XHF4yRRsHKMplxqcMLl+gJcPAdvwnySN+ug=";
};
sourceRoot = "source/package";
nativeBuildInputs = [
hassil
jinja2
pyyaml
regex
setuptools
voluptuous
];
postInstall = ''
pushd ..
# https://github.com/home-assistant/intents/blob/main/script/package#L18
${python.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home-assistant-intents/home_assistant_intents/data
popd
'';
checkInputs = [
pytest-xdist
pytestCheckHook
];
pytestFlagsArray = [
"../tests"
];
meta = with lib; {
description = "Intents to be used with Home Assistant";
homepage = "https://github.com/home-assistant/intents";
license = licenses.cc-by-40;
maintainers = teams.home-assistant.members;
};
}

View file

@ -0,0 +1,24 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
stdenv.mkDerivation rec {
pname = "mbusd";
version = "0.5.1";
src = fetchFromGitHub {
owner = "3cky";
repo = "mbusd";
rev = "v${version}";
hash = "sha256-vYYaJKcnREng+2UsDIZ28hvANkQCHVixQIxo82m7MQs=";
};
nativeBuildInputs = [ cmake pkg-config ];
meta = with lib; {
description = "Modbus TCP to Modbus RTU (RS-232/485) gateway";
homepage = "https://github.com/3cky/mbusd";
changelog = "https://github.com/3cky/mbusd/blob/v${version}/CHANGELOG.md";
license = licenses.bsd3;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
};
}

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "unpoller"; pname = "unpoller";
version = "2.7.10"; version = "2.7.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "unpoller"; owner = "unpoller";
repo = "unpoller"; repo = "unpoller";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-zwrVMQI/zn+UtaXZyZr1wGkBP/KKDKvE/YjLR5rbK0o="; hash = "sha256-/tGmMeHrurKTaRQLHusOkjISuxrrT/JjUCimEL7zoIk=";
}; };
vendorHash = "sha256-SjZQnVG7j2zbPCr4AeF9vZkmd7eEocmnCQKFH09qSng="; vendorHash = "sha256-ZwJCqL8vU38k8pfNmKGIhJSgMwxQuzBBfl6IduQrQEw=";
ldflags = [ ldflags = [
"-w" "-s" "-w" "-s"

View file

@ -7,10 +7,10 @@ let archString = if stdenv.isAarch64 then "arm64"
platformString = if stdenv.isDarwin then "osx" platformString = if stdenv.isDarwin then "osx"
else if stdenv.isLinux then "linux" else if stdenv.isLinux then "linux"
else throw "unsupported platform"; else throw "unsupported platform";
platformSha = if (stdenv.isDarwin && stdenv.isx86_64) then "sha256-bcLyf/sIaFoS1xS4RLPPC9lVFa94IfQlWeXhyXUTsd0=" platformSha = if (stdenv.isDarwin && stdenv.isx86_64) then "sha256-JKB7Oy+3KWtVo1Aqmc7vZiO88FrF9+8N/tdGlvIQolM="
else if (stdenv.isDarwin && stdenv.isAarch64) then "sha256-2UACjUtyQ611iXmwyiWrGwRVA0FT1cLLMKnY0y4SgoQ=" else if (stdenv.isDarwin && stdenv.isAarch64) then "sha256-9UwB1tT2VaW+favw/KWPziFMSRWcw7AqeeZvbaGOBqc="
else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-5AZGwxpEqn3X20rCxPcvuqcQib689ui+e0jvri92EdA=" else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-kAcT9av4PFZfYqpS0XwKC0IiquUcVtN30Mq649PUnSM="
else if (stdenv.isLinux && stdenv.isAarch64) then "sha256-90Sz32hm+EcK3nFJOGGCSqIEtW7w48G8mizXvcLb8WU=" else if (stdenv.isLinux && stdenv.isAarch64) then "sha256-3Lm9WYVcfkEVfji/h52VqFy1Jo1AiSQ22JhEGiCPzzM="
else throw "unsupported platform"; else throw "unsupported platform";
platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
else if stdenv.isLinux then "LD_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH"
@ -20,7 +20,7 @@ let archString = if stdenv.isAarch64 then "arm64"
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "powershell"; pname = "powershell";
version = "7.2.4"; version = "7.3.2";
src = fetchzip { src = fetchzip {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz"; url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz";

View file

@ -30,6 +30,9 @@ variant: $plat $arch
hash: $hash hash: $hash
" "
rm -r $exDest
mkdir $exDest
done done
done done

View file

@ -32,14 +32,14 @@
buildGoModule rec { buildGoModule rec {
pname = "lxd"; pname = "lxd";
version = "5.9"; version = "5.10";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
"https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"
]; ];
sha256 = "sha256-okz3++PlUno03tp+jpLxfAWlFJhyOCH2mxRtHo5YEX8="; hash = "sha256-sYJkPr/tE22xJEjKX7fMjOLQ9zBDm52UjqbVLrm39zU=";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -104,7 +104,7 @@ buildGoModule rec {
homepage = "https://linuxcontainers.org/lxd/"; homepage = "https://linuxcontainers.org/lxd/";
changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}"; changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ marsam ]; maintainers = with maintainers; [ marsam adamcstephens ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rsnapshot"; pname = "rsnapshot";
version = "1.4.4"; version = "1.4.5";
src = fetchurl { src = fetchurl {
url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz"; url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz";
sha256 = "sha256-wct8t0jFqWVsOGNivfbCZ5WXN3JKu1Bfv56UCp2YhXk="; sha256 = "sha256-ELdeAcolUR6CZqrNSVUxl1rRqK1VYha2pXx20CizgkI=";
}; };
propagatedBuildInputs = [perl openssh rsync logger]; propagatedBuildInputs = [perl openssh rsync logger];

View file

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "stratis-cli"; pname = "stratis-cli";
version = "3.4.1"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stratis-storage"; owner = "stratis-storage";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-S0daUi0rhelip2pwcAP3WGey8BbeMa/7AgSrFfuB+cM="; hash = "sha256-IfvI8DVjm68SewHtQbhGGU1oku4eZnF7cRyeVPB/Ctk=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

View file

@ -5,6 +5,7 @@
, pkg-config , pkg-config
, asciidoc , asciidoc
, ncurses , ncurses
, glibc
, dbus , dbus
, cryptsetup , cryptsetup
, util-linux , util-linux
@ -24,18 +25,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stratisd"; pname = "stratisd";
version = "3.4.4"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stratis-storage"; owner = "stratis-storage";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-6VrbouYNB2iOndnDBfww8gT4eFgfP+HWcfep+N1nErI="; hash = "sha256-1x6zVWFr4WNpYGVz/UGlP+lycVF2cbWJoiAmiXWzGT8=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
hash = "sha256-C3nkHQt+w0OYbExDfEpFE0Et6ILJqMNRPXCEWiURf3A="; hash = "sha256-emsmdQY2od8XVjNY/rt0BbNsVy2XKtLpe8ydZGRil+Q=";
}; };
postPatch = '' postPatch = ''
@ -61,6 +62,8 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
glibc
glibc.static
dbus dbus
cryptsetup cryptsetup
util-linux util-linux
@ -81,7 +84,7 @@ stdenv.mkDerivation rec {
]); ]);
makeFlags = [ "PREFIX=${placeholder "out"}" "INSTALL=install" ]; makeFlags = [ "PREFIX=${placeholder "out"}" "INSTALL=install" ];
buildFlags = [ "build" "build-min" "docs/stratisd.8" ]; buildFlags = [ "build-all" ];
doCheck = true; doCheck = true;
checkTarget = "test"; checkTarget = "test";

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, python3 }: { lib, stdenv, fetchFromGitHub, cmake, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "spirv-cross"; pname = "spirv-cross";
version = "MoltenVK-1.1.5"; version = "1.3.236.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Cross"; repo = "SPIRV-Cross";
rev = version; rev = "sdk-${finalAttrs.version}";
sha256 = "/t6hAlGY3+bddWg5ERFbqeU4/MAjq+/AEVv1Jy2C0HA="; hash = "sha256-zx/fjDKgteWizC3O1bL4WSwwPNw2/2m0xCnCiOttgAo=";
}; };
nativeBuildInputs = [ cmake python3 ]; nativeBuildInputs = [ cmake python3 ];
@ -21,4 +21,4 @@ stdenv.mkDerivation rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ Flakebi ]; maintainers = with maintainers; [ Flakebi ];
}; };
} })

View file

@ -30,5 +30,8 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ sifmelcara ]; maintainers = with maintainers; [ sifmelcara ];
# this package is deprecated, please use fcitx5 instead.
# and it cannot be built with the new version of librime
broken = true;
}; };
} }

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "brook"; pname = "brook";
version = "20230101"; version = "20230122";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "txthinking"; owner = "txthinking";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-WQSpflJ7b5zl+1lEoyXxFeuiz1HvlXSBl7FbBFrxZLc="; sha256 = "sha256-M4AYbHbnRDvG55AvfRpcdpK4MU/cM1RBqn0JzhsKgsk=";
}; };
vendorHash = "sha256-sJbWAytX3JhFbaTwZHgGNv9rPNTwn0v/bbeaIsfyBro="; vendorHash = "sha256-sJbWAytX3JhFbaTwZHgGNv9rPNTwn0v/bbeaIsfyBro=";

View file

@ -0,0 +1,25 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl }:
stdenv.mkDerivation rec {
pname = "gsocket";
version = "1.4.39";
src = fetchFromGitHub {
owner = "hackerschoice";
repo = "gsocket";
rev = "v${version}";
sha256 = "sha256-iSII21X3F4Cb1UqF0aYw23N7CyeTQMmziRioEULx9Zk=";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ openssl ];
dontDisableStatic = true;
meta = with lib; {
description = "Connect like there is no firewall, securely";
homepage = "https://www.gsocket.io";
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = [ maintainers.msm ];
};
}

View file

@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "hurl"; pname = "hurl";
version = "1.8.0"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Orange-OpenSource"; owner = "Orange-OpenSource";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-d2iWLswlKBow1B+cOaSmsHVWXk/ugwf3pn3OiLhCml0="; sha256 = "sha256-CQDyIGUIijNphOVo+aYZ7SqkxE4md9+H3D/g7jdqV+M=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
# Tests require network access to a test server # Tests require network access to a test server
doCheck = false; doCheck = false;
cargoSha256 = "sha256-A3vl7QRKuox8aE0FsEOiVH/5sRMnKNcdjT2wWPLhd+4="; cargoSha256 = "sha256-wNiEULv+0WlZruxibcKqsw4Ym3retwjoGKXxzACcEeA=";
postInstall = '' postInstall = ''
installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1 installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1

View file

@ -4815,6 +4815,8 @@ with pkgs;
gsctl = callPackage ../applications/misc/gsctl { }; gsctl = callPackage ../applications/misc/gsctl { };
gsocket = callPackage ../tools/networking/gsocket { };
gthree = callPackage ../development/libraries/gthree { }; gthree = callPackage ../development/libraries/gthree { };
gtg = callPackage ../applications/office/gtg { }; gtg = callPackage ../applications/office/gtg { };
@ -18318,6 +18320,8 @@ with pkgs;
inherit (callPackage ../development/tools/replay-io { }) inherit (callPackage ../development/tools/replay-io { })
replay-io replay-node-cli; replay-io replay-node-cli;
reshape = callPackage ../development/tools/reshape { } ;
retdec = callPackage ../development/tools/analysis/retdec { retdec = callPackage ../development/tools/analysis/retdec {
stdenv = gcc8Stdenv; stdenv = gcc8Stdenv;
}; };
@ -22903,6 +22907,7 @@ with pkgs;
SDL_compat = callPackage ../development/libraries/SDL_compat { SDL_compat = callPackage ../development/libraries/SDL_compat {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
inherit (darwin) autoSignDarwinBinariesHook;
}; };
SDL = SDL_classic; SDL = SDL_classic;
@ -23501,7 +23506,7 @@ with pkgs;
stdenv = gcc9Stdenv; stdenv = gcc9Stdenv;
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices IOKit CFNetwork Security ApplicationServices
CoreText IOSurface ImageIO OpenGL GLUT; CoreText IOSurface ImageIO OpenGL GLUT;
}; };
@ -23511,7 +23516,7 @@ with pkgs;
vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix {
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices IOKit CFNetwork Security ApplicationServices
CoreText IOSurface ImageIO OpenGL GLUT; CoreText IOSurface ImageIO OpenGL GLUT;
}; };
@ -24465,6 +24470,8 @@ with pkgs;
mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };
mbusd = callPackage ../servers/mbusd { };
memcached = callPackage ../servers/memcached {}; memcached = callPackage ../servers/memcached {};
merecat = callPackage ../servers/http/merecat { }; merecat = callPackage ../servers/http/merecat { };