Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
@@ -626,7 +626,7 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called
|
||||
|
||||
### The check phase {#ssec-check-phase}
|
||||
|
||||
The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make check`, but only if the `doCheck` variable is enabled.
|
||||
The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the `doCheck` variable is enabled (see below).
|
||||
|
||||
#### Variables controlling the check phase {#variables-controlling-the-check-phase}
|
||||
|
||||
@@ -646,7 +646,7 @@ See the [build phase](#var-stdenv-makeFlags) for details.
|
||||
|
||||
##### `checkTarget` {#var-stdenv-checkTarget}
|
||||
|
||||
The make target that runs the tests. Defaults to `check`.
|
||||
The make target that runs the tests. Defaults to `check` if it exists, otherwise `test`; if neither is found, do nothing.
|
||||
|
||||
##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags}
|
||||
|
||||
|
||||
@@ -1621,6 +1621,16 @@
|
||||
githubId = 45811;
|
||||
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 = {
|
||||
email = "me@bb010g.com";
|
||||
matrix = "@bb010g:matrix.org";
|
||||
@@ -5172,6 +5182,15 @@
|
||||
githubId = 3217744;
|
||||
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 = {
|
||||
name = "Kasper Kondzielski";
|
||||
email = "kghost0@gmail.com";
|
||||
|
||||
@@ -168,6 +168,15 @@ with lib.maintainers; {
|
||||
shortName = "Cosmopolitan";
|
||||
};
|
||||
|
||||
deepin = {
|
||||
members = [
|
||||
rewine
|
||||
];
|
||||
scope = "Maintain deepin desktop environment and related packages.";
|
||||
shortName = "DDE";
|
||||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
deshaw = {
|
||||
# Verify additions to this team with at least one already existing member of the team.
|
||||
members = [
|
||||
|
||||
@@ -294,6 +294,14 @@
|
||||
<literal>i18n.inputMethod.kime</literal> instead.
|
||||
</para>
|
||||
</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>
|
||||
<para>
|
||||
<literal>llvmPackages_rocm.llvm</literal> will not contain
|
||||
|
||||
@@ -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.
|
||||
|
||||
- `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`.
|
||||
|
||||
- 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.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
x86_64-linux = "/nix/store/h88w1442c7hzkbw8sgpcsbqp4lhz6l5p-nix-2.12.0";
|
||||
i686-linux = "/nix/store/j23527l1c3hfx17nssc0v53sq6c741zs-nix-2.12.0";
|
||||
aarch64-linux = "/nix/store/zgzmdymyh934y3r4vqh8z337ba4cwsjb-nix-2.12.0";
|
||||
x86_64-darwin = "/nix/store/wnlrzllazdyg1nrw9na497p4w0m7i7mm-nix-2.12.0";
|
||||
aarch64-darwin = "/nix/store/7n5yamgzg5dpp5vb6ipdqgfh6cf30wmn-nix-2.12.0";
|
||||
x86_64-linux = "/nix/store/lsr79q5xqd9dv97wn87x12kzax8s8i1s-nix-2.13.2";
|
||||
i686-linux = "/nix/store/wky9xjwiwzpifgk0s3f2nrg8nr67bi7x-nix-2.13.2";
|
||||
aarch64-linux = "/nix/store/v8drr3x1ia6bdr8y4vl79mlz61xynrpm-nix-2.13.2";
|
||||
x86_64-darwin = "/nix/store/1l14si31p4aw7c1gwgjy0nq55k38j9nj-nix-2.13.2";
|
||||
aarch64-darwin = "/nix/store/6x7nr1r780fgn254zhkwhih3f3i8cr45-nix-2.13.2";
|
||||
}
|
||||
|
||||
@@ -50,7 +50,6 @@ with lib;
|
||||
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")
|
||||
(mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
|
||||
(mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.")
|
||||
|
||||
@@ -18,12 +18,6 @@ let
|
||||
fwupd = cfg.daemonSettings;
|
||||
};
|
||||
};
|
||||
"fwupd/uefi_capsule.conf" = {
|
||||
source = pkgs.writeText "uefi_capsule.conf" ''
|
||||
[uefi_capsule]
|
||||
OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
originalEtc =
|
||||
@@ -147,7 +141,10 @@ in {
|
||||
###### implementation
|
||||
config = mkIf cfg.enable {
|
||||
# Disable test related plug-ins implicitly so that users do not have to care about them.
|
||||
services.fwupd.daemonSettings.DisabledPlugins = cfg.package.defaultDisabledPlugins;
|
||||
services.fwupd.daemonSettings = {
|
||||
DisabledPlugins = cfg.package.defaultDisabledPlugins;
|
||||
EspLocation = config.boot.loader.efi.efiSysMountPoint;
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
services.stratis.enable = true;
|
||||
virtualisation.emptyDiskImages = [ 1024 1024 1024 1024 ];
|
||||
virtualisation.emptyDiskImages = [ 2048 1024 1024 1024 ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.62";
|
||||
version = "1.63";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PHDkCE30sVAFXHjG8d/4ETSDS2KO/j43iMMW0PhCFgI=";
|
||||
sha256 = "sha256-uDAW97lTeL15PPpR5vlIS371EZ7BBNd86ETPEB8joSU=";
|
||||
};
|
||||
|
||||
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pt2-clone";
|
||||
version = "1.56";
|
||||
version = "1.57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "pt2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NetzlQdhbyClnVQTrHoX9QpVtoj8a8FoDue+uxhgrlA=";
|
||||
sha256 = "sha256-YUGTcL/k+MbAnB/kcWPEmrGxGF/kSHdIgdBVUqCsDWM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -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 {
|
||||
mktplcRef = {
|
||||
name = "vim";
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "20.7.4";
|
||||
version = "20.8.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "sha256-gmC8s+0eef09wcLE9fBiG82rRPXijRyR1WTlp4gYPq4=";
|
||||
sha256 = "118e9c9a328c92aeeda3c5925c8d8ed50d0993c07715726447ee720699958626";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cubiomes-viewer";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cubitect";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yT8PDmMntnd5meDPJm1rekfDVgmWFSZTNFEH03AKCy0=";
|
||||
sha256 = "sha256-UPphXaxq/Hnt1U3J+lgwa0lp3vX1B/Ou8eqD9rHe3sw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "organicmaps";
|
||||
version = "2022.11.24-3";
|
||||
version = "2023.01.25-3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "organicmaps";
|
||||
repo = "organicmaps";
|
||||
rev = "${version}-android";
|
||||
sha256 = "sha256-4RW7/sCtOXxA8n0Jx4ksNGRg7r8ErujmyzbnA1pi6ng=";
|
||||
sha256 = "sha256-4nlD/GFOoBOCXVWtC7i6SUquEbob5++GyagZOTznygU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tut";
|
||||
version = "1.0.34";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RasmusLindroth";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-AnuPTv9W+2yDcM803DZaNIn4S7A78JEv6S8pA18whVA=";
|
||||
sha256 = "sha256-Oypl80UsYRRSIMvHDPSS6rrvzjlxZ/UKDNDGc2Yan+w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-go7eZHhrQ1ZcLOn56a3Azn3eRyAesAkgLabPbwzKtds=";
|
||||
vendorHash = "sha256-qeYgkF9sIJ0slRarXbCHZ+1JmtZwXDnrJIpRKGOoW5Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TUI for Mastodon with vim inspired keys";
|
||||
|
||||
@@ -90,11 +90,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.47.171";
|
||||
version = "1.47.186";
|
||||
|
||||
src = fetchurl {
|
||||
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;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -471,6 +471,7 @@ buildStdenv.mkDerivation ({
|
||||
separateDebugInfo = enableDebugSymbols;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
|
||||
|
||||
# tests were disabled in configureFlags
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubedb-cli";
|
||||
version = "0.29.0";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubedb";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MVvhXvf/R7Cku8S4zbs1MlH4NuEwkxCsbbc2ASCF67c=";
|
||||
sha256 = "sha256-i8kv/YzEWAFQJwIkwot2huIEAZYMUGQqSak4nUMRjn4=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@@ -167,11 +167,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"bitbucket": {
|
||||
"hash": "sha256-EsupdOP2aWLGeQrtuTyPg4ppM/j0WT0q/UV60oK732Y=",
|
||||
"hash": "sha256-4uwMg2DXd7T4WqdfwcZHtsPMTTCqrwSngh01DYW5yko=",
|
||||
"homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
|
||||
"owner": "DrFaust92",
|
||||
"repo": "terraform-provider-bitbucket",
|
||||
"rev": "v2.29.2",
|
||||
"rev": "v2.30.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0="
|
||||
},
|
||||
@@ -816,11 +816,11 @@
|
||||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-EewM1/7zzmJ5KL+/KqstFg6rQT8YpvMULScYeD2ClUQ=",
|
||||
"hash": "sha256-L8y00f+57hndpVevliJ2kNqpGeNR2Jv/FHbqkAUIRMI=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.104.2",
|
||||
"rev": "v4.105.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -861,20 +861,20 @@
|
||||
"vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY="
|
||||
},
|
||||
"opentelekomcloud": {
|
||||
"hash": "sha256-brODSqSwZXy3B/F5jqPz1h5UJ2hNncG7tIpICJjoBW4=",
|
||||
"hash": "sha256-D2RPpG1RE+bM7rVvmItczpRExMXK0RaKfJsnifvXRTs=",
|
||||
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
|
||||
"owner": "opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.32.2",
|
||||
"rev": "v1.32.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-p01ZIAt8cUv/UklRnMu+TTmfEw8jdde9C4nUJrhA7wE="
|
||||
"vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ="
|
||||
},
|
||||
"opsgenie": {
|
||||
"hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=",
|
||||
"hash": "sha256-NMaTTZQyEJ0vb+eDNTGRozTrme78Vo+/GuIR43AeDbU=",
|
||||
"homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
|
||||
"owner": "opsgenie",
|
||||
"repo": "terraform-provider-opsgenie",
|
||||
"rev": "v0.6.18",
|
||||
"rev": "v0.6.19",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -1,25 +1,35 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "drive";
|
||||
version = "0.3.8.1";
|
||||
|
||||
goPackagePath = "github.com/odeke-em/drive";
|
||||
subPackages = [ "cmd/drive" ];
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "odeke-em";
|
||||
repo = "drive";
|
||||
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; {
|
||||
homepage = "https://github.com/odeke-em/drive";
|
||||
description = "Google Drive client for the commandline";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
-192
@@ -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";
|
||||
};
|
||||
}
|
||||
]
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.5.18";
|
||||
version = "3.5.21";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gMOpKXLUihiNcpHF6045D1ZcYwTgyjaVIFpDRCln5rI=";
|
||||
hash = "sha256-VVZvr0h98bWJW9FNFr3/pw7pSqF62hCnr6iv9xSzXf8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||
signal-desktop = {
|
||||
dir = "Signal";
|
||||
version = "6.2.0";
|
||||
hash = "sha256-auOcMlwKPj5rsnlhK34sYe4JxlHCjb3e2ye8Cs12Qtc=";
|
||||
version = "6.3.0";
|
||||
hash = "sha256-Mg7znebHiREC9QI5T7bWT4QXL8biDVBp0Z6Jgeid/gY=";
|
||||
};
|
||||
signal-desktop-beta = {
|
||||
dir = "Signal Beta";
|
||||
ringrtcPrefix = "@signalapp/";
|
||||
version = "6.3.0-beta.1";
|
||||
hash = "sha256-cYJWhnyiWULnIZvI2/k1koLCd2zrL4CVMohcnSZa/TY=";
|
||||
version = "6.4.0-beta.1";
|
||||
hash = "sha256-GR7RWFT20i5dx6XYrp73inCOQ2Hj2UjSXf5jmjfDKMU=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{ pname
|
||||
, dir
|
||||
, ringrtcPrefix ? ""
|
||||
, version
|
||||
, hash
|
||||
, stdenv
|
||||
@@ -161,7 +160,7 @@ stdenv.mkDerivation rec {
|
||||
--replace "/opt/${dir}/${pname}" $out/bin/${pname}
|
||||
|
||||
autoPatchelf --no-recurse -- "$out/lib/${dir}/"
|
||||
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/${ringrtcPrefix}ringrtc/build/linux/libringrtc-x64.node"
|
||||
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node"
|
||||
'';
|
||||
|
||||
# Tests if the application launches and waits for "Link your phone to Signal Desktop":
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs $out/bin/update.sh
|
||||
wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs}
|
||||
'';
|
||||
phases = [ "installPhase" ];
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,21 +1,62 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner
|
||||
, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam, mesa
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, wayland-scanner
|
||||
, aml
|
||||
, jansson
|
||||
, libxkbcommon
|
||||
, mesa
|
||||
, neatvnc
|
||||
, pam
|
||||
, pixman
|
||||
, wayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wayvnc";
|
||||
version = "0.5.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "any1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/OKkQKt43lR0UCmQeSDMl1hXh03k+dX3UweigMWEUx4=";
|
||||
sha256 = "sha256-WKtflN6DyzumOMEx+iX0AoIyGRN4nXUckmW/9Z2EW+Q=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ];
|
||||
buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam mesa ];
|
||||
strictDeps = true;
|
||||
|
||||
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; {
|
||||
description = "A VNC server for wlroots based Wayland compositors";
|
||||
|
||||
@@ -83,6 +83,11 @@ stdenv.mkDerivation rec {
|
||||
dontWrapQtApps = 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 = ''
|
||||
for f in "$out"/bin/*; do
|
||||
echo "Wrapping $f"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
name = "cloudlog";
|
||||
version = "2.3";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
sha256 = "sha256-IepCeV/mYy/GEzRTXf67LYQQaN5Rj5Z77KaF2l30r60=";
|
||||
sha256 = "sha256-9m7BuUNdGeKqi8pzeW2J9zpxShulpynCwJJGkRFkBa4=";
|
||||
};
|
||||
|
||||
postPath = ''
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boinc";
|
||||
version = "7.20.5";
|
||||
version = "7.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "${pname}-${version}-src";
|
||||
owner = "BOINC";
|
||||
repo = "boinc";
|
||||
rev = "client_release/${lib.versions.majorMinor version}/${version}";
|
||||
hash = "sha256-KqD986Q7npKTnh0DdNgMHro+1M/UQHiNsXaRl9WjONw=";
|
||||
hash = "sha256-AVWgFsxeuHADEat83XQLLeQkzw3kaUdPL0rp8b6Rxyk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];
|
||||
|
||||
@@ -207,6 +207,7 @@ stdenv.mkDerivation rec {
|
||||
"-Druntime_cxxmodules=OFF"
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
|
||||
|
||||
# Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib
|
||||
, defusedxml, future, packaging, psutil, setuptools
|
||||
, defusedxml, future, ujson, packaging, psutil, setuptools
|
||||
# Optional dependencies:
|
||||
, bottle, pysnmp
|
||||
, hddtemp
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "glances";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicolargo";
|
||||
repo = "glances";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-4EZjr8oW5759U20YS6eWVZ0pelTCDj75FBc7IkAzd3M=";
|
||||
sha256 = "sha256-93fghrNktcz+YyPkRl6ZiSZC+3a5TDql6eFZMy6veJc=";
|
||||
};
|
||||
|
||||
# On Darwin this package segfaults due to mismatch of pure and impure
|
||||
@@ -36,6 +36,7 @@ buildPythonApplication rec {
|
||||
bottle
|
||||
defusedxml
|
||||
future
|
||||
ujson
|
||||
netifaces
|
||||
packaging
|
||||
psutil
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
{ lib
|
||||
, bash
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, coreutils
|
||||
, gawk
|
||||
, gnugrep
|
||||
, gnused
|
||||
, openssh
|
||||
, resholve
|
||||
, rsync
|
||||
, which
|
||||
, zfs
|
||||
}:
|
||||
|
||||
resholve.mkDerivation rec {
|
||||
pname = "zxfer";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allanjude";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-11SQJcD3GqPYBIgaycyKkc62/diVKPuuj2Or97j+NZY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# these may point to paths on remote systems, calculated at runtime, thus we cannot fix them
|
||||
# we can only set their initial values, and let them remain dynamic
|
||||
postPatch = ''
|
||||
substituteInPlace zxfer \
|
||||
--replace 'LCAT=""' 'LCAT=${coreutils}/bin/cat' \
|
||||
--replace 'LZFS=$( which zfs )' 'LZFS=${zfs}/bin/zfs'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
installManPage zxfer.1m zxfer.8
|
||||
install -Dm755 zxfer -t $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
solutions.default = {
|
||||
scripts = [ "bin/zxfer" ];
|
||||
interpreter = "${bash}/bin/sh";
|
||||
inputs = [
|
||||
coreutils
|
||||
gawk
|
||||
gnugrep
|
||||
gnused
|
||||
openssh
|
||||
rsync
|
||||
which
|
||||
];
|
||||
fake.external = [
|
||||
"kldload" # bsd builtin
|
||||
"kldstat" # bsd builtin
|
||||
"svcadm" # solaris builtin
|
||||
];
|
||||
keep = {
|
||||
"$LCAT" = true;
|
||||
"$LZFS" = true;
|
||||
"$PROGRESS_DIALOG" = true;
|
||||
"$RZFS" = true;
|
||||
"$input_optionts" = true;
|
||||
"$option_O" = true;
|
||||
"$option_T" = true;
|
||||
};
|
||||
fix = {
|
||||
"$AWK" = [ "awk" ];
|
||||
"$RSYNC" = [ "rsync" ];
|
||||
};
|
||||
execer = [ "cannot:${rsync}/bin/rsync" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A popular script for managing ZFS snapshot replication";
|
||||
homepage = "https://github.com/allanjude/zxfer";
|
||||
changelog = "https://github.com/allanjude/zxfer/releases/tag/v${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ urandom ];
|
||||
};
|
||||
}
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "got";
|
||||
version = "0.81";
|
||||
version = "0.82";
|
||||
|
||||
src = fetchurl {
|
||||
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 ];
|
||||
|
||||
@@ -22,14 +22,14 @@ buildGoModule rec {
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
# make xdg-open overrideable at runtime
|
||||
wrapProgram $out/bin/lab \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ git ]}" \
|
||||
--suffix PATH ":" "${lib.makeBinPath [ xdg-utils ]}"
|
||||
# create shell completions before wrapProgram so that lab detects the right path for itself
|
||||
installShellCompletion --cmd lab \
|
||||
--bash <($out/bin/lab completion bash) \
|
||||
--fish <($out/bin/lab completion fish) \
|
||||
--zsh <($out/bin/lab completion zsh)
|
||||
# make xdg-open overrideable at runtime
|
||||
wrapProgram $out/bin/lab \
|
||||
--suffix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -9,8 +9,8 @@ in {
|
||||
} {};
|
||||
|
||||
sublime-merge-dev = common {
|
||||
buildVersion = "2078";
|
||||
x64sha256 = "33oJOnsOUr9W+OGMetafaGtXUa+CHxxLjmtDoZliw0k=";
|
||||
buildVersion = "2081";
|
||||
x64sha256 = "QzJP25KxczmrR5PZ9ujRSM3V+TrKqiH82plo1bTv48s=";
|
||||
dev = true;
|
||||
} {};
|
||||
}
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { };
|
||||
|
||||
obs-livesplit-one = callPackage ./obs-livesplit-one { };
|
||||
|
||||
obs-move-transition = callPackage ./obs-move-transition.nix { };
|
||||
|
||||
obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { };
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "streamlink";
|
||||
version = "5.1.2";
|
||||
version = "5.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno=";
|
||||
hash = "sha256-/YcFH5t9x9EsmK7oPvSECmhL2ypHYgPvsMdL1IupEfw=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
@@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec {
|
||||
requests
|
||||
websocket-client
|
||||
urllib3
|
||||
certifi
|
||||
]) ++ [
|
||||
ffmpeg
|
||||
];
|
||||
|
||||
@@ -11,7 +11,7 @@ let
|
||||
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "17.0.4";
|
||||
version = "17.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
|
||||
|
||||
@@ -1,95 +1,95 @@
|
||||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
iosevka = "1765nh5502m1blmnxmfpbc6qwscp3h78c361sz2libypiwsh20fl";
|
||||
iosevka-aile = "0jnkaln0yyvj2cvh7ckwi181hzpw67lvyk9zclwjhzbmqy1w289c";
|
||||
iosevka-curly = "0m9qq02wfvd42zg4b33jvz6aiy4hlpvd25a812hd231763i3nixa";
|
||||
iosevka-curly-slab = "16xnrzmarrk90gphbmn4cp7hvqba5j8w8lhxb5p9vjp9avg81bvy";
|
||||
iosevka-etoile = "0dwnysyaf1ig8pdfbd16gv3lssivnwyx0mqvx24r42yvg6f4k043";
|
||||
iosevka-slab = "0724dz6q4hlxgakbqhzr5cxrlap16kqrr4m04rdvmnml606g3msh";
|
||||
iosevka-ss01 = "09i8f2mzbsz211nypr3c6k4mkpng53p5xspxd0srnix48hn0yl16";
|
||||
iosevka-ss02 = "1ar36zm8x4s5wspis4mmk0bl0lgyj75dkhpx9h3hg8gk0y7rd2kl";
|
||||
iosevka-ss03 = "1m66m6hangpzxbdmcpzqnrx79sc7w9id8c7w3l6lik3xkhwlqj9q";
|
||||
iosevka-ss04 = "096h5zgv69j96a4ylyzjiy94qiyyk411n27by7dsxmj0kfzcrlyx";
|
||||
iosevka-ss05 = "0r9xln2zmzns4abrxaznv9qi6y2sdaq957sh0v5w866bkgcbdrd6";
|
||||
iosevka-ss06 = "0dhj8hqf5ja1zyqlsw7blw4al713014khdbh5mm44qilgxzp5s2p";
|
||||
iosevka-ss07 = "0d8sycqnfvw1v4b5smj1nbwf1n7bkjqky4m6f0a0xmbgbd50aaz3";
|
||||
iosevka-ss08 = "1psrg7dmkgyg47a96p1k5izsnhnw6jqp9zkv91r92yxx6dlag6fd";
|
||||
iosevka-ss09 = "0mws0jakjybkj6bh9fsksi1mam642ravlcyz7j8q9h301ibkbm07";
|
||||
iosevka-ss10 = "1rz8qxjydcvr124rrvdd2hn0ykcwhpvyv40rs5kqc8saz9v60wcv";
|
||||
iosevka-ss11 = "1bz2lbp0d31222b1mxj7s5vr9irfb1iy4pfq8fhh24gfdgnznr73";
|
||||
iosevka-ss12 = "00xnqbpdgklxlkr7vnznrqh65zwn7szs4pb4bhd3z9mx6rb6ai7a";
|
||||
iosevka-ss13 = "162xr2kgq5sv7c3lnb8wvxzb5ddw20njy52q8p6mvyak47h1wh0k";
|
||||
iosevka-ss14 = "17vlj4z8y0i9q7cb6b4h35wj82cv3cq7x0wyjnm0amzsn3xvv09j";
|
||||
iosevka-ss15 = "1czw0r76b9414vk098rzaf204z3a37xsvwy919ibiszd2pc9fsyl";
|
||||
iosevka-ss16 = "08bc0qj1dcgnmhj1x07xncy82bi6mzhx1wl9x0s9bfkjx69cf9rk";
|
||||
iosevka-ss17 = "1q239m4xz7whdf61ic8n56ymvqmk7f1ab898zs6x1ylv65ai9ixz";
|
||||
iosevka-ss18 = "0ccicy1862rpmgihdaj0624437cbjci24ivlqlj9k61p5zrg0gn9";
|
||||
sgr-iosevka = "0jc6j2lzh3qj72wi5wp7b7adk865nmfb4jxlj7mgn14ni0chd3sx";
|
||||
sgr-iosevka-aile = "0vx2rx09749f28xbi0i2ml9hfk1rhr2wx4afsg151gx37slvrc4w";
|
||||
sgr-iosevka-curly = "18lpx5rxl2c5mg69wym63nggaq2vgi84b071ikjz3z77zv7ykdy8";
|
||||
sgr-iosevka-curly-slab = "0g2x2v9ld536c8qrxwmdw9gv8lbg3g5xmmd9zpmqlc302v43arpz";
|
||||
sgr-iosevka-etoile = "172003jxpf5867x7yr1741561k7lbmn152djjf54313273s62imc";
|
||||
sgr-iosevka-fixed = "08cwln0q0w2sf9kjngq21150azp4550np9lmxg07bvj7r1h1x8yg";
|
||||
sgr-iosevka-fixed-curly = "1fnxxxrnqdgm3c5f0n8sbv53x4drmmjcwy03fwax2zsmhx8v545i";
|
||||
sgr-iosevka-fixed-curly-slab = "1n6fcmnwbxcrylh9dkidd0sdn4sw8b3xymh9dr521acnnp4zcbmc";
|
||||
sgr-iosevka-fixed-slab = "08pyarvnwnkf4yvmnls60ydbnkrkkvm91fkvc7hj237hi11ka3mh";
|
||||
sgr-iosevka-fixed-ss01 = "0gfffkjpqwhcazcr4p287fhi81rlb3pdxxljpx8m08anq5g8lzb9";
|
||||
sgr-iosevka-fixed-ss02 = "1k0433d552j7j7bdaq9vink6v2kkbfhj66f3riw6a6bfcda15j7b";
|
||||
sgr-iosevka-fixed-ss03 = "1i11pgx8ifp654y08m5wjvzlghvcaf47946s6rv0x0n4v3ybjnan";
|
||||
sgr-iosevka-fixed-ss04 = "1jlghxl8ca4yx3w9m1v6y8abyh7pi1chnrmfn4xjxnrmchn6zjvc";
|
||||
sgr-iosevka-fixed-ss05 = "1xkz9vw6qk1al3brxy9ay3dny5s0bi3vjhg9j10igs4n5m2gba1a";
|
||||
sgr-iosevka-fixed-ss06 = "1bch2vm22s9hv8njvwkjz5bsf4529q911k0p76pwmx389hqm2dcm";
|
||||
sgr-iosevka-fixed-ss07 = "0is0pg745kyvy78la73zaic9bp44xd2d3gcqy1bj0hncj573m0zc";
|
||||
sgr-iosevka-fixed-ss08 = "1a3jpfcix555pkm6ifvb6zqwhq9vbg7rv3q6w826wzkmvcbc94wx";
|
||||
sgr-iosevka-fixed-ss09 = "0wfpwljxrqrrjm3c9salbwz628qqz7j0hvwwqkjr0cva4gqwrzjy";
|
||||
sgr-iosevka-fixed-ss10 = "0pcpi1cycdj41b4m2h2aa39aak673d4hp8gbs9j665c2749mfllq";
|
||||
sgr-iosevka-fixed-ss11 = "0jiv860lr20v67b2w1dss5qm10ydpkl82857rx9bq6jc3a5wld06";
|
||||
sgr-iosevka-fixed-ss12 = "1wsidq0v01ww8ylkv2fxy518k96gqmfgfd8f7j0nb63a0qh1iqlf";
|
||||
sgr-iosevka-fixed-ss13 = "19wvawm8ygkr7h5nsgln4vmkxdq5g35j035l8rbfsvbn6hb0znnn";
|
||||
sgr-iosevka-fixed-ss14 = "1jvj70n5qj7mriczy6l7fn94d4mk3kkljg0f62n3bhp749n4h28j";
|
||||
sgr-iosevka-fixed-ss15 = "07lnaask7qrl6fjvf4ddxl8ijisga34h3prydhm4h2v4l1hwhiyg";
|
||||
sgr-iosevka-fixed-ss16 = "06hg2mfb9kvn7s34vd7jkvr4mhsrs3z0xaw8ny2g4bx4nwb3cwsz";
|
||||
sgr-iosevka-fixed-ss17 = "0ggx0g673d1kb8pxn9iyixqidi2kniggvaadkqryn22xxppvyn72";
|
||||
sgr-iosevka-fixed-ss18 = "0yiii5jf76dqrs5ivnnf5dk8lyf8snrl2iycpfyrfp2mi786qw8l";
|
||||
sgr-iosevka-slab = "10m4p6vgkbvk5m0y10bpxm8v913k1xrm50f6c6gghsgvsd5954wc";
|
||||
sgr-iosevka-ss01 = "0rmjdx4cigazb47cismx51qni7kvb5zylhl504gq0l7rw4f941mw";
|
||||
sgr-iosevka-ss02 = "18i85pbcz2ikaa0k52gslmh4pnirdmwg50rxqcw5dpf3sfd64k1s";
|
||||
sgr-iosevka-ss03 = "0466l4kdfyy6qga0gw0iihlx4jh3zsw3nscgr0mp5rff8kxrllyv";
|
||||
sgr-iosevka-ss04 = "0h8zji83q4c12bs0dnllb78s66c852ffqwr377ma4clk0d70qgdx";
|
||||
sgr-iosevka-ss05 = "0gnlpf4j0d01a7ihv94ac5rlskzpcdyrxzy38d7fg7x8z13bi507";
|
||||
sgr-iosevka-ss06 = "0q8q8q83p95yrgszcm8yk0vqrmi5g8psymvx8lrl9caskjyf5gk1";
|
||||
sgr-iosevka-ss07 = "1n9k9nk1izx9rw3c17bvr1fhj7nqq1sl1j3r9v9s7wh99wliwzvb";
|
||||
sgr-iosevka-ss08 = "0b6gm4aq21lf60dmw0bbi0wm37qf5yd5x53fvd1zd3iqk9jcr4jb";
|
||||
sgr-iosevka-ss09 = "17iwjzh5dg4gsnzihakbriwwyqnb8rk0z33ay4zn2hml0b7g03kv";
|
||||
sgr-iosevka-ss10 = "1jj8fy5l96dfd5fn3v1dqzpiyqimhqh6cplzgg7mzp94pabwrrrx";
|
||||
sgr-iosevka-ss11 = "02hw77qwi5gazpf153cfhkf24ngsfjfkxn4mjxxr89b1z6jsbkv6";
|
||||
sgr-iosevka-ss12 = "1365v9chsg93lyjsv1p239kr9p11x9cz87s9l0pzdx1liaby6zdl";
|
||||
sgr-iosevka-ss13 = "1bzl0zr4g0rxkwbkgpdqxw6l01g0wlqi868c0b9lzkf14dpl4g7f";
|
||||
sgr-iosevka-ss14 = "0iksdqrylgbyykixa4h5ajwrsjd818l626f176kih4cwl1l31hlh";
|
||||
sgr-iosevka-ss15 = "018wl1pv1phq0msw16wc8h77vhpmx30z7z85i09lwi5lsa8k6sqh";
|
||||
sgr-iosevka-ss16 = "1843xvzppkssaz7w43gqk606c3qv5gkj83s91gv1zcj5dkw7r6s4";
|
||||
sgr-iosevka-ss17 = "1x8i1ixs99wwvxs0hpvjw87dzwix0kllnvkbyj9mikdprlaj5fv0";
|
||||
sgr-iosevka-ss18 = "0jday3yxajg79xkf346rak7qk34fil7bm4821j84nlpx2pv9hnl8";
|
||||
sgr-iosevka-term = "1a5j06ch0sbbbg5gka4anlx7jdgdma0imbd69jkcp6wimdr5scjh";
|
||||
sgr-iosevka-term-curly = "1ba099crsfljg8isvc7bvwxg6w4nv98q9451b92vwr6szmz18a6v";
|
||||
sgr-iosevka-term-curly-slab = "0linlp56r1zxjk5517npy92flnw2iy2pdjpzklhm6f42yzpkz6a0";
|
||||
sgr-iosevka-term-slab = "1m19gxb5cyvswmdccyskfy9b0ymgibcnxsmcrn56k5df15hlb12f";
|
||||
sgr-iosevka-term-ss01 = "1b1ixxjv0ryyahm17w4cr9cydwq41vg4nzyii4pj6agzpi28yczg";
|
||||
sgr-iosevka-term-ss02 = "1155c7gcfcrb6i5w2qbwicnvbhda9vg753wghkwc6fbzyg95236c";
|
||||
sgr-iosevka-term-ss03 = "14nm4nn3szvj3is3c0b88li6ks7yizr4fjgw2jj0sl76ypj4if8z";
|
||||
sgr-iosevka-term-ss04 = "0j58sbffmmwa7i4b0slz789j5lrlqaizxbmfg8qzgccwp75q1s4a";
|
||||
sgr-iosevka-term-ss05 = "0jmiiacpjp3x5x70sybbhnnjqsmjhs4l1pgj4baqxc0lgj2j5xxl";
|
||||
sgr-iosevka-term-ss06 = "1w8b708njfhjcv36vpagnxvsij81gylmlwhn69ahnw17wvhw63c5";
|
||||
sgr-iosevka-term-ss07 = "1v7545d84jraa7mxm9k2yx7ik5wp1hy6r4lfpwsxd3n8x5kgvbcr";
|
||||
sgr-iosevka-term-ss08 = "10v9c4rmb2932zsh7qz9ij1q04r0d7y08rxlnjr8w6g57kn7mmd9";
|
||||
sgr-iosevka-term-ss09 = "0j12j6qwnrvkyh46qvzgzip4jpkxcbg80bfkplrskrwglcdxig68";
|
||||
sgr-iosevka-term-ss10 = "1racjzqllhlz6xpad5cnms0m8psmrv3b4flqivdh4w8r6alpavpw";
|
||||
sgr-iosevka-term-ss11 = "1vn3s084z46sszil1g5mf2z31hndxpb7a835b306rklnrsv87h3k";
|
||||
sgr-iosevka-term-ss12 = "0pm9c06vfx9c322zqyq54ibfmrhnfmn8yqa682z3y4sss20gw2nb";
|
||||
sgr-iosevka-term-ss13 = "1ixd92l81hanzkdmkgvz302ghjdx9x96rcl4j5qf4amxa77hn341";
|
||||
sgr-iosevka-term-ss14 = "108l7wb90fyimfzzxc08rw0z67iabvd9mliybsqp4cv73d408lni";
|
||||
sgr-iosevka-term-ss15 = "0knhyvjy9wsrd209sy5h3q4mrkj49kgr76fdzgn4j4mmssnjkvp2";
|
||||
sgr-iosevka-term-ss16 = "1hydhyhd25gpj0r3xlv2n3m34vbx0nfqgy07vibywhq0pm29ywkr";
|
||||
sgr-iosevka-term-ss17 = "1j84529d54kxvxf7xlilh6xpn1nrv8ablkyg829y5v2ad06db14m";
|
||||
sgr-iosevka-term-ss18 = "03vvcmvrhkb4rsj1vvvnvprawzwk71s4756wvr0dfngc838nrmg5";
|
||||
iosevka = "0lxcyg93max17fqm6yvxwvr79jz9bggxcmv6qx8sknvjmq89l0pf";
|
||||
iosevka-aile = "0pljy65m5zaxbajfmhc3gayz73rbp8vzaqzqcrlm2ir9yxaz21qc";
|
||||
iosevka-curly = "0svf6hm0cspydgzjg39f5rp7mrcabb0vc2088r1msipaw8naajqf";
|
||||
iosevka-curly-slab = "1afk0ijfciwh9pjy2qsawxw7gq7jxr52li2nwggcq04c9ybh62pg";
|
||||
iosevka-etoile = "07zihk9q1ff93ms9gj92hbf2fzw7h4fl28szhrfll3p96y9f81q7";
|
||||
iosevka-slab = "18hrv0kc82hfb6ivbdg5k9179k37anjigm8ddh5waiq2is6gmh8l";
|
||||
iosevka-ss01 = "127zki1wcd2wjpqr1n2zf57iq44pwcrg2vlrspi3b9lhmxw0rlz9";
|
||||
iosevka-ss02 = "0ig7y86c2d9y4bg5cqibbn0wqwwzm5d5qxd8vwhvd323mg3gh6bg";
|
||||
iosevka-ss03 = "0zp2nkrl39pvidn846706dp8l12ac66kd9wsyh4cnn08mmm6gl4i";
|
||||
iosevka-ss04 = "0r0ylsxj2j9akpxchnldwyddm7vrlpn82sxkgmjhr81hn3q08bgc";
|
||||
iosevka-ss05 = "0r9mdhdjndxgm68fg59dbd810ggrpmpkvgcypyqf92l8sf1h55hj";
|
||||
iosevka-ss06 = "1c6ga4jaglfp5mx980qy1alkifr1d1lq4qj69xfq6sx4146xn20f";
|
||||
iosevka-ss07 = "0h1x2p9finl4482vx6lvs45x5258bpw5avkpgmg66wn16kd95zfq";
|
||||
iosevka-ss08 = "1n5m11dlv49jj63s771ny77qpiz178iyvn7pfnhv2mzqwimz5sl2";
|
||||
iosevka-ss09 = "1rbs15xsk7fajrm81nacixf18jjx08bpg26fw7pmxjv727zafv05";
|
||||
iosevka-ss10 = "1rdpiq5pyzrnxhnsvf08zg0vjhln25vqkyknnv4xf34wr8r9xcc0";
|
||||
iosevka-ss11 = "0l9454vx90pj0yva864qfj06ggplia0qdkv3nr14s3wmv5khh9gw";
|
||||
iosevka-ss12 = "0cafszj0c7nkcxpbqsrqy5l2v0nzfph6i22w1iayg8bqvpip3x5m";
|
||||
iosevka-ss13 = "1mlxh6qikrl0g82difr85lpkxdr83z5iymf0brmgdxkmyig3psr7";
|
||||
iosevka-ss14 = "1330p52h94fgr76gll396hb0qalamm8z79hw73ci4ph22dpsd4ni";
|
||||
iosevka-ss15 = "0cc5a1187i9idgvz7zhs0byya8c69f0g4pkqlivh37ffj07yv47v";
|
||||
iosevka-ss16 = "052nypjppbrbkhjq85nwmx8469prfsbc9f05kw0vi30c8mpcjqwf";
|
||||
iosevka-ss17 = "0k5p1qvx8vi8ic7yayky7zdi1hrkwli698ydlfhnk4yx10l0xq8j";
|
||||
iosevka-ss18 = "16diyrfpz1kp9vcyq61pbdrrv4pl96kzn8ckv7wb5cnwxwa336c7";
|
||||
sgr-iosevka = "0b92jmai9cgxdah74jmks7fwbyb1m722ablf3qaiizc597y031wv";
|
||||
sgr-iosevka-aile = "1z5jg74aspkvhw41ihwzbfs4f075gs8ny76m30adp0n3v877nhjz";
|
||||
sgr-iosevka-curly = "06bm6jg16sgvxnqbayqa92lvr0bc5vdjybbi467yx57hi83w860q";
|
||||
sgr-iosevka-curly-slab = "08kg8imp29sww57mdpfmi86046vqwd4a2ayijcvs511v8nhl478r";
|
||||
sgr-iosevka-etoile = "0gybfn95n2b8kn3bvi8pjkps5bmndnbbq9jbfbm81fims0s0496b";
|
||||
sgr-iosevka-fixed = "15q4y8cm8cwxcbmjzknc19gyqmd4nb928b26nswm8m17p85zlcq0";
|
||||
sgr-iosevka-fixed-curly = "1faci2m7w8cf65mjkigqlyh838r5mqvg7ai4nfdidms6ilhhsf37";
|
||||
sgr-iosevka-fixed-curly-slab = "019m3nvsy6vwgf6f0z2l0wxxkqbl30y55jfgi2bsmxhizwzl3csc";
|
||||
sgr-iosevka-fixed-slab = "1ps1xi334h7by3nihn3n6d76sbzcvv03dwy4iy5wixlz0lr8id5i";
|
||||
sgr-iosevka-fixed-ss01 = "18qdd6qbk8dy6z36lsy89a7g6l1asdzqvlc82j9vk437yjm59vwi";
|
||||
sgr-iosevka-fixed-ss02 = "0xm1k1f5hbhjbksshlv7bcdigdrxxhfpc8pgv7dvz7zpy7cx2y4y";
|
||||
sgr-iosevka-fixed-ss03 = "1741k3p2mncq9kp1wshpl6dkwqvvg2bpakl91k6ssvj1z63r2zhq";
|
||||
sgr-iosevka-fixed-ss04 = "0sw65088yihk2sk2mcdr4cd8rl9l954l2sc3y7dil3jkgw6kf0wq";
|
||||
sgr-iosevka-fixed-ss05 = "1cc71vidcljh6k6pw6z5yygi0kir7n235l19as8y1qazmc8kh0ip";
|
||||
sgr-iosevka-fixed-ss06 = "0s2f0j0z4dyd23z5mldih03cg8vqwvpqrmagbpx02v2krzn2vb27";
|
||||
sgr-iosevka-fixed-ss07 = "07nfdx7bdbsxrmylsja8bvr1n2a116qyfg8pk1wpcax3vf56jamh";
|
||||
sgr-iosevka-fixed-ss08 = "0ys6gw2p7vpdv8csxzxjx09m8k0h4s28w7i98iq27ak47xcm8xd7";
|
||||
sgr-iosevka-fixed-ss09 = "0vn6vc0byakggyrd6d9mv1l9d4h5g7wcbkkmxzqfjr6xp3k96r88";
|
||||
sgr-iosevka-fixed-ss10 = "0llqjvv7m1imvqw41xvmcw9y9c9wsnv2i8swnszr9r5khx3kbp6h";
|
||||
sgr-iosevka-fixed-ss11 = "1wwjp1fgl2gxhjkmsz6k0a59kjcapby9y8j5m763ap4ig5djbv8r";
|
||||
sgr-iosevka-fixed-ss12 = "1k9ak5dc3s024iz6rp4yz9b73752v93n0kldcnwi0lvbh4hp358k";
|
||||
sgr-iosevka-fixed-ss13 = "0rgj38jkj6d7g44wn02k6ycixkwq6lwy756vp9w01aqqn5flw6s1";
|
||||
sgr-iosevka-fixed-ss14 = "0lbpwnc40lswlmfwqziz7n3kn95kc5rn4fbq5nxa1z8cxz9dkhvh";
|
||||
sgr-iosevka-fixed-ss15 = "034h7af7876q0ni8idj5dhkq1cpl91gvxhwxyw17pgnz8i51a261";
|
||||
sgr-iosevka-fixed-ss16 = "0i00nxj0j7yr57b4ccd2yc4x7k8zw1xxpdwfwlm0n38c05iqbvj9";
|
||||
sgr-iosevka-fixed-ss17 = "1z21han7l7nwz0qfi6fzvwdiadd9brpna51p24drdi8y3915b8n9";
|
||||
sgr-iosevka-fixed-ss18 = "0fjdsx66al0h3spgdivryiw5d871s93s2lbmh7nxwf19lylrkv19";
|
||||
sgr-iosevka-slab = "0j42hxgcwy5abf5jv5aqjri6h21k2nkgjj7527f68rgcnl9d980b";
|
||||
sgr-iosevka-ss01 = "1m7c8zb3rhxnf9h4v55jv7ns6x74bwfsl6f4sl2b1gkfl50ibwqg";
|
||||
sgr-iosevka-ss02 = "05cc3p8lkxl1s27wmgspk93fz8f51daqcfid8vpsvnqw75abivc9";
|
||||
sgr-iosevka-ss03 = "0bmh1ijdalss96lkji0dcyl00wc2yw7a3lx0nqbbjl4m0l2mz4yp";
|
||||
sgr-iosevka-ss04 = "1jc1y9rgw8hnd7zqrn98b35r01kmr2nykqip63h6qal7l456m4s2";
|
||||
sgr-iosevka-ss05 = "06acxqhzfxlhqd083s57b15sx2vgq0r6pl9myp8syh1d9azbk899";
|
||||
sgr-iosevka-ss06 = "0g3zaxy9363p28kcv6a52dqb1swnrn3rwl6pfvanz92vrrjspr7n";
|
||||
sgr-iosevka-ss07 = "1bmdparw1hg3i8lnx8vwd467pwf4q94q80a62fcy87hppy3afryg";
|
||||
sgr-iosevka-ss08 = "16kgj158nhmlql0gkkfya04dy1gp9an4gk691f28n0mqhi7hygcr";
|
||||
sgr-iosevka-ss09 = "144x84qmh9pycn9v36q4z074vmnngn0chlyb8a8hyhgsyfqf7q7h";
|
||||
sgr-iosevka-ss10 = "0i9hsmw78yg75a3m80jlmdn2rn72snz69m0abvz7z94b7c99ffsb";
|
||||
sgr-iosevka-ss11 = "05a9azf7f64jdr5wwiy7djlmarl01mg6rfmzvrdd8a1a0nfcz1iz";
|
||||
sgr-iosevka-ss12 = "1nqa88csh170gs3bggs6v5ssaqljvpw1zxaclhmzdvyhcphrwd19";
|
||||
sgr-iosevka-ss13 = "1klhp2w99znj9qyz95z8jq3g23fs8jznya9dfzfy2i4hivw2gxv0";
|
||||
sgr-iosevka-ss14 = "1w84mqg0x46fbr8v72ccxc9a7sp52g4qb0x6l84wr8cm1fn7n21f";
|
||||
sgr-iosevka-ss15 = "05kdxmghhdyvlnc3wxzc5yyp00ybrq63fzh2kz3s4rwh11hhf0lq";
|
||||
sgr-iosevka-ss16 = "0a9i7plsfy8fawip70p5w3dkmjh4sy61iwi9pnl0ara7z23783dq";
|
||||
sgr-iosevka-ss17 = "1xmaqs54jhag7s18gfll94g0ixjqp2z5s69kwk48nznzpbfbpdsb";
|
||||
sgr-iosevka-ss18 = "09nq0a7b4hkiyi1prxpf6vwms9cnmby2dzn9k4y0xcax7m464531";
|
||||
sgr-iosevka-term = "1zr8cyq6578n8f3y9yyc0phs26hda1bf0bsd417wqcwsn88wfmx8";
|
||||
sgr-iosevka-term-curly = "0xlwljc2gmwh119x83p2pic5zwjqdymg7pbl2ginzilsrgjl2k0q";
|
||||
sgr-iosevka-term-curly-slab = "1vmpdws71sf1pf8nz3w7y0a64a5c3mp8f9w57bqmcn9vr22ymcl7";
|
||||
sgr-iosevka-term-slab = "1wkqdgy9nd4mvy4rsssvpis1r17ikpbl8mfx6bp80fh0lai97mxw";
|
||||
sgr-iosevka-term-ss01 = "1ly5ic5ihj00apb87am3kl38mywns8jizc7f4hniyrd9xhy1186z";
|
||||
sgr-iosevka-term-ss02 = "09lisy461dvppfv6sdk4i6vfrqhxyx558zdaflv9vskmfq8iq66d";
|
||||
sgr-iosevka-term-ss03 = "0nm84l4xk53l1q96hx8q63nbflgmivj3cq7z5mysv1z8jdp7isx3";
|
||||
sgr-iosevka-term-ss04 = "1y9kkasxmpm4n1vs5plsa25cgwvdi4jahn3ggdlxpl35yi4kxnr3";
|
||||
sgr-iosevka-term-ss05 = "1drngqgcibv6kfwjn3s2bik286ypj613q4p3fz0b7incniaz372j";
|
||||
sgr-iosevka-term-ss06 = "1rkqnj59hv1lzsplss3jk0jgz6q68qkg4a3200hv10rs9i2w2qxk";
|
||||
sgr-iosevka-term-ss07 = "1z6jh8qmc2063zgwbd00xi258grdillkc1nja69awdxiamv6hgf9";
|
||||
sgr-iosevka-term-ss08 = "022qw6frmmmpwbq6af8rysm8pbq713fiw92hkqi5k3j4v8dwl9v2";
|
||||
sgr-iosevka-term-ss09 = "1c32p4d46q3izif68ka6gr1hmq10snrlga5d7ypphmm8yxvavd9c";
|
||||
sgr-iosevka-term-ss10 = "1p497kqa386q5rvsfigzxdr0009agiw4bv4xxmb83pg3sl8bf7z9";
|
||||
sgr-iosevka-term-ss11 = "19kfvmwijd1kyw4bln0m5z7wpch9h44ny13ccxx0qmiv5y7wwm94";
|
||||
sgr-iosevka-term-ss12 = "1pnr7yd431xnym12vnlww6rxm1vfd9x24kqpx0323q3n61yjqzd6";
|
||||
sgr-iosevka-term-ss13 = "04nhps95s360vv4qr1pbzs1aj8zdalzv4ajdkawdssxaz1xs57c7";
|
||||
sgr-iosevka-term-ss14 = "1xvdpx8sa4ifgy9a3y65qcxj8cavisw4h7hjfivq4y0il79sl7nw";
|
||||
sgr-iosevka-term-ss15 = "03rs8b8yb7n1f7cp6zffgr7x20vx6hiag7a22ysx0zr2i4zp37i6";
|
||||
sgr-iosevka-term-ss16 = "1s86hmr7a6qwyf5m9q0npzzd25nvh9k1nlja1b8fnnlgchycwfbw";
|
||||
sgr-iosevka-term-ss17 = "0y5i99iy7r3z4cv87s3v3mxbadp3np16a3c65w41pjv86llkc30g";
|
||||
sgr-iosevka-term-ss18 = "0s5hdh61y5v17jrdpajgkzzrg0cqgcad6gvs9m8v55xi2zlqfxip";
|
||||
}
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202301190046";
|
||||
version = "202301260045";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "83ea735314fbc2c3404cb4b9aa044b476e67bc8b";
|
||||
sha256 = "sha256-8u2xhpoA6BH9e+kgDwxPsjD4RSuUw05h39aUo7ivM3U=";
|
||||
rev = "dda29e7611d13ff6f580cf389a7b84194363f75c";
|
||||
sha256 = "sha256-9X9Oh4WFFpuRG1jQyQHTqNOCcW5f+uNOjH1iv1i6Je0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
{ lib, pkgs, libsForQt5 }:
|
||||
let
|
||||
packages = self:
|
||||
let
|
||||
inherit (self) callPackage;
|
||||
in {
|
||||
#### LIBRARIES
|
||||
dtkcommon = callPackage ./library/dtkcommon { };
|
||||
dtkcore = callPackage ./library/dtkcore { };
|
||||
dtkgui = callPackage ./library/dtkgui { };
|
||||
dtkwidget = callPackage ./library/dtkwidget { };
|
||||
qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
|
||||
qt5integration = callPackage ./library/qt5integration { };
|
||||
deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };
|
||||
dwayland = callPackage ./library/dwayland { };
|
||||
dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { };
|
||||
disomaster = callPackage ./library/disomaster { };
|
||||
docparser = callPackage ./library/docparser { };
|
||||
gio-qt = callPackage ./library/gio-qt { };
|
||||
image-editor = callPackage ./library/image-editor { };
|
||||
udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
|
||||
};
|
||||
in
|
||||
lib.makeScope libsForQt5.newScope packages
|
||||
@@ -0,0 +1,53 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
, python3
|
||||
, dtkcore
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-qt-dbus-factory";
|
||||
version = "5.5.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jqk04S+i3py3rVJcHmkPKHsU+eNEN1yoUBBlfXBbcwM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
dtkcore
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
"INSTALL_ROOT=${placeholder "out"}"
|
||||
"LIB_INSTALL_DIR=${placeholder "out"}/lib"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace libdframeworkdbus/libdframeworkdbus.pro \
|
||||
--replace "/usr" ""
|
||||
|
||||
substituteInPlace libdframeworkdbus/DFrameworkdbusConfig.in \
|
||||
--replace "/usr/include" "$out/include"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Repo of auto-generated D-Bus source code which DDE used";
|
||||
homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-wayland-protocols";
|
||||
version = "1.6.0-deepin.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "XML files of the non-standard wayland protocols use in deepin";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-wayland-protocols";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, qmake
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, libisoburn
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "disomaster";
|
||||
version = "5.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ libisoburn ];
|
||||
|
||||
qmakeFlags = [ "VERSION=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A libisoburn wrapper class for Qt";
|
||||
homepage = "https://github.com/linuxdeepin/disomaster";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, qmake
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, poppler
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "docparser";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-iWRWSu8fALTTLLWdQGbpunN/1tpvKxuN/ZWJg34x0mU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ poppler ];
|
||||
|
||||
qmakeFlags = [ "VERSION=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A document parser library ported from document2html";
|
||||
homepage = "https://github.com/linuxdeepin/docparser";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, qtbase
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, glib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtkcommon";
|
||||
version = "5.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9gFJ0Uun0q/XVaegxTUu4Kkc+/GE09eAV68VZgWurrM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
preFixup = ''
|
||||
glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A public project for building DTK Library";
|
||||
homepage = "https://github.com/linuxdeepin/dtkcommon";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, gsettings-qt
|
||||
, wrapQtAppsHook
|
||||
, lshw
|
||||
, dtkcommon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtkcore";
|
||||
version = "5.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DEpo/eKMjtTVGEkq5JofkRNSHtTOZ1t2QNjrdulUtPQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/dsysinfo.cpp \
|
||||
--replace "/usr/share/deepin/distribution.info" "/etc/distribution.info" \
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gsettings-qt
|
||||
lshw
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ dtkcommon ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDVERSION=${version}"
|
||||
"-DBUILD_DOCS=OFF"
|
||||
"-DDSG_PREFIX_PATH='/run/current-system/sw'"
|
||||
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deepin tool kit core library";
|
||||
homepage = "https://github.com/linuxdeepin/dtkcore";
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, librsvg
|
||||
, lxqt
|
||||
, dtkcore
|
||||
, qtimageformats
|
||||
, freeimage
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtkgui";
|
||||
version = "5.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-r6ZwGPiK6CcKEg8RoHV07wJbQI3idJFV3WFtuKim8n4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
lxqt.libqtxdg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dtkcore
|
||||
librsvg
|
||||
qtimageformats
|
||||
freeimage
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDVERSION=${version}"
|
||||
"-DBUILD_DOCS=OFF"
|
||||
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deepin Toolkit, gui module for DDE look and feel";
|
||||
homepage = "https://github.com/linuxdeepin/dtkgui";
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkgui
|
||||
, pkg-config
|
||||
, cmake
|
||||
, qttools
|
||||
, qtmultimedia
|
||||
, qtsvg
|
||||
, qtx11extras
|
||||
, wrapQtAppsHook
|
||||
, cups
|
||||
, gsettings-qt
|
||||
, libstartup_notification
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtkwidget";
|
||||
version = "5.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-APk2p8pdLsaKvPp95HtEI1F1LM4ySUL+fhGsC5vHasU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/widgets/dapplication.cpp \
|
||||
--replace "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \
|
||||
"auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
qtx11extras
|
||||
cups
|
||||
gsettings-qt
|
||||
libstartup_notification
|
||||
xorg.libXdmcp
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ dtkgui ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDVERSION=${version}"
|
||||
"-DBUILD_DOCS=OFF"
|
||||
"-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deepin graphical user interface library";
|
||||
homepage = "https://github.com/linuxdeepin/dtkwidget";
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qtbase
|
||||
, qtwayland
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, extra-cmake-modules
|
||||
, deepin-wayland-protocols
|
||||
, qttools
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dwayland";
|
||||
version = "5.24.3-deepin.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/aWS4uvhxi9azxJWjRE+Bw+veURFO+mC8l9yypseclU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
qttools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtwayland
|
||||
wayland
|
||||
wayland-protocols
|
||||
deepin-wayland-protocols
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt-style API to interact with the wayland-client and wayland-server";
|
||||
homepage = "https://github.com/linuxdeepin/dwayland";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, glibmm
|
||||
, doxygen
|
||||
, buildDocs ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gio-qt";
|
||||
version = "0.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dlY1CTlXywgGZUonBBe3cDwx8h2xXrPY6Ft/D59nlug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DPROJECT_VERSION=${version}"
|
||||
]
|
||||
++ lib.optional (!buildDocs) [ "-DBUILD_DOCS=OFF" ];
|
||||
|
||||
buildInputs = lib.optional buildDocs doxygen;
|
||||
|
||||
propagatedBuildInputs = [ glibmm ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gio wrapper for Qt applications";
|
||||
homepage = "https://github.com/linuxdeepin/gio-qt";
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, dtkwidget
|
||||
, cmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, opencv
|
||||
, freeimage
|
||||
, libmediainfo
|
||||
, ffmpegthumbnailer
|
||||
, pcre
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "image-editor";
|
||||
version = "1.0.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0p/aicuBfaEyvfZomnz49IJLospWIdl23ZreDe+Bzqc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "feat_check_PREFIX_value_before_set";
|
||||
url = "https://github.com/linuxdeepin/image-editor/commit/dae86e848cf53ba0ece879d81e8d5335d61a7473.patch";
|
||||
sha256 = "sha256-lxmR+nIrMWVyhl1jpA17x2yqJ40h5vnpqKKcjd8j9RY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "feat_use_FULL_install_path";
|
||||
url = "https://github.com/linuxdeepin/image-editor/commit/855ae53a0444ac628aa0fe893932df6263b82e2e.patch";
|
||||
sha256 = "sha256-3Dynlwl/l/b6k6hOHjTdoDQ/VGBDfyRz9b8QY8FEsCc=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace libimageviewer/service/ffmpegvideothumbnailer.cpp \
|
||||
--replace 'libPath("libffmpegthumbnailer.so")' 'QString("${ffmpegthumbnailer.out}/lib/libffmpegthumbnailer.so")'
|
||||
|
||||
substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out'
|
||||
substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
opencv
|
||||
freeimage
|
||||
libmediainfo
|
||||
ffmpegthumbnailer
|
||||
pcre
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Image editor lib for dtk";
|
||||
homepage = "https://github.com/linuxdeepin/image-editor";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, qmake
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qtx11extras
|
||||
, qt5platform-plugins
|
||||
, lxqt
|
||||
, mtdev
|
||||
, xorg
|
||||
, gtest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qt5integration";
|
||||
version = "5.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GXxPoBM4tlWezTfv/f+/IJezzcAsuMbr/OOGaSOpn2g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
qtx11extras
|
||||
qt5platform-plugins
|
||||
mtdev
|
||||
lxqt.libqtxdg
|
||||
xorg.xcbutilrenderutil
|
||||
gtest
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/${qtbase.qtPluginPrefix}
|
||||
cp -r bin/plugins/* $out/${qtbase.qtPluginPrefix}/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt platform theme integration plugins for DDE";
|
||||
homepage = "https://github.com/linuxdeepin/qt5integration";
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
, wrapQtAppsHook
|
||||
, mtdev
|
||||
, cairo
|
||||
, xorg
|
||||
, waylandSupport ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qt5platform-plugins";
|
||||
version = "5.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk=";
|
||||
};
|
||||
|
||||
## https://github.com/linuxdeepin/qt5platform-plugins/pull/119
|
||||
postPatch = ''
|
||||
rm -r xcb/libqt5xcbqpa-dev/
|
||||
mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version}
|
||||
cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
mtdev
|
||||
cairo
|
||||
qtbase
|
||||
qtx11extras
|
||||
xorg.libSM
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
"INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
|
||||
]
|
||||
++ lib.optional (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt platform plugins for DDE";
|
||||
homepage = "https://github.com/linuxdeepin/qt5platform-plugins";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, udisks
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "udisks2-qt5";
|
||||
version = "5.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ udisks ];
|
||||
|
||||
qmakeFlags = [ "VERSION=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "UDisks2 D-Bus interfaces binding for Qt5";
|
||||
homepage = "https://github.com/linuxdeepin/udisks2-qt5";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
@@ -43,7 +43,7 @@ let
|
||||
elvis-erlang = callPackage ./elvis-erlang { };
|
||||
|
||||
# BEAM-based languages.
|
||||
elixir = elixir_1_13;
|
||||
elixir = elixir_1_14;
|
||||
|
||||
elixir_1_14 = lib'.callElixir ../interpreters/elixir/1.14.nix {
|
||||
inherit erlang;
|
||||
|
||||
@@ -25,11 +25,11 @@ let
|
||||
in
|
||||
builder rec {
|
||||
pname = "guile";
|
||||
version = "3.0.8";
|
||||
version = "3.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-2qcGClbygE6bdMjX5/6L7tErQ6qyeJo4WFGD/MF7ihM=";
|
||||
sha256 = "sha256-GiYlrHKyNm6VeS8/51j9Lfd1tARKkKSpeHMm5mwNdQ0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
|
||||
@@ -149,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
# while we have a double-float toolchain
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d";
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
|
||||
|
||||
postPatch = lib.optionalString (lib.versionOlder version "102") ''
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
, SDL2
|
||||
, libiconv
|
||||
, Cocoa
|
||||
, autoSignDarwinBinariesHook
|
||||
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, openglSupport ? libGLSupported
|
||||
, libGL
|
||||
@@ -27,7 +28,8 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-8b9rFI4iRpBJqeJ2KRJ9vRyv9gYwa9jRWCuXRfA3x50=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config ]
|
||||
++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ];
|
||||
|
||||
propagatedBuildInputs = [ SDL2 ]
|
||||
++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ]
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aml";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "any1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WhhjK9uzKyvnzpGtAWXXo0upfZTPINHVk0qmzNXwobE=";
|
||||
sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
|
||||
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
# have to link to static gcc lib on aarch64-linux explicitly
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "exprtk";
|
||||
version = "unstable-2021-12-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArashPartow";
|
||||
repo = "exprtk";
|
||||
rev = "806c519c91fd08ba4fa19380dbf3f6e42de9e2d1";
|
||||
hash = "sha256-5/k+y3gNJeggfwXmtAVqmaiV+BXX+WKtWwZWcQSrQDM=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 exprtk.hpp "$out/include/exprtk.hpp"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The C++ Mathematical Expression Toolkit Library";
|
||||
homepage = "https://www.partow.net/programming/exprtk/index.html";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ anselmschueler ];
|
||||
};
|
||||
}
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [ libiconv ];
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
preAutoreconf = let
|
||||
reports = "https://github.com/tlwg/libdatrie/issues";
|
||||
|
||||
@@ -10,13 +10,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librime";
|
||||
version = "1.7.3";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rime";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GzNMwyJR9PgJN0eGYbnBW6LS3vo4SUVLdyNG9kcEE18=";
|
||||
sha256 = "sha256-tPuDDVV4ZeBva/oHcw0rNjkzYmCtT2vLCdwCukBM28w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libunibreak";
|
||||
version = "5.0";
|
||||
version = "5.1";
|
||||
|
||||
src = let
|
||||
rev_version = lib.replaceStrings ["."] ["_"] version;
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "adah1972";
|
||||
repo = pname;
|
||||
rev = "libunibreak_${rev_version}";
|
||||
sha256 = "sha256-ju+DNCzwD+y/ebLVBU96iNpE1Wt7/K0qLcZHzWGzrWQ=";
|
||||
sha256 = "sha256-hjgT5DCQ6KFXKlxk9LLzxGHz6B71X/3Ot7ipK3KY85A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -1,20 +1,52 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja
|
||||
, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml, mesa, ffmpeg
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, aml
|
||||
, ffmpeg
|
||||
, gnutls
|
||||
, libjpeg_turbo
|
||||
, mesa
|
||||
, pixman
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neatvnc";
|
||||
version = "0.5.4";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "any1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IZUCNHhlDhq0KlUjkp3Yh5ysJsThlGw1FLHSaFe4Z0Q=";
|
||||
sha256 = "sha256-3hNdgfAJGJkMXdB86+u3bKwrvXoMei1YCFXDG4ObkU4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml mesa ffmpeg ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
aml
|
||||
ffmpeg
|
||||
gnutls
|
||||
libjpeg_turbo
|
||||
mesa
|
||||
pixman
|
||||
zlib
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "tests" true)
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A VNC server library";
|
||||
|
||||
@@ -174,10 +174,11 @@ let
|
||||
cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult
|
||||
'';
|
||||
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.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;
|
||||
};
|
||||
qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
, systemd
|
||||
, enableProprietaryCodecs ? true
|
||||
, gn
|
||||
, cctools, libobjc, libunwind, sandbox, xnu
|
||||
, cctools, libobjc, libpm, libunwind, sandbox, xnu
|
||||
, ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit
|
||||
, ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication
|
||||
, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML
|
||||
, cups, openbsm, runCommand, xcbuild, writeScriptBin
|
||||
, ffmpeg_4 ? null
|
||||
, lib, stdenv, fetchpatch
|
||||
@@ -94,6 +95,11 @@ qtModule {
|
||||
--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 \
|
||||
--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;
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
|
||||
@@ -105,8 +111,6 @@ qtModule {
|
||||
"-march=westmere"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-elaborated-enum-base"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-Wno-elaborated-enum-base"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
@@ -177,6 +181,11 @@ qtModule {
|
||||
Quartz
|
||||
Cocoa
|
||||
LocalAuthentication
|
||||
MediaPlayer
|
||||
MediaAccessibility
|
||||
SecurityInterface
|
||||
Vision
|
||||
CoreML
|
||||
|
||||
openbsm
|
||||
libunwind
|
||||
@@ -184,6 +193,7 @@ qtModule {
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
cups
|
||||
libpm
|
||||
sandbox
|
||||
|
||||
# `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py`
|
||||
@@ -235,6 +245,7 @@ qtModule {
|
||||
(isMips && isLittleEndian))))
|
||||
(map (plat: plat.system))
|
||||
];
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
|
||||
# This build takes a long time; particularly on slow architectures
|
||||
timeout = 24 * 3600;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv
|
||||
, enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given."
|
||||
# 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
|
||||
}:
|
||||
|
||||
@@ -34,6 +34,7 @@ in stdenv.mkDerivation rec {
|
||||
libXt
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
xpc
|
||||
AGL
|
||||
Cocoa
|
||||
CoreServices
|
||||
DiskArbitration
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "cairo2";
|
||||
version = "0.6.2";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";
|
||||
sha256 = "sha256-a7P1kiVmIwT6Fhtwxs29ffgO4iexsulxUoc9cnJmEK4=";
|
||||
sha256 = "sha256-QDVzUtcgXTpXNYVWQ4MMs0Xy24OP+dGaUyAYdg1GigU=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.02";
|
||||
|
||||
@@ -6,13 +6,13 @@ else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-ctypes";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocamllabs";
|
||||
repo = "ocaml-ctypes";
|
||||
rev = version;
|
||||
sha256 = "sha256-fr60H/hiSVjEg11qM8LF1Y5CotS3FEyFdCcIh0A0uI4=";
|
||||
sha256 = "sha256-H1QR0MJCqRdXxRufCA663wzTNWQ8MYYAy2nz/XHCn0Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ocaml findlib ];
|
||||
|
||||
@@ -3,24 +3,25 @@
|
||||
, faraday
|
||||
, fetchurl
|
||||
, lib
|
||||
, ke
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gluten";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz";
|
||||
sha256 = "1pl0mpcprz8hmaiv28p7w51qfcx7s76zdkak0vm5cazbjl38nc46";
|
||||
hash = "sha256-9jctX3G/nQJTGJ7ClSBEiXwxeu0GcT9N+EmPfLuSFOU=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bigstringaf
|
||||
faraday
|
||||
ke
|
||||
];
|
||||
|
||||
doCheck = false; # No tests
|
||||
|
||||
@@ -7,7 +7,9 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gluten-lwt-unix";
|
||||
inherit (gluten) doCheck meta src useDune2 version;
|
||||
inherit (gluten) doCheck meta src version;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
faraday-lwt-unix
|
||||
|
||||
@@ -5,7 +5,9 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gluten-lwt";
|
||||
inherit (gluten) doCheck meta src useDune2 version;
|
||||
inherit (gluten) doCheck meta src version;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gluten
|
||||
|
||||
@@ -8,7 +8,7 @@ buildDunePackage rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz";
|
||||
hash = "sha256-+OqDwUIiPrtJy1C3DmDNTrtsT8clKKcNWCev4TEMRBc=";
|
||||
hash = "sha256-EQ+KjDn+UsyHFRh0RWe9toqdjiNcacQUMNRQCLuaw5I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
minimalOCamlVersion = "4.07";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
pname = "optint";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/optint/releases/download/v${version}/optint-${version}.tbz";
|
||||
sha256 = "sha256-HcvgtrYDH3fbMwKMhxOP2zv5D5KRXjtmKd3rMKDTAAs=";
|
||||
sha256 = "sha256-KVz/LBNLA4WxO6gdUAXZ+EG6QNSlAq7RDJl/I57xFHs=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, buildDunePackage
|
||||
, ocaml
|
||||
, dune-site
|
||||
, fetchzip
|
||||
, fetchurl
|
||||
, gluten-lwt-unix
|
||||
, lib
|
||||
, logs
|
||||
@@ -22,9 +22,11 @@ buildDunePackage rec {
|
||||
pname = "piaf";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz";
|
||||
sha256 = "0d431kz3bkwlgdamvsv94mzd9631ppcjpv516ii91glzlfdzh5hz";
|
||||
hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, pycodestyle
|
||||
, glibcLocales
|
||||
, tomli
|
||||
, pycodestyle
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, tomli
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "autopep8";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hhatto";
|
||||
@@ -20,6 +23,15 @@ buildPythonPackage rec {
|
||||
hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Ignore DeprecationWarnings to fix tests on Python 3.11, https://github.com/hhatto/autopep8/pull/665
|
||||
(fetchpatch {
|
||||
name = "ignore-deprecation-warnings.patch";
|
||||
url = "https://github.com/hhatto/autopep8/commit/75b444d7cf510307ef67dc2b757d384b8a241348.patch";
|
||||
hash = "sha256-5hcJ2yAuscvGyI7zyo4Cl3NEFG/fZItQ8URstxhzwzE=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pycodestyle
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-eventhub";
|
||||
version = "5.10.1";
|
||||
version = "5.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "sha256-LV+o7dMVCFIQfq9d2wYY34LghIP5FN06zDpUPtkELFQ=";
|
||||
sha256 = "sha256-Z1tekAHjO2kVe5g/MpB1U9m38pBQ8J03+pDZdJgzcgE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
|
||||
# extras: babel
|
||||
, babel
|
||||
@@ -45,12 +46,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-security-too";
|
||||
version = "5.0.2";
|
||||
version = "5.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-Security-Too";
|
||||
inherit version;
|
||||
sha256 = "sha256-Nv7g2l0bPSEcrydFU7d1NHjCCJl8Ykq7hOu6QmHeZcI=";
|
||||
hash = "sha256-nSo7fdY9tiE7PnhosXh1eBfVa5l6a43XNvp6vKvrq5Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -103,10 +107,13 @@ buildPythonPackage rec {
|
||||
++ passthru.optional-dependencies.mfa;
|
||||
|
||||
|
||||
pythonImportsCheck = [ "flask_security" ];
|
||||
pythonImportsCheck = [
|
||||
"flask_security"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pypi.org/project/Flask-Security-Too/";
|
||||
changelog = "https://github.com/Flask-Middleware/flask-security/blob/${version}/CHANGES.rst";
|
||||
homepage = "https://github.com/Flask-Middleware/flask-security";
|
||||
description = "Simple security for Flask apps (fork)";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5zysTKqmzRAiePBwLkbUhiAG91sKwao2BCTOBnVHlYg=";
|
||||
hash = "sha256-TwVY6/4TSY8cPj3y/A7+cxpyVJ9+lPg+vAKNhfBNfqI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-firestore";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gEgTYUsaac9dJIxCZJU/axjwiNqttUQiL6UskhzjsJg=";
|
||||
hash = "sha256-WxUiufi+rXBPuSBcC/Ktp0tEkcaA457o0WexweS9MMI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-redis";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dWpsiitG58iCw8z8Hd10eAXXfRRBlq90m0cs1YjeMqE=";
|
||||
hash = "sha256-dRavwtaU+dpRZkO49Q0Btmh2Mi/zUWbvZbImrfUkrAM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-speech";
|
||||
version = "2.17.0";
|
||||
version = "2.17.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Lb2oV2r7CE1qc5iaxzGpIm3xZKpsORx1Nofkjno6xNs=";
|
||||
hash = "sha256-gWcYMY9Ztm5d9CkQXPtAZaDgrKwU90EZBdznuWWDp9o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-translate";
|
||||
version = "3.10.0";
|
||||
version = "3.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SdhAsksalGug0eW9rVlAGpEGIUjreKkFIj3v9x54G6I=";
|
||||
hash = "sha256-++1k8lhJfJ7e/oK//IyYx9W/RacQa/1RwdrhyvCYWEM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-vision";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Rj6yR/8V65wOILVSlLEi6+IRgNk3t/t7grVaHc8sRJY=";
|
||||
hash = "sha256-G7v09CA1pJ2OSL7gBzYvfRGrjPjQElxnyeUvP2vpFJQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "googlemaps";
|
||||
version = "4.7.3";
|
||||
version = "4.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "googlemaps";
|
||||
repo = "google-maps-services-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SwNUoC4x1Z+cqBvuBtDZNZMDcs4XwLj7LWntZ4gZ+vo=";
|
||||
hash = "sha256-Ji9GDVQdDmneOcjrmfaG84HJNCz4igHJQmnwk9xiUlM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec{
|
||||
pname = "panflute";
|
||||
version = "2.2.3";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AJMz+gt8Wa45aFZSLm15RjiiJlJnkWC4Lobk8o8Pu8Y=";
|
||||
hash = "sha256-zv2d/EjM2XMqU9tXYQcB0igG2jl6ipflzI3AcLVYZco=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -30,6 +30,7 @@ buildPythonPackage rec{
|
||||
meta = with lib; {
|
||||
description = "Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions";
|
||||
homepage = "http://scorreia.com/software/panflute";
|
||||
changelog = "https://github.com/sergiocorreia/panflute/releases/tag/${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ synthetica ];
|
||||
};
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
, pylint
|
||||
, pyqt5
|
||||
, pytestCheckHook
|
||||
, pythonRelaxDepsHook
|
||||
, python-lsp-jsonrpc
|
||||
, pythonOlder
|
||||
, rope
|
||||
@@ -32,7 +33,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-lsp-server";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -41,7 +42,7 @@ buildPythonPackage rec {
|
||||
owner = "python-lsp";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s=";
|
||||
hash = "sha256-Rx8mHBmJw4gh0FtQBVMmOlQklODplrhnWwzsEhQm4NE=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
@@ -49,15 +50,20 @@ buildPythonPackage rec {
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
|
||||
--replace "--cov pylsp --cov test" "" \
|
||||
--replace "autopep8>=1.6.0,<1.7.0" "autopep8" \
|
||||
--replace "flake8>=5.0.0,<7" "flake8" \
|
||||
--replace "mccabe>=0.7.0,<0.8.0" "mccabe" \
|
||||
--replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \
|
||||
--replace "pyflakes>=2.5.0,<3.1.0" "pyflakes"
|
||||
--replace "--cov pylsp --cov test" ""
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"autopep8"
|
||||
"flake8"
|
||||
"mccabe"
|
||||
"pycodestyle"
|
||||
"pydocstyle"
|
||||
"pyflakes"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
@@ -130,6 +136,8 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Don't run lint tests
|
||||
"test_pydocstyle"
|
||||
# https://github.com/python-lsp/python-lsp-server/issues/243
|
||||
"test_numpy_completions"
|
||||
"test_workspace_loads_pycodestyle_config"
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.3";
|
||||
pname = "scripttest";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@@ -20,8 +20,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
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;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "setupmeta";
|
||||
version = "3.3.2";
|
||||
version = "3.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -20,8 +20,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "codrsquad";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kX7S5NSqO1LDRkfBHaNfTjzW+l0Pd+5KvQHiNF3eH/M=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "air";
|
||||
version = "1.40.4";
|
||||
version = "1.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmtrek";
|
||||
repo = "air";
|
||||
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}" ];
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ buildah-unwrapped
|
||||
, runCommand
|
||||
, makeWrapper
|
||||
, symlinkJoin
|
||||
, lib
|
||||
, stdenv
|
||||
, extraPackages ? []
|
||||
@@ -11,6 +12,8 @@
|
||||
, fuse-overlayfs # CoW for images, much faster than default vfs
|
||||
, util-linux # nsenter
|
||||
, iptables
|
||||
, aardvark-dns
|
||||
, netavark
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -25,6 +28,17 @@ let
|
||||
iptables
|
||||
] ++ extraPackages);
|
||||
|
||||
helpersBin = symlinkJoin {
|
||||
name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}";
|
||||
|
||||
# this only works for some binaries, others may need to be be added to `binPath` or in the modules
|
||||
paths = [
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
aardvark-dns
|
||||
netavark
|
||||
];
|
||||
};
|
||||
|
||||
in runCommand buildah-unwrapped.name {
|
||||
name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}";
|
||||
inherit (buildah-unwrapped) pname version;
|
||||
@@ -48,5 +62,6 @@ in runCommand buildah-unwrapped.name {
|
||||
mkdir -p $out/bin
|
||||
ln -s ${buildah-unwrapped}/share $out/share
|
||||
makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \
|
||||
--set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \
|
||||
--prefix PATH : ${binPath}
|
||||
''
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "micronaut";
|
||||
version = "3.8.1";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchzip {
|
||||
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 ];
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
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;
|
||||
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -2,16 +2,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsass";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ksub+VYTbaWbFpHJFrMr6Dnx6LOnEOUlI2qHhCfbS40=";
|
||||
pname = "rsass-cli";
|
||||
inherit version;
|
||||
sha256 = "sha256-IaXfxccRRY868waEPI7qbWp1SSAhJlRqgeEiRNddC/c=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ugG4ivQ2NzLJeZss7h9TME2Aipurl1LZBgxt1cYaK2E=";
|
||||
|
||||
buildFeatures = [ "commandline" ];
|
||||
cargoSha256 = "sha256-2owdX9ePHcAXpE43Svan252lAa5ICk0/DrDeADegZ6U=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sass reimplemented in rust with nom";
|
||||
|
||||
+1080
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user