Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a376e04925
|
|
@ -187,6 +187,8 @@
|
|||
|
||||
- `kratos` has been updated from 0.10.1 to the first stable version 1.0.0, please read the [0.10.1 to 0.11.0](https://github.com/ory/kratos/releases/tag/v0.11.0), [0.11.0 to 0.11.1](https://github.com/ory/kratos/releases/tag/v0.11.1), [0.11.1 to 0.13.0](https://github.com/ory/kratos/releases/tag/v0.13.0) and [0.13.0 to 1.0.0](https://github.com/ory/kratos/releases/tag/v1.0.0) upgrade guides. The most notable breaking change is the introduction of one-time passwords (`code`) and update of the default recovery strategy from `link` to `code`.
|
||||
|
||||
- The `hail` NixOS module was removed, as `hail` was unmaintained since 2017.
|
||||
|
||||
## Other Notable Changes {#sec-release-23.11-notable-changes}
|
||||
|
||||
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
|
||||
|
|
|
|||
|
|
@ -395,7 +395,6 @@
|
|||
./services/continuous-integration/gitlab-runner.nix
|
||||
./services/continuous-integration/gocd-agent/default.nix
|
||||
./services/continuous-integration/gocd-server/default.nix
|
||||
./services/continuous-integration/hail.nix
|
||||
./services/continuous-integration/hercules-ci-agent/default.nix
|
||||
./services/continuous-integration/hydra/default.nix
|
||||
./services/continuous-integration/jenkins/default.nix
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
{ config, lib, pkgs, ...}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.hail;
|
||||
in {
|
||||
|
||||
|
||||
###### interface
|
||||
|
||||
options.services.hail = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Enables the Hail Auto Update Service. Hail can automatically deploy artifacts
|
||||
built by a Hydra Continuous Integration server. A common use case is to provide
|
||||
continuous deployment for single services or a full NixOS configuration.'';
|
||||
};
|
||||
profile = mkOption {
|
||||
type = types.str;
|
||||
default = "hail-profile";
|
||||
description = lib.mdDoc "The name of the Nix profile used by Hail.";
|
||||
};
|
||||
hydraJobUri = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "The URI of the Hydra Job.";
|
||||
};
|
||||
netrc = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
description = lib.mdDoc "The netrc file to use when fetching data from Hydra.";
|
||||
default = null;
|
||||
};
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.haskellPackages.hail;
|
||||
defaultText = literalExpression "pkgs.haskellPackages.hail";
|
||||
description = lib.mdDoc "Hail package to use.";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.hail = {
|
||||
description = "Hail Auto Update Service";
|
||||
wants = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = with pkgs; [ nix ];
|
||||
environment = {
|
||||
HOME = "/var/lib/empty";
|
||||
};
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/hail --profile ${cfg.profile} --job-uri ${cfg.hydraJobUri}"
|
||||
+ lib.optionalString (cfg.netrc != null) " --netrc-file ${cfg.netrc}";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@ in {
|
|||
default = { };
|
||||
description = mdDoc ''
|
||||
Configuration options for the Stalwart email server.
|
||||
See <https://stalw.art/docs/> for available options.
|
||||
See <https://stalw.art/docs/category/configuration> for available options.
|
||||
|
||||
By default, the module is configured to store everything locally.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -248,6 +248,7 @@ in {
|
|||
# setup
|
||||
${cfg.package}/createdb.sh
|
||||
${cfg.package}/migrate.sh
|
||||
${cfg.package}/bin/plausible eval "(Plausible.Release.prepare() ; Plausible.Auth.create_user(\"$ADMIN_USER_NAME\", \"$ADMIN_USER_EMAIL\", \"$ADMIN_USER_PWD\"))"
|
||||
${optionalString cfg.adminUser.activate ''
|
||||
if ! ${cfg.package}/init-admin.sh | grep 'already exists'; then
|
||||
psql -d plausible <<< "UPDATE users SET email_verified=true;"
|
||||
|
|
|
|||
|
|
@ -3108,8 +3108,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "shd101wyy";
|
||||
name = "markdown-preview-enhanced";
|
||||
version = "0.6.8";
|
||||
sha256 = "9NRaHgtyiZJ0ic6h1B01MWzYhDABAl3Jm2IUPogYWr0=";
|
||||
version = "0.6.10";
|
||||
sha256 = "sha256-nCsl7ZYwuTvNZSTUMR6jEywClmcPm8xW6ABu9220wJI=";
|
||||
};
|
||||
meta = {
|
||||
description = "Provides a live preview of markdown using either markdown-it or pandoc";
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@ let
|
|||
if extension == "zip" then fetchzip args else fetchurl args;
|
||||
|
||||
pname = "1password-cli";
|
||||
version = "2.20.0";
|
||||
version = "2.21.0";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-D9cPNtHiofY/Fb2EO+AGexRSqY+AidZm0D9+9W9dCUY=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-sY8kI4InFGZIFoz5rfvNMxA9C4u6Qcg3vNTsoY7X6OY=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-TkfEh75k3KzvvInPAsYDhS2OIKQpBOCaT6qRIld+wQ8=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-kytAXelvvP+SBaniHlo9JTK1LLRrefgLuWPhC8sC7U8=" "pkg";
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-pXGBlduNOvxpPMd/BObHVXXGQ0ZTlIkqZ3jYyoGXnqA=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-iePA4nzwBtAlYWybmQdV7Zvvnv+jPqrndB4aabf/JMM=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-wevv0KYe01ZL70zL4BNti/oCcAzNJ3EO97QIU1BYQRE=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-AViR53q1/jZtzpFZ7FaBwoZAGuXsGHfULEIuIrTqgSs=" "pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
platforms = builtins.attrNames sources;
|
||||
|
|
|
|||
|
|
@ -32,25 +32,24 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "calibre";
|
||||
version = "6.25.0";
|
||||
version = "6.26.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-4ghB2RUImh8AsMGsBCsVeKXgyV+llCLNy24/2LNJwv0=";
|
||||
hash = "sha256-7UUnDtTRf162xKMUuZoKh+y47oeUtrOsFHUTAvtOryM=";
|
||||
};
|
||||
|
||||
# https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1
|
||||
patches = [
|
||||
# allow for plugin update check, but no calibre version check
|
||||
(fetchpatch {
|
||||
name = "0001-only-plugin-update.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/0001-only-plugin-update.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch";
|
||||
hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0007-Hardening-Qt-code.patch";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
|
||||
hash = "sha256-WBm0dWDXoPT6alEdK5dVMrVTOxG7Z8bq1s0iO2HTy/Q=";
|
||||
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
|
||||
hash = "sha256-2V8H6ElvzS5yw1di+XZvMssuokUT5zP3aTzpDpMsMac=";
|
||||
})
|
||||
]
|
||||
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
|
||||
|
|
|
|||
25
pkgs/applications/misc/ghosttohugo/default.nix
Normal file
25
pkgs/applications/misc/ghosttohugo/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghosttohugo";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbarone";
|
||||
repo = "ghostToHugo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lYqjwLPvSX9/HaFvSwtkvxbCToTwfDPeVivNfazZwQA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/7MsVLVek2nQwf8rVJQywBKiIOCGe72L45CkAElXrMo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert Ghost export to Hugo posts";
|
||||
homepage = "https://github.com/jbarone/ghostToHugo";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ clerie ];
|
||||
};
|
||||
}
|
||||
109
pkgs/applications/misc/mission-center/Cargo.lock
generated
109
pkgs/applications/misc/mission-center/Cargo.lock
generated
|
|
@ -178,11 +178,11 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
|
|||
|
||||
[[package]]
|
||||
name = "cairo-rs"
|
||||
version = "0.17.10"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a"
|
||||
checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"bitflags 2.3.3",
|
||||
"cairo-sys-rs",
|
||||
"glib",
|
||||
"libc 0.2.147",
|
||||
|
|
@ -192,9 +192,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "cairo-sys-rs"
|
||||
version = "0.17.10"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1"
|
||||
checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc 0.2.147",
|
||||
|
|
@ -634,11 +634,10 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gdk-pixbuf"
|
||||
version = "0.17.10"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717"
|
||||
checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"gdk-pixbuf-sys",
|
||||
"gio",
|
||||
"glib",
|
||||
|
|
@ -648,9 +647,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gdk-pixbuf-sys"
|
||||
version = "0.17.10"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb"
|
||||
checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
|
||||
dependencies = [
|
||||
"gio-sys",
|
||||
"glib-sys",
|
||||
|
|
@ -661,11 +660,10 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gdk4"
|
||||
version = "0.6.3"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff"
|
||||
checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"cairo-rs",
|
||||
"gdk-pixbuf",
|
||||
"gdk4-sys",
|
||||
|
|
@ -677,9 +675,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gdk4-sys"
|
||||
version = "0.6.3"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64"
|
||||
checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"gdk-pixbuf-sys",
|
||||
|
|
@ -735,11 +733,10 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gio"
|
||||
version = "0.17.10"
|
||||
version = "0.18.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a"
|
||||
checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
"futures-io",
|
||||
|
|
@ -755,9 +752,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gio-sys"
|
||||
version = "0.17.10"
|
||||
version = "0.18.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3"
|
||||
checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
|
|
@ -788,11 +785,11 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "glib"
|
||||
version = "0.17.10"
|
||||
version = "0.18.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b"
|
||||
checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"bitflags 2.3.3",
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
"futures-executor",
|
||||
|
|
@ -811,24 +808,23 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "glib-macros"
|
||||
version = "0.17.10"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26"
|
||||
checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"heck",
|
||||
"proc-macro-crate",
|
||||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.23",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glib-sys"
|
||||
version = "0.17.10"
|
||||
version = "0.18.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0"
|
||||
checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
|
||||
dependencies = [
|
||||
"libc 0.2.147",
|
||||
"system-deps",
|
||||
|
|
@ -836,9 +832,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gobject-sys"
|
||||
version = "0.17.10"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062"
|
||||
checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc 0.2.147",
|
||||
|
|
@ -847,9 +843,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "graphene-rs"
|
||||
version = "0.17.10"
|
||||
version = "0.18.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9"
|
||||
checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401"
|
||||
dependencies = [
|
||||
"glib",
|
||||
"graphene-sys",
|
||||
|
|
@ -858,9 +854,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "graphene-sys"
|
||||
version = "0.17.10"
|
||||
version = "0.18.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d"
|
||||
checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc 0.2.147",
|
||||
|
|
@ -870,11 +866,10 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gsk4"
|
||||
version = "0.6.3"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c"
|
||||
checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"cairo-rs",
|
||||
"gdk4",
|
||||
"glib",
|
||||
|
|
@ -886,9 +881,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gsk4-sys"
|
||||
version = "0.6.3"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0"
|
||||
checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"gdk4-sys",
|
||||
|
|
@ -902,11 +897,10 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gtk4"
|
||||
version = "0.6.6"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b"
|
||||
checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"cairo-rs",
|
||||
"field-offset",
|
||||
"futures-channel",
|
||||
|
|
@ -919,15 +913,14 @@ dependencies = [
|
|||
"gtk4-macros",
|
||||
"gtk4-sys",
|
||||
"libc 0.2.147",
|
||||
"once_cell",
|
||||
"pango",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gtk4-macros"
|
||||
version = "0.6.6"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f"
|
||||
checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"proc-macro-crate",
|
||||
|
|
@ -939,9 +932,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gtk4-sys"
|
||||
version = "0.6.3"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f"
|
||||
checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"gdk-pixbuf-sys",
|
||||
|
|
@ -1122,11 +1115,10 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||
|
||||
[[package]]
|
||||
name = "libadwaita"
|
||||
version = "0.4.4"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf"
|
||||
checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"gdk-pixbuf",
|
||||
"gdk4",
|
||||
"gio",
|
||||
|
|
@ -1139,9 +1131,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "libadwaita-sys"
|
||||
version = "0.4.4"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404"
|
||||
checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7"
|
||||
dependencies = [
|
||||
"gdk4-sys",
|
||||
"gio-sys",
|
||||
|
|
@ -1281,7 +1273,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "missioncenter"
|
||||
version = "0.3.1"
|
||||
version = "0.3.2"
|
||||
dependencies = [
|
||||
"arrayvec 0.7.4",
|
||||
"drm",
|
||||
|
|
@ -1438,11 +1430,10 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pango"
|
||||
version = "0.17.10"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48"
|
||||
checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"gio",
|
||||
"glib",
|
||||
"libc 0.2.147",
|
||||
|
|
@ -1452,9 +1443,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pango-sys"
|
||||
version = "0.17.10"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195"
|
||||
checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mission-center";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mission-center-devs";
|
||||
repo = "mission-center";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fiUF1mvbnguySy2ZXTi4Z61t35FO6fljqm21dMGwQMI=";
|
||||
hash = "sha256-KuaVivW/i+1Pw6ShpvBYbwPMUHsEJ7FR80is0DBMbXM=";
|
||||
};
|
||||
|
||||
cargoDeps = symlinkJoin {
|
||||
|
|
|
|||
|
|
@ -58,6 +58,12 @@ version = "1.3.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
|
||||
|
||||
[[package]]
|
||||
name = "blocking"
|
||||
version = "1.3.1"
|
||||
|
|
@ -178,7 +184,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gatherer"
|
||||
version = "0.3.1"
|
||||
version = "0.3.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arrayvec",
|
||||
|
|
@ -186,7 +192,9 @@ dependencies = [
|
|||
"lazy_static",
|
||||
"libc",
|
||||
"num_cpus",
|
||||
"raw-cpuid",
|
||||
"rust-ini",
|
||||
"rustbus",
|
||||
"shared_memory_extended",
|
||||
"thiserror",
|
||||
]
|
||||
|
|
@ -283,15 +291,26 @@ version = "2.5.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.26.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 1.3.2",
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"memoffset",
|
||||
"pin-utils",
|
||||
"static_assertions",
|
||||
]
|
||||
|
||||
|
|
@ -333,6 +352,12 @@ version = "0.2.10"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.17"
|
||||
|
|
@ -393,6 +418,15 @@ dependencies = [
|
|||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "raw-cpuid"
|
||||
version = "11.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1"
|
||||
dependencies = [
|
||||
"bitflags 2.4.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rust-ini"
|
||||
version = "0.19.0"
|
||||
|
|
@ -403,6 +437,28 @@ dependencies = [
|
|||
"ordered-multimap",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustbus"
|
||||
version = "0.19.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "208e43f29ba67bb31fc726854383be3c358e48df918a0d2d2a7efb710ea3575b"
|
||||
dependencies = [
|
||||
"nix",
|
||||
"rustbus_derive",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustbus_derive"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8dcb6a55a8a297bb62066b114624aac082ac1a330d90a0d5b336645208e29ae2"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc_version"
|
||||
version = "0.4.0"
|
||||
|
|
@ -452,6 +508,17 @@ version = "1.1.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.109"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.27"
|
||||
|
|
@ -480,7 +547,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"syn 2.0.27",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
|
|||
33
pkgs/applications/misc/pot/Cargo.lock
generated
33
pkgs/applications/misc/pot/Cargo.lock
generated
|
|
@ -1139,14 +1139,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "enigo"
|
||||
version = "0.1.2"
|
||||
source = "git+https://github.com/enigo-rs/enigo?rev=c53be78#c53be78a4cdbd2d19ccda59f990050d8591bb969"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "802e4b2ae123615659085369b453cba87c5562e46ed8050a909fee18a9bc3157"
|
||||
dependencies = [
|
||||
"core-graphics 0.22.3",
|
||||
"core-graphics 0.23.1",
|
||||
"libc",
|
||||
"objc",
|
||||
"pkg-config",
|
||||
"windows 0.48.0",
|
||||
"windows 0.51.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4050,8 +4051,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "selection"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pot-app/Selection#8b44b68fbfe614aff190610ec03d52b6f3b57f19"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09de39c8f10d37a7b9c2a9cb224dbe4535525cbe17ccf37c21419123ab54a197"
|
||||
dependencies = [
|
||||
"arboard",
|
||||
"enigo",
|
||||
|
|
@ -5742,6 +5744,16 @@ dependencies = [
|
|||
"windows-targets 0.48.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows"
|
||||
version = "0.51.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
|
||||
dependencies = [
|
||||
"windows-core",
|
||||
"windows-targets 0.48.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-bindgen"
|
||||
version = "0.39.0"
|
||||
|
|
@ -5752,6 +5764,15 @@ dependencies = [
|
|||
"windows-tokens",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-core"
|
||||
version = "0.51.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
|
||||
dependencies = [
|
||||
"windows-targets 0.48.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-implement"
|
||||
version = "0.39.0"
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pot";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pot-app";
|
||||
repo = "pot-desktop";
|
||||
rev = version;
|
||||
hash = "sha256-VgEDV7bD5EfT5ZG7wuj5Ch3mfZ6x8a8473AvX96C64Q=";
|
||||
hash = "sha256-8AIOAM3xEmKn++DqgXVDhCGlPMoeQPGrKtuUnPXmoeU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src-tauri";
|
||||
|
|
@ -74,8 +74,6 @@ stdenv.mkDerivation rec {
|
|||
outputHashes = {
|
||||
# All other crates in the same workspace reuse this hash.
|
||||
"tauri-plugin-autostart-0.0.0" = "sha256-7Qi07yRb+ww569+sEXFIwAtS8jbUNQx6LsrUnMl5YOo=";
|
||||
"enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q=";
|
||||
"selection-0.1.0" = "sha256-V4vixiyKqhpZeTXiFw0HKz5xr0zHd4DkC/hovJ8Y2a8=";
|
||||
"reqwest_dav-0.1.3" = "sha256-nWOH1SOoNA2o2lmGAIEJj3OLOlP39FjlXqK8LPZ95hI=";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
62
pkgs/applications/misc/translatelocally/default.nix
Normal file
62
pkgs/applications/misc/translatelocally/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, qt6, libarchive, pcre2, protobuf, gperftools, blas
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "f8a2dba0a63989c6b3a7be36f736ed478cad1dd2";
|
||||
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "translatelocally";
|
||||
version = "unstable-2023-08-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XapaJIaMnu";
|
||||
repo = "translateLocally";
|
||||
inherit rev;
|
||||
hash = "sha256-uUdDi0CwCR/FQjw5D2s088d/Tp7NQOI0ia30oOhlGoc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./version_without_git.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
echo '#define GIT_REVISION "${rev} ${finalAttrs.version}"' > \
|
||||
3rd_party/bergamot-translator/3rd_party/marian-dev/src/common/git_revision.h
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
protobuf
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qttools
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
libarchive
|
||||
pcre2
|
||||
protobuf
|
||||
gperftools # provides tcmalloc
|
||||
blas
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBLAS_LIBRARIES=-lblas"
|
||||
"-DCBLAS_LIBRARIES=-lcblas"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "translateLocally";
|
||||
homepage = "https://translatelocally.com/";
|
||||
description = "Fast and secure translation on your local machine, powered by marian and Bergamot.";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pacien ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
# https://github.com/XapaJIaMnu/translateLocally/issues/150
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
Submodule 3rd_party/bergamot-translator contains modified content
|
||||
Submodule 3rd_party/marian-dev contains modified content
|
||||
diff --git a/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake b/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake
|
||||
index 31352565..d90a366d 100644
|
||||
--- a/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake
|
||||
+++ b/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake
|
||||
@@ -22,10 +22,8 @@ else()
|
||||
endif()
|
||||
|
||||
# Get current commit SHA from git
|
||||
-execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
|
||||
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
- OUTPUT_VARIABLE PROJECT_VERSION_GIT_SHA
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
+# (dummy value for nix package without the .git)
|
||||
+set(PROJECT_VERSION_GIT_SHA 000000000000)
|
||||
|
||||
# Get partial versions into a list
|
||||
string(REGEX MATCHALL "-.*$|[0-9]+" PROJECT_PARTIAL_VERSION_LIST
|
||||
diff --git a/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt b/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt
|
||||
index 76aa0e2b..ca982bd3 100644
|
||||
--- a/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt
|
||||
+++ b/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt
|
||||
@@ -149,23 +149,8 @@ target_compile_options(marian PRIVATE ${ALL_WARNINGS})
|
||||
#
|
||||
# We set MARIAN_GIT_DIR to the appropriate path, depending on whether
|
||||
# ${CMAKE_CURRENT_SOURCE_DIR}/../.git is a directory or file.
|
||||
-set(MARIAN_GIT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
|
||||
-if(NOT IS_DIRECTORY ${MARIAN_GIT_DIR}) # i.e., it's a submodule
|
||||
- file(READ ${MARIAN_GIT_DIR} MARIAN_GIT_DIR)
|
||||
- string(REGEX REPLACE "gitdir: (.*)\n" "\\1" MARIAN_GIT_DIR ${MARIAN_GIT_DIR})
|
||||
- if(NOT IS_ABSOLUTE ${MARIAN_GIT_DIR})
|
||||
- get_filename_component(MARIAN_GIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${MARIAN_GIT_DIR}" ABSOLUTE)
|
||||
- endif()
|
||||
-endif(NOT IS_DIRECTORY ${MARIAN_GIT_DIR})
|
||||
-
|
||||
-add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h
|
||||
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
- COMMAND git log -1 --pretty=format:\#define\ GIT_REVISION\ \"\%h\ \%ai\" > ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h
|
||||
- DEPENDS ${MARIAN_GIT_DIR}/logs/HEAD
|
||||
- VERBATIM
|
||||
-)
|
||||
-add_custom_target(marian_version DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h)
|
||||
-add_dependencies(marian marian_version) # marian must depend on it so that it gets created first
|
||||
+# (generated by nix package instead)
|
||||
+
|
||||
# make sure all local dependencies are installed first before this is built
|
||||
add_dependencies(marian 3rd_party_installs)
|
||||
|
||||
diff --git a/cmake/GetVersionFromFile.cmake b/cmake/GetVersionFromFile.cmake
|
||||
index 83b7975..71cd861 100644
|
||||
--- a/cmake/GetVersionFromFile.cmake
|
||||
+++ b/cmake/GetVersionFromFile.cmake
|
||||
@@ -23,10 +23,8 @@ else()
|
||||
endif()
|
||||
|
||||
# Get current commit SHA from git
|
||||
-execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
|
||||
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
- OUTPUT_VARIABLE PROJECT_VERSION_GIT_SHA
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
+# (dummy value for nix package without the .git)
|
||||
+set(PROJECT_VERSION_GIT_SHA 000000000000)
|
||||
|
||||
# Get partial versions into a list
|
||||
string(REGEX MATCHALL "-.*$|[0-9]+" PROJECT_PARTIAL_VERSION_LIST
|
||||
|
|
@ -33,16 +33,16 @@ let
|
|||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.40.2";
|
||||
version = "1.40.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}-fixed-tag";
|
||||
hash = "sha256-3apr4dCnw+eIJ7PkpQtpgGYWl1jPLV/z/aRuBVbFdHk=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UVsjka/ptUiSN9aqRESdFZA3uh+FJnJot/YXWUPCJtc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-qOABH0rAQyioYOSEjyJtVoqMmaxFXfXXT1MRDjuo1rI=";
|
||||
npmDepsHash = "sha256-r0IUQNZJEpY8VE0G/WLdygup32iQ6DxfGkvOgFi7R4k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20230906";
|
||||
version = "20230907";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-e2k5L2UaujXHkQQPMZXxft/UREDPykbW70janduBa2M=";
|
||||
hash = "sha256-Y0fCWy2hrUcsH1ru96Y5TezglUaDrw4pcoWmLjBojxs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
54
pkgs/applications/science/logic/netlistsvg/default.nix
Normal file
54
pkgs/applications/science/logic/netlistsvg/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, runCommandLocal
|
||||
, netlistsvg
|
||||
, yosys
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "netlistsvg";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nturley";
|
||||
repo = "netlistsvg";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-H37zhjfv7c/TV+pAk70eDiE6ZQ9JjZq1TFvac6OOKBk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} ./package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-nKxskNW8YFDloA9Nxs/Rfjew8nX+l9xKB8/8313KoYo=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
node --trace-warnings test/test-all.js
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
# An integration test: Synthesize a circuit from hdl and generate a diagram
|
||||
passthru.tests.netlistsvg-yosys-integration-test = runCommandLocal "netlistsvg-yosys-integration-test" {
|
||||
nativeBuildInputs = [ netlistsvg yosys ];
|
||||
} ''
|
||||
yosys -p "prep -top helloworld -flatten; aigmap; write_json circuit.json" ${./test.v}
|
||||
netlistsvg circuit.json -o circuit.svg
|
||||
test -s circuit.svg
|
||||
touch $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Draw SVG digital circuits schematics from yosys JSON netlists";
|
||||
homepage = "https://neilturley.dev/netlistsvg/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pbsds ];
|
||||
};
|
||||
}
|
||||
9761
pkgs/applications/science/logic/netlistsvg/package-lock.json
generated
Normal file
9761
pkgs/applications/science/logic/netlistsvg/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load diff
7
pkgs/applications/science/logic/netlistsvg/test.v
Normal file
7
pkgs/applications/science/logic/netlistsvg/test.v
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
module helloworld (
|
||||
input wire[7:0] a,
|
||||
input wire[7:0] b,
|
||||
output wire[7:0] c,
|
||||
);
|
||||
assign c = a + b;
|
||||
endmodule
|
||||
|
|
@ -20,12 +20,12 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitea";
|
||||
version = "1.20.3";
|
||||
version = "1.20.4";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz";
|
||||
hash = "sha256-cn61Z5nYMmzSoHcDoXwuhm+IMn6+iIYPi7KxzO/b5Nw=";
|
||||
hash = "sha256-96LI7/4FZy17KED2xc4UFyW4e47DZMuSnMw7loYYB8c=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jujutsu";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinvonz";
|
||||
repo = "jj";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kbJWkCnb77VRKemA8WejaChaQYCxNiVMbqW5PCrDoE8=";
|
||||
sha256 = "sha256-5RN2xaH591/83iNXRcW9i/TyU5ndPZq3P/BesHM9I6w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qbCOVcKpNGWGonRAwPsr3o3yd+7qUTy3IVmC3Ifn4xE=";
|
||||
cargoHash = "sha256-G4W3GeTWTuIZO1PupuZ0hACwhNoNBQhULyT9f6qVckg=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
|
|
@ -38,16 +38,6 @@ rustPlatform.buildRustPackage rec {
|
|||
"packaging"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# this patch (hopefully!) fixes a very, very rare test failure that can
|
||||
# occasionally be cajoled out of Nix and GitHub CI builds. go ahead and
|
||||
# apply it to be safe.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/martinvonz/jj/commit/8e7e32710d29010423f3992bb920aaf2a0fa04ec.patch";
|
||||
hash = "sha256-ySieobB1P/DpWOurcCb4BXoHk9IqrjzMfzdc3O5cTXk=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors
|
||||
useNextest = true; # nextest is the upstream integration framework
|
||||
ZSTD_SYS_USE_PKG_CONFIG = "1"; # disable vendored zlib
|
||||
|
|
|
|||
|
|
@ -228,6 +228,7 @@ buildFHSEnv {
|
|||
homepage = "https://www.blackmagicdesign.com/products/davinciresolve";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ jshcmpbll ];
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,11 +120,13 @@ let
|
|||
else throw "fetchurl requires either `url` or `urls` to be set";
|
||||
|
||||
hash_ =
|
||||
# Many other combinations don't make sense, but this is the most common one:
|
||||
if hash != "" && sha256 != "" then throw "multiple hashes passed to fetchurl" else
|
||||
if with lib.lists; length (filter (s: s != "") [ hash outputHash sha1 sha256 sha512 ]) > 1
|
||||
then throw "multiple hashes passed to fetchurl" else
|
||||
|
||||
if hash != "" then { outputHashAlgo = null; outputHash = hash; }
|
||||
else if (outputHash != "" && outputHashAlgo != "") then { inherit outputHashAlgo outputHash; }
|
||||
else if outputHash != "" then
|
||||
if outputHashAlgo != "" then { inherit outputHashAlgo outputHash; }
|
||||
else throw "fetchurl was passed outputHash without outputHashAlgo"
|
||||
else if sha512 != "" then { outputHashAlgo = "sha512"; outputHash = sha512; }
|
||||
else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; }
|
||||
else if sha1 != "" then { outputHashAlgo = "sha1"; outputHash = sha1; }
|
||||
|
|
|
|||
41
pkgs/by-name/zc/zcfan/package.nix
Normal file
41
pkgs/by-name/zc/zcfan/package.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
# Testing this requires a Thinkpad or the presence of /proc/acpi/ibm/fan
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zcfan";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdown";
|
||||
repo = "zcfan";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-XngchR06HP2iExKJVe+XKBDgsv98AEYWOkl1a/Hktgs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "/usr/local" $out
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
$out/bin/${finalAttrs.pname} -h
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A zero-configuration fan daemon for ThinkPads";
|
||||
homepage = "https://github.com/cdown/zcfan";
|
||||
changelog = "https://github.com/cdown/zcfan/tags/${finalAttrs.version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kashw2 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -44,7 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
xvfb-run
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# requires xvfb-run
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
|
@ -65,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ benediktbroich paveloom ranfdev ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
, targetPlatform
|
||||
, hostPlatform
|
||||
, withoutTargetLibc
|
||||
, libcCross
|
||||
}:
|
||||
|
||||
assert !stdenv.targetPlatform.hasSharedLibraries -> !enableShared;
|
||||
|
|
@ -31,7 +32,7 @@ drv: lib.pipe drv
|
|||
# nixpkgs did not add the "libgcc" output until gcc11. In theory
|
||||
# the following condition can be changed to `true`, but that has not
|
||||
# been tested.
|
||||
lib.optional (lib.versionAtLeast version "11.0")
|
||||
lib.optionals (lib.versionAtLeast version "11.0")
|
||||
|
||||
(let
|
||||
targetPlatformSlash =
|
||||
|
|
@ -39,11 +40,20 @@ lib.optional (lib.versionAtLeast version "11.0")
|
|||
then ""
|
||||
else "${targetPlatform.config}/";
|
||||
|
||||
# If we are building a cross-compiler and the target libc provided
|
||||
# to us at build time has a libgcc, use that instead of building a
|
||||
# new one. This avoids having two separate (but identical) libgcc
|
||||
# outpaths in the closure of most packages, which can be confusing.
|
||||
useLibgccFromTargetLibc =
|
||||
libcCross != null &&
|
||||
libcCross?passthru.libgcc;
|
||||
|
||||
enableLibGccOutput =
|
||||
(!stdenv.targetPlatform.isWindows || (with stdenv; targetPlatform == hostPlatform)) &&
|
||||
!langJit &&
|
||||
!stdenv.hostPlatform.isDarwin &&
|
||||
enableShared
|
||||
enableShared &&
|
||||
!useLibgccFromTargetLibc
|
||||
;
|
||||
|
||||
# For some reason libgcc_s.so has major-version "2" on m68k but
|
||||
|
|
@ -54,6 +64,14 @@ lib.optional (lib.versionAtLeast version "11.0")
|
|||
else "1";
|
||||
|
||||
in
|
||||
[
|
||||
|
||||
(pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs useLibgccFromTargetLibc {
|
||||
passthru = (previousAttrs.passthru or {}) // {
|
||||
inherit (libcCross) libgcc;
|
||||
};
|
||||
}))
|
||||
|
||||
(pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) {
|
||||
outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
|
||||
# This is a separate phase because gcc assembles its phase scripts
|
||||
|
|
@ -143,5 +161,4 @@ in
|
|||
+ ''
|
||||
patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.${libgcc_s-version-major}
|
||||
'');
|
||||
}))))
|
||||
|
||||
}))]))
|
||||
|
|
|
|||
|
|
@ -450,7 +450,7 @@ ${""} done
|
|||
}
|
||||
))
|
||||
([
|
||||
(callPackage ./common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
|
||||
(callPackage ./common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared libcCross; })
|
||||
] ++ optionals atLeast11 [
|
||||
(callPackage ./common/checksum.nix { inherit langC langCC; })
|
||||
])
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luau";
|
||||
version = "0.593";
|
||||
version = "0.594";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roblox";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
hash = "sha256-12C/MH0wICnW1GpQ/gBcSNx80noMioMNFolXIsHtEi0=";
|
||||
hash = "sha256-GRdJlVCT1jRAuQHsDjV2oqk7mtBUNDpWt8JGlP31CVs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -31,12 +31,6 @@ assert useCudatoolkitRunfile || (libcublas != null); let
|
|||
# versionTriple :: String
|
||||
# Version with three components: major.minor.patch
|
||||
versionTriple = majorMinorPatch version;
|
||||
|
||||
# cudatoolkit_root :: Derivation
|
||||
cudatoolkit_root =
|
||||
if useCudatoolkitRunfile
|
||||
then cudatoolkit
|
||||
else libcublas;
|
||||
in
|
||||
backendStdenv.mkDerivation {
|
||||
pname = "cudatoolkit-${cudaMajorVersion}-cudnn";
|
||||
|
|
@ -65,7 +59,10 @@ in
|
|||
stdenv.cc.cc.lib
|
||||
|
||||
zlib
|
||||
cudatoolkit_root
|
||||
] ++ lists.optionals useCudatoolkitRunfile [
|
||||
cudatoolkit
|
||||
] ++ lists.optionals (!useCudatoolkitRunfile) [
|
||||
libcublas.lib
|
||||
];
|
||||
|
||||
# We used to patch Runpath here, but now we use autoPatchelfHook
|
||||
|
|
|
|||
|
|
@ -99,8 +99,6 @@ stdenv.mkDerivation {
|
|||
export ANDROID_SERIAL="emulator-$port"
|
||||
|
||||
# Create a virtual android device for testing if it does not exist
|
||||
${sdk}/bin/avdmanager list target
|
||||
|
||||
if [ "$(${sdk}/bin/avdmanager list avd | grep 'Name: device')" = "" ]
|
||||
then
|
||||
# Create a virtual android device
|
||||
|
|
|
|||
|
|
@ -104,7 +104,9 @@ mapAliases {
|
|||
"@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02
|
||||
ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21
|
||||
stf = throw "stf was removed because it was broken"; # added 2023-08-21
|
||||
surge = pkgs.surge-cli; # Added 2023-09-08
|
||||
thelounge = pkgs.thelounge; # Added 2023-05-22
|
||||
three = throw "three was removed because it was no longer needed"; # Added 2023-09-08
|
||||
inherit (pkgs) titanium; # added 2023-08-17
|
||||
triton = pkgs.triton; # Added 2023-05-06
|
||||
typescript = pkgs.typescript; # Added 2023-06-21
|
||||
|
|
|
|||
|
|
@ -240,7 +240,6 @@
|
|||
, "sql-formatter"
|
||||
, "stackdriver-statsd-backend"
|
||||
, "stylelint"
|
||||
, "surge"
|
||||
, "svelte-check"
|
||||
, "svelte-language-server"
|
||||
, "svgo"
|
||||
|
|
@ -303,7 +302,6 @@
|
|||
, "thelounge-theme-zenburn"
|
||||
, "thelounge-theme-zenburn-monospace"
|
||||
, "thelounge-theme-zenburn-sourcecodepro"
|
||||
, "three"
|
||||
, "tiddlywiki"
|
||||
, "tsun"
|
||||
, "ts-node"
|
||||
|
|
|
|||
155
pkgs/development/node-packages/node-packages.nix
generated
155
pkgs/development/node-packages/node-packages.nix
generated
|
|
@ -108358,143 +108358,6 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
surge = nodeEnv.buildNodePackage {
|
||||
name = "surge";
|
||||
packageName = "surge";
|
||||
version = "0.23.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/surge/-/surge-0.23.1.tgz";
|
||||
sha512 = "w92meVuKxqO1up0JpSe2iVSiVTv7E7t1qDA9fZhCSZx/+6Q85I3Y2LCoZIcWLpMm9BM0iB843NAWAwdScTR4Uw==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."ajv-6.12.6"
|
||||
sources."ansi-escapes-3.2.0"
|
||||
sources."ansi-regex-3.0.1"
|
||||
sources."ansi-styles-3.2.1"
|
||||
sources."asn1-0.2.6"
|
||||
sources."assert-plus-1.0.0"
|
||||
sources."asynckit-0.4.0"
|
||||
sources."aws-sign2-0.7.0"
|
||||
sources."aws4-1.12.0"
|
||||
sources."balanced-match-1.0.2"
|
||||
sources."bcrypt-pbkdf-1.0.2"
|
||||
sources."block-stream-0.0.9"
|
||||
sources."brace-expansion-1.1.11"
|
||||
sources."caseless-0.12.0"
|
||||
sources."chalk-2.4.2"
|
||||
sources."chardet-0.7.0"
|
||||
sources."cli-cursor-2.1.0"
|
||||
sources."cli-table3-0.5.1"
|
||||
sources."cli-width-2.2.1"
|
||||
sources."color-convert-1.9.3"
|
||||
sources."color-name-1.1.3"
|
||||
sources."colors-1.4.0"
|
||||
sources."combined-stream-1.0.8"
|
||||
sources."concat-map-0.0.1"
|
||||
sources."core-util-is-1.0.2"
|
||||
sources."dashdash-1.14.1"
|
||||
sources."delayed-stream-1.0.0"
|
||||
sources."ecc-jsbn-0.1.2"
|
||||
sources."escape-string-regexp-1.0.5"
|
||||
sources."extend-3.0.2"
|
||||
sources."external-editor-3.1.0"
|
||||
sources."extsprintf-1.3.0"
|
||||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-json-stable-stringify-2.1.0"
|
||||
sources."figures-2.0.0"
|
||||
sources."forever-agent-0.6.1"
|
||||
sources."form-data-2.3.3"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."fstream-1.0.12"
|
||||
sources."getpass-0.1.7"
|
||||
sources."glob-7.2.3"
|
||||
sources."graceful-fs-4.2.11"
|
||||
sources."har-schema-2.0.0"
|
||||
sources."har-validator-5.1.5"
|
||||
sources."has-flag-3.0.0"
|
||||
sources."http-signature-1.2.0"
|
||||
sources."iconv-lite-0.4.24"
|
||||
sources."inflight-1.0.6"
|
||||
sources."inherits-2.0.4"
|
||||
(sources."inquirer-6.5.2" // {
|
||||
dependencies = [
|
||||
sources."ansi-regex-4.1.1"
|
||||
sources."strip-ansi-5.2.0"
|
||||
];
|
||||
})
|
||||
sources."is-domain-0.0.1"
|
||||
sources."is-fullwidth-code-point-2.0.0"
|
||||
sources."is-typedarray-1.0.0"
|
||||
sources."isstream-0.1.2"
|
||||
sources."jsbn-0.1.1"
|
||||
sources."json-schema-0.4.0"
|
||||
sources."json-schema-traverse-0.4.1"
|
||||
sources."json-stringify-safe-5.0.1"
|
||||
sources."jsprim-1.4.2"
|
||||
sources."lodash-4.17.21"
|
||||
sources."mime-db-1.52.0"
|
||||
sources."mime-types-2.1.35"
|
||||
sources."mimic-fn-1.2.0"
|
||||
sources."minimatch-3.1.2"
|
||||
sources."minimist-1.2.3"
|
||||
(sources."mkdirp-0.5.6" // {
|
||||
dependencies = [
|
||||
sources."minimist-1.2.8"
|
||||
];
|
||||
})
|
||||
sources."moniker-0.1.2"
|
||||
sources."mute-stream-0.0.7"
|
||||
sources."netrc-0.1.4"
|
||||
sources."oauth-sign-0.9.0"
|
||||
sources."object-assign-4.1.1"
|
||||
sources."once-1.4.0"
|
||||
sources."onetime-2.0.1"
|
||||
sources."os-tmpdir-1.0.2"
|
||||
sources."path-is-absolute-1.0.1"
|
||||
sources."performance-now-2.1.0"
|
||||
sources."progress-1.1.8"
|
||||
sources."psl-1.9.0"
|
||||
sources."punycode-2.3.0"
|
||||
sources."qs-6.5.3"
|
||||
sources."read-1.0.5"
|
||||
sources."request-2.88.2"
|
||||
sources."restore-cursor-2.0.0"
|
||||
sources."rimraf-2.7.1"
|
||||
sources."run-async-2.4.1"
|
||||
sources."rxjs-6.6.7"
|
||||
sources."safe-buffer-5.2.1"
|
||||
sources."safer-buffer-2.1.2"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."split-0.3.1"
|
||||
sources."sshpk-1.17.0"
|
||||
sources."string-width-2.1.1"
|
||||
sources."strip-ansi-4.0.0"
|
||||
sources."supports-color-5.5.0"
|
||||
sources."surge-fstream-ignore-1.0.6"
|
||||
sources."surge-ignore-0.2.0"
|
||||
sources."tarr-1.1.0"
|
||||
sources."through-2.3.8"
|
||||
sources."tmp-0.0.33"
|
||||
sources."tough-cookie-2.5.0"
|
||||
sources."tslib-1.14.1"
|
||||
sources."tunnel-agent-0.6.0"
|
||||
sources."tweetnacl-0.14.5"
|
||||
sources."uri-js-4.4.1"
|
||||
sources."url-parse-as-address-1.0.0"
|
||||
sources."uuid-3.4.0"
|
||||
sources."verror-1.10.0"
|
||||
sources."wrappy-1.0.2"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "CDN for front-end developers";
|
||||
homepage = "https://github.com/sintaxi/surge#readme";
|
||||
license = "ISC";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
svelte-check = nodeEnv.buildNodePackage {
|
||||
name = "svelte-check";
|
||||
packageName = "svelte-check";
|
||||
|
|
@ -113937,24 +113800,6 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
three = nodeEnv.buildNodePackage {
|
||||
name = "three";
|
||||
packageName = "three";
|
||||
version = "0.155.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/three/-/three-0.155.0.tgz";
|
||||
sha512 = "sNgCYmDijnIqkD/bMfk+1pHg3YzsxW7V2ChpuP6HCQ8NiZr3RufsXQr8M3SSUMjW4hG+sUk7YbyuY0DncaDTJQ==";
|
||||
};
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "JavaScript 3D library";
|
||||
homepage = "https://threejs.org/";
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
tiddlywiki = nodeEnv.buildNodePackage {
|
||||
name = "tiddlywiki";
|
||||
packageName = "tiddlywiki";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
let
|
||||
pname = "phpstan";
|
||||
version = "1.10.28";
|
||||
version = "1.10.33";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
|
||||
sha256 = "sha256-Jbsamdtxui2esC9WyxLakWLxWg33mhKJKi/iaEV9nbA=";
|
||||
sha256 = "sha256-dFIuCVYmZr6E0181jegKs6d3mA9jPoFqoIY+lyWl7P8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dataclass-factory";
|
||||
version = "2.13";
|
||||
version = "2.16";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reagento";
|
||||
repo = "dataclass-factory";
|
||||
rev = version;
|
||||
hash = "sha256-hNPuqs3TvDleIxflCW5rutbXjDotFRLCNJlcTBFxFAw=";
|
||||
hash = "sha256-0BIWgyAV1hJzFX4xYFqswvQi5F1Ce+V9FKSmNYuJfZM=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyenphase";
|
||||
version = "1.9.3";
|
||||
version = "1.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "pyenphase";
|
||||
repo = "pyenphase";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Wcv5E0Oj8wkVOPGz9viXMNpaqK00xti+pF5Jt6mCWi4=";
|
||||
hash = "sha256-b2rT7H9FmeM5RD1TZhXqyqgvBdTWwZHg7Hui5OpXAX8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, CoreAudio
|
||||
, CoreMIDI
|
||||
, CoreServices
|
||||
, Foundation
|
||||
, cython_3
|
||||
, fetchPypi
|
||||
, flake8
|
||||
|
|
@ -40,13 +41,14 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
libjack2
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libjack2
|
||||
alsa-lib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreAudio
|
||||
CoreMIDI
|
||||
CoreServices
|
||||
Foundation
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -40,13 +40,6 @@ buildPythonPackage rec {
|
|||
xmltodict
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest>=5,<6'," ""
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "pytest-asyncio" ""
|
||||
'';
|
||||
|
||||
# Project only has a dummy test
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -57,6 +50,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module to communicate with Seat Connect";
|
||||
homepage = "https://github.com/farfar/seatconnect";
|
||||
changelog = "https://github.com/Farfar/seatconnect/releases/tag/${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
, pandas
|
||||
, parameterized
|
||||
, pathtools
|
||||
, promise
|
||||
, protobuf
|
||||
, psutil
|
||||
, pydantic
|
||||
|
|
@ -46,17 +45,15 @@
|
|||
, sentry-sdk
|
||||
, setproctitle
|
||||
, setuptools
|
||||
, shortuuid
|
||||
, substituteAll
|
||||
, tensorflow
|
||||
, torch
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wandb";
|
||||
version = "0.15.5";
|
||||
format = "setuptools";
|
||||
version = "0.15.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -64,7 +61,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-etS1NkkskA5Lg/38QIdzCVWgqZpjpT2LwaWF1k7WVXs=";
|
||||
hash = "sha256-MuYaeg7+lMOOSalnLyKsCw+f44daDDayvyKvY8z697c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -77,6 +74,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
# setuptools is necessary since pkg_resources is required at runtime.
|
||||
|
|
@ -86,7 +84,6 @@ buildPythonPackage rec {
|
|||
docker_pycreds
|
||||
gitpython
|
||||
pathtools
|
||||
promise
|
||||
protobuf
|
||||
psutil
|
||||
pyyaml
|
||||
|
|
@ -94,7 +91,6 @@ buildPythonPackage rec {
|
|||
sentry-sdk
|
||||
setproctitle
|
||||
setuptools
|
||||
shortuuid
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
@ -128,7 +124,6 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
responses
|
||||
scikit-learn
|
||||
tensorflow
|
||||
torch
|
||||
tqdm
|
||||
];
|
||||
|
|
@ -141,6 +136,11 @@ buildPythonPackage rec {
|
|||
|
||||
pythonRelaxDeps = [ "protobuf" ];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# We want to run only unit tests
|
||||
"tests/pytest_tests"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.
|
||||
"tests/pytest_tests/system_tests/test_notebooks/test_notebooks.py"
|
||||
|
|
@ -167,7 +167,6 @@ buildPythonPackage rec {
|
|||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_aws.py"
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_cli.py"
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_docker.py"
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_kubernetes.py"
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch.py"
|
||||
"tests/pytest_tests/unit_tests/test_cli.py"
|
||||
"tests/pytest_tests/unit_tests/test_data_types.py"
|
||||
|
|
@ -209,6 +208,7 @@ buildPythonPackage rec {
|
|||
"tests/pytest_tests/system_tests/test_core/test_time_resolution.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_torch_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_validation_data_logger.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb_init.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb_integration.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb_run.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb_settings.py"
|
||||
|
|
@ -216,6 +216,7 @@ buildPythonPackage rec {
|
|||
"tests/pytest_tests/system_tests/test_core/test_wandb_verify.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb.py"
|
||||
"tests/pytest_tests/system_tests/test_importers/test_import_mlflow.py"
|
||||
"tests/pytest_tests/system_tests/test_nexus/test_nexus.py"
|
||||
"tests/pytest_tests/system_tests/test_sweep/test_public_api.py"
|
||||
"tests/pytest_tests/system_tests/test_sweep/test_sweep_scheduler.py"
|
||||
"tests/pytest_tests/system_tests/test_sweep/test_sweep_utils.py"
|
||||
|
|
@ -230,6 +231,7 @@ buildPythonPackage rec {
|
|||
"tests/pytest_tests/system_tests/test_launch/test_launch_kubernetes.py"
|
||||
"tests/pytest_tests/system_tests/test_launch/test_launch_local_container.py"
|
||||
"tests/pytest_tests/system_tests/test_launch/test_launch_run.py"
|
||||
"tests/pytest_tests/system_tests/test_launch/test_launch_sagemaker.py"
|
||||
"tests/pytest_tests/system_tests/test_launch/test_launch_sweep_cli.py"
|
||||
"tests/pytest_tests/system_tests/test_launch/test_launch_sweep.py"
|
||||
"tests/pytest_tests/system_tests/test_launch/test_launch.py"
|
||||
|
|
@ -243,7 +245,7 @@ buildPythonPackage rec {
|
|||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_jobs.py"
|
||||
|
||||
# Requires google-cloud-aiplatform which is not packaged as of 2023-04-25.
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_gcp.py"
|
||||
"tests/pytest_tests/unit_tests/test_launch/test_runner/test_vertex.py"
|
||||
|
||||
# Requires google-cloud-artifact-registry which is not packaged as of 2023-04-25.
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_kaniko_build.py"
|
||||
|
|
@ -255,6 +257,12 @@ buildPythonPackage rec {
|
|||
# Requires metaflow which is not packaged as of 2023-04-25.
|
||||
"tests/pytest_tests/unit_tests/test_metaflow.py"
|
||||
|
||||
# Requires tensorflow which is broken as of 2023-09-03
|
||||
"tests/pytest_tests/unit_tests/test_keras.py"
|
||||
|
||||
# Try to get hardware information, not possible in the nix build environment
|
||||
"tests/pytest_tests/unit_tests/test_system_metrics/test_disk.py"
|
||||
|
||||
# See https://github.com/wandb/wandb/issues/5423
|
||||
"tests/pytest_tests/unit_tests/test_docker.py"
|
||||
"tests/pytest_tests/unit_tests/test_library_public.py"
|
||||
|
|
|
|||
2
pkgs/development/tools/git-ps-rs/Cargo.lock
generated
2
pkgs/development/tools/git-ps-rs/Cargo.lock
generated
|
|
@ -258,7 +258,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gps"
|
||||
version = "6.8.0"
|
||||
version = "6.9.0"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"git2",
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-ps-rs";
|
||||
version = "6.8.0";
|
||||
version = "6.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uptech";
|
||||
repo = "git-ps-rs";
|
||||
rev = version;
|
||||
hash = "sha256-M5VLQY+0QOKKygnNHjOutwniWO90y4RReAJoxwWpRSA=";
|
||||
hash = "sha256-D6613T87jLEur8WXHed2cSKVafKVfgGWap/z/UBe31U=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -12,19 +12,19 @@ let
|
|||
in
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "java-language-server";
|
||||
version = "0.2.38";
|
||||
version = "0.2.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "georgewfraser";
|
||||
repo = pname;
|
||||
# commit hash is used as owner sometimes forgets to set tags. See https://github.com/georgewfraser/java-language-server/issues/104
|
||||
rev = "1dfdc54d1f1e57646a0ec9c0b3f4a4f094bd9f17";
|
||||
sha256 = "sha256-zkbl/SLg09XK2ZhJNzWEtvFCQBRQ62273M/2+4HV1Lk=";
|
||||
rev = "d7f4303cd233cdad84daffbb871dd4512a2c8da2";
|
||||
sha256 = "sha256-BIcfwz+pLQarnK8XBPwDN2nrdvK8xqUo0XFXk8ZV/h0=";
|
||||
};
|
||||
|
||||
mvnFetchExtraArgs.dontConfigure = true;
|
||||
mvnParameters = "-DskipTests";
|
||||
mvnHash = "sha256-XhAqd67RtETd9XvqbiEuTOwPUsUtoLkhXy2Dde7NLTo=";
|
||||
mvnHash = "sha256-2uthmSjFQ43N5lgV11DsxuGce+ZptZsmRLTgjDo0M2w=";
|
||||
|
||||
nativeBuildInputs = [ jdk makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ccache";
|
||||
version = "4.8.2";
|
||||
version = "4.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ccache";
|
||||
repo = "ccache";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
sha256 = "sha256-wft9T0XzTJhN/85kV+pIAUqTvcIBClbj+nHPQK0ncVE=";
|
||||
sha256 = "sha256-fcstTjwwOh5SAe6+VT5MpBaD+AEFoQtHop99dOMr7/A=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -245,6 +245,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Nix-based continuous build system";
|
||||
homepage = "https://nixos.org/hydra";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ lheckemann mindavi das_j ];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
let
|
||||
pname = "phpunit";
|
||||
version = "10.3.2";
|
||||
version = "10.3.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://phar.phpunit.de/phpunit-${version}.phar";
|
||||
hash = "sha256-DHAr0oI9EUgsKlEdJFqdQXkYEMSTBYf91ZV6qjf+Kx0=";
|
||||
hash = "sha256-fhgsP/sA2nQXBQ34V2/Zvc+SPiDYWfkEXKKHoD+Heak=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "reviewdog";
|
||||
version = "0.14.2";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JTHvLbJJOnQD9rW9GJ+7vtROMnpjgwD9Gu4cSf+ZIgs=";
|
||||
hash = "sha256-EKDs0Xv38RLC3qDkb8QT3CMWdi7tEPRXxhlZiC/dyZo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ADLBpTruCHgdi9+kO24ZguKJkxGDDKyrC60i7aiDA/4=";
|
||||
vendorHash = "sha256-IKndnxeLy9hLFzs0SesRQzii9h8MX9FrEcpHaaKIq4k=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
|
||||
homepage = "https://github.com/reviewdog/reviewdog";
|
||||
changelog = "https://github.com/reviewdog/reviewdog/raw/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/reviewdog/reviewdog/blob/v${version}/CHANGELOG.md";
|
||||
maintainers = [ maintainers.marsam ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
|
|
|||
154
pkgs/development/tools/redisinsight/default.nix
Normal file
154
pkgs/development/tools/redisinsight/default.nix
Normal file
|
|
@ -0,0 +1,154 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, fixup_yarn_lock
|
||||
, yarn
|
||||
, nodejs_18
|
||||
, python3
|
||||
, fetchYarnDeps
|
||||
, electron
|
||||
, desktopToDarwinBundle
|
||||
, nest-cli
|
||||
, libsass
|
||||
, buildPackages
|
||||
, pkg-config
|
||||
, sqlite
|
||||
, xdg-utils
|
||||
}:
|
||||
let
|
||||
nodejs = nodejs_18;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "redisinsight-electron";
|
||||
version = "2.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RedisInsight";
|
||||
repo = "RedisInsight";
|
||||
rev = "${finalAttrs.version}";
|
||||
hash = "sha256-TzqbMycKcOlUSKvfghip/KdMRiwstkFP+iJG5/9JVlA=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
sha256 = "sha256-aDr5wxM/Rp3Tj09nPpLPJHSG5A73+4rAfrMCcxCr7so=";
|
||||
};
|
||||
|
||||
feOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/redisinsight/yarn.lock";
|
||||
sha256 = "sha256-O+8lNDrqPdxE+tgjpKbgm9Q66VlJaJgZRHlNyaFkumM=";
|
||||
};
|
||||
|
||||
apiOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/redisinsight/api/yarn.lock";
|
||||
sha256 = "sha256-2Tvck+9MDj6s+7jehUEyPfJiFFxbMOYDFD/Qgt2En6c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper python3 nest-cli libsass pkg-config ]
|
||||
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
|
||||
|
||||
buildInputs = [ sqlite xdg-utils ];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
yarn config --offline set yarn-offline-mirror $offlineCache
|
||||
fixup_yarn_lock yarn.lock
|
||||
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
|
||||
|
||||
yarn config --offline set yarn-offline-mirror $feOfflineCache
|
||||
fixup_yarn_lock redisinsight/yarn.lock
|
||||
yarn --offline --cwd redisinsight/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
|
||||
|
||||
yarn config --offline set yarn-offline-mirror $apiOfflineCache
|
||||
fixup_yarn_lock redisinsight/api/yarn.lock
|
||||
yarn --offline --cwd redisinsight/api/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
|
||||
|
||||
patchShebangs node_modules/
|
||||
patchShebangs redisinsight/node_modules/
|
||||
patchShebangs redisinsight/api/node_modules/
|
||||
|
||||
mkdir -p "$HOME/.node-gyp/${nodejs.version}"
|
||||
echo 9 >"$HOME/.node-gyp/${nodejs.version}/installVersion"
|
||||
ln -sfv "${nodejs}/include" "$HOME/.node-gyp/${nodejs.version}"
|
||||
export npm_config_nodedir=${nodejs}
|
||||
|
||||
pushd redisinsight
|
||||
# Build the sqlite3 package.
|
||||
npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev} sqlite3
|
||||
popd
|
||||
|
||||
substituteInPlace redisinsight/api/config/default.ts \
|
||||
--replace "process['resourcesPath']" "\"$out/share/redisinsight\"" \
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
yarn config --offline set yarn-offline-mirror $offlineCache
|
||||
|
||||
pushd node_modules/node-sass
|
||||
LIBSASS_EXT=auto yarn run build --offline
|
||||
popd
|
||||
|
||||
yarn --offline build:prod
|
||||
|
||||
yarn --offline electron-builder \
|
||||
--dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
|
||||
-c.electronDist=${electron}/lib/electron \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# resources
|
||||
mkdir -p "$out/share/redisinsight"
|
||||
mkdir -p "$out/share/redisinsight/static/resources/plugins"
|
||||
mkdir -p "$out/share/redisinsight/default"
|
||||
|
||||
cp -r release/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/{app.asar,app.asar.unpacked} $out/share/redisinsight/
|
||||
cp -r resources/ $out/share/redisinsight
|
||||
|
||||
# icons
|
||||
for icon in "$out/resources/icons/*.png"; do
|
||||
mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
|
||||
ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/redisinsight.png"
|
||||
done
|
||||
|
||||
ln -s "${finalAttrs.desktopItem}/share/applications" "$out/share/applications"
|
||||
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/redisinsight" \
|
||||
--add-flags "$out/share/redisinsight/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--chdir "$out/share/redisinsight" \
|
||||
--argv0 "$out/share/redisinsight/app.asar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "redisinsight";
|
||||
exec = "redisinsight %u";
|
||||
icon = "redisinsight";
|
||||
desktopName = "RedisInsight";
|
||||
genericName = "RedisInsight Redis Client";
|
||||
comment = finalAttrs.meta.description;
|
||||
categories = [ "Development" ];
|
||||
startupWMClass = "redisinsight";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "RedisInsight Redis client powered by Electron";
|
||||
homepage = "https://github.com/RedisInsight/RedisInsight";
|
||||
license = licenses.sspl;
|
||||
maintainers = with maintainers; [ gmemstr ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "leptosfmt";
|
||||
version = "0.1.13";
|
||||
version = "0.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bram209";
|
||||
repo = "leptosfmt";
|
||||
rev = version;
|
||||
hash = "sha256-QitvZ0AkZcXmjv8EnewWjexQMVEHy/naUarBIrzHbBA=";
|
||||
hash = "sha256-Dj58p//g6sCpZMmTbROrGxs8fiQm4y1WSYqNjQ5K3Oo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Fjj4lgkdHeA/3ajNbF1vTf6/YzGvDUJsDmiXzkEpels=";
|
||||
cargoHash = "sha256-epCLbr9Z3o/G0rEiYri0CswZYzjOZkb4UVIO4/vD6ko=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A formatter for the leptos view! macro";
|
||||
|
|
|
|||
25
pkgs/development/tools/surge-cli/default.nix
Normal file
25
pkgs/development/tools/surge-cli/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ buildNpmPackage, fetchFromGitHub, lib }:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "surge-cli";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sintaxi";
|
||||
repo = "surge";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EpYww/YCQhPFmnOJ1zbigI2qyUrKN2TxKHEju/0Si3M=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-F1C/sfOT/Tf+h28g1umP6czLFIsxDkbvT14ZfWLTiCE=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "surge";
|
||||
description = "CLI for the surge.sh CDN";
|
||||
homepage = "https://surge.sh";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ MoritzBoehme ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,23 +11,23 @@ let
|
|||
if stdenv.isAarch64 then "armv8" else
|
||||
"unknown";
|
||||
|
||||
nnueFile = "nn-6877cd24400e.nnue";
|
||||
nnueFile = "nn-5af11540bbfe.nnue";
|
||||
nnue = fetchurl {
|
||||
name = nnueFile;
|
||||
url = "https://tests.stockfishchess.org/api/nn/${nnueFile}";
|
||||
sha256 = "sha256-aHfNJEAOAbGf8SrjBoriQhUoAr3TMOZve2cDhlJR1uM=";
|
||||
sha256 = "sha256-WvEVQLv+/LVOOMXdAAyrS0ad+nWZodVb5dJyLCCokps=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stockfish";
|
||||
version = "15";
|
||||
version = "16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "official-stockfish";
|
||||
repo = "Stockfish";
|
||||
rev = "sf_${version}";
|
||||
sha256 = "sha256-sK4Jw9BPGRvlm9oIcgGcmHe8G4GR4cEuD8MtDrHZKew=";
|
||||
sha256 = "sha256-ASy2vIP94lnSKgxixK1GoC84yAysaJpxeyuggV4MrP4=";
|
||||
};
|
||||
|
||||
# This addresses a linker issue with Darwin
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
|
||||
in package.override rec {
|
||||
pname = "bookstack";
|
||||
version = "23.06.2";
|
||||
version = "23.08.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bookstackapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1Ap/imfzoezT0bcyyBrYOLlVJWqah8TZDKcAjqMm4VQ=";
|
||||
sha256 = "0qg4isivyxinbccac4gga1ym43wh80qhs0308l5hk8dc3zvi7d5q";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,20 +5,20 @@ let
|
|||
"aws/aws-crt-php" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "aws-aws-crt-php-1926277fc71d253dfa820271ac5987bdb193ccf5";
|
||||
name = "aws-aws-crt-php-2f1dc7b7eda080498be96a4a6d683a41583030e9";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5";
|
||||
sha256 = "037rdpys895vmk80zgb6r2c77ss2l545qsfma7q55kx9jm39habl";
|
||||
url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/2f1dc7b7eda080498be96a4a6d683a41583030e9";
|
||||
sha256 = "12b7kvc8r5rw3g47hfpg5y37ybk6b67xvq6a36id5pxxkbzsqzwx";
|
||||
};
|
||||
};
|
||||
};
|
||||
"aws/aws-sdk-php" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "aws-aws-sdk-php-6d759ef9f24f0c7f271baf8014f41fc0cfdfbf78";
|
||||
name = "aws-aws-sdk-php-ebd5e47c5be0425bb5cf4f80737850ed74767107";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/6d759ef9f24f0c7f271baf8014f41fc0cfdfbf78";
|
||||
sha256 = "178k6mcjg6qlvzn4mkw1qykn5bs3921xhh554z45nqd5f9fclwxb";
|
||||
url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/ebd5e47c5be0425bb5cf4f80737850ed74767107";
|
||||
sha256 = "0fnbhpr5awvq4463l51j4rr0cc15lqqa9ppdjjp4jw2g6azckb8y";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -95,10 +95,10 @@ let
|
|||
"doctrine/dbal" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "doctrine-dbal-19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f";
|
||||
name = "doctrine-dbal-63646ffd71d1676d2f747f871be31b7e921c7864";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/doctrine/dbal/zipball/19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f";
|
||||
sha256 = "0mz606j1ndng7cakmra4f6rs6ij1wbznkax4nyxd76ikn65isdqg";
|
||||
url = "https://api.github.com/repos/doctrine/dbal/zipball/63646ffd71d1676d2f747f871be31b7e921c7864";
|
||||
sha256 = "0qqiq46983m5c4w0i59z2ik1v69slglr8nrj5p2zcpxq9zmczbkj";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -155,10 +155,10 @@ let
|
|||
"dragonmantank/cron-expression" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "dragonmantank-cron-expression-782ca5968ab8b954773518e9e49a6f892a34b2a8";
|
||||
name = "dragonmantank-cron-expression-adfb1f505deb6384dc8b39804c5065dd3c8c8c0a";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8";
|
||||
sha256 = "18pxn1v3b2yhwzky22p4wn520h89rcrihl7l6hd0p769vk1b2qg9";
|
||||
url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a";
|
||||
sha256 = "1gw2bnsh8ca5plfpyyyz1idnx7zxssg6fbwl7niszck773zrm5ca";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -205,20 +205,20 @@ let
|
|||
"guzzlehttp/promises" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "guzzlehttp-promises-67ab6e18aaa14d753cc148911d273f6e6cb6721e";
|
||||
name = "guzzlehttp-promises-111166291a0f8130081195ac4556a5587d7f1b5d";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e";
|
||||
sha256 = "0y3md6lkpk60kvmi607mgj29cfjg2bljc5nhfh3qf9hzk6c1b2j6";
|
||||
url = "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d";
|
||||
sha256 = "17d50in3wq62y8gcgadiimn9s2mc90xvil5g851l9y2k0c4y31s2";
|
||||
};
|
||||
};
|
||||
};
|
||||
"guzzlehttp/psr7" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "guzzlehttp-psr7-b635f279edd83fc275f822a1188157ffea568ff6";
|
||||
name = "guzzlehttp-psr7-8bd7c33a0734ae1c5d074360512beb716bef3f77";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6";
|
||||
sha256 = "0734h3r8db06hcffagr8s7bxhjkvlfzvqg1klwmqidflwdwk7yj1";
|
||||
url = "https://api.github.com/repos/guzzle/psr7/zipball/8bd7c33a0734ae1c5d074360512beb716bef3f77";
|
||||
sha256 = "0c2b8n3ip5w91fg277dccak0z7p6jgc0fm7m8lc9s5n567aahmj3";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -255,30 +255,30 @@ let
|
|||
"laravel/framework" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "laravel-framework-858add225ce88a76c43aec0e7866288321ee0ee9";
|
||||
name = "laravel-framework-e3350e87a52346af9cc655a3012d2175d2d05ad7";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/laravel/framework/zipball/858add225ce88a76c43aec0e7866288321ee0ee9";
|
||||
sha256 = "0af52p51g1jgjx7jxw02nyfciz6a3jlc0lpxbfvl4c4dvbdkbwn2";
|
||||
url = "https://api.github.com/repos/laravel/framework/zipball/e3350e87a52346af9cc655a3012d2175d2d05ad7";
|
||||
sha256 = "1iqqiwvi3q8vhnhrnfismczga0q958i1h44xv3qna80l6iv5vv0m";
|
||||
};
|
||||
};
|
||||
};
|
||||
"laravel/serializable-closure" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "laravel-serializable-closure-f23fe9d4e95255dacee1bf3525e0810d1a1b0f37";
|
||||
name = "laravel-serializable-closure-e5a3057a5591e1cfe8183034b0203921abe2c902";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37";
|
||||
sha256 = "0dyvqph5q1lb6gl6ga4b1xkziqzj6s2ia5pbd7h40anm4sh3z8dl";
|
||||
url = "https://api.github.com/repos/laravel/serializable-closure/zipball/e5a3057a5591e1cfe8183034b0203921abe2c902";
|
||||
sha256 = "0sjcn7w31x14slfj2mqs32kj62ay86i47i441p5cg3ajw9kjb6iy";
|
||||
};
|
||||
};
|
||||
};
|
||||
"laravel/socialite" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "laravel-socialite-00ea7f8630673ea49304fc8a9fca5a64eb838c7e";
|
||||
name = "laravel-socialite-50148edf24b6cd3e428aa9bc06a5d915b24376bb";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/laravel/socialite/zipball/00ea7f8630673ea49304fc8a9fca5a64eb838c7e";
|
||||
sha256 = "0ryw1hwngxqdsi5cvsj69zfqg1ql92z4wmi7bb1wj75x7dn1v76f";
|
||||
url = "https://api.github.com/repos/laravel/socialite/zipball/50148edf24b6cd3e428aa9bc06a5d915b24376bb";
|
||||
sha256 = "0xdp118b59winbyvh7pa43bcp8rkfd75fckj0mbpx7zf72ralp8a";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -345,20 +345,20 @@ let
|
|||
"league/html-to-markdown" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "league-html-to-markdown-e0fc8cf07bdabbcd3765341ecb50c34c271d64e1";
|
||||
name = "league-html-to-markdown-0b4066eede55c48f38bcee4fb8f0aa85654390fd";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e0fc8cf07bdabbcd3765341ecb50c34c271d64e1";
|
||||
sha256 = "1a7ab0xafjwd5hmkmixc3ijwrrncb2qncy9b52jbnzspv1vjav1h";
|
||||
url = "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/0b4066eede55c48f38bcee4fb8f0aa85654390fd";
|
||||
sha256 = "0cd0sv99albdkrj4hmrbb76ji366dsl4jcpsr9gmrrpy3jxi2h7a";
|
||||
};
|
||||
};
|
||||
};
|
||||
"league/mime-type-detection" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "league-mime-type-detection-ff6248ea87a9f116e78edd6002e39e5128a0d4dd";
|
||||
name = "league-mime-type-detection-a6dfb1194a2946fcdc1f38219445234f65b35c96";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd";
|
||||
sha256 = "1a63nvqd6cz3vck3y8vjswn6c3cfwh13p0cn0ci5pqdf0bgjvvfz";
|
||||
url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96";
|
||||
sha256 = "14yylg4lyyc522kpzlcby1zhfs01d8xrcc4rqvyink0ry8az12jj";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -385,10 +385,10 @@ let
|
|||
"masterminds/html5" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "masterminds-html5-3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3";
|
||||
name = "masterminds-html5-f47dcf3c70c584de14f21143c55d9939631bc6cf";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/Masterminds/html5-php/zipball/3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3";
|
||||
sha256 = "19gkv95lzsqwwxlvhi4pk7a2nvl29jdga9mrh43387z9nakzddp4";
|
||||
url = "https://api.github.com/repos/Masterminds/html5-php/zipball/f47dcf3c70c584de14f21143c55d9939631bc6cf";
|
||||
sha256 = "1n2xiyxqmxk9g34wn1lg2yyivwg2ry8iqk8m7g2432gm97rmyb20";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -415,40 +415,40 @@ let
|
|||
"nesbot/carbon" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "nesbot-carbon-4f991ed2a403c85efbc4f23eb4030063fdbe01da";
|
||||
name = "nesbot-carbon-4308217830e4ca445583a37d1bf4aff4153fa81c";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/4f991ed2a403c85efbc4f23eb4030063fdbe01da";
|
||||
sha256 = "09k9ljqwn6qsr5z7wp2yv8p0vqr4hn03lyxvm76xm2g6wb6l43gp";
|
||||
url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/4308217830e4ca445583a37d1bf4aff4153fa81c";
|
||||
sha256 = "1ycjj9d107nbv390qqm9phmhvc1slxl0pa2dzf8lhmcif58863vb";
|
||||
};
|
||||
};
|
||||
};
|
||||
"nette/schema" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "nette-schema-abbdbb70e0245d5f3bf77874cea1dfb0c930d06f";
|
||||
name = "nette-schema-c9ff517a53903b3d4e29ec547fb20feecb05b8ab";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f";
|
||||
sha256 = "16i8gim0jpmmbq0pp4faw8kn2448yvpgsd1zvipbv9xrk37vah5q";
|
||||
url = "https://api.github.com/repos/nette/schema/zipball/c9ff517a53903b3d4e29ec547fb20feecb05b8ab";
|
||||
sha256 = "1b7xhxdm2hxm5m0b3d2sv2rhw5986bqkxfl9k7mqdfka78mpvmlx";
|
||||
};
|
||||
};
|
||||
};
|
||||
"nette/utils" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "nette-utils-cacdbf5a91a657ede665c541eda28941d4b09c1e";
|
||||
name = "nette-utils-9124157137da01b1f5a5a22d6486cb975f26db7e";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/nette/utils/zipball/cacdbf5a91a657ede665c541eda28941d4b09c1e";
|
||||
sha256 = "0v3as5xdmr9j7d4q4ly18f7g8g0sjcy25l4ispsdp60byldi7m8h";
|
||||
url = "https://api.github.com/repos/nette/utils/zipball/9124157137da01b1f5a5a22d6486cb975f26db7e";
|
||||
sha256 = "0ly27z4m2w9h24kssjc5x4rhksw5hd9nwjzxnzmxrz7kvh7068gd";
|
||||
};
|
||||
};
|
||||
};
|
||||
"nikic/php-parser" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "nikic-php-parser-19526a33fb561ef417e822e85f08a00db4059c17";
|
||||
name = "nikic-php-parser-a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17";
|
||||
sha256 = "13rmjg186nz0w63hjbwbs55nxb999msjin268s9h56w8zc5ki0sy";
|
||||
url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d";
|
||||
sha256 = "0a5a6fzgvcgxn5kc1mxa5grxmm8c1ax91pjr3gxpkji7nyc1zh1y";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -525,10 +525,10 @@ let
|
|||
"phpseclib/phpseclib" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "phpseclib-phpseclib-543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67";
|
||||
name = "phpseclib-phpseclib-4580645d3fc05c189024eb3b834c6c1e4f0f30a1";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67";
|
||||
sha256 = "108bb1lz9c1nxq8f1rkzi75h3xwa9lpvnayg7pph92x18g98ks9l";
|
||||
url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/4580645d3fc05c189024eb3b834c6c1e4f0f30a1";
|
||||
sha256 = "0v3c7n9h99pw4f03bfxjsgni7wpq7xr47nw2hf2hq8yjndw19n3p";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -545,10 +545,10 @@ let
|
|||
"predis/predis" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "predis-predis-33b70b971a32b0d28b4f748b0547593dce316e0d";
|
||||
name = "predis-predis-5f2b410a74afaff296a87a494e4c5488cf9fab57";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/predis/predis/zipball/33b70b971a32b0d28b4f748b0547593dce316e0d";
|
||||
sha256 = "0qlz42vsqzqnwg0cmdgxgb35k6gab5vs53dg87qsihi0n3rfj9ar";
|
||||
url = "https://api.github.com/repos/predis/predis/zipball/5f2b410a74afaff296a87a494e4c5488cf9fab57";
|
||||
sha256 = "02bf6w5vrzxmd6zzzlgr31g5fbf8k5yyk9gj00a1ql09ndyx51sn";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -562,6 +562,16 @@ let
|
|||
};
|
||||
};
|
||||
};
|
||||
"psr/clock" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "psr-clock-e41a24703d4560fd0acb709162f73b8adfc3aa0d";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d";
|
||||
sha256 = "0wz5b8hgkxn3jg88cb3901hj71axsj0fil6pwl413igghch6i8kj";
|
||||
};
|
||||
};
|
||||
};
|
||||
"psr/container" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
|
|
@ -635,10 +645,10 @@ let
|
|||
"psy/psysh" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "psy-psysh-4f00ee9e236fa6a48f4560d1300b9c961a70a7ec";
|
||||
name = "psy-psysh-0fa27040553d1d280a67a4393194df5228afea5b";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec";
|
||||
sha256 = "10754cxjwjf818g7i3vyd4jk0sy8r3i36jxpqk38n70ckasdd7w0";
|
||||
url = "https://api.github.com/repos/bobthecow/psysh/zipball/0fa27040553d1d280a67a4393194df5228afea5b";
|
||||
sha256 = "1as5sp2vi6873in83qnxq6iiad9qd9zsladw4smid8nlvgkpajfz";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -695,10 +705,10 @@ let
|
|||
"socialiteproviders/discord" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "socialiteproviders-discord-11f6a8ded5b1948723886f2e5413b91139fcce6b";
|
||||
name = "socialiteproviders-discord-c71c379acfdca5ba4aa65a3db5ae5222852a919c";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/SocialiteProviders/Discord/zipball/11f6a8ded5b1948723886f2e5413b91139fcce6b";
|
||||
sha256 = "1jc64flz7djp8i87fp3xi6q80m6bp069gbq1mh44g82qnky4jp1h";
|
||||
url = "https://api.github.com/repos/SocialiteProviders/Discord/zipball/c71c379acfdca5ba4aa65a3db5ae5222852a919c";
|
||||
sha256 = "0xly514yax8rlz91pp86s24apcam1cvjnphanjhdshd42hmpwr7w";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -735,10 +745,10 @@ let
|
|||
"socialiteproviders/okta" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "socialiteproviders-okta-7c0b7522423943131f680e74123b71ccd3989541";
|
||||
name = "socialiteproviders-okta-e5fb62035bfa0ccdbc8facf4cf205428fc502edb";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/SocialiteProviders/Okta/zipball/7c0b7522423943131f680e74123b71ccd3989541";
|
||||
sha256 = "1hly2f06k6jxjxz36swa3b0g285ni556k3wz089f3lxyrnhwnkdf";
|
||||
url = "https://api.github.com/repos/SocialiteProviders/Okta/zipball/e5fb62035bfa0ccdbc8facf4cf205428fc502edb";
|
||||
sha256 = "0lrinkzlf39yr990n5dzn6slpgihrkh970dfz3m8ddcgwa04rw2m";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dolibarr";
|
||||
version = "17.0.3";
|
||||
version = "18.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dolibarr";
|
||||
repo = "dolibarr";
|
||||
rev = version;
|
||||
sha256 = "sha256-RpmeBoFY2TyYTpHLG2Kx5FezUHzwukj1+SfZhQOqxqU=";
|
||||
sha256 = "sha256-vOHspLYH0hB2aPVzfTqHzKdHFScyxFez5kHozAiokBo=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -12,20 +12,20 @@
|
|||
|
||||
let
|
||||
pname = "plausible";
|
||||
version = "1.4.4";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plausible";
|
||||
repo = "analytics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Exwy+LEafDZITriXiIbc60j555gHy1+hnNKkTxorfLI=";
|
||||
hash = "sha256-KcIZMsWlKGCZFi7DrTS8JMWEahdERoExtpBj+7Ec+FQ=";
|
||||
};
|
||||
|
||||
# TODO consider using `mix2nix` as soon as it supports git dependencies.
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
pname = "${pname}-deps";
|
||||
inherit src version;
|
||||
hash = "sha256-ZQfrTxsLzCWFf3vabOk0vyHWZLw69GJovm3vR+7UbMY=";
|
||||
hash = "sha256-rLkD2FuNFKU3nB8FT/qPgSVP8H60qEmHtPvcdw4JUF8=";
|
||||
};
|
||||
|
||||
yarnDeps = mkYarnModules {
|
||||
|
|
@ -54,11 +54,14 @@ beamPackages.mixRelease {
|
|||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lib/plausible_release.ex --replace 'defp prepare do' 'def prepare do'
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
export NODE_OPTIONS=--openssl-legacy-provider # required for webpack compatibility with OpenSSL 3 (https://github.com/webpack/webpack/issues/14532)
|
||||
ln -sf ${yarnDeps}/node_modules assets/node_modules
|
||||
substituteInPlace assets/package.json --replace '$(npm bin)/' 'npx '
|
||||
npm run deploy --prefix ./assets
|
||||
|
||||
# for external task you need a workaround for the no deps check flag
|
||||
|
|
|
|||
|
|
@ -1,21 +1,24 @@
|
|||
{
|
||||
"repository": {},
|
||||
"license": "MIT",
|
||||
"version": "v1.5.1",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"scripts": {
|
||||
"deploy": "$(npm bin)/webpack --mode production",
|
||||
"watch": "$(npm bin)/webpack --mode development --watch",
|
||||
"format": "$(npm bin)/prettier --write {css,js}/**",
|
||||
"check-format": "$(npm bin)/prettier --check {css,js}/**",
|
||||
"lint": "$(npm bin)/eslint js/**"
|
||||
"deploy": "webpack --mode production",
|
||||
"watch": "webpack --mode development --watch",
|
||||
"format": "prettier --write {css,js}/**",
|
||||
"check-format": "prettier --check {css,js}/**",
|
||||
"lint": "eslint js/**",
|
||||
"bundlemon": "bundlemon"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.14.3",
|
||||
"@babel/preset-env": "^7.14.4",
|
||||
"@babel/preset-react": "^7.13.13",
|
||||
"@headlessui/react": "^1.3.0",
|
||||
"@heroicons/react": "^1.0.1",
|
||||
"@heroicons/react": "^2.0.11",
|
||||
"@juggle/resize-observer": "^3.3.1",
|
||||
"@kunukn/react-collapse": "^2.2.9",
|
||||
"@popperjs/core": "^2.11.6",
|
||||
"@tailwindcss/aspect-ratio": "^0.2.1",
|
||||
"@tailwindcss/forms": "^0.3.2",
|
||||
"@tailwindcss/typography": "^0.4.1",
|
||||
|
|
@ -27,20 +30,21 @@
|
|||
"classnames": "^2.3.1",
|
||||
"copy-webpack-plugin": "^9.0.0",
|
||||
"css-loader": "^5.2.6",
|
||||
"css-minimizer-webpack-plugin": "^3.0.1",
|
||||
"css-minimizer-webpack-plugin": "^3.2.0",
|
||||
"datamaps": "^0.5.9",
|
||||
"debounce-promise": "^3.1.2",
|
||||
"downshift": "^6.1.3",
|
||||
"iframe-resizer": "^4.3.2",
|
||||
"mini-css-extract-plugin": "^1.6.0",
|
||||
"phoenix": "file:../../tmp/deps/phoenix",
|
||||
"phoenix_html": "file:../../tmp/deps/phoenix_html",
|
||||
"phoenix": "1.5.0",
|
||||
"phoenix_html": "2.12",
|
||||
"postcss": "^8.3.0",
|
||||
"postcss-loader": "^6.1.1",
|
||||
"react": "^16.13.1",
|
||||
"react-dom": "^16.13.1",
|
||||
"react-flatpickr": "3.10.5",
|
||||
"react-flip-move": "^3.0.4",
|
||||
"react-popper": "^2.3.0",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-transition-group": "^4.4.2",
|
||||
"tailwindcss": "^2.1.2",
|
||||
|
|
@ -51,18 +55,18 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"babel-eslint": "^10.1.0",
|
||||
"bundlemon": "^1.4.0",
|
||||
"eslint": "^7.2.0",
|
||||
"eslint-config-prettier": "^7.0.0",
|
||||
"eslint-plugin-import": "^2.22.1",
|
||||
"eslint-plugin-import": "^2.26.0",
|
||||
"eslint-plugin-jsx-a11y": "^6.4.1",
|
||||
"eslint-plugin-prettier": "^3.3.0",
|
||||
"eslint-plugin-react": "^7.21.5",
|
||||
"eslint-plugin-react-hooks": "^4.2.0",
|
||||
"stylelint": "^13.8.0",
|
||||
"stylelint-config-prettier": "^8.0.2",
|
||||
"stylelint-config-standard": "^20.0.0",
|
||||
"stylelint": "^14.1.0",
|
||||
"stylelint-config-prettier": "^9.0.3",
|
||||
"stylelint-config-standard": "^24.0.0",
|
||||
"webpack-bundle-analyzer": "^4.4.2"
|
||||
},
|
||||
"name": "plausible",
|
||||
"version": "v1.4.4"
|
||||
"name": "plausible"
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, glib, fetchFromGitHub, networkmanager, python3Packages
|
||||
, gobject-introspection }:
|
||||
, gobject-introspection, procps }:
|
||||
|
||||
let inherit (python3Packages) python pygobject3;
|
||||
in stdenv.mkDerivation rec {
|
||||
|
|
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
buildInputs = [ glib python pygobject3 networkmanager python3Packages.wrapPython ];
|
||||
buildInputs = [ glib python pygobject3 networkmanager python3Packages.wrapPython procps ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "arti";
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
|
|
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "core";
|
||||
repo = "arti";
|
||||
rev = "arti-v${version}";
|
||||
sha256 = "sha256-RUBSF6zG+LpBopnCo/mj+Sr+iFz95Ce0p0/RNIOuRCg=";
|
||||
sha256 = "sha256-+Y41jhMEzcNyA9U0zsvVyR9f1dEV94hFNR8SxiJ6hCk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ngIrAaQY3aWPridH67ZKACbFRkP8BeZ1W1wji6IPBAA=";
|
||||
cargoHash = "sha256-MF2WPUs0MvhN3MSmey7ziPPwZz8zkn2D3G2WDgXn+hs=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,18 @@
|
|||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ssh-audit";
|
||||
version = "2.9.0";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtesta";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WrED2cSoqR276iOma+pZq/Uu1vQWJmtJvsI73r8ivJA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-+v+DLZPDC5uffTIJPzMvY/nLoy7BGiAsTddjNZZhTpo=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
|
|
@ -18,6 +22,7 @@ python3Packages.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "Tool for ssh server auditing";
|
||||
homepage = "https://github.com/jtesta/ssh-audit";
|
||||
changelog = "https://github.com/jtesta/ssh-audit/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ tv SuperSandro2000 ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sslscan";
|
||||
version = "2.0.16";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rbsec";
|
||||
repo = "sslscan";
|
||||
rev = version;
|
||||
sha256 = "sha256-1j5p9cuSxc8u6/+puP9ywHEljeva18m+WO3M8gbpkIU=";
|
||||
sha256 = "sha256-sEWWmfTdzqDoTyERoJUZ1/xqeRFcshc72mXzecij4TI=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swayr";
|
||||
version = "0.26.1";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~tsdh";
|
||||
repo = "swayr";
|
||||
rev = "swayr-${version}";
|
||||
sha256 = "sha256-8Z83VW45Sb29PUE5oyJdELD25tAKkcr0zXfZDgkNikk=";
|
||||
sha256 = "sha256-FvlBpBBvmivrnHaKYPxmRAE+PCfTxWS+tYYAFjq8Q6I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QgzKmbYEmUr3qwSp58/dYwwz2tJeoJlMZfrp1vB0zjo=";
|
||||
cargoHash = "sha256-Ux0Tx5+manPNUUtiCBo7FCMrBYwwUggrdpitywQ7MPk=";
|
||||
|
||||
patches = [
|
||||
./icon-paths.patch
|
||||
|
|
@ -24,11 +24,12 @@ rustPlatform.buildRustPackage rec {
|
|||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "A window switcher (and more) for sway";
|
||||
homepage = "https://git.sr.ht/~tsdh/swayr";
|
||||
license = with licenses; [ gpl3Plus ];
|
||||
maintainers = with maintainers; [ artturin ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "swayr";
|
||||
maintainers = with lib.maintainers; [ artturin ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11090,6 +11090,8 @@ with pkgs;
|
|||
|
||||
netlify-cli = callPackage ../development/web/netlify-cli { };
|
||||
|
||||
netlistsvg = callPackage ../applications/science/logic/netlistsvg { };
|
||||
|
||||
netpbm = callPackage ../tools/graphics/netpbm { };
|
||||
|
||||
netproc = callPackage ../tools/networking/netproc { };
|
||||
|
|
@ -14036,6 +14038,8 @@ with pkgs;
|
|||
|
||||
transifex-cli = callPackage ../applications/misc/transifex-cli { };
|
||||
|
||||
translatelocally = callPackage ../applications/misc/translatelocally { };
|
||||
|
||||
translate-shell = callPackage ../applications/misc/translate-shell { };
|
||||
|
||||
translatepy = with python3.pkgs; toPythonApplication translatepy;
|
||||
|
|
@ -20093,6 +20097,8 @@ with pkgs;
|
|||
|
||||
redis-plus-plus = callPackage ../development/libraries/redis-plus-plus { };
|
||||
|
||||
redisinsight = callPackage ../development/tools/redisinsight { };
|
||||
|
||||
redo = callPackage ../development/tools/build-managers/redo { };
|
||||
|
||||
redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { };
|
||||
|
|
@ -20130,7 +20136,9 @@ with pkgs;
|
|||
withPEPatterns = true;
|
||||
};
|
||||
|
||||
reviewdog = callPackage ../development/tools/misc/reviewdog { };
|
||||
reviewdog = callPackage ../development/tools/misc/reviewdog {
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
|
||||
revive = callPackage ../development/tools/revive { };
|
||||
|
||||
|
|
@ -20346,6 +20354,8 @@ with pkgs;
|
|||
|
||||
supabase-cli = callPackage ../development/tools/supabase-cli { };
|
||||
|
||||
surge-cli = callPackage ../development/tools/surge-cli { };
|
||||
|
||||
svlint = callPackage ../development/tools/analysis/svlint { };
|
||||
|
||||
swarm = callPackage ../development/tools/analysis/swarm { };
|
||||
|
|
@ -32644,6 +32654,8 @@ with pkgs;
|
|||
|
||||
hugo = callPackage ../applications/misc/hugo { };
|
||||
|
||||
ghosttohugo = callPackage ../applications/misc/ghosttohugo {};
|
||||
|
||||
gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { };
|
||||
|
||||
go-org = callPackage ../applications/misc/go-org { };
|
||||
|
|
@ -37515,7 +37527,10 @@ with pkgs;
|
|||
|
||||
gotypist = callPackage ../games/gotypist { };
|
||||
|
||||
heroic-unwrapped = callPackage ../games/heroic { };
|
||||
heroic-unwrapped = callPackage ../games/heroic {
|
||||
# Match the version used by the upstream package.
|
||||
electron = electron_24;
|
||||
};
|
||||
|
||||
heroic = callPackage ../games/heroic/fhsenv.nix { };
|
||||
|
||||
|
|
|
|||
|
|
@ -10568,7 +10568,7 @@ self: super: with self; {
|
|||
python-roborock = callPackage ../development/python-modules/python-roborock { };
|
||||
|
||||
python-rtmidi = callPackage ../development/python-modules/python-rtmidi {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Foundation;
|
||||
};
|
||||
|
||||
python-sat = callPackage ../development/python-modules/python-sat { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue