Merge branch 'master' into haskell-updates
This commit is contained in:
Naïm Favier
@@ -22140,6 +22140,12 @@
|
||||
githubId = 474343;
|
||||
name = "Xavier Zwirtz";
|
||||
};
|
||||
XBagon = {
|
||||
name = "XBagon";
|
||||
email = "xbagon@outlook.de";
|
||||
github = "XBagon";
|
||||
githubId = 1523292;
|
||||
};
|
||||
xbreak = {
|
||||
email = "xbreak@alphaware.se";
|
||||
github = "xbreak";
|
||||
|
||||
@@ -226,7 +226,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- `k3s`: was updated to version [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2), all previous versions (k3s_1_26, k3s_1_27, k3s_1_28) will be removed. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information.
|
||||
- `k3s`: has been updated to version [v1.30](https://github.com/k3s-io/k3s/releases/tag/v1.30.0%2Bk3s1), previous supported versions are available under release specific names (e.g. k3s_1_27, k3s_1_28, and k3s_1_29) and present to help you migrate to the latest supported version. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.30.md#changelog-since-v1290) for more information.
|
||||
|
||||
- `himalaya` was updated to v1.0.0-beta.4, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details.
|
||||
|
||||
|
||||
@@ -97,7 +97,12 @@ in {
|
||||
|
||||
serviceConfig = let
|
||||
conf = if cfg.configFile == null
|
||||
then prettyJSON cfg.configuration
|
||||
then
|
||||
# Config validation may fail when using extraFlags = [ "-config.expand-env=true" ].
|
||||
# To work around this, we simply skip it when extraFlags is not empty.
|
||||
if cfg.extraFlags == []
|
||||
then validateConfig (prettyJSON cfg.configuration)
|
||||
else prettyJSON cfg.configuration
|
||||
else cfg.configFile;
|
||||
validateConfig = file:
|
||||
pkgs.runCommand "validate-loki-conf" {
|
||||
@@ -108,7 +113,7 @@ in {
|
||||
'';
|
||||
in
|
||||
{
|
||||
ExecStart = "${cfg.package}/bin/loki --config.file=${validateConfig conf} ${escapeShellArgs cfg.extraFlags}";
|
||||
ExecStart = "${cfg.package}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}";
|
||||
User = cfg.user;
|
||||
Restart = "always";
|
||||
PrivateTmp = true;
|
||||
|
||||
@@ -225,8 +225,10 @@ in
|
||||
# See <https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Specifiers>
|
||||
environment.CONFIG = "%t/${serviceConfig.RuntimeDirectory}/config.toml";
|
||||
|
||||
preStart = "${getExe pkgs.envsubst} -i ${config} -o \"$CONFIG\"";
|
||||
script = "rosenpass exchange-config \"$CONFIG\"";
|
||||
script = ''
|
||||
${getExe pkgs.envsubst} -i ${config} -o "$CONFIG"
|
||||
rosenpass exchange-config "$CONFIG"
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -62,6 +62,24 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
};
|
||||
};
|
||||
|
||||
caclientcaddy =
|
||||
{ config, pkgs, ... }: {
|
||||
security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ];
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
virtualHosts."caclientcaddy".extraConfig = ''
|
||||
respond "Welcome to Caddy!"
|
||||
|
||||
tls caddy@example.org {
|
||||
ca https://caserver:8443/acme/acme/directory
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
catester = { config, pkgs, ... }: {
|
||||
security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ];
|
||||
};
|
||||
@@ -71,7 +89,12 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
''
|
||||
catester.start()
|
||||
caserver.wait_for_unit("step-ca.service")
|
||||
caserver.succeed("journalctl -o cat -u step-ca.service | grep '${pkgs.step-ca.version}'")
|
||||
|
||||
caclient.wait_for_unit("acme-finished-caclient.target")
|
||||
catester.succeed("curl https://caclient/ | grep \"Welcome to nginx!\"")
|
||||
|
||||
caclientcaddy.wait_for_unit("caddy.service")
|
||||
catester.succeed("curl https://caclientcaddy/ | grep \"Welcome to Caddy!\"")
|
||||
'';
|
||||
})
|
||||
|
||||
@@ -748,6 +748,7 @@ Review process:
|
||||
- License must match the upstream license.
|
||||
- Platforms should be set (or the package will not get binary substitutes).
|
||||
- Maintainers must be set. This can be the package submitter or a community member that accepts taking up maintainership of the package.
|
||||
- The `meta.mainProgram` must be set if a main executable exists.
|
||||
- Report detected typos.
|
||||
- Ensure the package source:
|
||||
- Uses `mirror://` URLs when available.
|
||||
@@ -769,6 +770,7 @@ Sample template for a new package review is provided below.
|
||||
- [ ] `meta.license` fits upstream license
|
||||
- [ ] `meta.platforms` is set
|
||||
- [ ] `meta.maintainers` is set
|
||||
- [ ] `meta.mainProgram` is set, if applicable.
|
||||
- [ ] build time only dependencies are declared in `nativeBuildInputs`
|
||||
- [ ] source is fetched using the appropriate function
|
||||
- [ ] the list of `phases` is not overridden
|
||||
|
||||
@@ -2646,6 +2646,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
};
|
||||
|
||||
cornelis = buildVimPlugin {
|
||||
pname = "cornelis";
|
||||
version = "2024-04-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "isovector";
|
||||
repo = "cornelis";
|
||||
rev = "c97b4817034a927dcadb22294cf97a88087a935f";
|
||||
sha256 = "03wkq7jly9syv7kqsf66hdq8p7fqk6a240azcys9fsak797nbs1a";
|
||||
};
|
||||
meta.homepage = "https://github.com/isovector/cornelis/";
|
||||
};
|
||||
|
||||
cosco-vim = buildVimPlugin {
|
||||
pname = "cosco.vim";
|
||||
version = "2018-08-07";
|
||||
|
||||
@@ -63,6 +63,8 @@
|
||||
, # command-t dependencies
|
||||
getconf
|
||||
, ruby
|
||||
, # cornelis dependencies
|
||||
cornelis
|
||||
, # cpsm dependencies
|
||||
boost
|
||||
, cmake
|
||||
@@ -466,6 +468,17 @@
|
||||
patches = [ ./patches/coq_nvim/emulate-venv.patch ];
|
||||
};
|
||||
|
||||
cornelis = super.cornelis.overrideAttrs {
|
||||
dependencies = with self; [ vim-textobj-user ];
|
||||
opt = with self; [ vim-which-key ];
|
||||
# Unconditionally use the cornelis binary provided by the top-level package:
|
||||
patches = [ ./patches/cornelis/0001-Unconditionally-use-global-binary.patch ];
|
||||
postInstall = ''
|
||||
substituteInPlace $out/ftplugin/agda.vim \
|
||||
--subst-var-by CORNELIS "${lib.getBin cornelis}/bin/cornelis"
|
||||
'';
|
||||
};
|
||||
|
||||
cpsm = super.cpsm.overrideAttrs {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
From f8e993846551bda77a34a77aad7ad6dcc45b66a7 Mon Sep 17 00:00:00 2001
|
||||
From: Philipp Joram <nixpgks@phijor.me>
|
||||
Date: Tue, 16 Apr 2024 12:48:42 +0300
|
||||
Subject: [PATCH] Unconditionally use global binary
|
||||
|
||||
---
|
||||
ftplugin/agda.vim | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/ftplugin/agda.vim b/ftplugin/agda.vim
|
||||
index c7dd9d0..6b4aba3 100644
|
||||
--- a/ftplugin/agda.vim
|
||||
+++ b/ftplugin/agda.vim
|
||||
@@ -11,13 +11,7 @@ if exists("b:cornelis_ftplugin")
|
||||
endif
|
||||
let b:cornelis_ftplugin = 1
|
||||
|
||||
-if exists("g:cornelis_use_global_binary")
|
||||
- call remote#host#Register('cornelis', '*', rpcstart('cornelis', []))
|
||||
-else
|
||||
- call nvimhs#start(expand('<sfile>:p:h:h'), 'cornelis', ['-v', 'DEBUG', '-l', '/tmp/cornelis.log'])
|
||||
-endif
|
||||
-
|
||||
-nnoremap <F5> :call nvimhs#compileAndRestart('cornelis')<CR>
|
||||
+call remote#host#Register('cornelis', '*', rpcstart('@CORNELIS@', []))
|
||||
|
||||
runtime agda-input.vim
|
||||
runtime agda-matchpairs.vim
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@@ -220,6 +220,7 @@ https://github.com/ms-jpq/coq.artifacts/,HEAD,
|
||||
https://github.com/ms-jpq/coq.thirdparty/,HEAD,
|
||||
https://github.com/jvoorhis/coq.vim/,,
|
||||
https://github.com/ms-jpq/coq_nvim/,,
|
||||
https://github.com/isovector/cornelis/,HEAD,
|
||||
https://github.com/lfilho/cosco.vim/,,
|
||||
https://github.com/nixprime/cpsm/,,
|
||||
https://github.com/saecki/crates.nvim/,,
|
||||
|
||||
@@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-preview";
|
||||
publisher = "mgt19937";
|
||||
version = "0.11.4";
|
||||
hash = "sha256-GwlzFphZmP87pLys01+PWTv13imcdGjunCMH6atz9xs=";
|
||||
version = "0.11.6";
|
||||
hash = "sha256-8//6eUzMg5AX9NNQm5mzNGlOG50Cxl0Rt1+dPq0J2DU=";
|
||||
};
|
||||
|
||||
buildInputs = [ typst-preview ];
|
||||
|
||||
@@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "r";
|
||||
publisher = "reditorsupport";
|
||||
version = "2.8.3";
|
||||
hash = "sha256-3HVBBXMdRhnKLnhrbEQFIlIbB/rbj+AAb4/z3/Ch7eg=";
|
||||
version = "2.8.4";
|
||||
hash = "sha256-wVT9/JUuqP8whW99q1gwVMf7PRzgZNLoIdlXsclpbck=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lswt";
|
||||
version = "1.0.4";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~leon_plickat";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Orwa7sV56AeznEcq/Xj5qj4PALMxq0CI+ZnXuY4JYE0=";
|
||||
hash = "sha256-8jP6I2zsDt57STtuq4F9mcsckrjvaCE5lavqKTjhNT0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wayland-scanner ];
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz";
|
||||
sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz";
|
||||
sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89";
|
||||
};
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{
|
||||
k3sVersion = "1.26.15+k3s1";
|
||||
k3sCommit = "132972364806998c35d250153e2af245f9ecf18d";
|
||||
k3sRepoSha256 = "13iwmjxyf71l2g66kxdivnj21bf9lmr5p4qlp8kmysm23w2badj9";
|
||||
k3sVendorHash = "sha256-xoscRchOK4p3d1DAnxbJq7oIvxIn1twePmOBDdfXzw8=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
k3sRootVersion = "0.12.2";
|
||||
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
|
||||
k3sCNIVersion = "1.4.0-k3s2";
|
||||
k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
|
||||
containerdVersion = "1.7.11-k3s2.26";
|
||||
containerdSha256 = "0413a81kzb05xkklwyngg8g6a0w4icsi938rim69jmr2sijc89ww";
|
||||
criCtlVersion = "1.26.0-rc.0-k3s1";
|
||||
}
|
||||
@@ -12,17 +12,7 @@ let
|
||||
extraArgs = builtins.removeAttrs args [ "callPackage" ];
|
||||
in
|
||||
{
|
||||
k3s_1_26 = common (
|
||||
(import ./1_26/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"26"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
|
||||
# 1_27 can be built with the same builder as 1_26
|
||||
# 1_27 can be built with the same builder as 1_30
|
||||
k3s_1_27 = common (
|
||||
(import ./1_27/versions.nix)
|
||||
// {
|
||||
@@ -33,7 +23,7 @@ in
|
||||
}
|
||||
) extraArgs;
|
||||
|
||||
# 1_28 can be built with the same builder as 1_26
|
||||
# 1_28 can be built with the same builder as 1_30
|
||||
k3s_1_28 = common (
|
||||
(import ./1_28/versions.nix)
|
||||
// {
|
||||
@@ -44,7 +34,7 @@ in
|
||||
}
|
||||
) extraArgs;
|
||||
|
||||
# 1_29 can be built with the same builder as 1_26
|
||||
# 1_29 can be built with the same builder as 1_30
|
||||
k3s_1_29 = common (
|
||||
(import ./1_29/versions.nix)
|
||||
// {
|
||||
@@ -55,7 +45,6 @@ in
|
||||
}
|
||||
) extraArgs;
|
||||
|
||||
# 1_30 can be built with the same builder as 1_26
|
||||
k3s_1_30 = common (
|
||||
(import ./1_30/versions.nix)
|
||||
// {
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "datovka";
|
||||
version = "4.23.7";
|
||||
version = "4.23.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
|
||||
sha256 = "sha256-mGuTxOqudDhoJKZ9517H+A4PZxBqAOD+PfBHunhPXGw=";
|
||||
sha256 = "sha256-YmXpbSrbibkH0+DKE+ujFSLqxnWiA3XpuQSzOQUyEOo=";
|
||||
};
|
||||
|
||||
buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ];
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armcord";
|
||||
version = "3.2.6";
|
||||
version = "3.2.7";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -47,11 +47,11 @@ stdenv.mkDerivation rec {
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
|
||||
hash = "sha256-9AcxqCxhLAjYclaw6lri06R0PgQQeRHTbLJLEdhDCWU=";
|
||||
hash = "sha256-TFgO9ddz/Svi4QfugjTTejpV/m+xc1548cokzhVgwkw=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
|
||||
hash = "sha256-/uk2slpNF1sSTW6z319Yg9yx/s45fJPvJQJpY11ULVw=";
|
||||
hash = "sha256-AJ4TSG3ry2P40vzK1fsaWgQ/O0z9r3z8+0uxSmddZKo=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop";
|
||||
dir = "Signal";
|
||||
version = "7.8.0";
|
||||
version = "7.9.0";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-gBcfe3lU2pmRHSXNNXBFU7Qv83Bf6OPv5LM/HxeLkjM=";
|
||||
hash = "sha256-Iv2WG1kvB3tEiFu4Oy0po0KlpWCwfalDNOXstO/C+e0=";
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
|
||||
${lib.optionalString (icaFlag program != null) ''--add-flags "${icaFlag program} $ICAInstDir"''} \
|
||||
--set ICAROOT "$ICAInstDir" \
|
||||
--prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib" \
|
||||
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
|
||||
--set LD_PRELOAD "${libredirect}/lib/libredirect.so ${lib.getLib pcsclite}/lib/libpcsclite.so" \
|
||||
--set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
|
||||
'';
|
||||
wrapLink = program: ''
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planify";
|
||||
version = "4.7.2";
|
||||
version = "4.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planify";
|
||||
rev = version;
|
||||
hash = "sha256-G0A3U0TUGL4RT1wpIXw/cIwDDlaLCPpo5QG6bJfoIYc=";
|
||||
hash = "sha256-x76HasjETqXqE5yXE69/69NAYEWAksHSt0nYRq8/P0k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haruna";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "multimedia";
|
||||
repo = "haruna";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-403ZqllSSaOdTS1GSf8EIQk9gHOxMsWogbK9qh+MhpY=";
|
||||
hash = "sha256-m4u1V+vp4wOSqRbdbxgxDNgC28biiB3A6w1pSfuczHs=";
|
||||
domain = "invent.kde.org";
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, libfido2
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "age-plugin-fido2-hmac";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olastor";
|
||||
repo = "age-plugin-fido2-hmac";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-P2gNOZeuODWEb/puFe6EA1wW3pc0xgM567qe4FKbFXg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-h4/tyq9oZt41IfRJmmsLHUpJiPJ7YuFu59ccM7jHsFo=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
buildInputs = [
|
||||
libfido2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Age plugin to encrypt files with fido2 tokens using the hmac-secret extension and non-discoverable credentials";
|
||||
homepage = "https://github.com/olastor/age-plugin-fido2-hmac/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthewcroughan ];
|
||||
mainProgram = "age-plugin-fido2-hmac";
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "badkeys";
|
||||
version = "0.0.10";
|
||||
version = "0.0.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badkeys";
|
||||
repo = "badkeys";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4vIPOKU/R+wASEx4OQHjtP6mJSKJDtPgQB968vuT24Y=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VfkJeHEdvRc0Khf/C7ZUNpjd6t+hUULCTXXY80rs4Ko=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "c2patool";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "contentauth";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fVH7itpVPg0vkgKSWa9x61yttLx73gTeLT5+R4aSOFE=";
|
||||
sha256 = "sha256-yR6VepMZquURDb2SDwx+xE55jo3MTzh6ntSrQln1Xxs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oNNfQIwl7QprrlpIZrTYVGp/UMWANVr3b3ALFKupyy8=";
|
||||
cargoHash = "sha256-Z4Q/33CwbJXlMZBq4WRT2k78PvaHpNm4pQkiAehCImI=";
|
||||
|
||||
# use the non-vendored openssl
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
{
|
||||
lib,
|
||||
gtk3,
|
||||
glib,
|
||||
dbus,
|
||||
curl,
|
||||
wget,
|
||||
cairo,
|
||||
stdenv,
|
||||
librsvg,
|
||||
libsoup,
|
||||
fetchzip,
|
||||
openssl_3,
|
||||
webkitgtk,
|
||||
gdk-pixbuf,
|
||||
pkg-config,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
autoPatchelfHook,
|
||||
}:
|
||||
let
|
||||
version = "8.0.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "catppuccinifier-gui";
|
||||
inherit version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/lighttigerXIV/catppuccinifier/releases/download/${version}/Catppuccinifer-Linux-${version}.zip";
|
||||
hash = "sha256-fG6YhLsjvMUIWsOnm+GSOh6LclCAISPSRiDQdWLlAR4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
pkg-config
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
wget
|
||||
webkitgtk
|
||||
gtk3
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
libsoup
|
||||
glib
|
||||
dbus
|
||||
openssl_3
|
||||
librsvg
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm555 installation-files/catppuccinifier-gui "$out/bin/catppuccinifier-gui"
|
||||
install -Dm644 installation-files/catppuccinifier.png "$out/share/pixmaps/catppuccinifier.png"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
desktopName = "catppuccinifier";
|
||||
name = "catppuccinifier";
|
||||
exec = "catppuccinifier-gui";
|
||||
icon = "catppuccinifier";
|
||||
comment = "Apply catppuccin flavors to your wallpapers";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Apply catppuccin flavors to your wallpapers";
|
||||
homepage = "https://github.com/lighttigerXIV/catppuccinifier";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ isabelroses ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "catppuccinifier-gui";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
{
|
||||
lib,
|
||||
haskell,
|
||||
haskellPackages,
|
||||
|
||||
# Test dependencies
|
||||
cornelis,
|
||||
runCommand,
|
||||
}:
|
||||
let
|
||||
inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
|
||||
overrides = {
|
||||
description = "agda-mode for Neovim";
|
||||
|
||||
passthru = {
|
||||
tests = runCommand "cornelis-tests" { nativeBuildInputs = [ cornelis ]; } ''
|
||||
cornelis --help > $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
in
|
||||
lib.pipe haskellPackages.cornelis [
|
||||
(overrideCabal overrides)
|
||||
|
||||
# Reduce closure size
|
||||
justStaticExecutables
|
||||
]
|
||||
@@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "gate";
|
||||
version = "0.36.7";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minekube";
|
||||
repo = "gate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WHxpx20O/HuCWqbY4zTxcjyIhW3+FQtTz5sUGAda71g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dswNJQWqN+u/mnpbj9se2j9uEi0ewNTXVlN3WnNbcyg=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = {
|
||||
description = "High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy";
|
||||
longDescription = ''
|
||||
Gate is an extensible, high performant & paralleled Minecraft proxy server
|
||||
with scalability, flexibility & excellent server version support - written in Go
|
||||
and ready for the cloud!
|
||||
'';
|
||||
homepage = "https://github.com/minekube/gate";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ XBagon ];
|
||||
mainProgram = "gate";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "marcel";
|
||||
version = "0.22.2";
|
||||
version = "0.27.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geophile";
|
||||
repo = "marcel";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CiAIY4qXv5V2VOsi+vat7OvFcmeFpIrmHCfqlY+JRXc=";
|
||||
hash = "sha256-jzb4kSrcN+pLFkWYy0hc7NCCextWgZQuf3P+kiouEfY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "myks";
|
||||
version = "3.4.4";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mykso";
|
||||
repo = "myks";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PaA8j4BWijhPR3DTZ0nnO54v0Uj/DpFdJpofseTA1+A=";
|
||||
hash = "sha256-IJlSryyNQFubjBQJ59Gl5Wn3eniwZ0svbGAxLKIrCt4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-A30SyqgAeYwgiYLZF9M3iW2u8JXPU6ozUThziCmSRgU=";
|
||||
vendorHash = "sha256-u9dNmgFMn6OMkKgTwNSqizUHJwvRk+S1xKZDozWjbps=";
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
|
||||
@@ -26,16 +26,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
pname = "neovide";
|
||||
version = "0.12.2";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovide";
|
||||
repo = "neovide";
|
||||
rev = version;
|
||||
sha256 = "sha256-M19LKNjUmC0WkVGm4t7vjxgMMe0FdMTmB1mLcG33OUg=";
|
||||
sha256 = "sha256-lYahMSaagT6DloFMXT2lLPM1xX/9IEGNIPvbo1MQgSw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2fPprZVT7V+Ot8aCpWj6WTdyFylmzlujFdTJCrtE0rk=";
|
||||
cargoHash = "sha256-g/Ezyz2gC1YaPMdIy/WdoOvezJUH3aB2FA87viahRzc=";
|
||||
|
||||
SKIA_SOURCE_DIR =
|
||||
let
|
||||
@@ -43,8 +43,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
owner = "rust-skia";
|
||||
repo = "skia";
|
||||
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
|
||||
rev = "m119-0.67.3";
|
||||
sha256 = "sha256-U75NuJnQa5+SNlOrsBmdlvflGdjo3el63EeIsbnE7ms=";
|
||||
rev = "m124-0.72.3";
|
||||
sha256 = "sha256-zlHUJUXukE4CsXwwmVl3KHf9mnNPT8lC/ETEE15Gb4s=";
|
||||
};
|
||||
# The externals for skia are taken from skia/DEPS
|
||||
externals = linkFarm "skia-externals" (lib.mapAttrsToList
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
},
|
||||
"zlib": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/zlib",
|
||||
"rev": "c876c8f87101c5a75f6014b0f832499afeb65b73",
|
||||
"sha256": "sha256-mwozVo8ymyrYN4tw+/ZnSI+xogSTZQ6PUBba/jQqRkE="
|
||||
"rev": "646b7f569718921d7d4b5b8e22572ff6c76f2596",
|
||||
"sha256": "sha256-jNj6SuTZ5/a7crtYhxW3Q/TlfRMNMfYIVxDlr7bYdzQ="
|
||||
},
|
||||
"harfbuzz": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "4cfc6d8e173e800df086d7be078da2e8c5cfca19",
|
||||
"sha256": "sha256-rrstyAz7Eb8ZgFJZKUASY8nU4YFZAptd5VS9B2cs2Yg="
|
||||
"rev": "c053e8f29257814e11ad61493dbbe29f27656de4",
|
||||
"sha256": "sha256-D8DNcZH/oiJqWvfWFHvQ8AwQ3OrMwyZdfGmZ5y30Hvg="
|
||||
},
|
||||
"wuffs": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
@@ -31,7 +31,7 @@
|
||||
},
|
||||
"libpng": {
|
||||
"url": "https://skia.googlesource.com/third_party/libpng.git",
|
||||
"rev": "386707c6d19b974ca2e3db7f5c61873813c6fe44",
|
||||
"sha256": "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c="
|
||||
"rev": "144b348e072a78e8130ed0acc452c9f039a67bf2",
|
||||
"sha256": "sha256-eTF7q7hR4S1OqV2oPQKmcHujA5Od4rGMc5879kT0SkE="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,42 +1,66 @@
|
||||
{ lib, stdenv, fetchurl, unzip, makeWrapper
|
||||
, coreutils, gawk, which, gnugrep, findutils
|
||||
, jre
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
makeBinaryWrapper,
|
||||
coreutils,
|
||||
gawk,
|
||||
which,
|
||||
gnugrep,
|
||||
findutils,
|
||||
jre,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openjump";
|
||||
version = "2.2.1";
|
||||
revision = "r5222%5B94156e5%5D";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/jump-pilot/OpenJUMP/${version}/OpenJUMP-Portable-${version}-${revision}-PLUS.zip";
|
||||
url = "mirror://sourceforge/jump-pilot/OpenJUMP/${finalAttrs.version}/OpenJUMP-Portable-${finalAttrs.version}-${finalAttrs.revision}-PLUS.zip";
|
||||
hash = "sha256-+/AMmD6NDPy+2Gq1Ji5i/QWGU7FOsU+kKsWoNXcx/VI=";
|
||||
};
|
||||
|
||||
# TODO: build from source
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
mkdir -p $out/opt
|
||||
unzip $src -d $out/opt
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
dir=$(echo $out/opt/OpenJUMP-*)
|
||||
|
||||
chmod +x "$dir/bin/oj_linux.sh"
|
||||
makeWrapper "$dir/bin/oj_linux.sh" $out/bin/OpenJump \
|
||||
--set JAVA_HOME ${jre} \
|
||||
--set PATH ${lib.makeBinPath [ coreutils gawk which gnugrep findutils ]}
|
||||
--set PATH ${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
gawk
|
||||
which
|
||||
gnugrep
|
||||
findutils
|
||||
]
|
||||
}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open source Geographic Information System (GIS) written in the Java programming language";
|
||||
homepage = "http://www.openjump.org/";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
license = lib.licenses.gpl2;
|
||||
mainProgram = "OpenJump";
|
||||
maintainers = lib.teams.geospatial.members ++ [ lib.maintainers.marcweber ];
|
||||
platforms = jre.meta.platforms;
|
||||
mainProgram = "OpenJump";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import ./generic.nix {
|
||||
version = "22.03.7";
|
||||
hash = "sha256-HzVzJN1QnMTlv39I7clzciJD/Owm93jFO4qfaE1k6e4=";
|
||||
updateScriptArgs = "--lts=true --regex '22.03.*'";
|
||||
version = "24.03.2";
|
||||
hash = "sha256-pO37MfmvlSd/bU9cGngFEJLnXtZFTqyz1zcYLvFLrrQ=";
|
||||
updateScriptArgs = "--lts=true --regex '24.03.*'";
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import ./generic.nix {
|
||||
version = "24.03.1";
|
||||
hash = "sha256-BvMbNkNtyIl8xrUUvJhWWXiLaAHFjiwcq8P7/CGGtzA=";
|
||||
version = "24.03.2";
|
||||
hash = "sha256-pO37MfmvlSd/bU9cGngFEJLnXtZFTqyz1zcYLvFLrrQ=";
|
||||
}
|
||||
|
||||
@@ -96,6 +96,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
"pillow"
|
||||
"python-dateutil"
|
||||
"reportlab"
|
||||
"rules"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
||||
@@ -7,20 +7,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rcp";
|
||||
version = "0.7.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wykurz";
|
||||
repo = "rcp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kVO2WMwB/Lv4fCcdXaWL/Gfmenky6uMNVrUwhWU9y7A=";
|
||||
hash = "sha256-e6m3E1R7o4X9cPEy/ayUIsK0xhRaVsAFDAwObJrDJPA=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
IOKit
|
||||
]);
|
||||
|
||||
cargoHash = "sha256-Pa8YgFAT9nue/QLhHQm6PlTJU/myK60UcND5TthMOxc=";
|
||||
cargoHash = "sha256-croFSe37yQa9LijaNxKHrZlcJdExz9SweOoG21PPn9E=";
|
||||
|
||||
RUSTFLAGS = "--cfg tokio_unstable";
|
||||
|
||||
|
||||
@@ -1,21 +1,32 @@
|
||||
{
|
||||
lib
|
||||
, php
|
||||
, fetchFromGitHub
|
||||
lib,
|
||||
php82,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
php82.buildComposerProject (finalAttrs: {
|
||||
pname = "robo";
|
||||
version = "4.0.6";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "consolidation";
|
||||
repo = "robo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-rpCs24Q15XM4BdW1+IfysFR/8/ZU4o5b4MyJL48uDaU=";
|
||||
hash = "sha256-tibG2sR5CsRnUjZEvOewX/fyMuAS1kgKjYbrkk+f0BI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ul8XjH0Nav37UVpNQslOkF2bkiyqUAEZiIbcSW2tGkQ=";
|
||||
patches = [
|
||||
# Fix the version number
|
||||
# Most likely to remove at the next bump update
|
||||
# See https://github.com/drupol/robo/pull/1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/drupol/robo/commit/c3cd001525c1adb5980a3a18a5561a0a5bbe1f50.patch";
|
||||
hash = "sha256-iMdZx+Bldmf1IS6Ypoet7GSsE6J9ZnE0HTskznkyEKM=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-RRnHv6sOYm8fYhY3Q6m5sFDflFXd9b9LPcAqk/D1jdE=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/consolidation/robo/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rosa";
|
||||
version = "1.2.38";
|
||||
version = "1.2.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openshift";
|
||||
repo = "rosa";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eS9mK5iK/fXWMpgA/RF7wYybcJtPDW/pIWo9Iw0I+K8=";
|
||||
hash = "sha256-K1FGiUNXSyCTmF//dculpnkTyn3hfqWrOiMUGk9kHrA=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -1,37 +1,68 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
cargo-about,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
let
|
||||
pname = "tracexec";
|
||||
version = "0.2.2";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kxxt";
|
||||
repo = "tracexec";
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-X2hLaBndeYLBMnDe2MT4pgZiPj0COHG2uTvAbW+JVd4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3xANOv+A4soDcKMINy+RnI8l6uS3koZpw3CMIUCmK5A=";
|
||||
|
||||
# Remove test binaries and only retain tracexec
|
||||
postInstall = ''
|
||||
find "$out/bin" -type f \! -name tracexec -print0 | xargs -0 rm -v
|
||||
nativeBuildInputs = [
|
||||
cargo-about
|
||||
];
|
||||
|
||||
# Remove RiscV64 specialisation when this is fixed:
|
||||
# * https://github.com/NixOS/nixpkgs/pull/310158#pullrequestreview-2046944158
|
||||
# * https://github.com/rust-vmm/seccompiler/pull/72
|
||||
cargoBuildFlags = lib.optional stdenv.hostPlatform.isRiscV64 "--no-default-features";
|
||||
|
||||
preBuild = ''
|
||||
sed -i '1ino-clearly-defined = true' about.toml # disable network requests
|
||||
cargo about generate --config about.toml -o THIRD_PARTY_LICENSES.HTML about.hbs
|
||||
'';
|
||||
|
||||
# ptrace is not allowed in sandbox
|
||||
doCheck = false;
|
||||
# Tests don't work for native non-x86 compilation
|
||||
# because upstream overrides the name of the linker executables,
|
||||
# see https://github.com/NixOS/nixpkgs/pull/310158#issuecomment-2118845043
|
||||
doCheck = stdenv.hostPlatform.isx86_64;
|
||||
|
||||
checkFlags = [
|
||||
"--skip=cli::test::log_mode_without_args_works" # `Permission denied` (needs `CAP_SYS_PTRACE`)
|
||||
"--skip=tracer::test::tracer_emits_exec_event" # needs `/bin/true`
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Remove test binaries (e.g. `empty-argv`, `corrupted-envp`) and only retain `tracexec`
|
||||
find "$out/bin" -type f \! -name tracexec -print0 | xargs -0 rm -v
|
||||
|
||||
install -Dm644 LICENSE -t "$out/share/licenses/${pname}/"
|
||||
install -Dm644 THIRD_PARTY_LICENSES.HTML -t "$out/share/licenses/${pname}/"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/kxxt/tracexec/blob/v${version}/CHANGELOG.md";
|
||||
description = "A small utility for tracing execve{,at} and pre-exec behavior";
|
||||
homepage = "https://github.com/kxxt/tracexec";
|
||||
changelog = "https://github.com/kxxt/tracexec/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ fpletz ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "tracexec";
|
||||
maintainers = with lib.maintainers; [ fpletz nh2 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "twitch-dl";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihabunek";
|
||||
repo = "twitch-dl";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0uOOc3ANXleQlENB+gdWheafBiOOcyZsFvYj7r+WMCY=";
|
||||
hash = "sha256-ixkIDJbysa3TOJiNmAG2SuJwCv5MaX6nCtUnS4901rg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
"unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@myriaddreamin/typst-ts-renderer": "0.4.2-rc10",
|
||||
"@myriaddreamin/typst.ts": "0.4.2-rc10"
|
||||
"@myriaddreamin/typst-ts-renderer": "0.5.0-rc4",
|
||||
"@myriaddreamin/typst.ts": "0.5.0-rc4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@myriaddreamin/typst-ts-renderer": "0.4.2-rc10",
|
||||
"@myriaddreamin/typst.ts": "0.4.2-rc10",
|
||||
"@myriaddreamin/typst-ts-renderer": "0.5.0-rc4",
|
||||
"@myriaddreamin/typst.ts": "0.5.0-rc4",
|
||||
"typescript": "^5.0.2",
|
||||
"vite": "^4.3.9",
|
||||
"vite-plugin-singlefile": "^0.13.5",
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
"unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
|
||||
},
|
||||
"dependencies": {
|
||||
"@myriaddreamin/typst-ts-renderer": "0.4.2-rc10",
|
||||
"@myriaddreamin/typst.ts": "0.4.2-rc10",
|
||||
"typst-dom": "file:../typst-dom",
|
||||
"@myriaddreamin/typst-ts-renderer": "0.5.0-rc4",
|
||||
"@myriaddreamin/typst.ts": "0.5.0-rc4",
|
||||
"typst-dom": "link:../typst-dom",
|
||||
"rxjs": "^7.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
let
|
||||
# Keep the vscode "mgt19937.typst-preview" extension in sync when updating
|
||||
# this package at pkgs/applications/editors/vscode/extensions/default.nix
|
||||
version = "0.11.4";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Enter-tainer";
|
||||
repo = "typst-preview";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5MbKp6j4+61Do8YH0xPIQPHEjU/kCKsMUUQDJDXzSMw=";
|
||||
hash = "sha256-z01Xm2NLWGn0/jEiVmoJKqcEXT5gqLs3H805LPUMDJw=";
|
||||
fetchSubmodules = true;
|
||||
|
||||
postFetch = ''
|
||||
@@ -41,7 +41,7 @@ let
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${domSrc}/yarn.lock";
|
||||
hash = "sha256-QIGwHG0n6vYfAPA/+CdvK1c+QxM3XyoQdS/T4+TdsKs=";
|
||||
hash = "sha256-XAVxUKf2XJCOUkAT+tTefAk8myGismhz1aOHosZA+d4=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
@@ -67,7 +67,7 @@ let
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${frontendSrc}/yarn.lock";
|
||||
hash = "sha256-QFiyUky/0BdB5vS9KX5xBOvBCEtJ+zZG4f7ai5j6V4U=";
|
||||
hash = "sha256-jZZG8omzwrustcrdVb42nypu6JKXPW/fJn26NUrc/ZA=";
|
||||
};
|
||||
|
||||
packageResolutions = { inherit typst-dom; };
|
||||
@@ -92,7 +92,7 @@ rustPlatform.buildRustPackage {
|
||||
pname = "typst-preview";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-xj8Xvbz0NUy0BFoVS8ONiYZZQWIJu1FZxJkBEuABDOw=";
|
||||
cargoHash = "sha256-Ay9YKTLks3ly0hftP7jHr7C1L5vuj1aK5lFWZiWlzNc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, libgit2
|
||||
, zlib
|
||||
@@ -11,30 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typstyle";
|
||||
version = "0.11.16";
|
||||
version = "0.11.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Enter-tainer";
|
||||
repo = "typstyle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZmGrdAHbU4PQgd9haoVEZ8Wn8Scujm9bJAtvO2+aPoQ=";
|
||||
hash = "sha256-dmHacYUL0Pig3SxSlRU4ddKzZmBJKDq/ulV3GDW7O1k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Trim whitespace patch
|
||||
name = "whitespace-trim.patch";
|
||||
url = "https://github.com/Enter-tainer/typstyle/commit/127b7362f5938e091e2e5a33976ad3f63b6e4ee3.patch";
|
||||
hash = "sha256-Xzo51bgpEUKP7WDQ7BFNAZsyofPcPDIJMWOf4S+GGvI=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"typst-syntax-0.11.0" = "sha256-BezpRq5O89gLbpRtte539vlJ4G5yJ6VPJ8AaC7rQNc0=";
|
||||
};
|
||||
};
|
||||
cargoHash = "sha256-D1IabmWlPwWnSdltDN+DViVpm4ue+ZFIQZrhL+YNeUU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "webcord";
|
||||
version = "4.9.1";
|
||||
version = "4.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpacingBat3";
|
||||
repo = "WebCord";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sYTMfqZokwJ3CFtArkUckCpQlnyJ1BVpewU92sNaKC8=";
|
||||
hash = "sha256-iuhi4ELHNPxFDz7cmiTFuUA8bf6VI2YXnHOTi69FloU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-LxOqpUVl2hXZrfTQfMz1+fVGRuNwG6dX03fGQVYmqq0=";
|
||||
npmDepsHash = "sha256-xEXAaYW/2Wx0ar0l7jcSj0NBYKTsa7vHdykLlU0BkJE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -20,8 +20,8 @@ let
|
||||
vc_intrinsics_src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "vc-intrinsics";
|
||||
rev = "v0.16.0";
|
||||
hash = "sha256-d197m80vSICdv4VKnyqdy3flzbKLKmB8jroY2difA7o=";
|
||||
rev = "v0.18.0";
|
||||
hash = "sha256-F2GR3TDUUiygEhdQN+PsMT/CIYBATMQX5wkvwrziS2E=";
|
||||
};
|
||||
|
||||
inherit (llvmPackages_14) lld llvm;
|
||||
@@ -31,7 +31,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-graphics-compiler";
|
||||
version = "1.0.16238.4";
|
||||
version = "1.0.16695.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
|
||||
@@ -48,7 +48,8 @@ stdenv.mkDerivation rec {
|
||||
"-DLLVM_INSTALL_TOOLCHAIN_ONLY=OFF"
|
||||
"-DMLIR_TOOLS_INSTALL_DIR=${placeholder "out"}/bin/"
|
||||
"-DLLVM_ENABLE_IDE=OFF"
|
||||
"-DMLIR_INSTALL_PACKAGE_DIR=${placeholder "out"}/lib/cmake/mlir"
|
||||
"-DMLIR_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/mlir"
|
||||
"-DMLIR_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/mlir"
|
||||
"-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
|
||||
"-DLLVM_ENABLE_FFI=ON"
|
||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
|
||||
@@ -3086,6 +3086,10 @@ self: super: {
|
||||
# https://github.com/isovector/type-errors/issues/9
|
||||
type-errors = dontCheck super.type-errors;
|
||||
|
||||
# 2024-05-15: Hackage distribution is missing files needed for tests
|
||||
# https://github.com/isovector/cornelis/issues/150
|
||||
cornelis = dontCheck super.cornelis;
|
||||
|
||||
cabal-gild = super.cabal-gild.overrideScope (self: super: {
|
||||
tasty = super.tasty_1_5;
|
||||
tasty-quickcheck = super.tasty-quickcheck_0_10_3;
|
||||
|
||||
@@ -1003,7 +1003,6 @@ broken-packages:
|
||||
- core-haskell # failure in job https://hydra.nixos.org/build/233222588 at 2023-09-02
|
||||
- corenlp-types # failure in job https://hydra.nixos.org/build/243808366 at 2024-01-01
|
||||
- core-warn # failure in job https://hydra.nixos.org/build/233204404 at 2023-09-02
|
||||
- cornelis # failure in job https://hydra.nixos.org/build/259604220 at 2024-05-15
|
||||
- Coroutine # failure in job https://hydra.nixos.org/build/233211213 at 2023-09-02
|
||||
- coroutine-object # failure in job https://hydra.nixos.org/build/233220413 at 2023-09-02
|
||||
- couchdb-conduit # failure in job https://hydra.nixos.org/build/233227244 at 2023-09-02
|
||||
|
||||
@@ -259,6 +259,8 @@ package-maintainers:
|
||||
- Unique
|
||||
libjared:
|
||||
- sensei
|
||||
malo:
|
||||
- cornelis
|
||||
maralorn:
|
||||
- bluefin
|
||||
- cabal-fmt
|
||||
@@ -327,6 +329,8 @@ package-maintainers:
|
||||
- titlecase
|
||||
- xmonad
|
||||
- xmonad-contrib
|
||||
phijor:
|
||||
- cornelis
|
||||
poscat:
|
||||
- hinit
|
||||
psibi:
|
||||
|
||||
+1
-2
@@ -76162,9 +76162,8 @@ self: {
|
||||
vector
|
||||
];
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "cornelis";
|
||||
broken = true;
|
||||
maintainers = [ lib.maintainers.malo lib.maintainers.phijor ];
|
||||
}) {};
|
||||
|
||||
"coroutine-enumerator" = callPackage
|
||||
|
||||
@@ -1,77 +1,110 @@
|
||||
{ lib, stdenv, fetchurl, makeFontsConf
|
||||
, cacert
|
||||
, cairo, coreutils, fontconfig, freefont_ttf
|
||||
, glib, gmp
|
||||
, gtk3
|
||||
, glibcLocales
|
||||
, libedit, libffi
|
||||
, libiconv
|
||||
, libGL
|
||||
, libGLU
|
||||
, libjpeg
|
||||
, ncurses
|
||||
, libpng, libtool, mpfr, openssl, pango, poppler
|
||||
, readline, sqlite
|
||||
, disableDocs ? false
|
||||
, CoreFoundation
|
||||
, gsettings-desktop-schemas
|
||||
, wrapGAppsHook3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
makeFontsConf,
|
||||
cacert,
|
||||
cairo,
|
||||
coreutils,
|
||||
fontconfig,
|
||||
freefont_ttf,
|
||||
glib,
|
||||
gmp,
|
||||
gtk3,
|
||||
glibcLocales,
|
||||
libedit,
|
||||
libffi,
|
||||
libiconv,
|
||||
libGL,
|
||||
libGLU,
|
||||
libjpeg,
|
||||
ncurses,
|
||||
libpng,
|
||||
libtool,
|
||||
mpfr,
|
||||
openssl,
|
||||
pango,
|
||||
poppler,
|
||||
readline,
|
||||
sqlite,
|
||||
disableDocs ? false,
|
||||
CoreFoundation,
|
||||
gsettings-desktop-schemas,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
fontsConf = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
|
||||
libPath = lib.makeLibraryPath ([
|
||||
cairo
|
||||
fontconfig
|
||||
glib
|
||||
gmp
|
||||
gtk3
|
||||
gsettings-desktop-schemas
|
||||
libedit
|
||||
libjpeg
|
||||
libpng
|
||||
mpfr
|
||||
ncurses
|
||||
openssl
|
||||
pango
|
||||
poppler
|
||||
readline
|
||||
sqlite
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
libGL
|
||||
libGLU
|
||||
]);
|
||||
fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
|
||||
|
||||
libPath = lib.makeLibraryPath (
|
||||
[
|
||||
cairo
|
||||
fontconfig
|
||||
glib
|
||||
gmp
|
||||
gtk3
|
||||
gsettings-desktop-schemas
|
||||
libedit
|
||||
libjpeg
|
||||
libpng
|
||||
mpfr
|
||||
ncurses
|
||||
openssl
|
||||
pango
|
||||
poppler
|
||||
readline
|
||||
sqlite
|
||||
]
|
||||
++ lib.optionals (!stdenv.isDarwin) [
|
||||
libGL
|
||||
libGLU
|
||||
]
|
||||
);
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "racket";
|
||||
version = "8.12"; # always change at once with ./minimal.nix
|
||||
version = "8.13"; # always change at once with ./minimal.nix
|
||||
|
||||
src = (lib.makeOverridable ({ name, hash }:
|
||||
fetchurl {
|
||||
url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
|
||||
inherit hash;
|
||||
}
|
||||
)) {
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-or26nirm5dGhg2S8to99BFOOSS2Oksn7Yb0y2L5b69c=";
|
||||
};
|
||||
src =
|
||||
(lib.makeOverridable (
|
||||
{ name, hash }:
|
||||
fetchurl {
|
||||
url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
|
||||
inherit hash;
|
||||
}
|
||||
))
|
||||
{
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-AB4EkgRAtlic9i1Wd9GMwv9q6Puvd+Y7iozyCJBoX7w=";
|
||||
};
|
||||
|
||||
FONTCONFIG_FILE = fontsConf;
|
||||
LD_LIBRARY_PATH = libPath;
|
||||
NIX_LDFLAGS = lib.concatStringsSep " " [
|
||||
(lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
|
||||
(lib.optionalString (stdenv.cc.isGNU && !stdenv.isDarwin) "-lgcc_s")
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cacert wrapGAppsHook3 ];
|
||||
nativeBuildInputs = [
|
||||
cacert
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ncurses ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
|
||||
buildInputs =
|
||||
[
|
||||
fontconfig
|
||||
libffi
|
||||
libtool
|
||||
sqlite
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
ncurses
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
CoreFoundation
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Hardcode variant detection because we wrap the Racket binary making it
|
||||
@@ -87,32 +120,34 @@ stdenv.mkDerivation rec {
|
||||
./force-remove-codesign-then-add.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
unset AR
|
||||
for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do
|
||||
substituteInPlace "$f" \
|
||||
--replace /usr/bin/uname ${coreutils}/bin/uname \
|
||||
--replace /bin/cp ${coreutils}/bin/cp \
|
||||
--replace /bin/ln ${coreutils}/bin/ln \
|
||||
--replace /bin/rm ${coreutils}/bin/rm \
|
||||
--replace /bin/true ${coreutils}/bin/true
|
||||
done
|
||||
preConfigure =
|
||||
''
|
||||
unset AR
|
||||
for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do
|
||||
substituteInPlace "$f" \
|
||||
--replace /usr/bin/uname ${coreutils}/bin/uname \
|
||||
--replace /bin/cp ${coreutils}/bin/cp \
|
||||
--replace /bin/ln ${coreutils}/bin/ln \
|
||||
--replace /bin/rm ${coreutils}/bin/rm \
|
||||
--replace /bin/true ${coreutils}/bin/true
|
||||
done
|
||||
|
||||
# The configure script forces using `libtool -o` as AR on Darwin. But, the
|
||||
# `-o` option is only available from Apple libtool. GNU ar works here.
|
||||
substituteInPlace src/ChezScheme/zlib/configure \
|
||||
--replace 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"'
|
||||
# The configure script forces using `libtool -o` as AR on Darwin. But, the
|
||||
# `-o` option is only available from Apple libtool. GNU ar works here.
|
||||
substituteInPlace src/ChezScheme/zlib/configure \
|
||||
--replace 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"'
|
||||
|
||||
mkdir src/build
|
||||
cd src/build
|
||||
mkdir src/build
|
||||
cd src/build
|
||||
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath})
|
||||
gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive")
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath})
|
||||
''
|
||||
;
|
||||
''
|
||||
+ lib.optionalString stdenv.isLinux ''
|
||||
gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath})
|
||||
gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive")
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath})
|
||||
'';
|
||||
|
||||
preBuild = lib.optionalString stdenv.isDarwin ''
|
||||
# Cannot set DYLD_LIBRARY_PATH as an attr of this drv, becasue dynamic
|
||||
@@ -129,9 +164,16 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
shared = if stdenv.isDarwin then "dylib" else "shared";
|
||||
configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ]
|
||||
++ lib.optionals disableDocs [ "--disable-docs" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "--disable-strip" "--enable-xonx" ];
|
||||
configureFlags =
|
||||
[
|
||||
"--enable-${shared}"
|
||||
"--enable-lt=${libtool}/bin/libtool"
|
||||
]
|
||||
++ lib.optionals disableDocs [ "--disable-docs" ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"--disable-strip"
|
||||
"--enable-xonx"
|
||||
];
|
||||
|
||||
configureScript = "../configure";
|
||||
|
||||
@@ -152,8 +194,16 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://racket-lang.org/";
|
||||
changelog = "https://github.com/racket/racket/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
license = with licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
|
||||
platforms = [
|
||||
"x86_64-darwin"
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,20 +1,25 @@
|
||||
{ racket
|
||||
}:
|
||||
{ racket }:
|
||||
|
||||
racket.overrideAttrs (oldAttrs: rec {
|
||||
pname = "racket-minimal";
|
||||
version = oldAttrs.version;
|
||||
src = oldAttrs.src.override {
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-ZbE5I2dnPY0GamerTFPFWz53+V1Xxhtx3AVp2KpF7vw=";
|
||||
hash = "sha256-9fotAmBj72eRl+n4Paigs+PQs8BezUqWLEzjI6RBYzc=";
|
||||
};
|
||||
|
||||
meta = oldAttrs.meta // {
|
||||
description = "Racket without bundled packages, such as Dr. Racket";
|
||||
longDescription = ''The essential package racket-libs is included,
|
||||
as well as libraries that live in collections. In particular, raco
|
||||
and the pkg library are still bundled.
|
||||
longDescription = ''
|
||||
The essential package racket-libs is included,
|
||||
as well as libraries that live in collections. In particular, raco
|
||||
and the pkg library are still bundled.
|
||||
'';
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,26 +1,39 @@
|
||||
{ lib, stdenv, fetchurl, makeFontsConf
|
||||
, cacert
|
||||
, cairo, coreutils, fontconfig, freefont_ttf
|
||||
, glib, gmp
|
||||
, gtk3
|
||||
, libedit, libffi
|
||||
, libiconv
|
||||
, libGL
|
||||
, libGLU
|
||||
, libjpeg
|
||||
, libpng, libtool, mpfr, openssl, pango, poppler
|
||||
, readline, sqlite
|
||||
, disableDocs ? false
|
||||
, CoreFoundation
|
||||
, gsettings-desktop-schemas
|
||||
, wrapGAppsHook3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
makeFontsConf,
|
||||
cacert,
|
||||
cairo,
|
||||
coreutils,
|
||||
fontconfig,
|
||||
freefont_ttf,
|
||||
glib,
|
||||
gmp,
|
||||
gtk3,
|
||||
libedit,
|
||||
libffi,
|
||||
libiconv,
|
||||
libGL,
|
||||
libGLU,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libtool,
|
||||
mpfr,
|
||||
openssl,
|
||||
pango,
|
||||
poppler,
|
||||
readline,
|
||||
sqlite,
|
||||
disableDocs ? false,
|
||||
CoreFoundation,
|
||||
gsettings-desktop-schemas,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
fontsConf = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
|
||||
|
||||
libPath = lib.makeLibraryPath [
|
||||
cairo
|
||||
@@ -41,34 +54,50 @@ let
|
||||
readline
|
||||
sqlite
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "racket";
|
||||
version = "7.9"; # always change at once with ./minimal.nix
|
||||
|
||||
src = (lib.makeOverridable ({ name, sha256 }:
|
||||
fetchurl {
|
||||
url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
|
||||
inherit sha256;
|
||||
}
|
||||
)) {
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m";
|
||||
};
|
||||
src =
|
||||
(lib.makeOverridable (
|
||||
{ name, sha256 }:
|
||||
fetchurl {
|
||||
url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
|
||||
inherit sha256;
|
||||
}
|
||||
))
|
||||
{
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m";
|
||||
};
|
||||
|
||||
FONTCONFIG_FILE = fontsConf;
|
||||
LD_LIBRARY_PATH = libPath;
|
||||
NIX_LDFLAGS = lib.concatStringsSep " " [
|
||||
(lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
|
||||
(lib.optionalString (stdenv.cc.isGNU && !stdenv.isDarwin) "-lgcc_s")
|
||||
(lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cacert wrapGAppsHook3 ];
|
||||
nativeBuildInputs = [
|
||||
cacert
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
|
||||
buildInputs =
|
||||
[
|
||||
fontconfig
|
||||
libffi
|
||||
libtool
|
||||
sqlite
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
CoreFoundation
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
unset AR
|
||||
@@ -82,15 +111,18 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
shared = if stdenv.isDarwin then "dylib" else "shared";
|
||||
configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ]
|
||||
++ lib.optionals disableDocs [ "--disable-docs" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ];
|
||||
configureFlags =
|
||||
[
|
||||
"--enable-${shared}"
|
||||
"--enable-lt=${libtool}/bin/libtool"
|
||||
]
|
||||
++ lib.optionals disableDocs [ "--disable-docs" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ];
|
||||
|
||||
configureScript = "../configure";
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "A programmable programming language";
|
||||
longDescription = ''
|
||||
@@ -103,9 +135,16 @@ stdenv.mkDerivation rec {
|
||||
GUIs and charts.
|
||||
'';
|
||||
homepage = "https://racket-lang.org/";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
license = with licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ];
|
||||
platforms = [
|
||||
"x86_64-darwin"
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
broken = stdenv.isDarwin; # No support yet for setting FFI lookup path
|
||||
};
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "http://0pointer.de/lennart/projects/libcanberra/";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ RossComputerGuy ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -77,6 +77,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ RossComputerGuy ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran, CoreFoundation }:
|
||||
{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran, CoreFoundation, CoreServices, SystemConfiguration }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "netcdf-fortran";
|
||||
version = "4.4.5";
|
||||
@@ -12,7 +12,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ gfortran ];
|
||||
buildInputs = [ netcdf hdf5 curl ]
|
||||
++ lib.optional stdenv.isDarwin CoreFoundation;
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
CoreServices
|
||||
SystemConfiguration
|
||||
];
|
||||
env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [
|
||||
"-F${CoreServices}/Library/Frameworks"
|
||||
"-F${SystemConfiguration}/Library/Frameworks"
|
||||
]);
|
||||
doCheck = true;
|
||||
|
||||
FFLAGS = [ "-std=legacy" ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpstan";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpstan";
|
||||
repo = "phpstan-src";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-zf6u7fGMMx+DeXcS4SxyK3aQ53jnXzQ8YPrJ89vG65Y=";
|
||||
hash = "sha256-CMIWxxryDDA38uyGl3SIooliU0ElAY1iAqnexn2Uq58=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Uv2BoE/hTK59uxHsdm4M5hfozDw4LwwZH4MHd+vN60Y=";
|
||||
vendorHash = "sha256-CSkwBBV6b2inpQu4TKBR23Du11mzr3rV6GtprzHAOgQ=";
|
||||
composerStrictValidation = false;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "anywidget";
|
||||
version = "0.9.10";
|
||||
version = "0.9.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-OQpigkCYHAmBPHUjJ53cq4L/T9Moet1UM7eLE2kIkGg=";
|
||||
hash = "sha256-WN3tjobsJ84odgyUVzF2YxE9mvYIlH7mqNDstSiyLNw=";
|
||||
};
|
||||
|
||||
# We do not need the jupyterlab build dependency, because we do not need to
|
||||
@@ -48,6 +48,11 @@ buildPythonPackage rec {
|
||||
watchfiles
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# requires package.json
|
||||
"test_version"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "anywidget" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -6,25 +6,39 @@
|
||||
, pytestCheckHook
|
||||
, vcrpy
|
||||
, citeproc-py
|
||||
, looseversion
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "duecredit";
|
||||
version = "0.9.3";
|
||||
version = "0.10.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+DeOqQ0R+XUlkuSHySFj2oDZqf85mT64PAi/LtTso3I=";
|
||||
hash = "sha256-IQgrmEclF/USrTjn5A0BbJ5GHgXh1R/KPJx4K4FuUuY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
propagatedBuildInputs = [ citeproc-py requests ];
|
||||
postPatch = ''
|
||||
substituteInPlace tox.ini \
|
||||
--replace-fail "--cov=duecredit" "" \
|
||||
--replace-fail "--cov-config=tox.ini" ""
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook vcrpy ];
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
propagatedBuildInputs = [
|
||||
citeproc-py
|
||||
looseversion
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
vcrpy
|
||||
];
|
||||
disabledTests = [ "test_import_doi" ]; # tries to access network
|
||||
|
||||
preCheck = ''
|
||||
@@ -33,12 +47,12 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "duecredit" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/duecredit/duecredit";
|
||||
description = "Simple framework to embed references in code";
|
||||
mainProgram = "duecredit";
|
||||
changelog = "https://github.com/duecredit/duecredit/releases/tag/${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ lib.maintainers.bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,27 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, aioresponses
|
||||
, pytestCheckHook
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchPypi,
|
||||
aiohttp,
|
||||
async-timeout,
|
||||
aioresponses,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "foobot-async";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "foobot_async";
|
||||
inherit version;
|
||||
sha256 = "fa557a22de925139cb4a21034ffdbcd01d28bf166c0e680eaf84a99206327f40";
|
||||
hash = "sha256-+lV6It6SUTnLSiEDT/280B0ovxZsDmgOr4SpkgYyf0A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.45.0";
|
||||
version = "0.45.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = "griffe";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-nczu6Neh1feSZyyMrXyiXU1aDIjOsX6RKqaH+Qw8yrQ=";
|
||||
hash = "sha256-NmCnhImkdo2zAHhl2fLknV0rXXmJ9A+FL1uXUBF4IPk=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
@@ -1,17 +1,30 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, pefile, pillow}:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pefile
|
||||
, pillow
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "icoextract";
|
||||
version = "0.1.4";
|
||||
format = "setuptools";
|
||||
version = "0.1.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "tar.gz";
|
||||
hash = "sha256-x0GEV0PUbkAzoUJgAqup9bHd7iYttGyzIZNdo8KsFyo=";
|
||||
hash = "sha256-/UxnWNyRNtwI4Rxx97i5QyjeMrUr5Sq+TfLTmU0xWyc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
pefile
|
||||
pillow
|
||||
];
|
||||
@@ -31,6 +44,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Extract icons from Windows PE files";
|
||||
homepage = "https://github.com/jlu5/icoextract";
|
||||
changelog = "https://github.com/jlu5/icoextract/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bryanasdev000 donovanglover ];
|
||||
};
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab-git";
|
||||
version = "0.50.0";
|
||||
version = "0.50.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "jupyterlab_git";
|
||||
inherit version;
|
||||
hash = "sha256-CYWVRtOQE067kYqWXCw/4mBf6v4yfPYWFb592Qtb37s=";
|
||||
hash = "sha256-v08Go/vCsquE6l1SMmqg4LjM9OmjNX+jGKEZVg4cak0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab";
|
||||
version = "4.1.8";
|
||||
version = "4.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-M4St7YaA585QT9Y7i7iaOd8hycdpTZ59xKaHQs2zD5s=";
|
||||
hash = "sha256-NW6SBaaiq2icR8j+SRnbpsB243bQPya6rcBXSMJDXdU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,33 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, hatchling
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "looseversion";
|
||||
version = "1.3.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4=";
|
||||
hash = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
pytestFlagsArray = [ "tests.py" ];
|
||||
|
||||
pythonImportsCheck = [ "looseversion" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Version numbering for anarchists and software realists";
|
||||
homepage = "https://github.com/effigies/looseversion";
|
||||
changelog = "https://github.com/effigies/looseversion/blob/${version}/CHANGES.md";
|
||||
license = licenses.psfl;
|
||||
maintainers = with maintainers; [ pelme ];
|
||||
};
|
||||
|
||||
@@ -3,30 +3,32 @@
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, black
|
||||
, click
|
||||
, docutils
|
||||
, itsdangerous
|
||||
, jedi
|
||||
, markdown
|
||||
, pymdown-extensions
|
||||
, psutil
|
||||
, pygments
|
||||
, pymdown-extensions
|
||||
, starlette
|
||||
, tomlkit
|
||||
, uvicorn
|
||||
, starlette
|
||||
, websockets
|
||||
, docutils
|
||||
, black
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marimo";
|
||||
version = "0.4.10";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-F6Hf8KPIkXuRhO/1mVHE1wfU6//vbUK1ghoqANmZjag=";
|
||||
hash = "sha256-L6ICaaMRrMOr/d8CJGcXxOYCWTVh8ObckW7xNeLRB2Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -34,17 +36,19 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
black
|
||||
click
|
||||
docutils
|
||||
itsdangerous
|
||||
jedi
|
||||
markdown
|
||||
pymdown-extensions
|
||||
psutil
|
||||
pygments
|
||||
pymdown-extensions
|
||||
starlette
|
||||
tomlkit
|
||||
uvicorn
|
||||
starlette
|
||||
websockets
|
||||
docutils
|
||||
black
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -1,31 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mortgage";
|
||||
version = "1.0.5";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
sha256 = "18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jlumbroso";
|
||||
repo = "mortgage";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UwSEKfMQqxpcF+7TF/+qD6l8gEO/qDCUklpZz1Nt/Ok=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
doCheck = false; # No tests in sdist
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
pythonImportsCheck = [ "mortgage" ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Mortgage calculator";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/jlumbroso/mortgage";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -1,62 +1,96 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, numpy
|
||||
, decorator
|
||||
, imageio
|
||||
, imageio-ffmpeg
|
||||
, proglog
|
||||
, requests
|
||||
, tqdm
|
||||
# Advanced image processing (triples size of output)
|
||||
, advancedProcessing ? false
|
||||
, scikit-image
|
||||
, scikit-learn
|
||||
, scipy
|
||||
, matplotlib
|
||||
, youtube-dl
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
decorator,
|
||||
fetchFromGitHub,
|
||||
imageio,
|
||||
imageio-ffmpeg,
|
||||
matplotlib,
|
||||
numpy,
|
||||
proglog,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
requests,
|
||||
scikit-image,
|
||||
scikit-learn,
|
||||
scipy,
|
||||
setuptools,
|
||||
tqdm,
|
||||
youtube-dl,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "moviepy";
|
||||
version = "1.0.3";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2884e35d1788077db3ff89e763c5ba7bfddbd7ae9108c9bc809e7ba58fa433f5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zulko";
|
||||
repo = "moviepy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-l7AwzAKSaEV+pPbltKgwllK6X54oruU2w0AvoCsrESE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0"
|
||||
--replace-fail "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0"
|
||||
'';
|
||||
|
||||
# No tests, require network connection
|
||||
doCheck = false;
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
dependencies = [
|
||||
decorator
|
||||
imageio
|
||||
imageio-ffmpeg
|
||||
tqdm
|
||||
requests
|
||||
numpy
|
||||
proglog
|
||||
] ++ lib.optionals advancedProcessing [
|
||||
scikit-image
|
||||
scikit-learn
|
||||
scipy
|
||||
matplotlib
|
||||
youtube-dl
|
||||
requests
|
||||
tqdm
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optionals = [
|
||||
matplotlib
|
||||
scikit-image
|
||||
scikit-learn
|
||||
scipy
|
||||
youtube-dl
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "moviepy" ];
|
||||
|
||||
disabledTests = [
|
||||
"test_cuts1"
|
||||
"test_issue"
|
||||
"test_PR"
|
||||
"test_setup"
|
||||
"test_subtitles"
|
||||
"test_sys_write_flush"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_compositing.py"
|
||||
"tests/test_fx.py"
|
||||
"tests/test_ImageSequenceClip.py"
|
||||
"tests/test_resourcerelease.py"
|
||||
"tests/test_resourcereleasedemo.py"
|
||||
"tests/test_TextClip.py"
|
||||
"tests/test_VideoClip.py"
|
||||
"tests/test_Videos.py"
|
||||
"tests/test_videotools.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Video editing with Python";
|
||||
homepage = "https://zulko.github.io/moviepy/";
|
||||
changelog = "https://github.com/Zulko/moviepy/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@@ -1,59 +1,62 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, httpx
|
||||
, microsoft-kiota-abstractions
|
||||
, microsoft-kiota-authentication-azure
|
||||
,microsoft-kiota-http
|
||||
, requests
|
||||
, azure-identity
|
||||
, pytestCheckHook
|
||||
, responses
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
python-dotenv,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
httpx,
|
||||
microsoft-kiota-abstractions,
|
||||
microsoft-kiota-authentication-azure,
|
||||
microsoft-kiota-http,
|
||||
requests,
|
||||
azure-identity,
|
||||
pytestCheckHook,
|
||||
responses,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msgraph-core";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoftgraph";
|
||||
repo = "msgraph-sdk-python-core";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VizjN7sXqPvo9VOSaaUnogTlUDJ1OA2COYNTcVRqhJA=";
|
||||
hash = "sha256-bQW1piSypfj3YAfzuEk/AkrB1x0lrHoIDyZv+KeCYgE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
httpx
|
||||
microsoft-kiota-abstractions
|
||||
microsoft-kiota-authentication-azure
|
||||
microsoft-kiota-http
|
||||
requests
|
||||
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
azure-identity
|
||||
pytestCheckHook
|
||||
python-dotenv
|
||||
responses
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"msgraph_core"
|
||||
pythonImportsCheck = [ "msgraph_core" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# client_id should be the id of a Microsoft Entra application
|
||||
"tests/tasks/test_page_iterator.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Core component of the Microsoft Graph Python SDK";
|
||||
homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core";
|
||||
changelog = "https://github.com/microsoftgraph/msgraph-sdk-python-core/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbdev";
|
||||
version = "2.3.21";
|
||||
version = "2.3.22";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-H3KHnVOdy+Hdpka+dxp/qPj1HZSXIbXJshnZuXVo9DQ=";
|
||||
hash = "sha256-CO88zk4aPoaYokt98IYXpfTrhdVBgCwM9BSiKqWeKm4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "notebook";
|
||||
version = "7.1.3";
|
||||
version = "7.2.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Qfzr/0TPe7k3cYCAi8uuBmYptV2MdyLx6751ykT5z8E=";
|
||||
hash = "sha256-NKK6SwitXRnskw23SE+3l0aheEvp4aX4IY+a+GVqFB8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,28 +1,32 @@
|
||||
{ lib
|
||||
, aioresponses
|
||||
, async-upnp-client
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lxml
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
aioresponses,
|
||||
async-upnp-client,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
lxml,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openhomedevice";
|
||||
version = "2.2";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazwilliams";
|
||||
repo = pname;
|
||||
repo = "openhomedevice";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
async-upnp-client
|
||||
lxml
|
||||
];
|
||||
@@ -32,13 +36,9 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"openhomedevice"
|
||||
];
|
||||
pythonImportsCheck = [ "openhomedevice" ];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests/*.py"
|
||||
];
|
||||
pytestFlagsArray = [ "tests/*.py" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to access Linn Ds and Openhome devices";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyduotecno";
|
||||
version = "2024.5.0";
|
||||
version = "2024.5.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Cereal2nd";
|
||||
repo = "pyDuotecno";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-59dwSr/IlNmHoJnPEBTR2FOXZ8JiFIo1V69/r0yxKNM=";
|
||||
hash = "sha256-huzv7f1Aq/n3cD9S4oXqGQogq7VpPpzAUqkOhiB879A=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# build-system
|
||||
, setuptools
|
||||
|
||||
# tests
|
||||
, django
|
||||
, djangorestframework
|
||||
@@ -10,16 +13,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rules";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
version = "3.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dfunckt";
|
||||
repo = "django-rules";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UFRfRwcvxEn0fD3ScJJ7f/EHd93BOpY3cEF9QDryJZY=";
|
||||
hash = "sha256-fxLaxjni+0S59vtvKBduR0pYMwJWWBPzR5mnH+j6gVE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rules"
|
||||
];
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "softlayer";
|
||||
version = "6.2.0";
|
||||
version = "6.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -29,8 +29,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "softlayer-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kOElL6VtHrtbA0lNAnDOC6VPX1mC7Rvk5x6N5x2Z1B0=";
|
||||
rev = "refs/tags/v.${version}";
|
||||
hash = "sha256-xlfVxQFsBKKpEsVmPlxn0sSyePNEmhly6wS/lTvP3DA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goa";
|
||||
version = "3.16.1";
|
||||
version = "3.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goadesign";
|
||||
repo = "goa";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1j7qgMTb9uz261mI8adY9aM8BkCFQHCCjuc8RIDcqCg=";
|
||||
hash = "sha256-HDGopedI0kI6S7/EqHHyBUJKx25M+0tN/kIBC6Z4NYU=";
|
||||
};
|
||||
vendorHash = "sha256-A7FsCfZQKFFrk0KXvgyJjfGjyHQ3Ruoq/+RxC+zSa04=";
|
||||
vendorHash = "sha256-H1hGZsDitamDDO0BNYjkLR4eIL0NFmpQHvMblNVLBho=";
|
||||
|
||||
subPackages = [ "cmd/goa" ];
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nexus";
|
||||
version = "3.52.0-01";
|
||||
version = "3.68.1-02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.sonatype.com/nexus/3/nexus-${version}-unix.tar.gz";
|
||||
hash = "sha256-+Hdmuy7WBtUIjEBZyLgE3a3+L/lANHiy1VRBJ2s686U=";
|
||||
hash = "sha256-VHS4KDFgU3djteDzDAe43TZIwRG/8bb7u3usoOCJS5M=";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-crev";
|
||||
version = "0.25.6";
|
||||
version = "0.25.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crev-dev";
|
||||
repo = "cargo-crev";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kMbbUXiU549JwblLzcP4X5rs6Qu8vaLKB5rnZSpKHKQ=";
|
||||
sha256 = "sha256-ZevtYJ1ibSs3an3m1KJNTTquz1w6UfTiFgd1mNHFHWE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gUHy8yXTiQd3/7IyVmiq0QqXKF4ZVhF+riryEj/w2NI=";
|
||||
cargoHash = "sha256-QHhfHm2fDFR5BpSnw1wzr3dfCWDTzWNDDdRtj2qOoKE=";
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Graphical frontend for firmware management";
|
||||
homepage = "https://github.com/pop-os/firmware-manager";
|
||||
license = lib.licenses.gpl3;
|
||||
license = with lib.licenses; [ gpl3Plus cc0 ];
|
||||
mainProgram = "com.system76.FirmwareManager";
|
||||
maintainers = [ lib.maintainers.shlevy ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
description = "SELinux binary policy manipulation library";
|
||||
homepage = "http://userspace.selinuxproject.org";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ RossComputerGuy ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
pkgConfigModules = [ "libselinux" ];
|
||||
};
|
||||
|
||||
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
||||
description = "SELinux policy core utilities (packaging additions)";
|
||||
license = licenses.gpl2;
|
||||
inherit (libsepol.meta) homepage platforms;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ RossComputerGuy ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
stdenv.mkDerivation {
|
||||
name = "kamailio-bin-test";
|
||||
meta.timeout = 60;
|
||||
src = ./.;
|
||||
|
||||
dontUnpack = true;
|
||||
dontInstall = true;
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ RossComputerGuy ];
|
||||
mainProgram = "tar";
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.info-zip.org";
|
||||
license = licenses.bsdOriginal;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ RossComputerGuy ];
|
||||
mainProgram = "zip";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "limitcpu";
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/limitcpu/cpulimit-${version}.tar.gz";
|
||||
sha256 = "sha256-rS9BXrK72j6DqKLZGO9ekPUuvMb+5h6Uv5F7PoTrtJw=";
|
||||
sha256 = "sha256-lGmU7GDznwMJW4m9dOZguJwUyCq6dUVmk5jjArx7I0w=";
|
||||
};
|
||||
|
||||
buildFlags = with stdenv; [ (
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "easyrsa";
|
||||
version = "3.1.7";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenVPN";
|
||||
repo = "easy-rsa";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zdVcT04nj7eE1a6M7WHeWpwG/TVTwyK+WgD70XwPXfY=";
|
||||
hash = "sha256-hjebDE7Ts93vtoOTquFbfTWdInhI7HXc4pRxIsvNLtg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oneshot";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "forestnode-io";
|
||||
repo = "oneshot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QReh8wdFeiCAv+XMz4cADNn9QcxlvewFJJuJ+OH7Lgc=";
|
||||
hash = "sha256-aIbKXBJNcBbYJRzETT0mkaqTRo+/8o6z882G21V74rg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-z6eOPugSwWEK02lgRu5Oo8LzjXnJlAtQvkzdevjBTVs=";
|
||||
vendorHash = "sha256-TktSQMIHYXF9eyY6jyfE31WLXEq7VZU3qnVIMGjMMcA=";
|
||||
|
||||
subPackages = [ "cmd" ];
|
||||
|
||||
|
||||
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0l1qsk949vnz18k4vjf3ppq8p497966x4c7f2yx18x8pk35whn2a";
|
||||
};
|
||||
|
||||
CFLAGS = "-std=gnu89";
|
||||
|
||||
# 'fcrackzip --use-unzip' cannot deal with file names containing a single quote
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430387
|
||||
patches = [ ./fcrackzip_forkexec.patch ];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sequoia-sqop";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sequoia-pgp";
|
||||
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage rec {
|
||||
# generated etc
|
||||
repo = "sequoia-sop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6g6JVNlLi++XboU/ewHM7KM0tJlDayCoz1octKloQro=";
|
||||
hash = "sha256-5XK5Cec6ojrpIncAtlp9jYr9KxmNYJKPhbsJraA0FA0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Vci29mnFiRRbI45Qkj6t8aVrEaJdKVB01zTXHQT5ckw=";
|
||||
cargoHash = "sha256-8ujQyG9qLuG8vjHoRtvpn4ka/Ft39u+NoxSZrD9NsfY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -24,6 +24,11 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-XlfdIg8YHCeCvc7kZczUxlxUonyZSQATgsxLTMvNDk4=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-X main.Version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "witness";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "in-toto";
|
||||
repo = "witness";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uv/HxPYOKxZskmlAxUS2I1sW4YsSAmIeNHjoJeR7VWs=";
|
||||
sha256 = "sha256-QnZZVQZMkh9GH6io19mlE3gHaiX73TgH7ibFT1H5DB4=";
|
||||
};
|
||||
vendorHash = "sha256-9IkDBaDRJGWfPRN5+rYU4uH6nAsfnytDkF518rfNpyc=";
|
||||
vendorHash = "sha256-5q405OP8VPChhxiH2tjh2H+ailQRjGmLZvul7CubjJo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -10841,7 +10841,7 @@ with pkgs;
|
||||
netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };
|
||||
|
||||
netcdffortran = callPackage ../development/libraries/netcdf-fortran {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration;
|
||||
};
|
||||
|
||||
networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { };
|
||||
@@ -32047,12 +32047,12 @@ with pkgs;
|
||||
inherit (callPackage ../applications/networking/cluster/k3s {
|
||||
buildGoModule = buildGo121Module;
|
||||
go = go_1_21;
|
||||
}) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29;
|
||||
}) k3s_1_27 k3s_1_28 k3s_1_29;
|
||||
inherit (callPackage ../applications/networking/cluster/k3s {
|
||||
buildGoModule = buildGo122Module;
|
||||
go = go_1_22;
|
||||
}) k3s_1_30;
|
||||
k3s = k3s_1_29;
|
||||
k3s = k3s_1_30;
|
||||
|
||||
k3sup = callPackage ../applications/networking/cluster/k3sup { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user