Merge remote-tracking branch 'upstream/master' into staging-next

This commit is contained in:
annalee 2024-03-13 00:38:07 +00:00
commit 8e038835fe
No known key found for this signature in database
157 changed files with 6500 additions and 6545 deletions

View File

@ -4,6 +4,7 @@ import base64
import binascii import binascii
import json import json
import pathlib import pathlib
from typing import Optional
from urllib.parse import urlparse from urllib.parse import urlparse
import bs4 import bs4
@ -57,19 +58,26 @@ def to_sri(hash):
), ),
default=pathlib.Path(__file__).parent.parent.parent.parent default=pathlib.Path(__file__).parent.parent.parent.parent
) )
def main(set: str, version: str, nixpkgs: pathlib.Path): @click.option(
"--sources-url",
type=str,
default=None,
)
def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[str]):
root_dir = nixpkgs / "pkgs/kde" root_dir = nixpkgs / "pkgs/kde"
set_dir = root_dir / set set_dir = root_dir / set
generated_dir = root_dir / "generated" generated_dir = root_dir / "generated"
metadata = utils.KDERepoMetadata.from_json(generated_dir) metadata = utils.KDERepoMetadata.from_json(generated_dir)
if sources_url is None:
set_url = { set_url = {
"frameworks": "kf", "frameworks": "kf",
"gear": "releases", "gear": "releases",
"plasma": "plasma", "plasma": "plasma",
}[set] }[set]
sources_url = f"https://kde.org/info/sources/source-{set_url}-{version}.html"
sources = httpx.get(f"https://kde.org/info/sources/source-{set_url}-{version}.html") sources = httpx.get(sources_url)
sources.raise_for_status() sources.raise_for_status()
bs = bs4.BeautifulSoup(sources.text, features="html.parser") bs = bs4.BeautifulSoup(sources.text, features="html.parser")

View File

@ -42,6 +42,12 @@ In addition to numerous new and upgraded packages, this release has the followin
- A new option `system.etc.overlay.enable` was added. If enabled, `/etc` is - A new option `system.etc.overlay.enable` was added. If enabled, `/etc` is
mounted via an overlayfs instead of being created by a custom perl script. mounted via an overlayfs instead of being created by a custom perl script.
- NixOS AMIs are now uploaded regularly to a new AWS Account.
Instructions on how to use them can be found on <https://nixos.github.io/amis>.
We are working on integration the data into the NixOS homepage.
The list in `nixos/modules/virtualisation/amazon-ec2-amis.nix` will stop
being updated and will be removed in the future.
- It is now possible to have a completely perlless system (i.e. a system - It is now possible to have a completely perlless system (i.e. a system
without perl). Previously, the NixOS activation depended on two perl scripts without perl). Previously, the NixOS activation depended on two perl scripts
which can now be replaced via an opt-in mechanism. To make your system which can now be replaced via an opt-in mechanism. To make your system
@ -131,6 +137,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
[v0.31](https://github.com/derailed/k9s/releases/tag/v0.31.0) for details. It is recommended [v0.31](https://github.com/derailed/k9s/releases/tag/v0.31.0) for details. It is recommended
to back up your current configuration and let k9s recreate the new base configuration. to back up your current configuration and let k9s recreate the new base configuration.
- NixOS AMIs are now uploaded regularly to a new AWS Account.
Instructions on how to use them can be found on <https://nixos.github.io/amis>.
We are working on integration the data into the NixOS homepage.
The list in `nixos/modules/virtualisation/amazon-ec2-amis.nix` will stop
being updated and will be removed in the future.
- The option `services.postgresql.ensureUsers._.ensurePermissions` has been removed as it's - The option `services.postgresql.ensureUsers._.ensurePermissions` has been removed as it's
not declarative and is broken with newer postgresql versions. Consider using not declarative and is broken with newer postgresql versions. Consider using
[](#opt-services.postgresql.ensureUsers._.ensureDBOwnership) [](#opt-services.postgresql.ensureUsers._.ensureDBOwnership)

View File

@ -56,6 +56,16 @@ in {
description = lib.mdDoc "Set the host to bind on."; description = lib.mdDoc "Set the host to bind on.";
default = "127.0.0.1"; default = "127.0.0.1";
}; };
extraOptions = mkOption {
type = types.listOf types.str;
default = [];
example = [ "--no-security-headers" ];
description = lib.mdDoc ''
Additional command-line arguments to pass to
{command}`hoogle server`
'';
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -66,7 +76,10 @@ in {
serviceConfig = { serviceConfig = {
Restart = "always"; Restart = "always";
ExecStart = ''${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home} --host ${cfg.host}''; ExecStart = ''
${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home} --host ${cfg.host} \
${concatStringsSep " " cfg.extraOptions}
'';
DynamicUser = true; DynamicUser = true;

View File

@ -33,7 +33,7 @@ let
sendversion=${boolToString cfg.sendVersion} sendversion=${boolToString cfg.sendVersion}
${optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"} ${optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"}
${optionalString (cfg.registerPassword == "") "registerPassword=${cfg.registerPassword}"} ${optionalString (cfg.registerPassword != "") "registerPassword=${cfg.registerPassword}"}
${optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"} ${optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"}
${optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"} ${optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}

View File

@ -1,3 +1,6 @@
# NOTE: this file will stop being updated.
# please use https://nixos.github.io/amis/ and https://nixos.github.io/amis/images.json
# instead.
let self = { let self = {
"14.04".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-71c6f470"; "14.04".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-71c6f470";
"14.04".ap-northeast-1.x86_64-linux.pv-ebs = "ami-4dcbf84c"; "14.04".ap-northeast-1.x86_64-linux.pv-ebs = "ami-4dcbf84c";
@ -584,5 +587,68 @@ let self = {
"23.05".us-west-1.aarch64-linux.hvm-ebs = "ami-0e75c8f3deb1f842b"; "23.05".us-west-1.aarch64-linux.hvm-ebs = "ami-0e75c8f3deb1f842b";
"23.05".us-west-2.aarch64-linux.hvm-ebs = "ami-0d0979d889078d036"; "23.05".us-west-2.aarch64-linux.hvm-ebs = "ami-0d0979d889078d036";
latest = self."23.05";
# 23.11.4976.79baff8812a0
"23.11".eu-north-1.x86_64-linux.hvm-ebs = "ami-00e64007071666b9e";
"23.11".ap-south-2.x86_64-linux.hvm-ebs = "ami-0bbb8e5663f912455";
"23.11".ap-south-1.x86_64-linux.hvm-ebs = "ami-057ec482a7bc9cb87";
"23.11".eu-south-1.x86_64-linux.hvm-ebs = "ami-083f9740e86ab36b9";
"23.11".eu-south-2.x86_64-linux.hvm-ebs = "ami-0686a9ef630e6eeef";
"23.11".me-central-1.x86_64-linux.hvm-ebs = "ami-0475d5925ff0390f8";
"23.11".il-central-1.x86_64-linux.hvm-ebs = "ami-0997e21a353de1226";
"23.11".ca-central-1.x86_64-linux.hvm-ebs = "ami-0f9fc310496ea54ec";
"23.11".eu-central-1.x86_64-linux.hvm-ebs = "ami-0923e79b6f9b198fa";
"23.11".eu-central-2.x86_64-linux.hvm-ebs = "ami-0b02e6421cde609ff";
"23.11".us-west-1.x86_64-linux.hvm-ebs = "ami-0e94c086e49480566";
"23.11".us-west-2.x86_64-linux.hvm-ebs = "ami-0a2f8942a90eb233a";
"23.11".af-south-1.x86_64-linux.hvm-ebs = "ami-0c9ff564e4a503c56";
"23.11".eu-west-3.x86_64-linux.hvm-ebs = "ami-0955d4d89c446d5ff";
"23.11".eu-west-2.x86_64-linux.hvm-ebs = "ami-0c5834d32e6dce6c8";
"23.11".eu-west-1.x86_64-linux.hvm-ebs = "ami-0e7d1823ac80520e6";
"23.11".ap-northeast-3.x86_64-linux.hvm-ebs = "ami-06b3692ef87ef308a";
"23.11".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0fb1e23007bdc6083";
"23.11".me-south-1.x86_64-linux.hvm-ebs = "ami-0a4beeb2fc744c149";
"23.11".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0f60ab2288ac784c3";
"23.11".sa-east-1.x86_64-linux.hvm-ebs = "ami-058779e1d5c1cc6ae";
"23.11".ap-east-1.x86_64-linux.hvm-ebs = "ami-039879f1b367e167f";
"23.11".ca-west-1.x86_64-linux.hvm-ebs = "ami-07dc9bc5645a981f1";
"23.11".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0ee92af1fc4c4e5f3";
"23.11".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0814092ef52275887";
"23.11".ap-southeast-3.x86_64-linux.hvm-ebs = "ami-0d20b4b6529b6214c";
"23.11".ap-southeast-4.x86_64-linux.hvm-ebs = "ami-0aa7b8aa04e5ec741";
"23.11".us-east-1.x86_64-linux.hvm-ebs = "ami-0c2e37dc938ed9405";
"23.11".us-east-2.x86_64-linux.hvm-ebs = "ami-05c218c4a08c58296";
"23.11".eu-north-1.aarch64-linux.hvm-ebs = "ami-05e68ac90786e5ac0";
"23.11".ap-south-2.aarch64-linux.hvm-ebs = "ami-0a53356d3176a82af";
"23.11".ap-south-1.aarch64-linux.hvm-ebs = "ami-0cc335be202b53954";
"23.11".eu-south-1.aarch64-linux.hvm-ebs = "ami-05d387849385390c0";
"23.11".eu-south-2.aarch64-linux.hvm-ebs = "ami-0193deb9aa4b398bb";
"23.11".me-central-1.aarch64-linux.hvm-ebs = "ami-05bd96550451e131d";
"23.11".il-central-1.aarch64-linux.hvm-ebs = "ami-0264204c502a16f49";
"23.11".ca-central-1.aarch64-linux.hvm-ebs = "ami-08345537f80791b3c";
"23.11".eu-central-1.aarch64-linux.hvm-ebs = "ami-03b257130b2b01000";
"23.11".eu-central-2.aarch64-linux.hvm-ebs = "ami-0b4412d8a4d3fb7ae";
"23.11".us-west-1.aarch64-linux.hvm-ebs = "ami-0a2d70cd7a3b03e24";
"23.11".us-west-2.aarch64-linux.hvm-ebs = "ami-01b8e062c74311de0";
"23.11".af-south-1.aarch64-linux.hvm-ebs = "ami-011c296fee301596b";
"23.11".eu-west-3.aarch64-linux.hvm-ebs = "ami-024531ee8546d7ec7";
"23.11".eu-west-2.aarch64-linux.hvm-ebs = "ami-0a5dda5cf7e00b39b";
"23.11".eu-west-1.aarch64-linux.hvm-ebs = "ami-013f7a51b602dec7d";
"23.11".ap-northeast-3.aarch64-linux.hvm-ebs = "ami-0220fc0e06979c6ff";
"23.11".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-0978048539bbad573";
"23.11".me-south-1.aarch64-linux.hvm-ebs = "ami-02057e1a9c901b506";
"23.11".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-05616e07e227f9982";
"23.11".sa-east-1.aarch64-linux.hvm-ebs = "ami-0bf5255283cec803b";
"23.11".ap-east-1.aarch64-linux.hvm-ebs = "ami-00432470e52956e49";
"23.11".ca-west-1.aarch64-linux.hvm-ebs = "ami-0675649785473e1ac";
"23.11".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-006494f0fa381ba53";
"23.11".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-0d8c15d68266d6881";
"23.11".ap-southeast-3.aarch64-linux.hvm-ebs = "ami-0db38da4ed78d2a10";
"23.11".ap-southeast-4.aarch64-linux.hvm-ebs = "ami-098b3b942486b5e71";
"23.11".us-east-1.aarch64-linux.hvm-ebs = "ami-02d1d66bda50b9036";
"23.11".us-east-2.aarch64-linux.hvm-ebs = "ami-0aa62457617706386";
latest = self."23.11";
}; in self }; in self

View File

@ -640,6 +640,7 @@ in {
nzbget = handleTest ./nzbget.nix {}; nzbget = handleTest ./nzbget.nix {};
nzbhydra2 = handleTest ./nzbhydra2.nix {}; nzbhydra2 = handleTest ./nzbhydra2.nix {};
oh-my-zsh = handleTest ./oh-my-zsh.nix {}; oh-my-zsh = handleTest ./oh-my-zsh.nix {};
ollama = handleTest ./ollama.nix {};
ombi = handleTest ./ombi.nix {}; ombi = handleTest ./ombi.nix {};
openarena = handleTest ./openarena.nix {}; openarena = handleTest ./openarena.nix {};
openldap = handleTest ./openldap.nix {}; openldap = handleTest ./openldap.nix {};

56
nixos/tests/ollama.nix Normal file
View File

@ -0,0 +1,56 @@
import ./make-test-python.nix ({ pkgs, lib, ... }:
let
mainPort = "11434";
altPort = "11435";
curlRequest = port: request:
"curl http://127.0.0.1:${port}/api/generate -d '${builtins.toJSON request}'";
prompt = {
model = "tinydolphin";
prompt = "lorem ipsum";
options = {
seed = 69;
temperature = 0;
};
};
in
{
name = "ollama";
meta = with lib.maintainers; {
maintainers = [ abysssol ];
};
nodes = {
cpu = { ... }: {
services.ollama.enable = true;
};
rocm = { ... }: {
services.ollama.enable = true;
services.ollama.acceleration = "rocm";
};
cuda = { ... }: {
services.ollama.enable = true;
services.ollama.acceleration = "cuda";
};
altAddress = { ... }: {
services.ollama.enable = true;
services.ollama.listenAddress = "127.0.0.1:${altPort}";
};
};
testScript = ''
vms = [ cpu, rocm, cuda, altAddress ];
start_all()
for vm in vms:
vm.wait_for_unit("multi-user.target")
stdout = cpu.succeed("""${curlRequest mainPort prompt}""", timeout=100)
stdout = altAddress.succeed("""${curlRequest altPort prompt}""", timeout=100)
'';
})

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snd"; pname = "snd";
version = "24.1"; version = "24.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
sha256 = "sha256-hC6GddYjBD6p4zwHD3fCvZZLwpRiNKOb6aaHstRhA1M="; sha256 = "sha256-1ngnhOpPaRGH3xmiA7cUfVDqlJM1ZC+XfeSiV8vcdls=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View File

@ -1,59 +0,0 @@
{ lib, stdenv , fetchFromGitHub
, pkg-config, autoreconfHook
, db5, openssl, boost, zlib, miniupnpc, libevent
, protobuf, qtbase ? null
, wrapQtAppsHook ? null, qttools ? null, qmake ? null, qrencode
, withGui, withUpnp ? true, withUtils ? true, withWallet ? true
, withZmq ? true, zeromq, util-linux ? null, Cocoa ? null }:
stdenv.mkDerivation rec {
pname = "dogecoin" + lib.optionalString (!withGui) "d";
version = "1.14.6";
src = fetchFromGitHub {
owner = "dogecoin";
repo = "dogecoin";
rev = "v${version}";
sha256 = "sha256-PmbmmA2Mq07dwB3cI7A9c/ewtu0I+sWvQT39Yekm/sU=";
};
preConfigure = lib.optionalString withGui ''
export LRELEASE=${lib.getDev qttools}/bin/lrelease
'';
nativeBuildInputs = [ pkg-config autoreconfHook util-linux ]
++ lib.optionals withGui [ wrapQtAppsHook qttools ];
buildInputs = [ openssl protobuf boost zlib libevent ]
++ lib.optionals withGui [ qtbase qrencode ]
++ lib.optionals withUpnp [ miniupnpc ]
++ lib.optionals withWallet [ db5 ]
++ lib.optionals withZmq [ zeromq ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
configureFlags = [
"--with-incompatible-bdb"
"--with-boost-libdir=${boost.out}/lib"
] ++ lib.optionals (!withGui) [ "--with-gui=no" ]
++ lib.optionals (!withUpnp) [ "--without-miniupnpc" ]
++ lib.optionals (!withUtils) [ "--without-utils" ]
++ lib.optionals (!withWallet) [ "--disable-wallet" ]
++ lib.optionals (!withZmq) [ "--disable-zmq" ];
enableParallelBuilding = true;
meta = with lib; {
description = "Wow, such coin, much shiba, very rich";
longDescription = ''
Dogecoin is a decentralized, peer-to-peer digital currency that
enables you to easily send money online. Think of it as "the
internet currency."
It is named after a famous Internet meme, the "Doge" - a Shiba Inu dog.
'';
homepage = "https://www.dogecoin.com/";
license = licenses.mit;
maintainers = with maintainers; [ edwtjo offline ];
platforms = platforms.unix;
broken = true;
};
}

View File

@ -2,10 +2,10 @@
let let
pname = "framesh"; pname = "framesh";
version = "0.6.8"; version = "0.6.9";
src = fetchurl { src = fetchurl {
url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage";
hash = "sha256-qTbT1g+9hypBUxRMZ/Eat5OGb1y6yJlxQ6iJzfQH8G4="; hash = "sha256-SsQIAg5DttvNJk1z+GJq4+e0Qa/j+VEKPV2bPA6+V8A=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

View File

@ -25,13 +25,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero-cli"; pname = "monero-cli";
version = "0.18.3.1"; version = "0.18.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero"; repo = "monero";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-PYcSbwbuQm6/r9RH+vjDy7NW1AiKhK/DG1pYYt4/drg="; hash = "sha256-iVxy5SKBowTd8tY1L/MrXAu3r2S7bv67up3qWf0xJiw=";
}; };
patches = [ patches = [

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero-gui"; pname = "monero-gui";
version = "0.18.3.1"; version = "0.18.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-1xgecaScGLFbv0V5QlpettdvCcb9+xu7eO/J9MyPzmY="; hash = "sha256-7/pJcEWc7zujegBnlRDMOfYpVuUDMGsQO805nYgN5PY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -5,11 +5,11 @@
let let
pname = "codux"; pname = "codux";
version = "15.21.0"; version = "15.22.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
sha256 = "sha256-NUIcHPXCEuR/ZlQuVCxDthZMksx1MtoOG/9koDXW/j8="; sha256 = "sha256-6UYWg018TumJVgZpLVLlkM+/sTqC6y0A7KVfiwn0hzw=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname version src; }; appimageContents = appimageTools.extractType2 { inherit pname version src; };

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "bemenu"; pname = "bemenu";
version = "0.6.19"; version = "0.6.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Cloudef"; owner = "Cloudef";
repo = finalAttrs.pname; repo = finalAttrs.pname;
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-k7xpMZUANacW/Qw7PSt+6XMPshSkmTHh/OGQlu7nmKY="; hash = "sha256-pXuaNhrXy33rZxk+qisFWpYj6w9QW3p3WmGtE1kHGII=";
}; };
strictDeps = true; strictDeps = true;

View File

@ -112,6 +112,11 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://projects.blender.org/blender/blender/commit/cf4365e555a759d5b3225bce77858374cb07faad.diff"; url = "https://projects.blender.org/blender/blender/commit/cf4365e555a759d5b3225bce77858374cb07faad.diff";
hash = "sha256-Nypd04yFSHYa7RBa8kNmoApqJrU4qpaOle3tkj44d4g="; hash = "sha256-Nypd04yFSHYa7RBa8kNmoApqJrU4qpaOle3tkj44d4g=";
}) })
(fetchpatch {
# https://projects.blender.org/blender/blender/issues/117145
url = "https://projects.blender.org/blender/blender/commit/eb99895c972b6c713294f68a34798aa51d36034a.patch";
hash = "sha256-95nG5mW408lhKJ2BppgaUwBMMeXeGyBqho6mCfB53GI=";
})
] ++ lib.optional stdenv.isDarwin ./darwin.patch; ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
postPatch = postPatch =

View File

@ -28,13 +28,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "bottles-unwrapped"; pname = "bottles-unwrapped";
version = "51.9"; version = "51.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bottlesdevs"; owner = "bottlesdevs";
repo = "bottles"; repo = "bottles";
rev = version; rev = version;
sha256 = "sha256-iZUszwVcbVn6Xsqou6crSp9gJBRmm5vEqxS87h/s3PQ="; sha256 = "sha256-uS3xmTu+LrVFX93bYcJvYjl6179d3IjpxLKrOXn8Z8Y=";
}; };
patches = [ patches = [

File diff suppressed because it is too large Load Diff

View File

@ -21,21 +21,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "done"; pname = "done";
version = "0.2.0"; version = "0.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "done-devs"; owner = "done-devs";
repo = "done"; repo = "done";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-97bWBayEyhCMjTxxxFVdO8V2pBZuVzss1Tp9/TnfDB0="; hash = "sha256-SbeP7PnJd7jjdXa9uDIAlMAJLOrYHqNP5p9gQclb6RU=";
}; };
cargoDeps = rustPlatform.importCargoLock { cargoDeps = rustPlatform.fetchCargoTarball {
lockFile = ./Cargo.lock; inherit src;
outputHashes = { name = "${pname}-${version}";
"directories-4.0.1" = "sha256-4M8WstNq5I7UduIUZI9q1R9oazp7MDBRBRBHZv6iGWI="; hash = "sha256-YJJGQR1tkK5z7vQQgkd8xPSqYhtiZIN+s9Xnwjn0z5A=";
"libset-0.1.2" = "sha256-+eA6pqafIYomXdlvwSzT/b/T4Je5HgPPmGL2M11VpMU=";
};
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -69,6 +67,7 @@ stdenv.mkDerivation rec {
homepage = "https://done.edfloreshz.dev/"; homepage = "https://done.edfloreshz.dev/";
changelog = "https://github.com/done-devs/done/blob/${src.rev}/CHANGES.md"; changelog = "https://github.com/done-devs/done/blob/${src.rev}/CHANGES.md";
license = licenses.mpl20; license = licenses.mpl20;
mainProgram = "done";
maintainers = with maintainers; [ figsoda ]; maintainers = with maintainers; [ figsoda ];
}; };
} }

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gimoji"; pname = "gimoji";
version = "1.0.0"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zeenix"; owner = "zeenix";
repo = "gimoji"; repo = "gimoji";
rev = version; rev = version;
hash = "sha256-O4rIla/vpei+N2TXB2eIrFAkOyguE9gCQgVptl2mn0w="; hash = "sha256-0mLFrFxMbX9Gl72W3EC7kfXHqDBo5QU+ut+1psntphY=";
}; };
cargoHash = "sha256-ne7b95snaoji3mF3yN6ZvTSnQxJvLT7jOMbh5U10YgU="; cargoHash = "sha256-pKHhYWEF9L0UX9hc2Ga3WOUWzISA8ONwn3rcI9u2/n0=";
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.AppKit

View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "otpclient"; pname = "otpclient";
version = "3.5.0"; version = "3.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paolostivanin"; owner = "paolostivanin";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-MiWEnyhHo6+3woWi4Vf75s+cfzJSPE0xdnvuPbsxrsc="; hash = "sha256-0BpdyZIUvDRGadomYRhEq5YLoPXsF9d3tewIi+q6wFs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "revanced-cli"; pname = "revanced-cli";
version = "4.4.1"; version = "4.4.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar"; url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar";
hash = "sha256-8uhKbEA3H8GY4ydefkLXAqCZdDIZANs3gZQGYyCUdOM="; hash = "sha256-zdkasyYwyPB6mPvRVMP3/UoaXdaRxAI8GyOxsCYBMEE=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View File

@ -1,20 +1,20 @@
{ lib { lib
, fetchurl , fetchurl
, undmg , _7zz
, stdenv , stdenv
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "tableplus"; pname = "tableplus";
version = "504"; version = "538";
src = fetchurl { src = fetchurl {
url = "https://download.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg"; url = "https://download.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg";
hash = "sha256-YFUquv71QFEnlmh93+HsFN6XtgoUx6CMOVqfdWAIWfo="; hash = "sha256-db3dvjEzkqWrEO+lXyImk0cVBkh8MnCwHOYKIg+kRC4=";
}; };
sourceRoot = "TablePlus.app"; sourceRoot = "TablePlus.app";
nativeBuildInputs = [ undmg ]; nativeBuildInputs = [ _7zz ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "toot"; pname = "toot";
version = "0.41.1"; version = "0.42.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ihabunek"; owner = "ihabunek";
repo = "toot"; repo = "toot";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-FwxA8YJzNKEK5WjdDi8PIufHh+SRVMRiFVIQs1iZ0UY="; sha256 = "sha256-FxA/loJzb/DBI1vWC71IFqdFcwjwIezhBJCGNeBzRoU=";
}; };
nativeCheckInputs = with python3Packages; [ pytest ]; nativeCheckInputs = with python3Packages; [ pytest ];

View File

@ -33,11 +33,11 @@
firefox-beta = buildMozillaMach rec { firefox-beta = buildMozillaMach rec {
pname = "firefox-beta"; pname = "firefox-beta";
version = "124.0b8"; version = "124.0b9";
applicationName = "Mozilla Firefox Beta"; applicationName = "Mozilla Firefox Beta";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "8f3564169be29a5456c2e3fee22c0fb7146caf4c13770a8c32dd9bcc667410a90135b634598fc243e088c1b078ab31470ceb2fc3557c13221414bf8ba518c67b"; sha512 = "1da2f0384719334bdef36293fe175850874dad3ee2e4edc97d7328e7967d19ebc7b241148d34d5e6108663dfb8282c3ed5bfbea734b797ce94c0c215d2e23051";
}; };
meta = { meta = {
@ -62,13 +62,13 @@
firefox-devedition = buildMozillaMach rec { firefox-devedition = buildMozillaMach rec {
pname = "firefox-devedition"; pname = "firefox-devedition";
version = "124.0b8"; version = "124.0b9";
applicationName = "Mozilla Firefox Developer Edition"; applicationName = "Mozilla Firefox Developer Edition";
requireSigning = false; requireSigning = false;
branding = "browser/branding/aurora"; branding = "browser/branding/aurora";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "7aa937b7d41fce7b8ccd3e33a68c7d85a05a2c6a8c3ff4891b8731e335c4ac3b03838c9056ac7fc1f28b5a0de04188c8126f6725a3d7f544f5854d53595688a6"; sha512 = "74460dcb68b895203752266f83243ca90328f5bad4745e9b435cfa403f0f7e5e8a367cad6c31dd970a51b008b0b88188790f64a943c1e6eecd9c6799d992c3d0";
}; };
meta = { meta = {

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "civo"; pname = "civo";
version = "1.0.75"; version = "1.0.76";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "civo"; owner = "civo";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ElhNxrbXywOWQmhgzM56NfGo7qOLn/Ju4/lOOoc5sDk="; sha256 = "sha256-Bk0YfW9KDliaJIqpVxCXTy7EiGGJPZTXcn6SFEmywRE=";
}; };
vendorHash = "sha256-oqitgYSL7nf2Lyne0c2vHOSOEG5uHPH9+3lgiROK2Yc="; vendorHash = "sha256-22n+ks1D65Gk2acCMHxgj19VHDf4B23ivqHfo3J45j0=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "yor"; pname = "yor";
version = "0.1.190"; version = "0.1.191";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bridgecrewio"; owner = "bridgecrewio";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-1CofTfH7PffncLsa8Ho/fY+R6oaefUld3x84oeD5Bbo="; hash = "sha256-gqtvaAt2iIkKXHO7X2hiTqAdao7t6fZhl11089D2wdM=";
}; };
vendorHash = "sha256-iUBajZv9BHQm0kHJGK/9FYp7nGSr7p6tlPKxugZ3BjQ="; vendorHash = "sha256-uT/jGD4hDVes4h+mlSIT2p+C9TjxnUWsmKv9haPjjLc=";
doCheck = false; doCheck = false;

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "zarf"; pname = "zarf";
version = "0.32.4"; version = "0.32.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "defenseunicorns"; owner = "defenseunicorns";
repo = "zarf"; repo = "zarf";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Pm8xvJKKIa7PX6oYR1LoxmHeG3rQdsfS444kL5R3/zQ="; hash = "sha256-uItOFBvxre7GHgASfTILkFkGddzISNciIpyQhsnyQGY=";
}; };
vendorHash = "sha256-2cXkGgyZoCsVYLPB4sglOWZURl1AS0Gb/7ke7P3mdyw="; vendorHash = "sha256-ZwcyUteDgR9mNVE3UVqHwHzE0bkxE3voxk3b3Ie4Els=";
proxyVendor = true; proxyVendor = true;
preBuild = '' preBuild = ''

View File

@ -19,7 +19,7 @@
}: }:
let let
version = "4.10.1"; version = "4.11.0";
geph-meta = with lib; { geph-meta = with lib; {
description = "A modular Internet censorship circumvention system designed specifically to deal with national filtering."; description = "A modular Internet censorship circumvention system designed specifically to deal with national filtering.";
homepage = "https://geph.io"; homepage = "https://geph.io";
@ -36,10 +36,10 @@ in
owner = "geph-official"; owner = "geph-official";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-e0Pdg4pQ5s1wvTnFm1rKuAwkYtCtu2Uacd7yH3EHeCo="; hash = "sha256-6zii8WxJp++yqTkxejNDta7IW+SG0uPgmnWqX5Oa9PU=";
}; };
cargoHash = "sha256-Kwc+EOH2pJJVvIcTUfL39Xrv/7YmTPUDge7mmjDs9pQ="; cargoHash = "sha256-WI525ufJxuepRZHyx8tO4K+7WZuM/NlTVNqVMJH6avg=";
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
@ -55,8 +55,8 @@ in
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "geph-official"; owner = "geph-official";
repo = "gephgui-pkg"; repo = "gephgui-pkg";
rev = "4163e12188dd679ba548e127fc9771cb5e87bab0"; rev = "3a6d2fa85603e9ac3d5d6286685d8a8ca792a508";
hash = "sha256-wBvhfgp5sZTRCBR9HZqs1G0VaIt9DW2e9CWMAp/T5WI="; hash = "sha256-SE1TwYvR3+zwdPxlanq4hovmJsOdCJQzWfSJ6sSyJ5k=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "alfaview"; pname = "alfaview";
version = "9.8.2"; version = "9.9.1";
src = fetchurl { src = fetchurl {
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
hash = "sha256-xDi51AtQGM8htkFaLKlHXHh0VaT477qK/7VZVmFIE0M="; hash = "sha256-GZLIVpXQ22W4JykdLJ7pTogOFhDaiukgsLa2E7giiaU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,52 +2,52 @@
let let
versions = versions =
if stdenv.isLinux then { if stdenv.isLinux then {
stable = "0.0.44"; stable = "0.0.45";
ptb = "0.0.72"; ptb = "0.0.74";
canary = "0.0.294"; canary = "0.0.300";
development = "0.0.13"; development = "0.0.14";
} else { } else {
stable = "0.0.294"; stable = "0.0.296";
ptb = "0.0.97"; ptb = "0.0.102";
canary = "0.0.416"; canary = "0.0.435";
development = "0.0.30"; development = "0.0.31";
}; };
version = versions.${branch}; version = versions.${branch};
srcs = rec { srcs = rec {
x86_64-linux = { x86_64-linux = {
stable = fetchurl { stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-mzpir5Js3pDtuOK5bKocd74p0PcDnMpNpx8PpchE6FE="; hash = "sha256-dSDc5EyWk/aH5JFG6WYfJqnb0Y2/b46YcdNB2Z9wRn0=";
}; };
ptb = fetchurl { ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
hash = "sha256-yZzQj8XOIk6Ccyn/o1PAZPlr43xrl8O2LLmwV+WO9Wg="; hash = "sha256-I466kZg4FE6oPem7wxR6Snd8V3nFF5hH70zlGTCcsZk=";
}; };
canary = fetchurl { canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-3D48+eg8hqToGepFdQznUTTUu37WRcZJ9kgG+wpxFAE="; hash = "sha256-GmPnc13LBBsMgTiUkOstL1u0l29NGUUQBQKTlXcJWsE=";
}; };
development = fetchurl { development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
hash = "sha256-/vYi82c9ef83MSBtmnZRGEgTNTOj/01zRUbvBWR0ayo="; hash = "sha256-QR71x+AUT2s/f8QBSJwSDqmqDRQBu3kUxAiXgfOsdOE=";
}; };
}; };
x86_64-darwin = { x86_64-darwin = {
stable = fetchurl { stable = fetchurl {
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
hash = "sha256-OzaAHCGusctuQk2uzJhCQCTI6SNRGQZXbQ0FgPZLV8w="; hash = "sha256-0bSyL/J2P1pVzv9pFTNSR3V2NkQcDTd74t8KT+WVd64=";
}; };
ptb = fetchurl { ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
hash = "sha256-nONU9TZAWtxqh5PpvgsvaEHESOKhMYGTe184EgCNxHQ="; hash = "sha256-33x6M++EsRJXTbsC4BCa21Yz7cbAhsosPO1WqYq/lCY=";
}; };
canary = fetchurl { canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
hash = "sha256-3Vl5qQihUqyQdHnM/968xaCPIM6P6ImLQAiWKXwYnps="; hash = "sha256-Jreet8EstaTAYAmQrzRaJE/b+xwgRVXIW8elEY7amvw=";
}; };
development = fetchurl { development = fetchurl {
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
hash = "sha256-ffTIfurfYprKAJbOOGzzxCfGQofiVy+Q0NmEJ59ENk4="; hash = "sha256-He/9KH1oMyj9ofYSwHhdqm7jKDsvrGpPPjLED9fSq30=";
}; };
}; };
aarch64-darwin = x86_64-darwin; aarch64-darwin = x86_64-darwin;

View File

@ -22,7 +22,7 @@
}: }:
let let
version = "0.9.24"; version = "0.9.25";
patchedXrdpSrc = applyPatches { patchedXrdpSrc = applyPatches {
patches = [ ./dynamic_config.patch ]; patches = [ ./dynamic_config.patch ];
name = "xrdp-patched-${version}"; name = "xrdp-patched-${version}";
@ -31,19 +31,19 @@ let
repo = "xrdp"; repo = "xrdp";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-Kvj72l+jmoad6VgmCYW2KtQAbJMJ8AZjNIYJ5lUNzRM="; hash = "sha256-XVaNN+sBEACh/yGnCLn9GHszoofWbcyA+Mr6KZMVFB0=";
}; };
}; };
xorgxrdp = stdenv.mkDerivation rec { xorgxrdp = stdenv.mkDerivation rec {
pname = "xorgxrdp"; pname = "xorgxrdp";
version = "0.9.19"; version = "0.9.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neutrinolabs"; owner = "neutrinolabs";
repo = "xorgxrdp"; repo = "xorgxrdp";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-WI1KyJDQkmNHwweZMbNd2KUfawaieoGMDMQfeD12cZs="; hash = "sha256-cAAWk/GqR5zJmh7EAzX3qJiYNl/RrDWdncdFeqsFIaU=";
}; };
nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ];

View File

@ -7,11 +7,11 @@ let
inherit (python3Packages) python pygobject3; inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gnumeric"; pname = "gnumeric";
version = "1.12.56"; version = "1.12.57";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "UaOPNaxbD3He+oueIL8uCFY3mPHLMzeamhdyb7Hj4bI="; sha256 = "r/ULG2I0DCT8z0U9X60+f7c/S8SzT340tsPS2a9qHk8=";
}; };
configureFlags = [ "--disable-component" ]; configureFlags = [ "--disable-component" ];

View File

@ -19,14 +19,14 @@
let let
pname = "qownnotes"; pname = "qownnotes";
appname = "QOwnNotes"; appname = "QOwnNotes";
version = "24.3.0"; version = "24.3.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-NIxRXNawzV6adgf7tCYdn1/Nd2ULodOVGt1QwITpO6Q="; hash = "sha256-9WlpZO/OUSSUxBXXOcB6fLq5t75uryViWsn26C05bVo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "igv"; pname = "igv";
version = "2.17.2"; version = "2.17.3";
src = fetchzip { src = fetchzip {
url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
sha256 = "sha256-KMLy+YxRT5EDZhfqkZRHrPR9BmBg6hFWLSNwJhZ2I+k="; sha256 = "sha256-SGqkWBv4nol0+lnGN7wBHJvndcIqZ5+Wt1wAcXA42cU=";
}; };
installPhase = '' installPhase = ''

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "seqkit"; pname = "seqkit";
version = "2.7.0"; version = "2.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shenwei356"; owner = "shenwei356";
repo = "seqkit"; repo = "seqkit";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-tnVkFING9BH/iNOdKeCsSk4ln2fLUUpI5ASaQ7CCdrg="; sha256 = "sha256-JsrmRUbSNCFJ58tIblKq+VRXCD1mBeCAcosDGiVb5Gs=";
}; };
vendorHash = "sha256-o7XGBI05BK7kOBagVV2eteJmkzLTmio41KOm46GdzDU="; vendorHash = "sha256-0//kySYhNmfiwiys/Ku0/8RzKpnxO0+byD8pcIkvDY0=";
meta = with lib; { meta = with lib; {
description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation"; description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation";

View File

@ -54,28 +54,29 @@ stdenv.mkDerivation {
qtbase qtbase
qtsvg qtsvg
qtserialport qtserialport
qtwayland
qt5compat qt5compat
boost boost
libgit2 libgit2
quazip quazip
libngspice libngspice
clipper clipper
] ++ lib.optionals stdenv.isLinux [
qtwayland
]; ];
postPatch = '' postPatch = ''
# Use packaged quazip, libgit and ngspice # Use packaged quazip, libgit and ngspice
sed -i "/pri\/quazipdetect.pri/d" phoenix.pro sed -i "/pri\/quazipdetect.pri/d" phoenix.pro
sed -i "/pri\/spicedetect.pri/d" phoenix.pro sed -i "/pri\/spicedetect.pri/d" phoenix.pro
substituteInPlace phoenix.pro \ substituteInPlace pri/libgit2detect.pri \
--replace 'LIBGIT_STATIC = true' 'LIBGIT_STATIC = false' --replace-fail 'LIBGIT_STATIC = true' 'LIBGIT_STATIC = false'
#TODO: Do not hardcode SHA. #TODO: Do not hardcode SHA.
substituteInPlace src/fapplication.cpp \ substituteInPlace src/fapplication.cpp \
--replace 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";' --replace-fail 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";'
substituteInPlace phoenix.pro \ substituteInPlace phoenix.pro \
--replace "6.5.10" "${qtbase.version}" --replace-fail "6.5.10" "${qtbase.version}"
mkdir parts mkdir parts
cp -a ${parts}/* parts/ cp -a ${parts}/* parts/
@ -92,6 +93,13 @@ stdenv.mkDerivation {
"phoenix.pro" "phoenix.pro"
]; ];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir $out/Applications
mv $out/bin/Fritzing.app $out/Applications/Fritzing.app
cp FritzingInfo.plist $out/Applications/Fritzing.app/Contents/Info.plist
makeWrapper $out/Applications/Fritzing.app/Contents/MacOS/Fritzing $out/bin/Fritzing
'';
postFixup = '' postFixup = ''
# generate the parts.db file # generate the parts.db file
QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" \ QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" \
@ -105,7 +113,7 @@ stdenv.mkDerivation {
homepage = "https://fritzing.org/"; homepage = "https://fritzing.org/";
license = with licenses; [ gpl3 cc-by-sa-30 ]; license = with licenses; [ gpl3 cc-by-sa-30 ];
maintainers = with maintainers; [ robberer muscaln ]; maintainers = with maintainers; [ robberer muscaln ];
platforms = platforms.linux; platforms = platforms.unix;
mainProgram = "Fritzing"; mainProgram = "Fritzing";
}; };
} }

View File

@ -13,11 +13,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "magic-vlsi"; pname = "magic-vlsi";
version = "8.3.463"; version = "8.3.464";
src = fetchurl { src = fetchurl {
url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
sha256 = "sha256-ba5kTz5ncsEPTh0a0/tbp37qFogUQ+W4p2rPNFLNIAY="; sha256 = "sha256-ICXFskoB/mqKPgjWeIoJ81H2eg4dPSj0bHY7S5/A858=";
}; };
nativeBuildInputs = [ python3 ]; nativeBuildInputs = [ python3 ];

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "eigenmath"; pname = "eigenmath";
version = "unstable-2024-03-06"; version = "unstable-2024-03-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "georgeweigt"; owner = "georgeweigt";
repo = pname; repo = pname;
rev = "ff2a5f89969e106f57ad624ac3897e06f26692d7"; rev = "dfa24af6c747e1c90d79a462c2a5a0716b3a1dc0";
hash = "sha256-54nw734EjICaac8PvdgiGeDWdJTCXnWVUJL2uE937E4="; hash = "sha256-kgC+E/ecgl27Hs+qCyqg8CjbEyB91AgN397DST/dPMI=";
}; };
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''

View File

@ -11,7 +11,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "commitizen"; pname = "commitizen";
version = "3.18.0"; version = "3.18.3";
format = "pyproject"; format = "pyproject";
disabled = python3.pythonOlder "3.8"; disabled = python3.pythonOlder "3.8";
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "commitizen-tools"; owner = "commitizen-tools";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-5baSXlC+ADHjisZLy4TVDuZ3kqoLwLS7KxYM9jAAzBI="; hash = "sha256-8l2nahrYq7GQwajdGwCg0Bfx8D5xk695UEHKds5+N5A=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [

View File

@ -12,13 +12,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "git-machete"; pname = "git-machete";
version = "3.23.2"; version = "3.24.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "virtuslab"; owner = "virtuslab";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-1b8nKA6/UYiFPx7Va2GBUsGWxeOABFgyVVrYtHcKyrA="; hash = "sha256-nxfSdgGF/hDFf7KIJ+tqCvxEi1GOjTAbpcJylIqhd/M=";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -6,13 +6,13 @@
}: }:
buildLua { buildLua {
pname = "visualizer"; pname = "visualizer";
version = "unstable-2023-08-13"; version = "unstable-2024-03-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mfcc64"; owner = "mfcc64";
repo = "mpv-scripts"; repo = "mpv-scripts";
rev = "7dbbfb283508714b73ead2a57b6939da1d139bd3"; rev = "b4246984ba6dc6820adef5c8bbf793af85c9ab8e";
sha256 = "zzB4uBc1M2Gdr/JKY2uk8MY0hmQl1XeomkfTzuM45oE="; sha256 = "ZNUzw4OW7z+yGTxim7CCWJdWmihDFOQAQk3bC5Ijcbs=";
}; };
passthru.updateScript = unstableGitUpdater {}; passthru.updateScript = unstableGitUpdater {};

View File

@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "streamlink"; pname = "streamlink";
version = "6.6.2"; version = "6.7.0";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-0UF8fFmG3BQ7xxHIqZ97iEsQ0lg/RLHD2t6n3wp15NU="; hash = "sha256-kjrDJ/QCccWxRLEQ0virAdm0TLxN5PmtO/Zs+4Nc1MM=";
}; };
nativeCheckInputs = with python3Packages; [ nativeCheckInputs = with python3Packages; [

View File

@ -11,13 +11,13 @@
buildGoModule rec { buildGoModule rec {
pname = "containerd"; pname = "containerd";
version = "1.7.13"; version = "1.7.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containerd"; owner = "containerd";
repo = "containerd"; repo = "containerd";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk="; hash = "sha256-okTz2UCF5LxOdtLDBy1pN2to6WHi+I0jtR67sn7Qrbk=";
}; };
vendorHash = null; vendorHash = null;

View File

@ -9,31 +9,31 @@
}: }:
let let
version = "0.20.1"; version = "0.20.2";
dist = { dist = {
aarch64-darwin = rec { aarch64-darwin = rec {
archSuffix = "Darwin-arm64"; archSuffix = "Darwin-arm64";
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
sha256 = "a561a457d3620965e017fc750805dd2fb99db1c21b2f14e8f044dfaa042de76f"; sha256 = "f250bed8a20b705f913e382b545641082f278f44687409f4b897d6430df4d735";
}; };
x86_64-darwin = rec { x86_64-darwin = rec {
archSuffix = "Darwin-x86_64"; archSuffix = "Darwin-x86_64";
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
sha256 = "c57d2b317e5488c96b642b05146146a5ec94d0407cccba0f31401f52824d404d"; sha256 = "bec9933254ed80827a6fd38eabe1234b538bdb783f4656a94e120bcaa5689d37";
}; };
aarch64-linux = rec { aarch64-linux = rec {
archSuffix = "Linux-aarch64"; archSuffix = "Linux-aarch64";
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
sha256 = "1d93b5fc0bde1369fce3029c917934ef57514fa23a715f8fb7fb333c1db9ec41"; sha256 = "0b839459aa3adde059577f7d9c3ed1bb4720dbdad798e4ffe00af5d86afa556e";
}; };
x86_64-linux = rec { x86_64-linux = rec {
archSuffix = "Linux-x86_64"; archSuffix = "Linux-x86_64";
url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz";
sha256 = "e7093ca1889d2dab436d9f0e6b53d65336f75cf8ebd54f583085eca462a1fc4b"; sha256 = "f9af6bd42e48a803fc1aeb5214bdf511582a56701a1c058ce4e66d871db65dd8";
}; };
}; };
in in

View File

@ -24,13 +24,13 @@ let
hy3 = { fetchFromGitHub, cmake, hyprland }: hy3 = { fetchFromGitHub, cmake, hyprland }:
mkHyprlandPlugin hyprland rec { mkHyprlandPlugin hyprland rec {
pluginName = "hy3"; pluginName = "hy3";
version = "unstable-2024-02-23"; version = "0.36.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "outfoxxed"; owner = "outfoxxed";
repo = "hy3"; repo = "hy3";
rev = "029a2001361d2a4cbbe7447968dee5d1b1880298"; rev = "hl${version}";
hash = "sha256-8LKCXwNU6wA8o6O7s9T2sLWbYNHaI1tYU4YMjHkNLZQ="; hash = "sha256-nRBeHh0Vr0gB3BHiqP9ZE4/yyZvRt8jJHwBF5lFu/24=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -2,12 +2,12 @@
let let
pname = "anytype"; pname = "anytype";
version = "0.38.0"; version = "0.39.0";
name = "Anytype-${version}"; name = "Anytype-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
name = "Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage";
hash = "sha256-tcAOj7omrhyyG8elnAvbj/FtYaYOBeBkclpPHhSoass="; hash = "sha256-Sgrgwp8yZGMLq25tHuoQquNjHTEbRPmFqzpMHnjq7oI=";
}; };
appimageContents = appimageTools.extractType2 { inherit name src; }; appimageContents = appimageTools.extractType2 { inherit name src; };
in appimageTools.wrapType2 { in appimageTools.wrapType2 {

View File

@ -0,0 +1,28 @@
From 0629bb5b90e54491263e371bc5594e9f97ba0af4 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 12 Mar 2024 11:48:15 -0400
Subject: [PATCH] Fix using unlocked dependencies in electron-builder
electron-builder will perform its "installing production dependencies"
step using this package.json, and without the package-lock.json, NPM
will try to fetch package metadata to install the latest, unlocked
dependencies.
---
apps/desktop/webpack.main.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/apps/desktop/webpack.main.js b/apps/desktop/webpack.main.js
index 9d683457d9..0ad707956e 100644
--- a/apps/desktop/webpack.main.js
+++ b/apps/desktop/webpack.main.js
@@ -70,6 +70,7 @@ const main = {
new CopyWebpackPlugin({
patterns: [
"./src/package.json",
+ "./src/package-lock.json",
{ from: "./src/images", to: "images" },
{ from: "./src/locales", to: "locales" },
],
--
2.43.2

View File

@ -5,7 +5,6 @@
, dbus , dbus
, electron_28 , electron_28
, fetchFromGitHub , fetchFromGitHub
, fetchpatch2
, glib , glib
, gnome , gnome
, gtk3 , gtk3
@ -30,28 +29,38 @@ let
electron = electron_28; electron = electron_28;
in buildNpmPackage rec { in buildNpmPackage rec {
pname = "bitwarden-desktop"; pname = "bitwarden-desktop";
version = "2024.2.0"; version = "2024.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitwarden"; owner = "bitwarden";
repo = "clients"; repo = "clients";
rev = "desktop-v${version}"; rev = "desktop-v${version}";
hash = "sha256-nCjcwe+7Riml/J0hAVv/t6/oHIDPhwFD5A3iQ/LNR5Y="; hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g=";
}; };
patches = [ patches = [
(fetchpatch2 { ./electron-builder-package-lock.patch
url = "https://github.com/bitwarden/clients/commit/746bf0a4745423b9e70c2c54dcf76a95ffb62e11.patch";
hash = "sha256-P9MTsiNbAb2kKo/PasIm9kGm0lQjuVUxAJ3Fh1DfpzY=";
})
]; ];
# The nested package-lock.json from upstream is out-of-date, so copy the
# lock metadata from the root package-lock.json.
postPatch = ''
cat {,apps/desktop/src/}package-lock.json \
| ${lib.getExe jq} -s '
.[1].packages."".dependencies.argon2 = .[0].packages."".dependencies.argon2
| .[0].packages."" = .[1].packages.""
| .[1].packages = .[0].packages
| .[1]
' \
| ${moreutils}/bin/sponge apps/desktop/src/package-lock.json
'';
nodejs = nodejs_18; nodejs = nodejs_18;
makeCacheWritable = true; makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ]; npmFlags = [ "--legacy-peer-deps" ];
npmWorkspace = "apps/desktop"; npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-GJl9pVwFWEg9yku9IXLcu2XMJZz+ZoQOxCf1TrW715Y="; npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc=";
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -67,7 +76,7 @@ in buildNpmPackage rec {
patches; patches;
patchFlags = [ "-p4" ]; patchFlags = [ "-p4" ];
sourceRoot = "${src.name}/${cargoRoot}"; sourceRoot = "${src.name}/${cargoRoot}";
hash = "sha256-LjwtOmIJlwtOiy36Y0pP+jJEwfmCGTN4RhqgmD3Yj6E="; hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI=";
}; };
cargoRoot = "apps/desktop/desktop_native"; cargoRoot = "apps/desktop/desktop_native";

View File

@ -2,13 +2,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "Boogie"; pname = "Boogie";
version = "3.1.1"; version = "3.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "boogie-org"; owner = "boogie-org";
repo = "boogie"; repo = "boogie";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-k3+8VlE6dRx3t+qhheHsRl+MBcnh/M1cRgfks5eLvck="; sha256 = "sha256-L70xKxLgJwpEt8e3HHJRSmDW+oq8nL6MjZaqgjUGDps=";
}; };
projectFile = [ "Source/Boogie.sln" ]; projectFile = [ "Source/Boogie.sln" ];

View File

@ -0,0 +1,61 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, wrapGAppsHook4
, libadwaita
, distrobox
}:
rustPlatform.buildRustPackage rec {
pname = "boxbuddy";
version = "2.1.3";
src = fetchFromGitHub {
owner = "Dvlv";
repo = "BoxBuddyRS";
rev = version;
hash = "sha256-Jl9WhMqb40Olub5eV7Meu5DJi+bzWhPf3DCRPe4CMfo=";
};
cargoHash = "sha256-HN+yGODTRXRa3AsBOuRVOnnU2pxBZfy0zlnCWs2oQCI=";
# The software assumes it is installed either in flatpak or in the home directory
# so the xdg data path needs to be patched here
postPatch = ''
substituteInPlace src/utils.rs \
--replace-fail '{data_home}/locale' "$out/share/locale" \
--replace-fail '{data_home}/icons/boxbuddy/{}' "$out/share/icons/boxbuddy/{}"
'';
nativeBuildInputs = [
pkg-config
wrapGAppsHook4
];
buildInputs = [
libadwaita
];
postInstall = ''
cp icons/* ./
XDG_DATA_HOME=$out/share INSTALL_DIR=$out ./scripts/install.sh
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ distrobox ]}
)
'';
doCheck = false; # No checks defined
meta = with lib; {
description = "An unofficial GUI for managing your Distroboxes, written with GTK4 + Libadwaita";
homepage = "https://dvlv.github.io/BoxBuddyRS";
license = licenses.mit;
mainProgram = "boxbuddy-rs";
maintainers = with maintainers; [ aleksana ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,32 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-wizard";
version = "0.2.1";
src = fetchFromGitHub {
owner = "kobzol";
repo = "cargo-wizard";
rev = "v${version}";
hash = "sha256-b8PFJphnTTzW0+f6p59CvQeZMnK6Szp0l/666guDbuc=";
};
cargoHash = "sha256-qBqFnvmGKZQv0vWigsUKELDNqy245GqBm3Nif2hAa78=";
preCheck = ''
export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType
'';
meta = with lib; {
description = "Cargo subcommand for configuring Cargo profile for best performance";
homepage = "https://github.com/kobzol/cargo-wizard";
changelog = "https://github.com/kobzol/cargo-wizard/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ kranzes ];
mainProgram = "cargo-wizard";
};
}

View File

@ -29,19 +29,25 @@
let let
hashes = { hashes = {
"8.2.0" = "1b19885d59f6130ee55414fb02e211a1773460689db38bfd1ac7f0d45117ed16"; "8.2.0" = "sha256-GxmIXVn2Ew7lVBT7AuIRoXc0YGids4v9Gsfw1FEX7RY=";
"8.2.1" = "1fh79r4fnh9gjxjh39gcp4j7npgs5hh3qhrhx74x8x546an3i0s2"; "8.2.1" = "sha256-QoM4rDKkdNTJ6TBDPCAs+l17JLnspQFlly9B60hOB7o=";
"8.2.2" = "sha256-bNK4iR35LSyti2/cR0gPwIneCFxPP+leuA1UUKKn9y0=";
};
names = {
"8.2.0" = "CiscoPacketTracer_820_Ubuntu_64bit.deb";
"8.2.1" = "CiscoPacketTracer_821_Ubuntu_64bit.deb";
"8.2.2" = "CiscoPacketTracer822_amd64_signed.deb";
}; };
in in
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "ciscoPacketTracer8"; pname = "ciscoPacketTracer8";
version = "8.2.1"; version = "8.2.2";
src = requireFile { src = requireFile {
name = "CiscoPacketTracer_${builtins.replaceStrings ["."] [""] version}_Ubuntu_64bit.deb"; name = names.${version};
sha256 = hashes.${version}; hash = hashes.${version};
url = "https://www.netacad.com"; url = "https://www.netacad.com";
}; };
@ -114,5 +120,6 @@ stdenvNoCC.mkDerivation rec {
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ lucasew ]; maintainers = with maintainers; [ lucasew ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
mainProgram = "packettracer8";
}; };
} }

View File

@ -11,11 +11,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "gpt4all"; pname = "gpt4all";
version = "2.7.2"; version = "2.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-casGjHiVZXec+9HGIH5fcpfWgLfsGCM5pEBINXJgMY8="; hash = "sha256-hIfeADP3tiooGZr/OMVFIkOAniMWXj9AsVzMPlVbucE=";
owner = "nomic-ai"; owner = "nomic-ai";
repo = "gpt4all"; repo = "gpt4all";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = '' postPatch = ''
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace 'set(CMAKE_INSTALL_PREFIX ''${CMAKE_BINARY_DIR}/install)' "" --replace-fail 'set(CMAKE_INSTALL_PREFIX ''${CMAKE_BINARY_DIR}/install)' ""
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
install -m 444 -D $src/gpt4all-chat/flatpak-manifest/io.gpt4all.gpt4all.desktop $out/share/applications/io.gpt4all.gpt4all.desktop install -m 444 -D $src/gpt4all-chat/flatpak-manifest/io.gpt4all.gpt4all.desktop $out/share/applications/io.gpt4all.gpt4all.desktop
install -m 444 -D $src/gpt4all-chat/icons/logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg install -m 444 -D $src/gpt4all-chat/icons/logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg
substituteInPlace $out/share/applications/io.gpt4all.gpt4all.desktop \ substituteInPlace $out/share/applications/io.gpt4all.gpt4all.desktop \
--replace 'Exec=chat' 'Exec=${finalAttrs.meta.mainProgram}' --replace-fail 'Exec=chat' 'Exec=${finalAttrs.meta.mainProgram}'
''; '';
meta = { meta = {

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "labwc-menu-generator"; pname = "labwc-menu-generator";
version = "unstable-2023-10-31"; version = "unstable-2024-03-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "labwc"; owner = "labwc";
repo = "labwc-menu-generator"; repo = "labwc-menu-generator";
rev = "d7c81071f8b121ef83da32ae3fa16155d1a2ced9"; rev = "38d08a6695fe9d3176059dc5c57a9c84f9ef4981";
hash = "sha256-gZ0TuSVJwcKW4orawSmRQvoCfrpb8yLXlv81qCR86MU="; hash = "sha256-wB5+VmtxjuWbeuDdtGt0f9u7bc3j1Bb6r5MfmMsmE0M=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "live555"; pname = "live555";
version = "2024.02.28"; version = "2024.03.08";
src = fetchurl { src = fetchurl {
urls = [ urls = [
@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz"
"mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz"
]; ];
hash = "sha256-5WjtkdqoofZIijunfomcEeWj6l4CUK9HRoYAle2jSx8="; hash = "sha256-wWUC4EbxxfK+OxXiyNbNMGObVMZOqb+8jTG078pnDeU=";
}; };
patches = [ patches = [

View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "namespace-cli"; pname = "namespace-cli";
version = "0.0.346"; version = "0.0.348";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "namespacelabs"; owner = "namespacelabs";
repo = "foundation"; repo = "foundation";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-lxzRvgB8FL85gMEQ579kG8c9jHeLkMg8KFz6iXyjMP4="; hash = "sha256-SEqiW3AdhvsIU9WEEcaRi8paMNgRvnZTFL874mSjUQE=";
}; };
vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE="; vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE=";

View File

@ -0,0 +1,76 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchYarnDeps
, makeWrapper
, nodejs
, prefetch-yarn-deps
, yarn
}:
stdenv.mkDerivation (finalAttrs: {
pname = "node-hp-scan-to";
version = "1.4.2";
src = fetchFromGitHub {
owner = "manuc66";
repo = "node-hp-scan-to";
rev = "v${finalAttrs.version}";
hash = "sha256-/aoR2ccDYTkdmcj4k2zf8VJydQufZ2ucqyZ1OH9jRt0=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-Mhlw/3js35TOVDADsPScE9kfv9rmF+u1LzDmKkzunM0=";
};
nativeBuildInputs = [
makeWrapper
nodejs
prefetch-yarn-deps
yarn
];
configurePhase = ''
runHook preConfigure
export HOME=$(mktemp -d)
yarn config --offline set yarn-offline-mirror $offlineCache
fixup-yarn-lock yarn.lock
yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install
patchShebangs node_modules
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
yarn --offline build
runHook postBuild
'';
installPhase = ''
runHook preInstall
yarn --offline --production install
mkdir -p "$out/lib/node_modules/node-hp-scan-to"
cp -r dist node_modules package.json "$out/lib/node_modules/node-hp-scan-to"
makeWrapper "${nodejs}/bin/node" "$out/bin/node-hp-scan-to" \
--add-flags "$out/lib/node_modules/node-hp-scan-to/dist/index.js"
runHook postInstall
'';
meta = {
changelog = "https://github.com/manuc66/node-hp-scan-to/releases/tag/${finalAttrs.src.rev}";
description = "Allow to send scan from device to computer for some HP All-in-One Printers";
homepage = "https://github.com/manuc66/node-hp-scan-to";
license = lib.licenses.mit;
mainProgram = "node-hp-scan-to";
maintainers = with lib.maintainers; [ jonas-w ];
};
})

View File

@ -1,21 +1,23 @@
{ lib { lib
, stdenv
, fetchFromGitHub
, cmake , cmake
, fetchFromGitHub
, primesieve , primesieve
, stdenv
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "primecount"; pname = "primecount";
version = "7.10"; version = "7.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kimwalisch"; owner = "kimwalisch";
repo = "primecount"; repo = "primecount";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-z7sHGR6zZSTV1PbL0WPGHf52CYQ572KC1yznCuIEJbQ="; hash = "sha256-z7sHGR6zZSTV1PbL0WPGHf52CYQ572KC1yznCuIEJbQ=";
}; };
outputs = [ "out" "dev" "lib" "man" ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
]; ];
@ -24,17 +26,18 @@ stdenv.mkDerivation rec {
primesieve primesieve
]; ];
strictDeps = true;
cmakeFlags = [ cmakeFlags = [
"-DBUILD_LIBPRIMESIEVE=ON" (lib.cmakeBool "BUILD_LIBPRIMESIEVE" true)
"-DBUILD_PRIMECOUNT=ON" (lib.cmakeBool "BUILD_PRIMECOUNT" true)
"-DBUILD_SHARED_LIBS=ON" (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
"-DBUILD_STATIC_LIBS=OFF" (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
"-DBUILD_TESTS=ON" (lib.cmakeBool "BUILD_TESTS" true)
]; ];
meta = with lib; { meta = {
homepage = "https://github.com/kimwalisch/primecount"; homepage = "https://github.com/kimwalisch/primecount";
changelog = "https://github.com/kimwalisch/primecount/blob/v${version}/ChangeLog";
description = "Fast prime counting function implementations"; description = "Fast prime counting function implementations";
longDescription = '' longDescription = ''
primecount is a command-line program and C/C++ library that counts the primecount is a command-line program and C/C++ library that counts the
@ -50,7 +53,9 @@ stdenv.mkDerivation rec {
of CPU cores. primecount has already been used to compute several prime of CPU cores. primecount has already been used to compute several prime
counting function world records. counting function world records.
''; '';
license = licenses.bsd2; changelog = "https://github.com/kimwalisch/primecount/blob/${finalAttrs.src.rev}/ChangeLog";
license = lib.licenses.bsd2;
mainProgram = "primecount";
inherit (primesieve.meta) maintainers platforms; inherit (primesieve.meta) maintainers platforms;
}; };
} })

View File

@ -1,25 +1,35 @@
{ lib { lib
, stdenv
, fetchFromGitHub
, cmake , cmake
, fetchFromGitHub
, stdenv
, primecount
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "primesieve"; pname = "primesieve";
version = "12.1"; version = "12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kimwalisch"; owner = "kimwalisch";
repo = "primesieve"; repo = "primesieve";
rev = "v${version}"; rev = "v${finalAttrs.version}";
hash = "sha256-AHl2GfZ1oJ8ZyjJzvg10AqN7TA7HFZ+qa6N2v51Qa78="; hash = "sha256-AHl2GfZ1oJ8ZyjJzvg10AqN7TA7HFZ+qa6N2v51Qa78=";
}; };
outputs = [ "out" "dev" "lib" "man" ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
meta = with lib; { strictDeps = true;
passthru = {
tests = {
inherit primecount; # dependent
};
};
meta = {
homepage = "https://primesieve.org/"; homepage = "https://primesieve.org/";
changelog = "https://github.com/kimwalisch/primesieve/blob/v${version}/ChangeLog";
description = "Fast C/C++ prime number generator"; description = "Fast C/C++ prime number generator";
longDescription = '' longDescription = ''
primesieve is a command-line program and C/C++ library for quickly primesieve is a command-line program and C/C++ library for quickly
@ -29,9 +39,11 @@ stdenv.mkDerivation rec {
CPU cores whenever possible i.e. if sequential ordering is not CPU cores whenever possible i.e. if sequential ordering is not
required. primesieve can generate primes and prime k-tuplets up to 264. required. primesieve can generate primes and prime k-tuplets up to 264.
''; '';
license = licenses.bsd2; changelog = "https://github.com/kimwalisch/primesieve/blob/${finalAttrs.src.rev}/ChangeLog";
maintainers = teams.sage.members ++ license = lib.licenses.bsd2;
(with maintainers; [ abbradar AndersonTorres ]); mainProgram = "primesieve";
platforms = platforms.unix; maintainers = lib.teams.sage.members ++
(with lib.maintainers; [ abbradar AndersonTorres ]);
platforms = lib.platforms.unix;
}; };
} })

View File

@ -1,34 +1,40 @@
{ lib { lib
, fetchFromGitHub
, python3
, bc , bc
, fetchFromGitHub
, jq , jq
, python3
}: }:
let let
version = "1.1.0"; pythonPackages = python3.pkgs;
in python3.pkgs.buildPythonApplication { finalAttrs = {
pname = "pyp"; pname = "pyp";
inherit version; version = "1.2.0";
format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hauntsaninja"; owner = "hauntsaninja";
repo = "pyp"; repo = "pyp";
rev = "v${version}"; rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-A1Ip41kxH17BakHEWEuymfa24eBEl5FIHAWL+iZFM4I="; hash = "sha256-hnEgqWOIVj2ugOhd2aS9IulfkVnrlkhwOtrgH4qQqO8=";
}; };
nativeBuildInputs = [ pyproject = true;
python3.pkgs.flit-core
build-system = with pythonPackages; [
flit-core
]; ];
nativeCheckInputs = [ nativeCheckInputs = (with pythonPackages; [
python3.pkgs.pytestCheckHook pytestCheckHook
]) ++ [
bc bc
jq jq
]; ];
pythonImportsCheck = [
"pyp"
];
# without this, the tests fail because they are unable to find the pyp tool # without this, the tests fail because they are unable to find the pyp tool
# itself... # itself...
preCheck = '' preCheck = ''
@ -36,7 +42,7 @@ in python3.pkgs.buildPythonApplication {
PATH=$out/bin:$PATH PATH=$out/bin:$PATH
''; '';
# And a cleanup # And a cleanup!
postCheck = '' postCheck = ''
PATH=$_OLD_PATH_ PATH=$_OLD_PATH_
''; '';
@ -44,8 +50,11 @@ in python3.pkgs.buildPythonApplication {
meta = { meta = {
homepage = "https://github.com/hauntsaninja/pyp"; homepage = "https://github.com/hauntsaninja/pyp";
description = "Easily run Python at the shell"; description = "Easily run Python at the shell";
changelog = "https://github.com/hauntsaninja/pyp/blob/${version}/CHANGELOG.md"; changelog = "https://github.com/hauntsaninja/pyp/blob/${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit; license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ AndersonTorres ]; mainProgram = "pyp";
maintainers = with lib.maintainers; [ rmcgibbo AndersonTorres ];
}; };
} };
in
pythonPackages.buildPythonPackage finalAttrs

File diff suppressed because it is too large Load Diff

View File

@ -8,29 +8,19 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rwpspread"; pname = "rwpspread";
version = "0.2.1"; version = "0.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "0xk1f0"; owner = "0xk1f0";
repo = "rwpspread"; repo = "rwpspread";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-I9zZtk+Byn2DBMvhRVUBJ5O8fzzy1uSTniMUDXi07ho="; hash = "sha256-gtqcogOjWvie7XK9E9KhuSsUh+aWEqZB7NVTqXH6R7Q=";
}; };
cargoHash = "sha256-3yWc1wi5jakBG2CTWpB4uhqIzG0/ufQhyd61EtpibIk=";
cargoLock = { nativeBuildInputs = [ pkg-config ];
lockFile = ./Cargo.lock;
outputHashes = {
"smithay-client-toolkit-0.18.0" = "sha256-7s5XPmIflUw2qrKRAZUz30cybYKvzD5Hu4ViDpzGC3s=";
};
};
nativeBuildInputs = [ buildInputs = [ libxkbcommon ];
pkg-config
];
buildInputs = [
libxkbcommon
];
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };

View File

@ -68,6 +68,7 @@
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; })
@ -150,9 +151,9 @@
(fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; }) (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; })
(fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; sha256 = "05918f6fl8byla2m7qjp7dvxww2rbpj2sqd4xq26rl885fmddfvf"; }) (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; sha256 = "05918f6fl8byla2m7qjp7dvxww2rbpj2sqd4xq26rl885fmddfvf"; })
(fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.16.0"; sha256 = "1j4wsv7kjgjkmf2vlm5jjnqkdh265rkz5s1hx42i0f4bmdaz2kj1"; }) (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.16.0"; sha256 = "1j4wsv7kjgjkmf2vlm5jjnqkdh265rkz5s1hx42i0f4bmdaz2kj1"; })
(fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0"; sha256 = "1lsc789fqsnh3jx5w0g5k2n1wlww58zyzrcf5rs3wx2fjrqi084k"; })
(fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.7"; sha256 = "07rd8vbd23ynhpz4y81b8fqnbn5q5q7rvcdwcky3nzngdg3vgw08"; })
(fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0"; sha256 = "0gh6xzw0jhjxf2slky11sdj0s8mp5dmps5k0rlx4krm68xb98zr0"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; sha256 = "0f6wbk9dnjiffb9ycjachy1m9zw3pai2m503nym07qgb0izxm792"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; sha256 = "0f6wbk9dnjiffb9ycjachy1m9zw3pai2m503nym07qgb0izxm792"; })
@ -242,7 +243,6 @@
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
@ -269,6 +269,7 @@
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; })

View File

@ -25,13 +25,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "ryujinx"; pname = "ryujinx";
version = "1.1.1217"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml version = "1.1.1223"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ryujinx"; owner = "Ryujinx";
repo = "Ryujinx"; repo = "Ryujinx";
rev = "bc4d99a0786dbcbfde62d3bdeb98ed3d12c94852"; rev = "5a900f38c52269ee1282695e5e62a05269d0a478";
sha256 = "00qvwhl18f09lgs94b66kzxyf0pbhwdkcyrsc7vjyv5dl88f5120"; sha256 = "1s0w89f8vafr81hq1gs4sz6qlcqd11vy5580mrfngkry8g3bmgjs";
}; };
dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-sdk = dotnetCorePackages.sdk_8_0;

File diff suppressed because it is too large Load Diff

View File

@ -12,6 +12,7 @@
"prettier-format": "prettier --config .prettierrc 'src/**/*.ts*' --write" "prettier-format": "prettier --config .prettierrc 'src/**/*.ts*' --write"
}, },
"dependencies": { "dependencies": {
"@column-resizer/react": "^1.3.0",
"@emotion/react": "^11.11.1", "@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0", "@emotion/styled": "^11.11.0",
"@fontsource/noto-sans": "^5.0.8", "@fontsource/noto-sans": "^5.0.8",

View File

@ -19,12 +19,12 @@
let let
pname = "treedome"; pname = "treedome";
version = "0.4.2"; version = "0.4.3";
src = fetchgit { src = fetchgit {
url = "https://codeberg.org/solver-orgz/treedome"; url = "https://codeberg.org/solver-orgz/treedome";
rev = version; rev = version;
hash = "sha256-Ypc5+HXmpyMjJDQCyxYwauozaf4HkjcbpDZNGVGPW7o="; hash = "sha256-FBzRsBoV3wnt2nu5WMnaTnBNC51jG120E0Orm55KhBg=";
fetchLFS = true; fetchLFS = true;
}; };
@ -34,7 +34,7 @@ let
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${src}/yarn.lock";
hash = "sha256-nUOKN/0BTibRI66Do+iQUFy8NKkcaxFKr5AOtK3K13Q="; hash = "sha256-CrD/n8z5fJKkBKEcvpRHJaqXBt1gbON7VsuLb2JGu1A=";
}; };
packageJSON = ./package.json; packageJSON = ./package.json;
@ -77,6 +77,10 @@ rustPlatform.buildRustPackage {
}; };
}; };
env = {
VERGEN_GIT_DESCRIBE = version;
};
preConfigure = '' preConfigure = ''
mkdir -p dist mkdir -p dist
cp -R ${frontend-build}/dist/** dist cp -R ${frontend-build}/dist/** dist
@ -135,7 +139,7 @@ rustPlatform.buildRustPackage {
''; '';
meta = with lib; { meta = with lib; {
description = "A local-first, encrypted, note taking application with tree-like structures, all written and saved in markdown"; description = "A local-first, encrypted, note taking application organized in tree-like structures";
homepage = " https://codeberg.org/solver-orgz/treedome"; homepage = " https://codeberg.org/solver-orgz/treedome";
license = licenses.agpl3; license = licenses.agpl3;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wit-bindgen"; pname = "wit-bindgen";
version = "0.21.0"; version = "0.22.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bytecodealliance"; owner = "bytecodealliance";
repo = "wit-bindgen"; repo = "wit-bindgen";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-rSPxvEZf4bnQfLNCmyZV7oOuhG/hRAcDs1zPmfovJ8o="; hash = "sha256-qPFw2ecnyZA3TV95AbJFWnWhV8zHQ/bq+MDRduVNl6s=";
}; };
cargoHash = "sha256-oHSsbGLz8OcAfLeNA1yqVVRHa0ZkE8UoJn795t8xxGs="; cargoHash = "sha256-BN425+tKgIvx+RvIedRCPig3kpbHrxrFdQe99voNkVc=";
# Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
# However, GitHub Actions ensures a proper build. # However, GitHub Actions ensures a proper build.

View File

@ -6,11 +6,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "worker"; pname = "worker";
version = "5.0.1"; version = "5.0.2";
src = fetchurl { src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/worker-${finalAttrs.version}.tar.gz"; url = "http://www.boomerangsworld.de/cms/worker/downloads/worker-${finalAttrs.version}.tar.gz";
hash = "sha256-7bnJ7w7ejK5VDkna52jCtHKD8iiNOdXCpU0wx7RtkxA="; hash = "sha256-k4HgIXuy0q72pHhGU+AuIwCUNMH/icasEXWIFc/w5Mo=";
}; };
buildInputs = [ libX11 ]; buildInputs = [ libX11 ];

View File

@ -9,7 +9,7 @@
let let
pname = "xonsh"; pname = "xonsh";
version = "0.14.4"; version = "0.15.1";
in in
python3.pkgs.buildPythonApplication { python3.pkgs.buildPythonApplication {
inherit pname version; inherit pname version;
@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication {
owner = "xonsh"; owner = "xonsh";
repo = "xonsh"; repo = "xonsh";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-7qOEc4RSdOO059LietKnrxY7cy9MfgmfJjdqZZ5ENLU="; hash = "sha256-mHOCkUGiSSPmkIQ4tgRZIaCTLgnx39SMwug5EIx/jrU=";
}; };
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [
@ -90,6 +90,8 @@ python3.pkgs.buildPythonApplication {
export HOME=$TMPDIR export HOME=$TMPDIR
''; '';
dontWrapPythonPrograms = true;
passthru = { passthru = {
shellPath = "/bin/xonsh"; shellPath = "/bin/xonsh";
python = python3; # To the wrapper python = python3; # To the wrapper

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "sudo-font"; pname = "sudo-font";
version = "1.1"; version = "1.2";
src = fetchzip { src = fetchzip {
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
hash = "sha256-acHeaA8WIkGNrjErbLCkkUpkIZvLbgaV+pvr56ku5tw="; hash = "sha256-8ucMeKbnrYtk2/ZeYxzp8MA4Ss952/opD8GpB01Ze/I=";
}; };
installPhase = '' installPhase = ''

View File

@ -2,7 +2,7 @@
let let
themeName = "Dracula"; themeName = "Dracula";
version = "unstable-2024-03-02"; version = "unstable-2024-03-10";
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "dracula-theme"; pname = "dracula-theme";
@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dracula"; owner = "dracula";
repo = "gtk"; repo = "gtk";
rev = "9eb561508e481d77f2d39fbb3a6b2949e990aa4f"; rev = "e28f5b8f8cbb7c3213c428667e351114188169ed";
hash = "sha256-jsi6nMblqKDPIF10hIqubuOiaYDO+SuHGfb5yncRRHE="; hash = "sha256-B0Cakf/hLiW/z71BzzVhieJOE2C0jLb9GkDVM4zpICc=";
}; };
propagatedUserEnvPkgs = [ propagatedUserEnvPkgs = [

View File

@ -319,6 +319,13 @@ in stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
# dotnet cli is in the root, so we need to strip from there
# TODO: should we install in $out/share/dotnet?
stripDebugList = [ "." ];
# stripping dlls results in:
# Failed to load System.Private.CoreLib.dll (error code 0x8007000B)
stripExclude = [ "*.dll" ];
passthru = { passthru = {
inherit releaseManifest buildRid targetRid; inherit releaseManifest buildRid targetRid;
icu = _icu; icu = _icu;

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "flix"; pname = "flix";
version = "0.44.0"; version = "0.45.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
sha256 = "sha256-osoUV05e1MCKs41j0dNIJi+0e7X+gHizgZSWicIJ678="; sha256 = "sha256-h7smcfV7heJtTVXCGSlUmk1RNZ4AWFe2fPPOWLcJz/M=";
}; };
dontUnpack = true; dontUnpack = true;

View File

@ -4,13 +4,13 @@ let
pkg = buildGoModule rec { pkg = buildGoModule rec {
pname = "arduino-cli"; pname = "arduino-cli";
version = "0.35.2"; version = "0.35.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arduino"; owner = "arduino";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ctgDuWbNLMyQrxnarTbCtGXM5G+bPeS4Xa7eTbkFo0k="; hash = "sha256-brWWoIOQhU/isd48VCx6tczAJnamBuOa6e/xezuHN7E=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -38,7 +38,7 @@ let
]; ];
in '' in ''
substituteInPlace Taskfile.yml \ substituteInPlace Taskfile.yml \
--replace "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'" --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'"
''; '';
doCheck = stdenv.isLinux; doCheck = stdenv.isLinux;
@ -53,12 +53,12 @@ let
"-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" "-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown"
] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
postInstall = '' postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
export HOME="$(mktemp -d)" export HOME="$(mktemp -d)"
for s in {bash,zsh,fish}; do installShellCompletion --cmd arduino-cli \
$out/bin/arduino-cli completion $s > completion.$s --bash <($out/bin/arduino-cli completion bash) \
installShellCompletion --cmd arduino-cli --$s completion.$s --zsh <($out/bin/arduino-cli completion zsh) \
done --fish <($out/bin/arduino-cli completion fish)
unset HOME unset HOME
''; '';
@ -85,6 +85,7 @@ if stdenv.isLinux then
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/$name $out/bin/arduino-cli mv $out/bin/$name $out/bin/arduino-cli
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
cp -r ${pkg.outPath}/share $out/share cp -r ${pkg.outPath}/share $out/share
''; '';
passthru.pureGoPkg = pkg; passthru.pureGoPkg = pkg;

View File

@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "R7RS Scheme scripting engine"; description = "R7RS Scheme scripting engine";
homepage = "https://practical-scheme.net/gauche/"; homepage = "https://practical-scheme.net/gauche/";
mainProgram = "gosh";
maintainers = with maintainers; [ mnacamura ]; maintainers = with maintainers; [ mnacamura ];
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.unix; platforms = platforms.unix;

View File

@ -1,30 +1,23 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48, fetchpatch }: { lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48, unstableGitUpdater }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "scsh"; pname = "scsh";
version = "0.7pre"; version = "0.7-unstable-2024-03-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "scheme"; owner = "scheme";
repo = "scsh"; repo = "scsh";
rev = "4acf6e4ed7b65b46186ef0c9c2a1e10bef8dc052"; rev = "6770db21b08edd907d1c9bd962297ff55664e3fe";
sha256 = "sha256-92NtMK5nVd6+WtHj/Rk6iQEkGsNEZySTVZkkbqKrLYY="; hash = "sha256-U95Rc/Ks5AytB5UwbzQLI3/Sj4TYybrp8/45fu9krSU=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
# Don't not include util.h if libutil.h is available
# https://github.com/scheme/scsh/pull/49
(fetchpatch {
url = "https://github.com/scheme/scsh/commit/b04e902de983761d7f432b2cfa364ca5d162a364.patch";
hash = "sha256-XSHzzCOBkraqW2re1ePoFl9tKQB81iQ0W9wvv83iGdA=";
})
];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ scheme48 ]; buildInputs = [ scheme48 ];
configureFlags = [ "--with-scheme48=${scheme48}" ]; configureFlags = [ "--with-scheme48=${scheme48}" ];
passthru.updateScript = unstableGitUpdater { };
meta = with lib; { meta = with lib; {
description = "A Scheme shell"; description = "A Scheme shell";
homepage = "http://www.scsh.net/"; homepage = "http://www.scsh.net/";

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libgpiod"; pname = "libgpiod";
version = "2.1"; version = "2.1.1";
src = fetchurl { src = fetchurl {
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
hash = "sha256-/W7UssZ0/mzDtIGID2zeHup54pbpWhObhUAequpt4/w="; hash = "sha256-CvQ6YInWn50HXPZ8oq5ZcrkIHjjms9Rs6jfWfi32+5s=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -6,14 +6,14 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
version = "1.5.4"; version = "1.5.5";
pname = "nanoflann"; pname = "nanoflann";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jlblancoc"; owner = "jlblancoc";
repo = "nanoflann"; repo = "nanoflann";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-7Vt/x9jHRqtVTv0MbHxIwd1/cTUB4aIgOiI+7cz0iu0="; hash = "sha256-a1XX1tvXfrPCar9EGMXzxLg2bXJaK85t2Bd8CworwFk=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
let let
version = "5.1.0"; version = "5.2.0";
libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];
in in
@ -14,7 +14,7 @@ stdenv.mkDerivation {
owner = "oracle"; owner = "oracle";
repo = "odpi"; repo = "odpi";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-J7v6nNwAXy0j2mXc9RcO/V54WutA9TvTGUubHkpNBWo="; sha256 = "sha256-2oM78YgP14oyFBWZ8KdHlGsN3hjoWTBcIvOI+93sSyM=";
}; };
nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;

View File

@ -79,6 +79,9 @@ buildPythonPackage rec {
# flaky # flaky
"test_timedelta_conversion" "test_timedelta_conversion"
# More flaky tests, see: https://github.com/NixOS/nixpkgs/issues/294392
"test_sidereal_lon_independent"
"test_timedelta_full_precision_arithmetic"
]; ];
meta = { meta = {

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "clarifai-grpc"; pname = "clarifai-grpc";
version = "10.2.0"; version = "10.2.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Clarifai"; owner = "Clarifai";
repo = "clarifai-python-grpc"; repo = "clarifai-python-grpc";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-DriHPROCDdzqtqtGgUr0Ls/QBtDYPVhCFTeFePwoHQU="; hash = "sha256-8U1e4NOvi2+8GFMXwKiAiCyMYTsfKGW728v0tk6WlgQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "databricks-connect"; pname = "databricks-connect";
version = "11.3.6"; version = "11.3.26";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-kAUBA9V1st5UxXihrXQjyk+1ahsum/VEcNfDK1he/Pc="; hash = "sha256-YjUY4i8PtXc+fWcGjvnRbZkiINprKcS1K9HT5+86E8c=";
}; };
sourceRoot = "."; sourceRoot = ".";

View File

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mixpanel"; pname = "mixpanel";
version = "4.10.0"; version = "4.10.1";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mixpanel"; owner = "mixpanel";
repo = "mixpanel-python"; repo = "mixpanel-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-jV2NLEc23uaI5Q7ZXDwGaZV9iAKQLMAETRTw8epZwQA="; hash = "sha256-i5vT5FTnw+BanHHrlRsPJ3EooZjQcaosbaHoh/uPRmQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "oci"; pname = "oci";
version = "2.124.0"; version = "2.124.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "oracle"; owner = "oracle";
repo = "oci-python-sdk"; repo = "oci-python-sdk";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-/I86zjhQsDYljgde7L2lPFHiMykRmOgNOaqk5SxNMlg="; hash = "sha256-tiTtBJIohUW80PLMGkdgsC8m4QF0lzmfqErNNb0Ede4=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [

View File

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "owslib"; pname = "owslib";
version = "0.29.3"; version = "0.30.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "geopython"; owner = "geopython";
repo = "OWSLib"; repo = "OWSLib";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-yAJXknSsGXcerzaOVSrFO4j5E6B/4/0JfoSxZ+Szmws="; hash = "sha256-miKAgZBiqZ6+0qDvlf8+VZ6omH5hlImO0E7AVK7FuD0=";
}; };
postPatch = '' postPatch = ''

View File

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylsp-rope"; pname = "pylsp-rope";
version = "0.1.11"; version = "0.1.15";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-SKrfmT2vpej8oRCLSlQxMUz4C8eM/91WQA6tnEB1U74="; hash = "sha256-0f0WzJcVOfH1abJnvZCLM5/W1JfVxSDAH+Z1ADA6kUQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,56 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, coreutils
, pythonOlder
, astunparse
, flit-core
, jq
, bc
}:
buildPythonPackage rec {
pname = "pyp";
version = "1.2.0";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "hauntsaninja";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-hnEgqWOIVj2ugOhd2aS9IulfkVnrlkhwOtrgH4qQqO8=";
};
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [
astunparse
];
preCheck = ''
export PATH=$out/bin:$PATH
'';
nativeCheckInputs = [
pytestCheckHook
coreutils
jq
bc
];
pythonImportsCheck = [
"pyp"
];
meta = with lib; {
description = "Easily run Python at the shell! Magical, but never mysterious";
homepage = "https://github.com/hauntsaninja/pyp";
license = licenses.mit;
maintainers = with maintainers; [ rmcgibbo ];
};
}

View File

@ -22,14 +22,15 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "PyQt6"; pname = "pyqt6";
version = "6.6.1"; version = "6.6.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "PyQt6";
inherit version;
hash = "sha256-nxWKop0gUULFbw810HeEuN8L4oN40gqXvNqL1k/9A3k="; hash = "sha256-nxWKop0gUULFbw810HeEuN8L4oN40gqXvNqL1k/9A3k=";
}; };

View File

@ -11,7 +11,7 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "PyQt5-stubs"; pname = "pyqt5-stubs";
version = "5.15.6.0"; version = "5.15.6.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";

View File

@ -12,14 +12,15 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "PyQt6_WebEngine"; pname = "pyqt6-webengine";
version = "6.6.0"; version = "6.6.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "PyQt6_WebEngine";
inherit version;
hash = "sha256-1QuYTD+F5AnmkrFWEychUi1OjPm2wl4M+Sfuot+zlIc="; hash = "sha256-1QuYTD+F5AnmkrFWEychUi1OjPm2wl4M+Sfuot+zlIc=";
}; };

View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytedee-async"; pname = "pytedee-async";
version = "0.2.15"; version = "0.2.16";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "zweckj"; owner = "zweckj";
repo = "pytedee_async"; repo = "pytedee_async";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-in5umB3ewrx5de1OaWI1XpDaNgy2ZtLYr4lCswhcayg="; hash = "sha256-MoAh5YYaZLF99fTFgErXunaLGT9hgInaZTjlDJcpSEw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-tado"; pname = "python-tado";
version = "0.17.4"; version = "0.17.5";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "wmalgadey"; owner = "wmalgadey";
repo = "PyTado"; repo = "PyTado";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-Wdd9HdsQjaYlL8knhMuO87+dom+aTsmrLRK0UdrpsbQ="; hash = "sha256-FjdqZc4Zt2sLYJpnD/MAzr8Y9lGHteHB5psQqheS84I=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "rich-click"; pname = "rich-click";
version = "1.7.3"; version = "1.7.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "ewels"; owner = "ewels";
repo = "rich-click"; repo = "rich-click";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-ZTUJbW39SBaqgVG+ytmnPG6DK7J2XGPwmC2w3TCodBo="; hash = "sha256-eqpxNurMHn4ClD0KjTQ7Yfny61tcYBRKlW74axjLI8A=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "twilio"; pname = "twilio";
version = "9.0.0"; version = "9.0.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "twilio"; owner = "twilio";
repo = "twilio-python"; repo = "twilio-python";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-5PhINmG1y+oAEpfxaB8ZFHfWlo0jRZnUKO5oUPcnFuM="; hash = "sha256-fOtNzyeE0Ijr2HvxuG5+01I1VBbX4io8OqGEjNcxAgk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-docutils"; pname = "types-docutils";
version = "0.20.0.20240309"; version = "0.20.0.20240311";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-zVFHAoE7pBPJATT+2tlBayy46viAFot2mnB9b80VnwU="; hash = "sha256-sp3zYunm78umjieveBNZAtVmFPb6dsBz0pmJJy7tsGk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -8,12 +8,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-requests"; pname = "types-requests";
version = "2.31.0.20240310"; version = "2.31.0.20240311";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-iiAXHgiKD3iTqsSQpffzfp9T4U1rdixdVWI76gIu4G8="; hash = "sha256-scG2ar+3+nmq4JCXqBHEqpcTDriDHGDkeu5Mo0RzHKU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -56,7 +56,7 @@
, grpcio , grpcio
}: }:
let let
version = "0.12.5"; version = "0.12.6";
optional-dependencies = { optional-dependencies = {
huggingflace = [ huggingflace = [
langdetect langdetect
@ -90,7 +90,7 @@ buildPythonPackage {
owner = "Unstructured-IO"; owner = "Unstructured-IO";
repo = "unstructured"; repo = "unstructured";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-69GukU2R38tM43vAk+l9vjypgjTS/Bcmcdcj1HXnzv4="; hash = "sha256-K2ilPDkxXICb66rOgz18AZ92u5VBgRh6bLiDVEgleDU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

Some files were not shown because too many files have changed in this diff Show More