Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
afae8eadb8
90 changed files with 551 additions and 324 deletions
|
|
@ -656,7 +656,7 @@ in
|
|||
to view the current value. By default it is empty.
|
||||
|
||||
Nix configurations defined under {option}`nix.*` will be translated and applied to this
|
||||
option. In addition, configuration specified in {option}`nix.extraOptions` which will be appended
|
||||
option. In addition, configuration specified in {option}`nix.extraOptions` will be appended
|
||||
verbatim to the resulting config file.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -42,13 +42,15 @@ let
|
|||
mkdir -p $out
|
||||
cp -r * $out/
|
||||
|
||||
# Link config file
|
||||
ln -s ${configFile} $out/WEB-INF/config.php
|
||||
|
||||
# Link writable templates_c directory
|
||||
rm -rf $out/WEB-INF/templates_c
|
||||
ln -s ${cfg.dataDir}/templates_c $out/WEB-INF/templates_c
|
||||
|
||||
# ln -fs ${cfg.dataDir}/templates_c $out/WEB-INF/templates_c
|
||||
# Remove unsafe dbinstall.php
|
||||
rm -f $out/dbinstall.php
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
|
@ -105,6 +107,41 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
hostname = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default =
|
||||
if config.networking.domain != null
|
||||
then config.networking.fqdn
|
||||
else config.networking.hostName;
|
||||
defaultText = lib.literalExpression "config.networking.fqdn";
|
||||
example = "anuko.example.com";
|
||||
description = lib.mdDoc ''
|
||||
The hostname to serve Anuko Time Tracker on.
|
||||
'';
|
||||
};
|
||||
|
||||
nginx = lib.mkOption {
|
||||
type = lib.types.submodule (
|
||||
lib.recursiveUpdate
|
||||
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {}
|
||||
);
|
||||
default = {};
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
serverAliases = [
|
||||
"anuko.''${config.networking.domain}"
|
||||
];
|
||||
|
||||
# To enable encryption and let let's encrypt take care of certificate
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
}
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
With this option, you can customize the Nginx virtualHost settings.
|
||||
'';
|
||||
};
|
||||
|
||||
dataDir = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "/var/lib/anuko-time-tracker";
|
||||
|
|
@ -118,15 +155,6 @@ in
|
|||
description = lib.mdDoc "User under which Anuko Time Tracker runs.";
|
||||
};
|
||||
|
||||
virtualHost = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = "localhost";
|
||||
description = lib.mdDoc ''
|
||||
Name of the nginx virtualhost to use and setup. If null, do not setup
|
||||
any virtualhost.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = {
|
||||
multiorgMode = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
|
|
@ -286,20 +314,26 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
services.nginx = lib.mkIf (cfg.virtualHost != null) {
|
||||
enable = true;
|
||||
virtualHosts = {
|
||||
"${cfg.virtualHost}" = {
|
||||
services.nginx = {
|
||||
enable = lib.mkDefault true;
|
||||
recommendedTlsSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedGzipSettings = true;
|
||||
virtualHosts."${cfg.hostname}" = lib.mkMerge [
|
||||
cfg.nginx
|
||||
{
|
||||
root = lib.mkForce "${package}";
|
||||
locations."/".index = "index.php";
|
||||
locations."~ [^/]\\.php(/|$)" = {
|
||||
extraConfig = ''
|
||||
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.anuko-time-tracker.socket};
|
||||
'';
|
||||
locations = {
|
||||
"/".index = "index.php";
|
||||
"~ [^/]\\.php(/|$)" = {
|
||||
extraConfig = ''
|
||||
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.anuko-time-tracker.socket};
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.mysql = lib.mkIf cfg.database.createLocally {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, wrapGAppsHook
|
||||
|
|
@ -20,9 +19,10 @@ buildGoModule rec {
|
|||
owner = "yktoo";
|
||||
repo = "ymuse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3QgBbK7AK9/uQ6Z7DNIJxa1oXrxvvHDQ/Z2QOf7yfS4=";
|
||||
hash = "sha256-3QgBbK7AK9/uQ6Z7DNIJxa1oXrxvvHDQ/Z2QOf7yfS4=";
|
||||
};
|
||||
vendorSha256 = "sha256-7oYYZWpvWzeHlp6l9bLeHcLITLZPVY5eZdfHSE+ZHW8=";
|
||||
|
||||
vendorHash = "sha256-7oYYZWpvWzeHlp6l9bLeHcLITLZPVY5eZdfHSE+ZHW8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "erigon";
|
||||
version = "2.47.0";
|
||||
version = "2.48.0";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
|
@ -11,11 +11,11 @@ buildGoModule {
|
|||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LmubFpewCEPcLzezEWye8y4Vjv68coxoCtrffxJsodY=";
|
||||
hash = "sha256-L2uQJdC0Z5biv//QzgjPpygsk8GlUoQsSNH4Cp5TvhU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zgBStaULqbdZmBDi/3AjGx35mh45M3uFkDd5z/vQeMQ=";
|
||||
vendorHash = "sha256-wzA75+BL5Fm6X13dF/ou7qvMEdeaImmSs2lypH4hOTY=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "namecoin" + lib.optionalString (!withGui) "d";
|
||||
version = "24.0";
|
||||
version = "25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namecoin";
|
||||
repo = "namecoin-core";
|
||||
rev = "nc${version}";
|
||||
sha256 = "sha256-DSUYqNHgPsHVwx3G83pZdzsTjhX2X2mMqt+lAlIuGp0=";
|
||||
sha256 = "sha256-2KMK5Vb8osuaKbzI1aaPSYg+te+v9CEcGUkrVI6Fk54=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1238,8 +1238,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "prettier-vscode";
|
||||
publisher = "esbenp";
|
||||
version = "9.16.0";
|
||||
sha256 = "sha256-MF+mPhX4Q6wi7FxfaWG6fNJHY6EsTWOX+9UmN0iIZGU=";
|
||||
version = "9.19.0";
|
||||
sha256 = "sha256-ymIlBzCcssj+J8hHOokVWUpxKTEkzkhNr80uCblhkFs=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
|
||||
|
|
@ -1923,11 +1923,16 @@ let
|
|||
mktplcRef = {
|
||||
name = "magit";
|
||||
publisher = "kahole";
|
||||
version = "0.6.40";
|
||||
sha256 = "sha256-AwkjfKBlAl6hTRN1nE6UuUuDXMJUXXDK2+3YzUp9drc=";
|
||||
version = "0.6.43";
|
||||
sha256 = "sha256-DPLlQ2IliyvzW8JvgVlGKNd2JjD/RbclNXU3gEFVhOE=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/kahole.magit/changelog";
|
||||
description = "Magit for VSCode";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=kahole.magit";
|
||||
homepage = "https://github.com/kahole/edamagit";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.azd325 ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.900"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.942"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "d604e982276105db043ca495a16f1b047bb2d0f6";
|
||||
sha256 = "0fsl2cw0y7jfj9b75w4x213x9hsxkfprvb6riin87yrdhmjkwa4r";
|
||||
rev = "6e28a4dd13df0ab866e6a178086abe36ca4a2b25";
|
||||
sha256 = "0890gh0907wcdzx4ci2jd75a72b3kllwavkcwz56ls0vaqymqxda";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
|
|
|||
8
pkgs/applications/emulators/ryujinx/deps.nix
generated
8
pkgs/applications/emulators/ryujinx/deps.nix
generated
|
|
@ -45,7 +45,7 @@
|
|||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; sha256 = "1l6v0ii5lapmfnfpjwi3j5bwlx8v9nvyani5pwvqzdfqsd5m7mp5"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.2"; sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||
|
|
@ -56,15 +56,15 @@
|
|||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.31.0"; sha256 = "0dbvi7ifsl6gdsa1hc4bvma9qyr63gvgamwndy0k7wyvvh492rhm"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.31.0"; sha256 = "0yrsysxgjfwrh1n2mplpm4jwm0ws4p49pdd3zcsql7kjjhs525lv"; })
|
||||
(fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.2"; sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.3"; sha256 = "1f2b9ljc3l6lk2qq3ps6pzb5r4dvqvs9j1xav8kj2yy52i2dbz7r"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.2"; sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.2"; sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.3"; sha256 = "0czzs36ybgipn9bga2swkdd653vh0wvs5hsi2lgykhblimdmb947"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.3"; sha256 = "0yi0n8jxf4l6v8bscgi8ws9zf5i84213pf1qj5d7nwx4jb05m23l"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; })
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
, pkg-config
|
||||
, cli11
|
||||
, eigen
|
||||
, fmt
|
||||
, hidrd
|
||||
, inih
|
||||
, microsoft-gsl
|
||||
|
|
@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
cli11
|
||||
eigen
|
||||
fmt
|
||||
hidrd
|
||||
inih
|
||||
microsoft-gsl
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "klipper-estimator";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Annex-Engineering";
|
||||
repo = "klipper_estimator";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h3mXdkUIc8OycvBbS5LhxsoIsO/GTXf3XkxbSpwfPHw=";
|
||||
hash = "sha256-sq0HWK+zH7Rj/XFgMrI4+SVhBXPbvvoSr3A/1Aq/Fa8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-e9IMkrvlkiVxwRToKGLzzBW4JZNsaOpucoHQiusehdY=";
|
||||
cargoHash = "sha256-QHSydaE867HaY7vBoV+v4p7G5qbQy5l3TemD3k41T4A=";
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p2pool";
|
||||
version = "3.4";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SChernykh";
|
||||
repo = "p2pool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JtBl+ZNqBbCl8gFZy+q5PP2qoRKULA++leGsyrT3DaQ=";
|
||||
sha256 = "sha256-qwdEmDfH+TE0WF2HIVCn23RlzelLBvCOu9VKpScdO68=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -35,14 +35,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "workrave";
|
||||
version = "1.10.50";
|
||||
version = "1.10.51.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "workrave";
|
||||
owner = "rcaelers";
|
||||
rev = with lib;
|
||||
"v" + concatStringsSep "_" (splitVersion version);
|
||||
sha256 = "sha256-fSUfgk0PmiteVQis+0NmMMZXBe/377X2k9oS2yp2Qzo=";
|
||||
sha256 = "sha256-rx3k4U5igRYxzuVke+x926K1Pso32iGob4Ccp0jdKds=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clash-verge";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb";
|
||||
hash = "sha256-46+7P9WH85fC3m+5LQHpvZX2ggeH6djoO53fQxQJdYk=";
|
||||
hash = "sha256-9VsHC0HqV3CavqBw9uK+zC1nHIkK8Dry3zhK1rr+VBU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.154.0";
|
||||
version = "0.155.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helmfile";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AKrTpV5Ky94H610iYO31/CBuZkTd1OcxX5Tl0GjNWaA=";
|
||||
sha256 = "sha256-9YOgpXiZegimS81owjHW/in0NbxMTL+DQEgSBWdW7Rs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PenQxs5Ds5GQ2LSlFRdpNUN8Y+jKCFSllMncWZwaL4c=";
|
||||
vendorHash = "sha256-ioZJr3v/8HhOEJJZpsCw5Gkbg9XvMMEOugyfRhevWBc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kaniko";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "kaniko";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-p/mGobQyn5e7TpqjarVT7qBgYDWtX1VgXq814O8mTmI=";
|
||||
hash = "sha256-wDIkQ6MY9g8uKCgfJfXsjkB4blF0QNKIKDN3rYHOa6E=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubelogin";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "int128";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oBgth4lAQP4UrFIk/AErlfyyCgPrugs5wQJDFxqGum0=";
|
||||
sha256 = "sha256-8atEUJLXSbLHdxo1wKtAHAFrZkQYWdW6tP2oKoxahXA=";
|
||||
};
|
||||
|
||||
subPackages = ["."];
|
||||
|
||||
vendorHash = "sha256-IJCbh1ryyk0r72SrVEiI7K5nIFf1+UGjTkXaNKpGsmo=";
|
||||
vendorHash = "sha256-rLpXBFNBJG3H0+2inCG4wN0I2LuKUhuqozeafUD3aMI=";
|
||||
|
||||
# Rename the binary instead of symlinking to avoid conflict with the
|
||||
# Azure version of kubelogin
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.1.8";
|
||||
version = "1.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YbO5bDHbquuiokIyepqE8nM+IZDW+x6rzJqnzeqoS8Q=";
|
||||
hash = "sha256-lFDyV2PwsYWmZ5E19LpWk60Fjo39M0wd8C1Z2qL3G+0=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
{ fetchurl, lib, stdenv
|
||||
{ fetchurl, lib, stdenv, makeWrapper
|
||||
, pkg-config, gnupg
|
||||
, xapian, gmime3, talloc, zlib
|
||||
, xapian, gmime3, sfsexp, talloc, zlib
|
||||
, doxygen, perl, texinfo
|
||||
, notmuch
|
||||
, pythonPackages
|
||||
, emacs
|
||||
, ruby
|
||||
, testers
|
||||
, which, dtach, openssl, bash, gdb, man
|
||||
, which, dtach, openssl, bash, gdb, man, git
|
||||
, withEmacs ? true
|
||||
, withRuby ? true
|
||||
, withSfsexp ? true # also installs notmuch-git, which requires sexp-support
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -28,14 +29,16 @@ stdenv.mkDerivation rec {
|
|||
texinfo # (optional) documentation -> doc/INSTALL
|
||||
pythonPackages.cffi
|
||||
] ++ lib.optional withEmacs emacs
|
||||
++ lib.optional withRuby ruby;
|
||||
++ lib.optional withRuby ruby
|
||||
++ lib.optional withSfsexp makeWrapper;
|
||||
|
||||
buildInputs = [
|
||||
gnupg # undefined dependencies
|
||||
xapian gmime3 talloc zlib # dependencies described in INSTALL
|
||||
perl
|
||||
pythonPackages.python
|
||||
] ++ lib.optional withRuby ruby;
|
||||
] ++ lib.optional withRuby ruby
|
||||
++ lib.optional withSfsexp sfsexp;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs configure test/
|
||||
|
|
@ -75,6 +78,12 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional withEmacs "emacs"
|
||||
++ lib.optional withRuby "ruby";
|
||||
|
||||
# if notmuch is built with s-expression support, the testsuite (T-850.sh) only
|
||||
# passes if notmuch-git can be executed, so we need to patch its shebang.
|
||||
postBuild = lib.optionalString withSfsexp ''
|
||||
patchShebangs notmuch-git
|
||||
'';
|
||||
|
||||
preCheck = let
|
||||
test-database = fetchurl {
|
||||
url = "https://notmuchmail.org/releases/test-databases/database-v1.tar.xz";
|
||||
|
|
@ -94,7 +103,10 @@ stdenv.mkDerivation rec {
|
|||
nativeCheckInputs = [
|
||||
which dtach openssl bash
|
||||
gdb man emacs
|
||||
];
|
||||
]
|
||||
# for the test T-850.sh for notmuch-git, which is skipped when notmuch is
|
||||
# built without sexp-support
|
||||
++ lib.optional withSfsexp git;
|
||||
|
||||
installTargets = [ "install" "install-man" "install-info" ];
|
||||
|
||||
|
|
@ -106,6 +118,12 @@ stdenv.mkDerivation rec {
|
|||
SHELL=$SHELL \
|
||||
$makeFlags "''${makeFlagsArray[@]}" \
|
||||
$installFlags "''${installFlagsArray[@]}"
|
||||
''
|
||||
# notmuch-git (https://notmuchmail.org/doc/latest/man1/notmuch-git.html) does not work without
|
||||
# sexp-support, so there is no point in installing if we're building without it.
|
||||
+ lib.optionalString withSfsexp ''
|
||||
cp notmuch-git $out/bin/notmuch-git
|
||||
wrapProgram $out/bin/notmuch-git --prefix PATH : $out/bin:${lib.getBin git}/bin
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -68,11 +68,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mullvad-vpn";
|
||||
version = "2023.3";
|
||||
version = "2023.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
|
||||
sha256 = "sha256-+XK9xUeSs93egmtsQ7qATug/n9taeQkmc4ZgObPYvn4=";
|
||||
sha256 = "sha256-7NoifrX1/3pUJHTYK+2dVos/oFsKiYwyhCGi07SsEhM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
let
|
||||
pname = "trilium-desktop";
|
||||
version = "0.60.3";
|
||||
version = "0.60.4";
|
||||
|
||||
linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||
linuxSource.sha256 = "0hfrww1r4s2rga8wzwhcfk60jy4b4xwglgflbc5jbxk3jalvk73x";
|
||||
linuxSource.sha256 = "02vbghvi2sbh943rslgm712x9zccvpjab3jvr5b1bw4bq5fzppgq";
|
||||
|
||||
darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip";
|
||||
darwinSource.sha256 = "0scwq4fmllhjmcj0621rlaaniib3nabfwjmsxdfc5hfnlhjzq7qs";
|
||||
darwinSource.sha256 = "0z6dk16xdzkiyxrm1yh3iz5351c8sdzvk8v5l3jdqy7davxw9f86";
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "trilium";
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
let
|
||||
serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
||||
serverSource.sha256 = "16xlbhjsd0xqaph14wk05qri256d7jga7fz0fwl4rw0li8r9qyd7";
|
||||
version = "0.60.3";
|
||||
serverSource.sha256 = "16xyxpxqvzhdq63wc2nzmfabpasypxwm474jf15y3q8kdrca9myv";
|
||||
version = "0.60.4";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "trilium-server";
|
||||
inherit version;
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simgrid";
|
||||
version = "3.32";
|
||||
version = "3.34";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o25wOROkUm07JPdNTJQcJw6apeoysnjd+YBMHlPpAYI=";
|
||||
sha256 = "sha256-EVTpW9jD1h8T2KRlDIqptKS6Wv1dVDfyJbXxrpsgmoo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ boost ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ecs-agent";
|
||||
version = "1.72.0";
|
||||
version = "1.73.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
hash = "sha256-GKIT1PfgnIPqZp21gA4eimhzT77HNd5wM2Ynt2ekvWU=";
|
||||
hash = "sha256-poVhzJi5cYAYJgLxcsnR8b9gGa5+T56xsFex3/pr7CU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2023-01-08";
|
||||
version = "2023-07-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-xqKGZPlGl8kNZ4AQYZWAywL+6UxwGzYOZ9WvB85JKZk=";
|
||||
hash = "sha256-lq6d3BForrvzEJYeEMQZplvn/p6dPjggTToAU9UcPoM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 jdupes ];
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-editor";
|
||||
version = "6.0.7";
|
||||
version = "6.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-7dHSybjoWZ1alcMsMm4BEEQJjQgNmhC7Eskeo3ZmoS8=";
|
||||
hash = "sha256-NevylvfeoT69i1AFJTypSfJKEd38uSXwGm9doRrZ2TI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-file-manager";
|
||||
version = "6.0.15";
|
||||
version = "6.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tG3Wl1AvwWhHmIIHgexv3mVVrmOwNrwn8k/sD4+WZzk=";
|
||||
hash = "sha256-H+pCWZ1jj5p3gOKXYyLxSmjCMv5/BPIz5A25JGGzrR8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "util-dfm";
|
||||
version = "1.2.8";
|
||||
version = "1.2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Mc3x0nTnEyMnruZotiT1J4BGOeNAQlCXGbO0yVJtqYM=";
|
||||
hash = "sha256-juZQCRtr0SWrPAz6PAAw2m/MWoTg7831BizziHsId00=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sagittarius-scheme";
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz";
|
||||
sha256 = "sha256-UB7Lfyc2afTIVW5SIiHxXi2wyoVC2Q2ClTkSOQ6UmPg=";
|
||||
sha256 = "sha256-F2GaaYVnDAGYDlQZBGhdPDO8lbeVgn+ta6LSK0L0zNA=";
|
||||
};
|
||||
preBuild = ''
|
||||
# since we lack rpath during build, need to explicitly add build path
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guile-fibers";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wingo";
|
||||
repo = "fibers";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3q1mJImce96Dn37UbofaNHj54Uzs1p4XyMNzpu3PdXQ=";
|
||||
hash = "sha256-jJKA5JEHsmqQ/IKb1aNmOtoVaGKNjcgTKyo5VCiJbXM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,14 +3,15 @@
|
|||
, graalvmCEPackages
|
||||
, removeReferencesTo
|
||||
, fetchurl
|
||||
, writeScript }:
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "babashka";
|
||||
pname = "babashka-unwrapped";
|
||||
version = "1.3.181";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar";
|
||||
sha256 = "sha256-NzchlHRxOCSyUf9U0Jv8h4bgKd2Jwp+LmxIfeV8+8+M=";
|
||||
};
|
||||
|
||||
|
|
@ -27,6 +28,8 @@ buildGraalvmNativeImage rec {
|
|||
"--enable-preview"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/bb --version | grep '${version}'
|
||||
$out/bin/bb '(+ 1 2)' | grep '3'
|
||||
|
|
@ -68,18 +71,18 @@ buildGraalvmNativeImage rec {
|
|||
too simple to be worth writing a clj/s script for. Babashka really
|
||||
seems to hit the sweet spot for those cases.
|
||||
|
||||
Goals:
|
||||
Goals:
|
||||
|
||||
- Low latency Clojure scripting alternative to JVM Clojure.
|
||||
- Easy installation: grab the self-contained binary and run. No JVM needed.
|
||||
- Familiarity and portability:
|
||||
- Scripts should be compatible with JVM Clojure as much as possible
|
||||
- Scripts should be platform-independent as much as possible. Babashka
|
||||
offers support for linux, macOS and Windows.
|
||||
- Allow interop with commonly used classes like java.io.File and System
|
||||
- Multi-threading support (pmap, future, core.async)
|
||||
- Batteries included (tools.cli, cheshire, ...)
|
||||
- Library support via popular tools like the clojure CLI
|
||||
- Low latency Clojure scripting alternative to JVM Clojure.
|
||||
- Easy installation: grab the self-contained binary and run. No JVM needed.
|
||||
- Familiarity and portability:
|
||||
- Scripts should be compatible with JVM Clojure as much as possible
|
||||
- Scripts should be platform-independent as much as possible. Babashka
|
||||
offers support for linux, macOS and Windows.
|
||||
- Allow interop with commonly used classes like java.io.File and System
|
||||
- Multi-threading support (pmap, future, core.async)
|
||||
- Batteries included (tools.cli, cheshire, ...)
|
||||
- Library support via popular tools like the clojure CLI
|
||||
'';
|
||||
homepage = "https://github.com/babashka/babashka";
|
||||
changelog = "https://github.com/babashka/babashka/blob/v${version}/CHANGELOG.md";
|
||||
35
pkgs/development/interpreters/babashka/wrapped.nix
Normal file
35
pkgs/development/interpreters/babashka/wrapped.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ stdenv
|
||||
, babashka-unwrapped
|
||||
, clojure
|
||||
, makeWrapper
|
||||
, rlwrap
|
||||
|
||||
, jdkBabashka ? clojure.jdk
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "babashka";
|
||||
inherit (babashka-unwrapped) version meta doInstallCheck installCheckPhase;
|
||||
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase =
|
||||
let unwrapped-bin = "${babashka-unwrapped}/bin/bb"; in
|
||||
''
|
||||
mkdir -p $out/clojure_tools
|
||||
ln -s -t $out/clojure_tools ${clojure}/*.edn
|
||||
ln -s -t $out/clojure_tools ${clojure}/libexec/*
|
||||
|
||||
makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \
|
||||
--inherit-argv0 \
|
||||
--set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \
|
||||
--set-default JAVA_HOME ${jdkBabashka}
|
||||
|
||||
substituteInPlace $out/bin/bb \
|
||||
--replace '"${unwrapped-bin}"' '"${rlwrap}/bin/rlwrap" "${unwrapped-bin}"'
|
||||
'';
|
||||
|
||||
passthru.unwrapped = babashka-unwrapped;
|
||||
})
|
||||
|
|
@ -71,6 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
update-source-version clojure "$latest_version"
|
||||
'';
|
||||
|
||||
passthru.jdk = jdk;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Lisp dialect for the JVM";
|
||||
homepage = "https://clojure.org/";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, babashka
|
||||
, cacert
|
||||
, clojure
|
||||
|
|
@ -79,5 +78,8 @@ stdenv.mkDerivation rec {
|
|||
willcohen
|
||||
];
|
||||
platforms = platforms.darwin;
|
||||
|
||||
# https://hydra.nixos.org/job/nixpkgs/trunk/obb.aarch64-darwin/all
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,19 +14,57 @@ stdenv.mkDerivation ( finalAttrs: {
|
|||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
./build.sh
|
||||
./build.sh ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"}
|
||||
./build.sh -shared ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib
|
||||
cp ./libblst.a $out/lib/
|
||||
mkdir -p $out/{lib,include}
|
||||
for lib in libblst.{a,so,dylib}; do
|
||||
if [ -f $lib ]; then
|
||||
cp $lib $out/lib/
|
||||
fi
|
||||
done
|
||||
cp bindings/{blst.h,blst_aux.h} $out/include
|
||||
|
||||
for lib in blst.dll; do
|
||||
if [ -f $lib ]; then
|
||||
mkdir -p $out/bin
|
||||
cp $lib $out/bin/
|
||||
fi
|
||||
done
|
||||
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
cat <<EOF > $out/lib/pkgconfig/libblst.pc
|
||||
prefix=$out
|
||||
exec_prefix=''\\''${prefix}
|
||||
libdir=''\\''${exec_prefix}/lib
|
||||
includedir=''\\''${prefix}/include
|
||||
|
||||
Name: libblst
|
||||
Description: ${finalAttrs.meta.description}
|
||||
URL: ${finalAttrs.meta.homepage}
|
||||
Version: ${finalAttrs.version}
|
||||
|
||||
Cflags: -I''\\''${includedir}
|
||||
Libs: -L''\\''${libdir} -lblst
|
||||
Libs.private:
|
||||
EOF
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# ensure we have the right install id set. Otherwise the library
|
||||
# wouldn't be found during install. The alternative would be to work
|
||||
# lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libblst.dylib";
|
||||
# into the setup.sh
|
||||
postFixup = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -id $out/lib/libblst.dylib $out/lib/libblst.dylib
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cimg";
|
||||
version = "3.2.5";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GreycLab";
|
||||
repo = "CImg";
|
||||
rev = "v.${finalAttrs.version}";
|
||||
hash = "sha256-1S48Ex44OKdpf6bsXZes7AFA1cAJZELGJqvC4V9sHdA=";
|
||||
hash = "sha256-HEqjvL16Ca3Al3I6VK50CU6zHFj9Nn/SAXXCfRU4rgo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crypto++";
|
||||
version = "8.7.0";
|
||||
version = "8.8.0";
|
||||
underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weidai11";
|
||||
repo = "cryptopp";
|
||||
rev = "CRYPTOPP_${underscoredVersion}";
|
||||
hash = "sha256-KtZXW7+J9a4uKHnK8sqj5WVaIjG3d6tzBBDxa7Wv4AE=";
|
||||
hash = "sha256-hg7g56bIYaXxB28nAmSQ7EP9NEwd1Psf/2GUtbC27oU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -3,19 +3,18 @@
|
|||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.9";
|
||||
pname = "fpattern";
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Loadmaster";
|
||||
repo = finalAttrs.pname;
|
||||
repo = "fpattern";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/QvMQCmoocaXfDm3/c3IAPyfZqR6d7IiJ9UoFKZTpVI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out $dev/include
|
||||
cp *.c *.h $dev/include
|
||||
mkdir -p $out/include
|
||||
cp *.c *.h $out/include
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, acl, attr, zlib }:
|
||||
{ lib, stdenv, fetchurl, acl, attr, libiconv, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libisofs";
|
||||
|
|
@ -11,9 +11,12 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-rB/TONZBdEyh+xVnkXGIt5vIwlBoMt1WiF/smGVrnyU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
acl
|
||||
attr
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
] ++ [
|
||||
zlib
|
||||
];
|
||||
|
||||
|
|
@ -24,6 +27,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ abbradar vrthra ];
|
||||
platforms = with platforms; linux;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "podofo";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "podofo";
|
||||
repo = "podofo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Z9mVAo2dITEtTdqA2sftaLZSCiTbGS02RYxfNcEwd1c=";
|
||||
hash = "sha256-Y5dpx0otX14Jig/O/oq+Sfdcia1a0bhT/6k8nwg+k5o=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
let
|
||||
pname = "ansible";
|
||||
version = "8.0.0";
|
||||
version = "8.1.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hnDHxGAhwYjKwjXp/eetrbs8OAwkNqOwwcSTxLoQvKs=";
|
||||
hash = "sha256-kfILW/z18phTPBdKk4geALyea0FBFGT0TAVKONcWpWo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,17 +5,21 @@
|
|||
, py
|
||||
, pytestCheckHook
|
||||
, pytest-html
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cons";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pythological";
|
||||
repo = "python-cons";
|
||||
rev = "fbeedfc8a3d1bff4ba179d492155cdd55538365e";
|
||||
hash = "sha256-ivHFep9iYPvyiBIZKMAzqrLGnQkeuxd0meYMZwZFFH0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XssERKiv4A8x7dZhLeFSciN6RCEfGs0or3PAQiYSPII=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -38,7 +42,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "An implementation of Lisp/Scheme-like cons in Python";
|
||||
homepage = "https://github.com/pythological/python-cons";
|
||||
changelog = "https://github.com/pythological/python-cons/releases";
|
||||
changelog = "https://github.com/pythological/python-cons/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ Etjean ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,24 +2,25 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, pydantic
|
||||
, pytest-examples
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dirty-equals";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "samuelcolvin";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yYptO6NPhQRlF0T2eXliw2WBms9uqTZVzdYzGj9pCug=";
|
||||
hash = "sha256-j+EqsKVRG2DDka1G3Px8ExYZt8QkqHkhojRnAHObdR4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -28,10 +29,11 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
pytz
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pydantic
|
||||
pytest-examples
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
@ -42,6 +44,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module for doing dirty (but extremely useful) things with equals";
|
||||
homepage = "https://github.com/samuelcolvin/dirty-equals";
|
||||
changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, pytest
|
||||
, django
|
||||
, python-fsutil
|
||||
, python
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
|
|
@ -21,18 +22,26 @@ buildPythonPackage rec {
|
|||
hash = "sha256-Mcj8O20hCINGf5T3PCG9jq0onSrm4R+Ke5CLMqMDmuU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-broken-test.patch";
|
||||
url = "https://github.com/fabiocaccamo/django-maintenance-mode/commit/68cde8d9ceef00eeaa2068f420698c1c562fa9fc.patch";
|
||||
hash = "sha256-K/zYYkcnmWGc7Knz4l9PgvUtT0IccPRXc3UFriC1ldc=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
python-fsutil
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
pythonImportsCheck = [
|
||||
"maintenance_mode"
|
||||
];
|
||||
${python.interpreter} runtests.py
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Shows a 503 error page when maintenance-mode is on";
|
||||
|
|
|
|||
|
|
@ -1,41 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, bx-py-utils
|
||||
, colorlog
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, importlib-resources
|
||||
, jaraco_classes
|
||||
, jaraco_collections
|
||||
, jaraco_itertools
|
||||
, jaraco-context
|
||||
, jaraco-net
|
||||
, keyring
|
||||
, lomond
|
||||
, more-itertools
|
||||
, platformdirs
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-mock
|
||||
, requests-toolbelt
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, requests
|
||||
, lomond
|
||||
, colorlog
|
||||
, keyring
|
||||
, requests-toolbelt
|
||||
, jaraco_collections
|
||||
, jaraco-context
|
||||
, jaraco_classes
|
||||
, jaraco-net
|
||||
, more-itertools
|
||||
, importlib-resources
|
||||
, bx-py-utils
|
||||
, platformdirs
|
||||
, jaraco_itertools
|
||||
, pytestCheckHook
|
||||
, requests-mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jaraco-abode";
|
||||
version = "5.0.1";
|
||||
version = "5.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaraco";
|
||||
repo = "jaraco.abode";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vKlvZrgRKv2C43JLfl4Wum4Icz9yOKEaB6qKapZ0rwQ=";
|
||||
hash = "sha256-guLgmhjFgYLRZsQ0j92NXkktZ80bwVvMUJLZeg3dgxE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -67,13 +66,15 @@ buildPythonPackage rec {
|
|||
jaraco_itertools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "jaraco.abode" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jaraco.abode"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TEMP
|
||||
'';
|
||||
|
|
@ -83,10 +84,12 @@ buildPythonPackage rec {
|
|||
"test_cookies"
|
||||
"test_empty_cookies"
|
||||
"test_invalid_cookies"
|
||||
# Issue with the regex
|
||||
"test_camera_capture_no_control_URLs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/jaraco/jaraco.abode/blob/${src.rev}/CHANGES.rst";
|
||||
changelog = "https://github.com/jaraco/jaraco.abode/blob/${version}/CHANGES.rst";
|
||||
homepage = "https://github.com/jaraco/jaraco.abode";
|
||||
description = "Library interfacing to the Abode home security system";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -5,18 +5,21 @@
|
|||
, pythonRelaxDepsHook
|
||||
, rapidfuzz
|
||||
, click
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jiwer";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jitsi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bH5TE6mcSG+WqvjW8Sd/o5bCBJmv9zurFEG2cVY/vYQ=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-z+M0/mftitLV2OaaQvTdRehtt16FFeBjqR//S5ad1XE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -33,11 +36,14 @@ buildPythonPackage rec {
|
|||
"rapidfuzz"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "jiwer" ];
|
||||
pythonImportsCheck = [
|
||||
"jiwer"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple and fast python package to evaluate an automatic speech recognition system";
|
||||
homepage = "https://github.com/jitsi/jiwer";
|
||||
changelog = "https://github.com/jitsi/jiwer/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lazy-loader";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scientific-python";
|
||||
repo = "lazy_loader";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QiRJt2aR2mY1f9ci/p6jOyMeyrHPqRdh43l4Th5PYf8=";
|
||||
hash = "sha256-Ky9EwPYt/wBqWXopH5WFjlVG+/Rd2gc+mlCeWqG7mZg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "objgraph";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5" || isPyPy;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-R1LKW8wOBRLkG4zE0ngKwv07PqvQO36VClWUwGID38Q=";
|
||||
hash = "sha256-NpVnw3tPL5KBYLb27e3L6o/H6SmDGHf9EFbHipAMF9M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -28,6 +28,12 @@ buildPythonPackage rec {
|
|||
url = "https://github.com/orion-labs/opuslib/commit/8aee916e4da4b3183d49cff5a986dc2408076d8d.patch";
|
||||
hash = "sha256-oa1HCFHNS3ejzSf0jxv9NueUKOZgdCtpv+xTrjYW5os=";
|
||||
})
|
||||
# https://github.com/orion-labs/opuslib/pull/25
|
||||
(fetchpatch {
|
||||
name = "fix-tests-when-using-libopus-1.4.patch";
|
||||
url = "https://github.com/orion-labs/opuslib/commit/87a214fc98c1dcae38035e99fe8e279a160c4a52.patch";
|
||||
hash = "sha256-UoOafyTFvWLY7ErtBhkXTZSgbMZFrg5DGxjbhqEI7wo=";
|
||||
})
|
||||
(substituteAll {
|
||||
src = ./opuslib-paths.patch;
|
||||
opusLibPath = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plaid-python";
|
||||
version = "14.1.0";
|
||||
version = "15.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sx/XlL+A2m0WmId8JXxjSmlkxirlYddFbyrsG1uFqk8=";
|
||||
hash = "sha256-vNOIMZce2PwH108KKaUIp1tadNH7HIKjzbm7rxZqLO8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "policy-sentry";
|
||||
version = "0.12.6";
|
||||
version = "0.12.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "salesforce";
|
||||
repo = "policy_sentry";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-odtMbPHty3NUqz+4UAw+8dsK6AMZer41/BAX8cK5Rek=";
|
||||
hash = "sha256-r2UQrMmgWaS1v8ZSFSvpwiSRdGw5uTAoWIlSbzrG6/g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymunk";
|
||||
version = "6.4.0";
|
||||
version = "6.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-YNzZ/wQz5s5J5ctXekNo0FksRoX03rZE1wXIghYcck4=";
|
||||
hash = "sha256-ZEO7YJBkCMgsD9MnwBn/X3qt39+IiecM453bjDgZDls=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
66
pkgs/development/python-modules/pytest-examples/default.nix
Normal file
66
pkgs/development/python-modules/pytest-examples/default.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, black
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, ruff
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-examples";
|
||||
version = "0.0.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "pytest-examples";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ecxSLbPnHdL60vlc7EjKmw5rATTePqJCa5QIdyxevv0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# ruff binary is used directly, the ruff Python package is not needed
|
||||
substituteInPlace pytest_examples/lint.py \
|
||||
--replace "'ruff'" "'${ruff}/bin/ruff'"
|
||||
'';
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"ruff"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
black
|
||||
ruff
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytest_examples"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pytest plugin for testing examples in docstrings and markdown files";
|
||||
homepage = "https://github.com/pydantic/pytest-examples";
|
||||
changelog = "https://github.com/pydantic/pytest-examples/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,6 +3,8 @@
|
|||
, buildPythonPackage
|
||||
, dateparser
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pycryptodome
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
|
|
@ -26,10 +28,19 @@ buildPythonPackage rec {
|
|||
hash = "sha256-e88INUEkjOSVOD0KSs9LmstuQ7dQZdJk8K6VqFEusww=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-unable-to-determine-version-error.patch";
|
||||
url = "https://github.com/sammchardy/python-binance/commit/1b9dd4853cafccf6cdacc13bb64a18632a79a6f1.patch";
|
||||
hash = "sha256-6KRHm2cZRcdD6qMdRAwlea4qLZ1/1YFzZAQ7Ph4XMCs=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
dateparser
|
||||
requests
|
||||
pycryptodome
|
||||
six
|
||||
ujson
|
||||
websockets
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-lsp-server";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
|||
owner = "python-lsp";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YU7u0vAJ4Qh3lCgY9+uHxY1odpB47HnrduzJIlAdyKY=";
|
||||
hash = "sha256-plciPUROFileVULGBZpwUTkW2NZVHy4Nuf4+fSjd8nM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "skorch";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-k9Zs4uqskHLqVHOKK7dIOmBSUmbDpOMuPS9eSdxNjO0=";
|
||||
hash = "sha256-/d0s0N40W18uGfVbD9VEbhbWfduoo+TBqDjmTkjMUxs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,14 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchPypi, sphinx, sphinxcontrib-tikz }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, sphinx
|
||||
, sphinxcontrib-tikz
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-bayesnet";
|
||||
version = "0.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
|
@ -20,6 +26,5 @@ buildPythonPackage rec {
|
|||
description = "Bayesian networks and factor graphs in Sphinx using TikZ syntax";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
broken = true; # relies on 2to3 conversion, which was removed from setuptools>=58.0
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "timetagger";
|
||||
version = "23.4.1";
|
||||
version = "23.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "almarklein";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-X0FeRyybomuOitpTldQTRlH3UeEs16ZYdYa/mu7mSGo=";
|
||||
hash = "sha256-WE/vsmIuRRqjZ1Hg/jiBfpCSlC8L+9t3psEhD7IFwgU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pyopenssl";
|
||||
version = "23.2.0.0";
|
||||
version = "23.2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types-pyOpenSSL";
|
||||
inherit version;
|
||||
hash = "sha256-Q+MH6N+zp6ggihmHTKBgMF9GDFKdTqyoomaeqJSZ8kQ=";
|
||||
hash = "sha256-vutdInBMYloeS23HVjVcW0rwuYATi3AqnZ+TKs8CCQM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,24 +1,32 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, curl, openssl, Security }:
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, curl
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tarpaulin";
|
||||
version = "0.26.0";
|
||||
version = "0.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xd009642";
|
||||
repo = "tarpaulin";
|
||||
rev = version;
|
||||
sha256 = "sha256-xFoqg8Ci60ZW0cUtSJSIIpO9HK+89nSHQhw1YvKy6MI=";
|
||||
hash = "sha256-FQdYos8hnQMkl/3vM9kSj0LM8fIZcsWMLKimpNXnrFo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fCoZ1pSKPXvNSWiAfhPygidkM0Ek7DYtHHv/sdPptvM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ curl Security ];
|
||||
|
||||
cargoHash = "sha256-YLROFEkTEhl6v6AidoEAyTtzDnJEBP6V30gVbxVjKvY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, babashka
|
||||
, graalvm17-ce
|
||||
, babashka-unwrapped
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
|
|
@ -29,7 +28,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
mkdir -p $out/share
|
||||
cp -r docs $out/share/docs
|
||||
wrapProgram $out/bin/bbin \
|
||||
--prefix PATH : "${lib.makeBinPath [ babashka babashka.graalvmDrv ]}"
|
||||
--prefix PATH : "${lib.makeBinPath [ babashka-unwrapped babashka-unwrapped.graalvmDrv ]}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
@ -38,7 +37,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
homepage = "https://github.com/babashka/bbin";
|
||||
description = "Install any Babashka script or project with one command";
|
||||
license = licenses.mit;
|
||||
inherit (babashka.meta) platforms;
|
||||
inherit (babashka-unwrapped.meta) platforms;
|
||||
maintainers = with maintainers; [ sohalt ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "frugal";
|
||||
version = "3.16.23";
|
||||
version = "3.16.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Workiva";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ofem3oSwas5X3D8zSzS5HpJANR6TNVSJ8hWb13hr0W4=";
|
||||
sha256 = "sha256-DXdecPsxYE12YkOn6acuai+mbqNkzZUEXEw1+ZcJlt8=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-wuT58Weyc8AB9i5bVe0696BGRWsl814Fz9bmnuJwgPM=";
|
||||
vendorHash = "sha256-9ZWK5xw2onwm9F/o/upGuo080X6neXUrSF+0WR+FpCs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Thrift improved";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "gede";
|
||||
version = "2.18.2";
|
||||
version = "2.18.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gede.dexar.se/uploads/source/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-QWrDHV+2trl+wKKibWiDa+kVREN116OwQ6DomaKj3LY=";
|
||||
sha256 = "sha256-RUl60iPa4XSlUilpYKaYQbRmLqthKHAvYonnhufjPsE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake makeWrapper python3 ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, babashka
|
||||
, jdk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
install -D neil $out/bin/neil
|
||||
wrapProgram $out/bin/neil \
|
||||
--prefix PATH : "${lib.makeBinPath [ babashka jdk ]}"
|
||||
--prefix PATH : "${lib.makeBinPath [ babashka ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "malt";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "memtt";
|
||||
repo = "malt";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yh9gmf7cggf3mx15cwmm99dha34aibkzhnpd0ckl0fkc6w17xqg";
|
||||
sha256 = "sha256-6GGIdBaw/JSc2Qexy+P1NON27EBBRltthyQpMPZwi+8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-go";
|
||||
version = "1.29.1";
|
||||
version = "1.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protocolbuffers";
|
||||
repo = "protobuf-go";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xlRHhr25+gXlO6ggIQgijWYzIVZCpRVCnuLnSW1r15s=";
|
||||
sha256 = "sha256-wKJYy/9Bld6GXM1VFYXEs9//Y27eLrqDdw+a9P9EwfU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y=";
|
||||
vendorHash = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y=";
|
||||
|
||||
subPackages = [ "cmd/protoc-gen-go" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
{ lib, stdenvNoCC, linuxPackages }:
|
||||
with lib;
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "rtl8723bs-firmware";
|
||||
version = linuxPackages.rtl8723bs.version;
|
||||
inherit (linuxPackages.rtl8723bs) src;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/lib/firmware/rtlwifi"
|
||||
cp rtl8723bs_nic.bin "$out/lib/firmware/rtlwifi"
|
||||
cp rtl8723bs_wowlan.bin "$out/lib/firmware/rtlwifi"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Firmware for RealTek 8723bs";
|
||||
homepage = "https://github.com/hadess/rtl8723bs";
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
maintainers = with maintainers; [ elitak ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, nukeReferences, kernel }:
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rtl8723bs-${kernel.version}-${version}";
|
||||
version = "2017-04-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hadess";
|
||||
repo = "rtl8723bs";
|
||||
rev = "db2c4f61d48fe3b47c167c8bcd722ce83c24aca5";
|
||||
sha256 = "0pxqya14a61vv2v5ky1ldybc0mjfin9mpvmajlmv0lls904rph7g";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
buildInputs = [ nukeReferences ];
|
||||
|
||||
makeFlags = [
|
||||
"ARCH=${stdenv.hostPlatform.linuxArch}" # Normally not needed, but the Makefile sets ARCH in a broken way.
|
||||
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us.
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# The Makefile doesn't use env-vars well, so install manually:
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless
|
||||
cp r8723bs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless
|
||||
|
||||
nuke-refs $(find $out -name "*.ko")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Realtek SDIO Wi-Fi driver";
|
||||
homepage = "https://github.com/hadess/rtl8723bs";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
broken = versionAtLeast kernel.version "4.12"; # Now in kernel staging drivers
|
||||
maintainers = with maintainers; [ elitak ];
|
||||
};
|
||||
}
|
||||
|
|
@ -38,15 +38,16 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rabbitmq-server";
|
||||
version = "3.12.0";
|
||||
version = "3.12.1";
|
||||
|
||||
# when updating, consider bumping elixir version in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-XHiFiKO4vi+gD2Cw6QnRCu5YHDKJviLETadmj1Vzr/Y=";
|
||||
hash = "sha256-n++vqJlRH0C4WdZEswoaJxkuvghbu9MYhBUqFhbhISA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ];
|
||||
|
||||
buildInputs = [ erlang elixir libxml2 libxslt glibcLocales ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
|
||||
|
||||
|
|
@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
|
|||
"PREFIX=${placeholder "out"}"
|
||||
"RMQ_ERLAPP_DIR=${placeholder "out"}"
|
||||
];
|
||||
|
||||
installTargets = [ "install" "install-man" ];
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -86,6 +88,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://www.rabbitmq.com/";
|
||||
description = "An implementation of the AMQP messaging protocol";
|
||||
changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${version}";
|
||||
license = licenses.mpl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ turion ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bazarr";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
|
||||
sha256 = "sha256-PuVK1jrNjxagESYvgqRBfxzsV/KxFhTdOyliO8smwec=";
|
||||
sha256 = "sha256-gHbaRqUEwTfYG4kJ3BNxaG74EDLW7khfvCk6dkRALt8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -52,6 +52,8 @@ stdenv.mkDerivation rec {
|
|||
NODE_ENV = "production";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$PWD
|
||||
# This option is needed for openssl-3 compatibility
|
||||
# Otherwise we encounter this upstream issue: https://github.com/mastodon/mastodon/issues/17924
|
||||
|
|
@ -79,13 +81,19 @@ stdenv.mkDerivation rec {
|
|||
brotli --best --keep ~/public/packs/report.html
|
||||
find ~/public/assets -type f -regextype posix-extended -iregex '.*\.(css|js|json|html)' \
|
||||
-exec brotli --best --keep {} ';'
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/public
|
||||
cp -r node_modules $out/node_modules
|
||||
cp -r public/assets $out/public
|
||||
cp -r public/packs $out/public
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -93,6 +101,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ mastodonGems nodejs-slim ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
ln -s $mastodonModules/node_modules node_modules
|
||||
ln -s $mastodonModules/public/assets public/assets
|
||||
ln -s $mastodonModules/public/packs public/packs
|
||||
|
|
@ -125,6 +135,8 @@ stdenv.mkDerivation rec {
|
|||
rm -rf log
|
||||
ln -s /var/log/mastodon log
|
||||
ln -s /tmp tmp
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = let
|
||||
|
|
@ -133,9 +145,13 @@ stdenv.mkDerivation rec {
|
|||
${nodejs-slim}/bin/node ./streaming
|
||||
'';
|
||||
in ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -r * $out/
|
||||
ln -s ${run-streaming} $out/run-streaming.sh
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "snmp_exporter";
|
||||
version = "0.21.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prometheus";
|
||||
repo = "snmp_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ko2PApbz8kL0n6IEsRKLwMq9WmAdvfwI6o7ZH/BTd6c=";
|
||||
sha256 = "sha256-HncffOX0/z8XIEXTOkt6bcnAfY7xwgNBGhUwC3FIJjo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nbJXiZ+vHN/EnvAPTJUKotCE+nwdrXtWHhGfugm+CQQ=";
|
||||
vendorHash = "sha256-n0LPKmGPxLZgvzdpyuE67WOJv7MKN28m7PtQpWYdtMk=";
|
||||
|
||||
buildInputs = [ net-snmp ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tidb";
|
||||
version = "7.1.0";
|
||||
version = "7.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pingcap";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KiF76SD2YbZ4GFXiuCLODIb1guOTYJ7MHCFTVQKytyY=";
|
||||
sha256 = "sha256-7iz82H3H22GCLvy8VD+t1BkEEoNQ0+6ZLBOUwWTlNfI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yfsOIQGqHk6kX2usQwkSHGcaOkJnF8ZFfM58Owpjvec=";
|
||||
vendorHash = "sha256-9vgxdX8CPUbyJZNSkwTZK02ORIXACjad/yPef8zB7FU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kics";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Checkmarx";
|
||||
repo = "kics";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9Pr8h6q/Au5fDgtAhKpOXNj3ldsLTwqGnduTAiUYdvE=";
|
||||
sha256 = "sha256-D5w/Wt6Dlu6ouwwyZkGa6Ttu367s7SrnlGI0lQqSpfI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Sg8f6fqe7DAsNsEGU1Ml42qgSuE5CrD+YrFqZKpNKtU=";
|
||||
vendorHash = "sha256-cMKEUH/teEfyhHgBz3pMD8sotZ51t6O+4EiQ9BJt2Qg=";
|
||||
|
||||
subPackages = [ "cmd/console" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ceph-csi";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
nativeBuildInputs = [ go ];
|
||||
buildInputs = [ ceph ];
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "ceph";
|
||||
repo = "ceph-csi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WN0oASficXdy0Q1BLm37ndGhjcIk1lm38owdk1K/ryY=";
|
||||
sha256 = "sha256-dKn79EIveepeMzFPweQ3BE3YMCg7mj8EycMbBH8J8PQ=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -55,11 +55,11 @@ assert lib.assertMsg
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
|
||||
version = "3.2.5";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-mfDcRG6zEjEuemCaLUOLzbbcq8FN9+n+EqN0NeR9H7U=";
|
||||
hash = "sha256-asB1YftHfdb7JG87WJ+ggyMCu7qb0f+aCanl5LLi9VE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gmic";
|
||||
version = "3.2.5";
|
||||
version = "3.2.6";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "GreycLab";
|
||||
repo = "gmic";
|
||||
rev = "v.${finalAttrs.version}";
|
||||
hash = "sha256-E02/sYD7GIcdwPl34DxkK+V7VFeZP83VBei2BdPARZs=";
|
||||
hash = "sha256-kaI5rcAz3Cw/xzWgJhMRu/cQwVrvLRAPiB5BhzPMOHY=";
|
||||
};
|
||||
|
||||
# TODO: build this from source
|
||||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
gmic_stdlib = fetchurl {
|
||||
name = "gmic_stdlib.h";
|
||||
url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] finalAttrs.version}.h";
|
||||
hash = "sha256-08EEKzb3sVwz1z8rgTNzz9hE8KADLFyXco9iV/RccFE=";
|
||||
hash = "sha256-7JzFU4HvAtC5Nz5vusKCnJ8VMuKfSi1yFmjj0Hh+vA4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Help vulkan-loader find the validation layers
|
||||
setupHook = writeText "setup-hook" ''
|
||||
export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS
|
||||
addToSearchPath XDG_DATA_DIRS @out@/share
|
||||
'';
|
||||
|
||||
# Tests are not for gpu-less and headless environments
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "1.18.2";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OvGPE6U/OeY1KcUFjR9CCBd0WOo2Rd4349wBm9SN8bo=";
|
||||
sha256 = "sha256-vK/rvI7RTT4gb80G8wG1lA+WlKLWEBG74OetsHBUIhM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0hT7wraXTUAGMJdAw3xkGzojpXnwaEOoHnW28DrA1QQ=";
|
||||
vendorHash = "sha256-56aE/Rd5l0kgEJ79EQbF/6xoKbNvEcp/l67gikhff4Y=";
|
||||
|
||||
ldflags =
|
||||
[ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lesspipe";
|
||||
version = "2.07";
|
||||
version = "2.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wofr06";
|
||||
repo = "lesspipe";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L39Prxs39Ku3jrQO/tOi2qGREFl7+W18WXTCcgoDkXU=";
|
||||
sha256 = "sha256-jN8x5qd9zRr0bpjGYOWfFbiXbWSDDQ8CLZJo79fnegI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ xorg,
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.38.0";
|
||||
version = "1.38.2";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
|
|
@ -82,7 +82,7 @@ let
|
|||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
|
||||
sha256 = "sha256-bTt4gdkKaR8OESzPwUHZ9C21uf/Lcy/eSya2oeAtgNA=";
|
||||
sha256 = "sha256-pDJMFJ/pfFlgHIJTATDW5gwRwRFoYHH6YNvtJJxDu60=";
|
||||
}
|
||||
else
|
||||
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "panoply";
|
||||
version = "5.2.7";
|
||||
version = "5.2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
|
||||
sha256 = "sha256-9mqamvUOMaCPnQQ9dhOawjp+GVFZfc59gb/Mx2XifW4=";
|
||||
sha256 = "sha256-KqlXG49hUHoQPvkDxJ2kJzRn+imMONQT04TP5r6AV6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "urn-timer";
|
||||
version = "unstable-2023-03-18";
|
||||
version = "unstable-2023-07-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paoloose";
|
||||
repo = "urn";
|
||||
rev = "09c075607a6e26307665b45095e133d6805f0aeb";
|
||||
hash = "sha256-0/V1KQxwHhpcruEsll0+JNtgT/6vEkpt+ff3SlsHYr8=";
|
||||
rev = "8efdabcdd806b3b8997b82925d26209e6da8311b";
|
||||
hash = "sha256-lQVdHD3IkITJ2P2zimhFLTxmOzZkdWOg/RhR2xlBLJU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, yara
|
||||
}:
|
||||
|
|
@ -16,7 +17,22 @@ buildGoModule rec {
|
|||
hash = "sha256-wlGZTMCJE6Ki5/6R6J9EJP06/S125BNNd/jNPYGwKNw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qZkt5WwicDXrExwMT0tCO+FZgClIHhrVtMR8xNsdAaQ=";
|
||||
patches = [
|
||||
# The following two patches come from https://github.com/spyre-project/spyre/pull/75
|
||||
# and improve Darwin support.
|
||||
(fetchpatch {
|
||||
name = "syscall-to-x-sys-unix.patch";
|
||||
url = "https://github.com/spyre-project/spyre/commit/8f08daf030c847de453613eb2eb1befdb7300921.patch";
|
||||
hash = "sha256-oy8Y85IubJVQrt0kmGA1hidZapgCw2aB6F/gT7uQ6KA=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "darwin-skip-dir.patch";
|
||||
url = "https://github.com/spyre-project/spyre/commit/12dea550bc4f3275f8f406c19216ad140733a6af.patch";
|
||||
hash = "sha256-BXLGOshyGnllbkvsbbmdnqvRHwycrjI52oGWBoXXgL0=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-aoeAnyFotKWWaRZQsgQPwwmhih/1zfL9eBV/2r1VPBM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "erdtree";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solidiquis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iiGtpzoyA4PpS5redrwYeAQb/sJ149e1/ZJ0R1ctYFk=";
|
||||
hash = "sha256-rm3j1exvdlJtMXgFeRmzr3YU/sLpQFL3PCa8kLVlinM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TfGA6AMG9zBrossM0vsRt6OY0etfWNR1FnpgiP/mfi4=";
|
||||
cargoHash = "sha256-rHrdGL/2diBwsWJyg7gaa6UmcUdvGhUPhLNESSBvDDg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "File-tree visualizer and disk usage analyzer";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "skeema";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeema";
|
||||
repo = "skeema";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JhOQKfJCaZc5PlDWPuYe1Ag9AHkw9RjEQ4N9MSda4rY=";
|
||||
hash = "sha256-t0UACavJaDorAgxm2gA6FEsMfQ8UQEY/CZbFIFHwfIQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hcledit";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minamijoyo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Y1v4VqbF23ah1MeBeFEjmNVfmA9DkMJZvulmy2kVdUI=";
|
||||
hash = "sha256-9FxQ/Y2vMyc4gLbKjhts36wtBIt90gkQZ9LQ3FO/Jig=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KwoauyXeDMMTUgtLvz6m28nvFSl5fptZzEvwFVC3n8g=";
|
||||
vendorHash = "sha256-HWwZd5AUo1cysT4WYylQ2+JPBBr/qYNVC4JcJyUiBag=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command line editor for HCL";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubevirt";
|
||||
version = "0.59.1";
|
||||
version = "0.59.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevirt";
|
||||
repo = "kubevirt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5xdPzL0GwEw+WHRIf7aQnvTd7dsayKkFubP/RSY8N/8=";
|
||||
sha256 = "sha256-J0HFWBhrzkDpQLJlp3kPlZeqHRhtZj0xMbNi3+y2FmY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -17137,7 +17137,8 @@ with pkgs;
|
|||
|
||||
angelscript = callPackage ../development/interpreters/angelscript { };
|
||||
|
||||
babashka = callPackage ../development/interpreters/clojure/babashka.nix { };
|
||||
babashka-unwrapped = callPackage ../development/interpreters/babashka { };
|
||||
babashka = callPackage ../development/interpreters/babashka/wrapped.nix { };
|
||||
|
||||
# BQN interpreters and compilers
|
||||
|
||||
|
|
@ -28028,8 +28029,6 @@ with pkgs;
|
|||
|
||||
rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { };
|
||||
|
||||
rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { };
|
||||
|
||||
rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { };
|
||||
|
||||
rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { };
|
||||
|
|
|
|||
|
|
@ -430,8 +430,6 @@ in {
|
|||
|
||||
rtl8189fs = callPackage ../os-specific/linux/rtl8189fs { };
|
||||
|
||||
rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { };
|
||||
|
||||
rtl8723ds = callPackage ../os-specific/linux/rtl8723ds { };
|
||||
|
||||
rtl8812au = callPackage ../os-specific/linux/rtl8812au { };
|
||||
|
|
@ -563,6 +561,7 @@ in {
|
|||
} // lib.optionalAttrs config.allowAliases {
|
||||
ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
|
||||
sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14
|
||||
rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14
|
||||
xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -9719,6 +9719,8 @@ self: super: with self; {
|
|||
|
||||
pytest-error-for-skips = callPackage ../development/python-modules/pytest-error-for-skips { };
|
||||
|
||||
pytest-examples = callPackage ../development/python-modules/pytest-examples { };
|
||||
|
||||
pytest-expect = callPackage ../development/python-modules/pytest-expect { };
|
||||
|
||||
pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue