mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 20:25:32 +03:00
Merge master into staging-next
This commit is contained in:
commit
d4537b75d3
48 changed files with 365 additions and 7404 deletions
1
.mailmap
1
.mailmap
|
@ -5,6 +5,7 @@ Christina Sørensen <christina@cafkafk.com>
|
|||
Christina Sørensen <christina@cafkafk.com> <christinaafk@gmail.com>
|
||||
Christina Sørensen <christina@cafkafk.com> <89321978+cafkafk@users.noreply.github.com>
|
||||
Daniel Løvbrøtte Olsen <me@dandellion.xyz> <daniel.olsen99@gmail.com>
|
||||
Ethan Carter Edwards <ethan@ethancedwards.com> Ethan Edwards <ethancarteredwards@gmail.com>
|
||||
Fabian Affolter <mail@fabian-affolter.ch> <fabian@affolter-engineering.ch>
|
||||
Fiona Behrens <me@kloenk.dev>
|
||||
Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
|
||||
|
|
|
@ -574,11 +574,6 @@
|
|||
githubId = 2071575;
|
||||
name = "Adam C. Stephens";
|
||||
};
|
||||
adamjhf = {
|
||||
github = "adamjhf";
|
||||
githubId = 50264672;
|
||||
name = "Adam Freeth";
|
||||
};
|
||||
adamt = {
|
||||
email = "mail@adamtulinius.dk";
|
||||
github = "adamtulinius";
|
||||
|
|
|
@ -123,6 +123,7 @@ nui.nvim,,,,,,mrcjkb
|
|||
nvim-cmp,https://raw.githubusercontent.com/hrsh7th/nvim-cmp/main/nvim-cmp-scm-1.rockspec,,,,,
|
||||
nvim-dbee,,,,,,perchun
|
||||
nvim-nio,,,,,,mrcjkb
|
||||
nvim-web-devicons,,,,,,
|
||||
orgmode,,,,,,
|
||||
papis-nvim,,,,,,GaetanLepage
|
||||
pathlib.nvim,,,,,,
|
||||
|
|
|
|
@ -290,6 +290,8 @@
|
|||
|
||||
- The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses.
|
||||
|
||||
- `python3Packages.bpycv` has been removed due to being incompatible with Blender 4 and unmaintained.
|
||||
|
||||
- `python3Packages.jaeger-client` was removed because it was deprecated upstream. [OpenTelemetry](https://opentelemetry.io) is the recommended replacement.
|
||||
|
||||
- `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel.
|
||||
|
|
|
@ -10,16 +10,6 @@ let
|
|||
tomlFormat = pkgs.formats.toml { };
|
||||
jsonFormat = pkgs.formats.json { };
|
||||
|
||||
commonConfigurationFile =
|
||||
if (cfg.commonConfigurationFile == null) then
|
||||
(tomlFormat.generate "common-config.toml" cfg.commonConfiguration)
|
||||
else
|
||||
cfg.commonConfigurationFile;
|
||||
configurationFile =
|
||||
if (cfg.configurationFile == null) then
|
||||
(jsonFormat.generate "amazon-cloudwatch-agent.json" cfg.configuration)
|
||||
else
|
||||
cfg.configurationFile;
|
||||
# See https://docs.aws.amazon.com/prescriptive-guidance/latest/implementing-logging-monitoring-cloudwatch/create-store-cloudwatch-configurations.html#store-cloudwatch-configuration-s3.
|
||||
#
|
||||
# We don't use the multiple JSON configuration files feature,
|
||||
|
@ -33,8 +23,9 @@ in
|
|||
enable = lib.mkEnableOption "Amazon CloudWatch Agent";
|
||||
package = lib.mkPackageOption pkgs "amazon-cloudwatch-agent" { };
|
||||
commonConfigurationFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
type = lib.types.path;
|
||||
default = tomlFormat.generate "common-config.toml" cfg.commonConfiguration;
|
||||
defaultText = lib.literalExpression ''tomlFormat.generate "common-config.toml" cfg.commonConfiguration'';
|
||||
description = ''
|
||||
Amazon CloudWatch Agent common configuration. See
|
||||
<https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/install-CloudWatch-Agent-commandline-fleet.html#CloudWatch-Agent-profile-instance-first>
|
||||
|
@ -70,8 +61,9 @@ in
|
|||
};
|
||||
};
|
||||
configurationFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
type = lib.types.path;
|
||||
default = jsonFormat.generate "amazon-cloudwatch-agent.json" cfg.configuration;
|
||||
defaultText = lib.literalExpression ''jsonFormat.generate "amazon-cloudwatch-agent.json" cfg.configuration'';
|
||||
description = ''
|
||||
Amazon CloudWatch Agent configuration file. See
|
||||
<https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Agent-Configuration-File-Details.html>
|
||||
|
@ -200,8 +192,8 @@ in
|
|||
LogsDirectory = "amazon-cloudwatch-agent";
|
||||
ExecStartPre = builtins.concatStringsSep " " [
|
||||
"${cfg.package}/bin/config-translator"
|
||||
"-config ${commonConfigurationFile}"
|
||||
"-input ${configurationFile}"
|
||||
"-config ${cfg.commonConfigurationFile}"
|
||||
"-input ${cfg.configurationFile}"
|
||||
"-input-dir ${configurationDirectory}"
|
||||
"-mode ${cfg.mode}"
|
||||
"-output \${RUNTIME_DIRECTORY}/amazon-cloudwatch-agent.toml"
|
||||
|
|
|
@ -10864,19 +10864,6 @@ final: prev:
|
|||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-web-devicons = buildVimPlugin {
|
||||
pname = "nvim-web-devicons";
|
||||
version = "2025-01-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-tree";
|
||||
repo = "nvim-web-devicons";
|
||||
rev = "1c9136332840edee0c593f2f4f89598c8ed97f5f";
|
||||
sha256 = "10liz7hpdb5vavn45hpqn0c39s0cqdns8dygr1472b5fyxh5ld29";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-whichkey-setup-lua = buildVimPlugin {
|
||||
pname = "nvim-whichkey-setup.lua";
|
||||
version = "2021-04-16";
|
||||
|
|
|
@ -9,19 +9,19 @@
|
|||
replaceVars,
|
||||
}:
|
||||
let
|
||||
version = "0.11.0";
|
||||
version = "0.12.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Saghen";
|
||||
repo = "blink.cmp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uL1g5zhTpWfdbCqE+JYFH+2uDj9MT86vLTyKEweQesg=";
|
||||
hash = "sha256-oPh0mIqSxbpzmUzk3lP7OwcqKfP8syP0NAPKysTet98=";
|
||||
};
|
||||
blink-fuzzy-lib = rustPlatform.buildRustPackage {
|
||||
inherit version src;
|
||||
pname = "blink-fuzzy-lib";
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-EoxKmVyJRxqI6HOuuiSj5+IOuo5M8ZNdSyk86sQNtE8=";
|
||||
cargoHash = "sha256-W7CdF70BMXKMCcooR6adw2wwHJ3WznZ+o8KRyHWMeeI=";
|
||||
|
||||
nativeBuildInputs = [ git ];
|
||||
|
||||
|
@ -59,6 +59,7 @@ vimUtils.buildVimPlugin {
|
|||
meta = {
|
||||
description = "Performant, batteries-included completion plugin for Neovim";
|
||||
homepage = "https://github.com/saghen/blink.cmp";
|
||||
changelog = "https://github.com/Saghen/blink.cmp/blob/v${version}/CHANGELOG.md";
|
||||
maintainers = with lib.maintainers; [
|
||||
balssh
|
||||
redxtech
|
||||
|
|
|
@ -4015,6 +4015,7 @@ in
|
|||
"nvim-cmp"
|
||||
"nvim-dbee"
|
||||
"nvim-nio"
|
||||
"nvim-web-devicons"
|
||||
"orgmode"
|
||||
"papis-nvim"
|
||||
"rest-nvim"
|
||||
|
|
|
@ -18,13 +18,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpxsee";
|
||||
version = "13.34";
|
||||
version = "13.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-adZTcZGRE0PkG9rntvD3vLIqXOsVxP28LCZrfyVqy9M=";
|
||||
hash = "sha256-TvDopZyrRx+604ARrOiy2OsswE8/K+W5LIhOitttt3U=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
dart-sass,
|
||||
symlinkJoin,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
gjs,
|
||||
glib,
|
||||
gobject-introspection,
|
||||
|
@ -22,23 +21,15 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "ags";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aylur";
|
||||
repo = "ags";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-snHhAgcH8hACWZFaAqHr5uXH412UrAuA603OK02MxN8=";
|
||||
hash = "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# refactor for better nix support
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/Aylur/ags/commit/17df94c576d0023185770f901186db427f2ec0a2.diff?full_index=1";
|
||||
hash = "sha256-tcoifkYmXjV+ZbeAFRHuk8cVmxWMrS64syvQMGGKAVA=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-Pw6UNT5YkDVz4HcH7b5LfOg+K3ohrBGPGB9wYGAQ9F4=";
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
@ -3,24 +3,24 @@
|
|||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.75.175";
|
||||
version = "1.75.178";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-/tzdBTkNF8KtSG36Xs1MC+d//SVcGaQu1ODs9YXBKzc=";
|
||||
hash = "sha256-e/HdEO8Z3woPGNR646M51En5/IBNh/KOwTjXTQLwOY0=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-IhWUUvms/UMps3KOcOqm5YBRlSfCX/TLYEx7iIp9Nvc=";
|
||||
hash = "sha256-Fl82K7W3awVxD7cflKVKcPrk4ZA7pxiQabCFlmp0U6w=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-laiGVu0rNUMw9ybXGRdJKoUGJ9uo7FoFhekuL0UgtFY=";
|
||||
hash = "sha256-juijrUlvkxlXXzP/5PY1ngO6EYdcGbxlyMpcEHj6bEU=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-wht/l79wLG1Fr4KcbhLbS7AbozWSgKBJconjy1hRBOI=";
|
||||
hash = "sha256-ipjLpENca6RlccXhd7sX5l8ycMKCFvSp3f2vCmkmcrA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
@ -10,19 +11,21 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evansmurithi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = "cloak";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Pd2aorsXdHB1bs609+S5s+WV5M1ql48yIKaoN8SEvsg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-PAZOenugZrKYIP7zzxozerjkauwg7VN0mAlex0WPttQ=";
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/evansmurithi/cloak";
|
||||
description = "Command-line OTP authenticator application";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mvs ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mvs ];
|
||||
mainProgram = "cloak";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "dns-over-https";
|
||||
version = "2.3.7";
|
||||
version = "2.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "m13253";
|
||||
repo = "dns-over-https";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3mg4kDlIqv+psQU/FxA9TksGVAYaOymEDpAhMBZuqKI=";
|
||||
hash = "sha256-0tjqj67PWPRChspUQQeZqtW68IB2G8N2vhebMwHNbX4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Dun1HWjV44PTpnijWBpGXqmKxtUw+Qu8rqsyMhEpkb4=";
|
||||
vendorHash = "sha256-cASJYEglq2IrnxjqOCiepjExX/FmakeMjxPOsjUDTWM=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
|
47
pkgs/by-name/dn/dnstap/package.nix
Normal file
47
pkgs/by-name/dn/dnstap/package.nix
Normal file
|
@ -0,0 +1,47 @@
|
|||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
stdenv,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "dnstap";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dnstap";
|
||||
repo = "golang-dnstap";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-GmwHJ6AQ4HcPEFNeodKqJe/mYE1Fa95hRiQWoka/nv4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xDui88YgLqIETIR34ZdqT6Iz12v+Rdf6BssAIXgaMLU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage dnstap/dnstap.8
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Structured DNS server events decoding utility";
|
||||
longDescription = ''
|
||||
dnstap implements an encoding format for DNS server events. It uses a
|
||||
lightweight framing on top of event payloads encoded using Protocol
|
||||
Buffers and is transport neutral.
|
||||
|
||||
dnstap can represent internal state inside a DNS server that is difficult
|
||||
to obtain using techniques based on traditional packet capture or
|
||||
unstructured textual format logging.
|
||||
'';
|
||||
homepage = "https://dnstap.info";
|
||||
changelog = "https://github.com/dnstap/golang-dnstap/releases/tag/${src.rev}";
|
||||
license = lib.licenses.asl20;
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = [ lib.maintainers.azahi ];
|
||||
mainProgram = "dnstap";
|
||||
};
|
||||
}
|
|
@ -16,19 +16,19 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "edgedb";
|
||||
version = "6.1.1";
|
||||
version = "6.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edgedb";
|
||||
repo = "edgedb-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cNjt66CTJq3q1leuQ7z1WreJVG0gdUmMW+pH+FozFz0=";
|
||||
hash = "sha256-7epi7cF6u3Y/Fomcd1+lQfIIRKzuqL6Qk3gTZGZnjv8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-fAr/cTF8LqLAxbKW1Vq4H8fFX1kUa/rZDSVz3/wl44E=";
|
||||
hash = "sha256-Iq960LU3Xxu5LHBENsZ48diPVJrdTHxtChtSp7yghCw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "falkor";
|
||||
version = "0.0.92";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Team-Falkor/falkor/releases/download/v${finalAttrs.version}/falkor.deb";
|
||||
hash = "sha256-yDpYu2ehrRQuD29jcyTQla2R2IT1zfBDeWDDRnmqc8Y=";
|
||||
url = "https://github.com/Team-Falkor/falkor/releases/download/v0.1.0-alpha/Falkor.deb";
|
||||
hash = "sha256-L1EBJ49+g7n6NtKs1BTBD30glL/K0SerL/k5Dl2SgqM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -28,8 +28,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
mkdir -p $out/bin
|
||||
mv usr/share $out/share
|
||||
mkdir -p $out/share/falkor
|
||||
sed -i "s|Exec=.*|Exec=falkor|" $out/share/applications/*.desktop
|
||||
mv opt/falkor/{resources,resources.pak,locales} $out/share/falkor
|
||||
substituteInPlace $out/share/applications/falkor.desktop \
|
||||
--replace-fail "/opt/Falkor/" ""
|
||||
mv opt/Falkor/{resources,resources.pak,locales} $out/share/falkor
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/falkor \
|
||||
--argv0 "falkor" \
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
@ -17,11 +18,13 @@ buildGoModule rec {
|
|||
|
||||
vendorHash = "sha256-RqQMCP9rmdTG5AXLXkIQz0vE7qF+3RZ1BDdVRYoHHQs=";
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/kc2g-flex-tools/nCAT";
|
||||
description = "FlexRadio remote control (CAT) via hamlib/rigctl protocol";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mvs ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mvs ];
|
||||
mainProgram = "nCAT";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
libpulseaudio,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
@ -21,12 +22,14 @@ buildGoModule rec {
|
|||
|
||||
vendorHash = "sha256-05LWJm4MoJqjJaFrBZvutKlqSTGl4dSp433AfHHO6LU=";
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
homepage = "https://github.com/kc2g-flex-tools/nDAX";
|
||||
description = "FlexRadio digital audio transport (DAX) connector for PulseAudio";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mvs ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mvs ];
|
||||
mainProgram = "nDAX";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.13.25";
|
||||
version = "3.15.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4VDMVJPzp6mCiO092iRn9e/3Jed3g29tLZa+TNYkYoI=";
|
||||
hash = "sha256-vMg4HimS+/QSbuwwVfKAroux8VHrKsm1wPGZDWN33g8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
@ -157,7 +157,7 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
meta = {
|
||||
homepage = "https://flexget.com/";
|
||||
changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}";
|
||||
changelog = "https://github.com/Flexget/Flexget/releases/tag/${src.tag}";
|
||||
description = "Multipurpose automation tool for all of your media";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pbsds ];
|
||||
|
|
|
@ -10,26 +10,26 @@ let
|
|||
systemToPlatform = {
|
||||
"x86_64-linux" = {
|
||||
name = "linux-amd64";
|
||||
hash = "sha256-HDyPQ7/suk6LA6mchwE+LHcO1+9aB7o+60lX6OKFLGQ=";
|
||||
hash = "sha256-KIiwIv0VzJf0GVkuDsevEah48hv4VybLuBhy4dJvggo=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
name = "linux-arm64";
|
||||
hash = "sha256-IfAfduUMAQ53oi2ZgRxc825oMyX6PvATkQpvxmFjMHo=";
|
||||
hash = "sha256-hNXDIB7r3Hdo7g2pPZKAYYrOaBJmAq7UKc+ZnRnVeoA=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
name = "darwin-amd64";
|
||||
hash = "sha256-I4EG6T//+YFLOlQMpW1ERpBzR/882lXMPqpO7em/QJY=";
|
||||
hash = "sha256-1tN734huSBzke8j8H/dyFS90LsWGFuGtLdYdrLbGeOs=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
name = "darwin-arm64";
|
||||
hash = "sha256-QtHCvTgfrQilIbd3S3/zkyBLccukGfFckCrZPCIMNMg=";
|
||||
hash = "sha256-lGhgND1E4jWZmoAaPXcxNlew9eqWOrMHAYVnpFnqeio=";
|
||||
};
|
||||
};
|
||||
platform = systemToPlatform.${system} or throwSystem;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gh-copilot";
|
||||
version = "1.0.6";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "gh-copilot";
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
pulseaudio,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
@ -12,7 +13,7 @@ buildGoModule rec {
|
|||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nonoo";
|
||||
repo = pname;
|
||||
repo = "kappanhang";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-l0V2NVzLsnpPe5EJcr5i9U7OGaYzNRDd1f/ogrdCnvk=";
|
||||
};
|
||||
|
@ -22,12 +23,14 @@ buildGoModule rec {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ pulseaudio ];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/nonoo/kappanhang";
|
||||
description = "Remote control for Icom radio transceivers";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mvs ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ mvs ];
|
||||
mainProgram = "kappanhang";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "lunarclient";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
|
||||
hash = "sha512-WS23Kz/9iVsFGuds/vD/kc2k6aCsLkNy6b/vFeYEkbqrXQ3FHiNMl6ELPFXuOznEo/AiuqNp0O623G7r7SrKlw==";
|
||||
hash = "sha512-Cyhj7TEZMsGHYxYslgEsG6ATM5YFrS/LuzDwbf3DrzzvNGPx1ETmuiNGKDI28aSswqRsNQ2kl+DoZalOLVJM7A==";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -2,40 +2,61 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
directoryListingUpdater,
|
||||
man,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "man-pages";
|
||||
version = "6.9.1";
|
||||
version = "6.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-4jy6wp8RC6Vx8NqFI+edNzaRRm7X8qMTAXIYF9NFML0=";
|
||||
url = "mirror://kernel/linux/docs/man-pages/man-pages-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-3aou2i6NKG++wiHRFfEtP/9dNsxQZs3+zI0koljVixk=";
|
||||
};
|
||||
|
||||
nativeInstallCheckInputs = [ man ];
|
||||
|
||||
dontBuild = true;
|
||||
enableParallelInstalling = true;
|
||||
doInstallCheck = true;
|
||||
|
||||
makeFlags = [
|
||||
"-R"
|
||||
"VERSION=${finalAttrs.version}"
|
||||
"prefix=${placeholder "out"}"
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
outputDocdev = "out";
|
||||
|
||||
enableParallelInstalling = true;
|
||||
|
||||
postInstall = ''
|
||||
# The manpath executable looks up manpages from PATH. And this package won't
|
||||
# appear in PATH unless it has a /bin folder. Without the change
|
||||
# 'nix-shell -p man-pages' does not pull in the search paths.
|
||||
# See 'man 5 manpath' for the lookup order.
|
||||
mkdir -p $out/bin
|
||||
preConfigure = ''
|
||||
# If not provided externally, the makefile will attempt to determine the
|
||||
# date and time of the release from the Git repository log, which is not
|
||||
# available in the distributed tarball. We therefore supply it from
|
||||
# $SOURCE_DATE_EPOCH, which is based on the most recent modification time
|
||||
# of all source files. Cf.
|
||||
# nixpkgs/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
|
||||
export DISTDATE="$(date --utc --date="@$SOURCE_DATE_EPOCH")"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
# Check for a few well‐known man pages
|
||||
for page in ldd write printf null hosts random ld.so; do
|
||||
man -M "$out/share/man" -P cat "$page" >/dev/null
|
||||
done
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru.updateScript = directoryListingUpdater {
|
||||
url = "https://www.kernel.org/pub/linux/docs/man-pages/";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Linux development manual pages";
|
||||
homepage = "https://www.kernel.org/doc/man-pages/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
priority = 30; # if a package comes with its own man page, prefer it
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
installShellFiles,
|
||||
}:
|
||||
let
|
||||
version = "0.4.43";
|
||||
version = "0.4.44";
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
inherit version;
|
||||
|
@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "rust-lang";
|
||||
repo = "mdBook";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-aADNcuIeDef9+a3NOWQxo6IRnKJ6AbkvE4GqvFbubyI=";
|
||||
hash = "sha256-p3DzsK1LSAp9eBES8gNqLsjKrs426nPgQxSjOKCLpzY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
allowGitDependencies = false;
|
||||
hash = "sha256-W5hg6ECNQRIh07ogZkXTn51el2YltutY86aJBYFDTP4=";
|
||||
hash = "sha256-ah/6sugq3fkgB2N6ZjXWCHVHhCY8z4zgq3jcobURdpk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
@ -6,17 +6,21 @@
|
|||
rcu,
|
||||
testers,
|
||||
copyDesktopItems,
|
||||
coreutils,
|
||||
desktopToDarwinBundle,
|
||||
gnutar,
|
||||
libsForQt5,
|
||||
makeDesktopItem,
|
||||
nettools,
|
||||
protobuf,
|
||||
python3Packages,
|
||||
system-config-printer,
|
||||
wget,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rcu";
|
||||
version = "2024.001q";
|
||||
version = "2025.001r";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
@ -24,8 +28,8 @@ python3Packages.buildPythonApplication rec {
|
|||
let
|
||||
src-tarball = requireFile {
|
||||
name = "rcu-d${version}-source.tar.gz";
|
||||
hash = "sha256-Ywk28gJBMSSQL6jEcHE8h253KOsXIGwVOag6PBWs8kg=";
|
||||
url = "http://www.davisr.me/projects/rcu/";
|
||||
hash = "sha256-3pTfe0ytcvLnO65S0Uqrv/IBoidpEIQXqkcIG354hUU=";
|
||||
url = "https://www.davisr.me/projects/rcu/";
|
||||
};
|
||||
in
|
||||
runCommand "${src-tarball.name}-unpacked" { } ''
|
||||
|
@ -48,6 +52,10 @@ python3Packages.buildPythonApplication rec {
|
|||
# This must match the protobuf version imported at runtime, regenerate it
|
||||
rm src/model/update_metadata_pb2.py
|
||||
protoc --proto_path src/model src/model/update_metadata.proto --python_out=src/model
|
||||
|
||||
# We don't make it available at this location, wrapping adds it to PATH instead
|
||||
substituteInPlace src/model/document.py \
|
||||
--replace-fail '/sbin/ifconfig' 'ifconfig'
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
|
@ -134,9 +142,21 @@ python3Packages.buildPythonApplication rec {
|
|||
''
|
||||
makeWrapperArgs+=(
|
||||
"''${qtWrapperArgs[@]}"
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
gnutar
|
||||
wget
|
||||
]
|
||||
}
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
--prefix PATH : ${lib.makeBinPath [ system-config-printer ]}
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
nettools
|
||||
system-config-printer
|
||||
]
|
||||
}
|
||||
''
|
||||
+ ''
|
||||
)
|
||||
|
@ -164,12 +184,12 @@ python3Packages.buildPythonApplication rec {
|
|||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
mainProgram = "rcu";
|
||||
description = "All-in-one offline/local management software for reMarkable e-paper tablets";
|
||||
homepage = "http://www.davisr.me/projects/rcu/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [ OPNA2608 ];
|
||||
hydraPlatforms = [ ]; # requireFile used as src
|
||||
};
|
||||
}
|
||||
|
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "stackit-cli";
|
||||
version = "0.22.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackitcloud";
|
||||
repo = "stackit-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-05x7nH3XSbO5iLF46BDgtkwBb3XLkAvOw0WIoVf/FkU=";
|
||||
hash = "sha256-n1F/DjGvNzU5aF05y3K6/vDuFa/ed2XZLfpafi5+NWg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5amIW9DA1F3q0W7s+TpbiyeW0W7PAlzpDyBRRVZ/4eA=";
|
||||
vendorHash = "sha256-EaHRYdP7w1PQFYNxAWiTYcCpfipuqvbtbBUYNXNM6nc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "sweet-folders";
|
||||
version = "unstable-2023-03-18";
|
||||
version = "0-unstable-2025-02-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "Sweet-folders";
|
||||
rev = "b2192ff1412472f036fdf9778c6b9dbcb6c044ec";
|
||||
hash = "sha256-QexfqXH5a1IEhKBRjWSMdrEvThvLRzd4M32Xti1DCGE=";
|
||||
rev = "40a5d36e50437901c7eaa1119bb9ae8006e2fe5c";
|
||||
hash = "sha256-Pb3xsNKM5yGT4uAUxrCds1JSSvU/whhTJcmqiM7EW+4=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -1,64 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
runCommand,
|
||||
tailwindcss_4,
|
||||
}:
|
||||
let
|
||||
version = "4.0.6";
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
|
||||
|
||||
plat =
|
||||
{
|
||||
aarch64-darwin = "macos-arm64";
|
||||
aarch64-linux = "linux-arm64";
|
||||
x86_64-darwin = "macos-x64";
|
||||
x86_64-linux = "linux-x64";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
hash =
|
||||
{
|
||||
aarch64-darwin = "sha256-FopnfuGYBjjQkfPHdIWacpom9WsAVRwHPQ/14waWR7s=";
|
||||
aarch64-linux = "sha256-y+9d53skmoSZPhbtk9vUkhKNzIE1A868Lnkw7Cot/PU=";
|
||||
x86_64-darwin = "sha256-rFjaDtPjJO9W6G//7Uu5CJE+pB0sqLrMByC5pv4FA4E=";
|
||||
x86_64-linux = "sha256-14EMXenpvPsKlnu5kebNu3MmfWwa7UYfAgEkh5EwVRM=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit version;
|
||||
pname = "tailwindcss_4";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-" + plat;
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
|
||||
installPhase = ''
|
||||
install -D $src $out/bin/tailwindcss
|
||||
'';
|
||||
|
||||
passthru.tests.helptext = runCommand "tailwindcss-test-helptext" { } ''
|
||||
${tailwindcss_4}/bin/tailwindcss --help > $out
|
||||
'';
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line tool for the CSS framework with composable CSS classes, standalone v4 CLI";
|
||||
homepage = "https://tailwindcss.com/blog/tailwindcss-v4";
|
||||
license = licenses.mit;
|
||||
sourceProvenance = [ sourceTypes.binaryNativeCode ];
|
||||
maintainers = [ maintainers.adamjhf ];
|
||||
mainProgram = "tailwindcss";
|
||||
platforms = platforms.darwin ++ platforms.linux;
|
||||
};
|
||||
}
|
|
@ -1,30 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused jq nix-prefetch
|
||||
set -eou pipefail
|
||||
|
||||
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||
|
||||
CURRENT_VERSION=$(nix-instantiate --eval --strict --json -A tailwindcss.version . | jq -r .)
|
||||
LATEST_VERSION=$(curl --fail --silent https://api.github.com/repos/tailwindlabs/tailwindcss/releases/latest | jq --raw-output .tag_name | sed 's/v//')
|
||||
sed -i "s/version = \".*\"/version = \"${LATEST_VERSION}\"/" "$ROOT/default.nix"
|
||||
|
||||
if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then
|
||||
echo "tailwindcss already at latest version $CURRENT_VERSION, exiting"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
function updatePlatform() {
|
||||
NIXPLAT=$1
|
||||
TAILWINDPLAT=$2
|
||||
echo "Updating tailwindcss for $NIXPLAT"
|
||||
|
||||
URL="https://github.com/tailwindlabs/tailwindcss/releases/download/v${LATEST_VERSION}/tailwindcss-${TAILWINDPLAT}"
|
||||
HASH=$(nix hash to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$URL")")
|
||||
|
||||
sed -i "s,$NIXPLAT = \"sha256.*\",$NIXPLAT = \"${HASH}\"," "$ROOT/default.nix"
|
||||
}
|
||||
|
||||
updatePlatform aarch64-darwin macos-arm64
|
||||
updatePlatform aarch64-linux linux-arm64
|
||||
updatePlatform x86_64-darwin macos-x64
|
||||
updatePlatform x86_64-linux linux-x64
|
6716
pkgs/by-name/ta/tasks/Cargo.lock
generated
6716
pkgs/by-name/ta/tasks/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -1,98 +1,67 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
atk,
|
||||
cairo,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
gtk3,
|
||||
libcosmicAppHook,
|
||||
just,
|
||||
libsecret,
|
||||
libxkbcommon,
|
||||
openssl,
|
||||
pango,
|
||||
sqlite,
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tasks";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edfloreshz";
|
||||
owner = "cosmic-utils";
|
||||
repo = "tasks";
|
||||
tag = version;
|
||||
hash = "sha256-0bXzeKnJ5MIl7vCo+7kyXm3L6QrCdm5sPreca1SPi8U=";
|
||||
hash = "sha256-OKXkAJ+TyMnTzvlUPwPU2MWgCTIN3cDiPcVPOzU4WEg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw=";
|
||||
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
|
||||
"clipboard_macos-0.1.0" = "sha256-temNg+RdvquSLAdkwU5b6dtu9vZkXjnDASS/eJo2rz8=";
|
||||
"cosmic-config-0.1.0" = "sha256-dYxBp/2JkgFUtkcfzQieHS7MPf6GoOIxuCN/8AZraio=";
|
||||
"cosmic-text-0.11.2" = "sha256-O8l3Auo+7/aqPYvWQXpOdrVHHdjc1fjoU1nFxqdiZ5I=";
|
||||
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
|
||||
"glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
|
||||
"smithay-client-toolkit-0.18.0" = "sha256-/7twYMt5/LpzxLXAQKTGNnWcfspUkkZsN5hJu7KaANc=";
|
||||
"smithay-clipboard-0.8.0" = "sha256-MqzynFCZvzVg9/Ry/zrbH5R6//erlZV+nmQ2St63Wnc=";
|
||||
"softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";
|
||||
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
|
||||
"winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4=";
|
||||
};
|
||||
};
|
||||
|
||||
# COSMIC applications now uses vergen for the About page
|
||||
# Update the COMMIT_DATE to match when the commit was made
|
||||
env.VERGEN_GIT_COMMIT_DATE = "2024-07-03";
|
||||
env.VERGEN_GIT_SHA = "0e8c728c88a9cac1bac130eb083ca0fe58c7121d";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-3SbqKB9DI1Bl8u8rrAPCO/sPKMByYhQ3YT63K5BDVvE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
libcosmicAppHook
|
||||
just
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
atk
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libsecret
|
||||
libxkbcommon
|
||||
openssl
|
||||
pango
|
||||
sqlite
|
||||
vulkan-loader
|
||||
wayland
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/tasks \
|
||||
--prefix LD_LIBRARY_PATH : "${
|
||||
lib.makeLibraryPath [
|
||||
libxkbcommon
|
||||
wayland
|
||||
]
|
||||
}"
|
||||
'';
|
||||
dontUseJustBuild = true;
|
||||
dontUseJustCheck = true;
|
||||
|
||||
justFlags = [
|
||||
"--set"
|
||||
"prefix"
|
||||
(placeholder "out")
|
||||
"--set"
|
||||
"bin-src"
|
||||
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/tasks"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/cosmic-utils/tasks/releases/tag/${version}";
|
||||
description = "Simple task management application for the COSMIC desktop";
|
||||
homepage = "https://github.com/edfloreshz/tasks";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://github.com/cosmic-utils/tasks";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
HeitorAugustoLN
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "tasks";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "tela-icon-theme";
|
||||
version = "2024-09-04";
|
||||
version = "2025-02-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = "tela-icon-theme";
|
||||
rev = version;
|
||||
hash = "sha256-ZzF4U/cTy/7oSDQs4+dezewgNzS5zroba8wpcfPciW4=";
|
||||
hash = "sha256-ufjKFlKJnmNwD2m1w+7JSBQij6ltxXWCpUEvVxECS98=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,34 +1,33 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tinyssh";
|
||||
version = "20241201";
|
||||
version = "20250201";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janmojzis";
|
||||
repo = "tinyssh";
|
||||
tag = version;
|
||||
hash = "sha256-bcQDKDpd7HFnmJAyqcO+BQMGV1pCHuS+OhFPJSOMInI=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HX531QjRrDG4dshqzR03naZptUYnoZLEdv/CGpKOaD0=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
echo /bin > conf-bin
|
||||
echo /share/man > conf-man
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";
|
||||
|
||||
DESTDIR = placeholder "out";
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Minimalistic SSH server";
|
||||
homepage = "https://tinyssh.org";
|
||||
changelog = "https://github.com/janmojzis/tinyssh/releases/tag/${version}";
|
||||
license = licenses.cc0;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
changelog = "https://github.com/janmojzis/tinyssh/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.cc0;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ kaction ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vintagestory";
|
||||
version = "1.20.3";
|
||||
version = "1.20.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
|
||||
hash = "sha256-+nEyFlLfTAOmd8HrngZOD1rReaXCXX/ficE/PCLcewg=";
|
||||
hash = "sha256-Hgp2u/y2uPnJhAmPpwof76/woFGz4ISUXU+FIRMjMuQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-Z5NCTgOs49Pld1jRyUngbSgkxuH4LPROx06bf7H0cuE=",
|
||||
"version": "0.2025.02.05.08.02.stable_03"
|
||||
"hash": "sha256-XEnwEb7z0NwXpD1OULegdkj9oHP1rPfUw+bxE/DqUSs=",
|
||||
"version": "0.2025.02.12.16.51.stable_03"
|
||||
},
|
||||
"linux_x86_64": {
|
||||
"hash": "sha256-xvckfFXl/ECP5YS/+NZv1UJFkVpIMQ7qnbzM3ffVrmw=",
|
||||
"version": "0.2025.02.05.08.02.stable_03"
|
||||
"hash": "sha256-teHHwoijqNi17U1XbZLBKwgn1CDVnOoPk+c+5qfaSEM=",
|
||||
"version": "0.2025.02.12.16.51.stable_03"
|
||||
},
|
||||
"linux_aarch64": {
|
||||
"hash": "sha256-x1U8EyZ+AoLdmF1LdXHEWz28+El/aBhD7JOG/XNaBJY=",
|
||||
"version": "0.2025.02.05.08.02.stable_03"
|
||||
"hash": "sha256-lsKkk7XU1uQ1lsbBtENe4vpfbGSozHV3TzClVHP3NxE=",
|
||||
"version": "0.2025.02.12.16.51.stable_03"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
wrapGAppsHook3,
|
||||
pkg-config,
|
||||
|
@ -9,17 +9,20 @@
|
|||
gtk3,
|
||||
blas,
|
||||
lapack,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xnec2c";
|
||||
version = "4.4.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.xnec2c.org/releases/${pname}-v${version}.tar.gz";
|
||||
hash = "sha256-XiZi8pfmfHjGpePkRy/pF1TA+5RdxX4AGuKzG5Wqrmk=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "KJ7LNW";
|
||||
repo = "xnec2c";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-W8JwbCSXt5cjgncOzV1wltPnJxwWC6B29eaT8emIU9Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -34,15 +37,17 @@ stdenv.mkDerivation rec {
|
|||
lapack
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.xnec2c.org/";
|
||||
description = "Graphical antenna simulation";
|
||||
mainProgram = "xnec2c";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ mvs ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ mvs ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
# Darwin support likely to be fixed upstream in the next release
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, lib
|
||||
, replaceVars
|
||||
# Dependencies
|
||||
|
@ -50,8 +49,6 @@ let
|
|||
binaryUrl = version: rel:
|
||||
if arch == archs.aarch64-linux then
|
||||
"https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz"
|
||||
else if arch == archs.x86_64-darwin && lib.versionOlder version "1.2.0" then
|
||||
"https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-darwin-x86_64.tar.gz"
|
||||
else
|
||||
"https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz";
|
||||
|
||||
|
@ -98,16 +95,7 @@ let
|
|||
(replaceVars ./tzdata.patch {
|
||||
inherit tzdata;
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder version "1.2.0") [
|
||||
# add support for DWARF5 debuginfo, fixes builds on recent compilers
|
||||
# the PR is 8 commits from 2019, so just fetch the whole thing
|
||||
# and hope it doesn't change
|
||||
(fetchpatch {
|
||||
url = "https://github.com/crystal-lang/crystal/pull/11399.patch";
|
||||
sha256 = "sha256-CjNpkQQ2UREADmlyLUt7zbhjXf0rTjFhNbFYLwJKkc8=";
|
||||
})
|
||||
];
|
||||
];
|
||||
|
||||
outputs = [ "out" "lib" "bin" ];
|
||||
|
||||
|
@ -145,10 +133,6 @@ let
|
|||
substituteInPlace spec/std/socket/udp_socket_spec.cr \
|
||||
--replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'
|
||||
|
||||
'' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") ''
|
||||
# See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277
|
||||
substituteInPlace spec/compiler/loader/unix_spec.cr \
|
||||
--replace 'it "parses file paths"' 'pending "parses file paths"'
|
||||
'' + lib.optionalString (stdenv.cc.isClang && (stdenv.cc.libcxx != null)) ''
|
||||
# Darwin links against libc++ not libstdc++. Newer versions of clang (12+) require
|
||||
# libc++abi to be linked explicitly (see https://github.com/NixOS/nixpkgs/issues/166205).
|
||||
|
@ -187,9 +171,6 @@ let
|
|||
|
||||
FLAGS = [
|
||||
"--single-module" # needed for deterministic builds
|
||||
] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.1") [
|
||||
# ffi is only used by the interpreter and its spec are broken on < 1.6.1
|
||||
"-Dwithout_ffi"
|
||||
];
|
||||
|
||||
# This makes sure we don't keep depending on the previous version of
|
||||
|
|
|
@ -250,14 +250,14 @@ buildLuarocksPackage {
|
|||
commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "commons.nvim";
|
||||
version = "26.0.0-1";
|
||||
version = "27.0.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/commons.nvim-26.0.0-1.rockspec";
|
||||
sha256 = "1syrpqc4ydnrq7ly8lws4i3fs9cp5c9la8g1ppzixjqpdinymcgh";
|
||||
url = "mirror://luarocks/commons.nvim-27.0.0-1.rockspec";
|
||||
sha256 = "0gz1943nrlpi7pq4izip6fb0pkfk13h5322qhynx27m82nm129mq";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/linrongbin16/commons.nvim/archive/84bd05cbdde7363541129c92ab60457ad45e63c9.zip";
|
||||
sha256 = "05a9a93kl88l68079kzmb40ahhzjf19424mrw69vq3bdhyjicjls";
|
||||
url = "https://github.com/linrongbin16/commons.nvim/archive/ac18006fe9e47cf6e53c79e333465d5a75455357.zip";
|
||||
sha256 = "10qlgly499lyhvmhj5lqv4jqzyrlx6h7h7gjbyrgzpjqyjr99m1l";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -486,14 +486,14 @@ buildLuarocksPackage {
|
|||
fidget-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "fidget.nvim";
|
||||
version = "1.4.1-1";
|
||||
version = "1.6.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/fidget.nvim-1.4.1-1.rockspec";
|
||||
sha256 = "1dfhwa6dgca88h6p9h75qlkcx3qsl8g4aflvndd7vjcimlnfiqqd";
|
||||
url = "mirror://luarocks/fidget.nvim-1.6.0-1.rockspec";
|
||||
sha256 = "1jra7xv2ifsy5p3zwbiv70ynligjh8wx48ykmbi2cagd2vz9arwz";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/j-hui/fidget.nvim/archive/1ba38e4cbb24683973e00c2e36f53ae64da38ef5.zip";
|
||||
sha256 = "0g0z1g1nmrjmg9298vg2ski6m41f1yhpas8kr9mi8pa6ibk4m63x";
|
||||
url = "https://github.com/j-hui/fidget.nvim/archive/v1.6.0.zip";
|
||||
sha256 = "120q3dzq142xda1bzw8chf02k86dw21n8qjznlaxxpqlpk9sl6hr";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -579,14 +579,14 @@ buildLuarocksPackage {
|
|||
fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "fzf-lua";
|
||||
version = "0.0.1715-1";
|
||||
version = "0.0.1753-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/fzf-lua-0.0.1715-1.rockspec";
|
||||
sha256 = "0lqm4cz5jbasz9h97h10wjhbvpmkipadbrk0b3xhdzl5s47fcvj5";
|
||||
url = "mirror://luarocks/fzf-lua-0.0.1753-1.rockspec";
|
||||
sha256 = "0d6cy5hqcpimm71kr1q58yf264mymhrvsfxsql9ghhmbrinrdq3w";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/d26acfea8d2b873a6c5f66e8d0168871e5be3945.zip";
|
||||
sha256 = "1karjyaizc7d0i08lz1jja72gzwc8832d2cbgp08shb2jpg4859r";
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/0a3b70feb05879a8001c51f7a2a42fa52a9e552c.zip";
|
||||
sha256 = "0ysjs6pm16373rp5p4l3cvxx6c9p8h5fp14vvd38z7f3gd6mxwqa";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -646,14 +646,14 @@ buildLuarocksPackage {
|
|||
haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "haskell-tools.nvim";
|
||||
version = "4.4.0-1";
|
||||
version = "4.4.2-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/haskell-tools.nvim-4.4.0-1.rockspec";
|
||||
sha256 = "076d5sl2zg7mrvdld548qarx3d5l3m16wv7lcpdfr8sabi4nclh2";
|
||||
url = "mirror://luarocks/haskell-tools.nvim-4.4.2-1.rockspec";
|
||||
sha256 = "1npx6f6rhbhgc6fkz7m3449vdy5fba7gvwkrb1qyw9ivxrlmcdpp";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v4.4.0.zip";
|
||||
sha256 = "075nifkkfribmq40jp0mdjvk8yk2sglr7jcd2hn7ss7z8h232ywh";
|
||||
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v4.4.2.zip";
|
||||
sha256 = "1r1h32a2xdh2dncn72zv6c55ayr8b24p0fl3z72z9rlvgy86m36r";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -771,8 +771,8 @@ buildLuarocksPackage {
|
|||
src = fetchFromGitHub {
|
||||
owner = "daurnimator";
|
||||
repo = "ldbus";
|
||||
rev = "6d4909c983c8a0e2c7384bac8055c628aa524ea2";
|
||||
hash = "sha256-8px1eFSxt/SJipxxmjTpGpJO7V0oOK39+nK7itJCCaM=";
|
||||
rev = "d2b80eced6293e2a02345fa517147953336af375";
|
||||
hash = "sha256-2es/xoh2G28Dq/74/wWX1OHgioqZBLzUtX4fy7cDit0=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1" || luaAtLeast "5.5";
|
||||
|
@ -877,16 +877,16 @@ buildLuarocksPackage {
|
|||
llscheck = callPackage({ ansicolors, argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-cjson, luaOlder, luafilesystem, penlight }:
|
||||
buildLuarocksPackage {
|
||||
pname = "llscheck";
|
||||
version = "0.6.0-1";
|
||||
version = "0.7.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/llscheck-0.6.0-1.rockspec";
|
||||
sha256 = "1scgsjgsjbapqgwvwcd9l378sipin2w85mcjdi0fzgldsx87gwni";
|
||||
url = "mirror://luarocks/llscheck-0.7.0-1.rockspec";
|
||||
sha256 = "0mq44xjsgvdh50cyi5khjqm19xd1w8cjhrr6vbckmb0zpia2v9sk";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeffzi";
|
||||
repo = "llscheck";
|
||||
rev = "v0.6.0";
|
||||
hash = "sha256-XYfcVPiYCDrmuHyR1TN4QvsWIvbs86FN3UQYfrRHPiI=";
|
||||
rev = "v0.7.0";
|
||||
hash = "sha256-DOXWBTw7ylfjrk6wxoii9/eAkY4WObtRStttQmhWglc=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -1397,16 +1397,16 @@ buildLuarocksPackage {
|
|||
lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }:
|
||||
buildLuarocksPackage {
|
||||
pname = "lua-resty-openssl";
|
||||
version = "1.5.1-1";
|
||||
version = "1.5.2-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lua-resty-openssl-1.5.1-1.rockspec";
|
||||
sha256 = "1xqwsh3r9dmasc46c3dwili7g9p427yh7xdvcpiz7pr25y35saps";
|
||||
url = "mirror://luarocks/lua-resty-openssl-1.5.2-1.rockspec";
|
||||
sha256 = "1nrriyf9fvn0achn2drvb915kx7cq4ldlyg24g118i8ib1fr9lgd";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "fffonion";
|
||||
repo = "lua-resty-openssl";
|
||||
rev = "1.5.1";
|
||||
hash = "sha256-wkc/9t2jXM2yPEd9ozAMcNe3WsS3MbN01OQ/9sI37Eg=";
|
||||
rev = "1.5.2";
|
||||
hash = "sha256-vkcqUaHCIBBmcVP4csqjn6oPSBvUF8MBzveIc6jJKWY=";
|
||||
};
|
||||
|
||||
|
||||
|
@ -1455,6 +1455,7 @@ buildLuarocksPackage {
|
|||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
nativeBuildInputs = [ luarocks-build-rust-mlua ];
|
||||
propagatedBuildInputs = [ luarocks-build-rust-mlua ];
|
||||
|
||||
meta = {
|
||||
|
@ -2542,14 +2543,14 @@ buildLuarocksPackage {
|
|||
lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "lz.n";
|
||||
version = "2.11.1-1";
|
||||
version = "2.11.2-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lz.n-2.11.1-1.rockspec";
|
||||
sha256 = "13wl4h294nn2hgxjw57i04144vf6s4h3f7sr48llkdz2x3jrlh5r";
|
||||
url = "mirror://luarocks/lz.n-2.11.2-1.rockspec";
|
||||
sha256 = "0m0019k9asx8z82drj54cgzal0hzmdwzrm6vbknsgwhwlq5wwk6v";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-neorocks/lz.n/archive/v2.11.1.zip";
|
||||
sha256 = "0qs1flavg22j3jivqdcgabpfp97vdw5ga84c371cr8jngym9plzs";
|
||||
url = "https://github.com/nvim-neorocks/lz.n/archive/v2.11.2.zip";
|
||||
sha256 = "0b4q1q083fiwfjmk44a15qd9rrb6hd92bim0q7xjdgm2j6ja8j73";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -2771,14 +2772,14 @@ buildLuarocksPackage {
|
|||
neorg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua-utils-nvim, luaOlder, nui-nvim, nvim-nio, pathlib-nvim, plenary-nvim }:
|
||||
buildLuarocksPackage {
|
||||
pname = "neorg";
|
||||
version = "9.1.1-1";
|
||||
version = "9.2.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/neorg-9.1.1-1.rockspec";
|
||||
sha256 = "0zafy1hkrvh41vlx1g4rqlcvc4x9pi8dcji30qi0b8lj45pldyr3";
|
||||
url = "mirror://luarocks/neorg-9.2.0-1.rockspec";
|
||||
sha256 = "1ykq010kf0bds4q6mqyymdbx4qynwyvznsh2aj8f5wyk5kwwzsz6";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-neorg/neorg/archive/v9.1.1.zip";
|
||||
sha256 = "18lk22lfzwwn4hy2s035g3kslqmvrr28lm5w9k3dazqwj5nlka3z";
|
||||
url = "https://github.com/nvim-neorg/neorg/archive/10bf607f11ed94151fb5496e6127d8823d162a7e.zip";
|
||||
sha256 = "0k7cizfw973fhvxfx09rkpflz1sych2b47s7d4b0ikss2ffanydq";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -2903,6 +2904,7 @@ buildLuarocksPackage {
|
|||
meta = {
|
||||
homepage = "https://github.com/kndndrj/nvim-dbee";
|
||||
description = "Interactive database client for neovim";
|
||||
maintainers = with lib.maintainers; [ perchun ];
|
||||
license.fullName = "GPL-3.0";
|
||||
};
|
||||
}) {};
|
||||
|
@ -2930,17 +2932,39 @@ buildLuarocksPackage {
|
|||
};
|
||||
}) {};
|
||||
|
||||
nvim-web-devicons = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "nvim-web-devicons";
|
||||
version = "0.100-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/nvim-web-devicons-0.100-1.rockspec";
|
||||
sha256 = "0i87kr2q1s97q4kw85k36xhryigbv4bgy3ig56qg6z5jgkxgldza";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-tree/nvim-web-devicons/archive/v0.100.zip";
|
||||
sha256 = "0d7gzk06f6z9wq496frbaavx90mcxvdhrswqd3pcayj2872i698d";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/nvim-tree/nvim-web-devicons";
|
||||
description = "Nerd Font icons for neovim";
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, tree-sitter-orgmode }:
|
||||
buildLuarocksPackage {
|
||||
pname = "orgmode";
|
||||
version = "0.4.1-1";
|
||||
version = "0.4.2-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/orgmode-0.4.1-1.rockspec";
|
||||
sha256 = "1vxlbmi11gia5yb01lkrnjwzihravnpyx1ifw5g44zf1limnf4yh";
|
||||
url = "mirror://luarocks/orgmode-0.4.2-1.rockspec";
|
||||
sha256 = "0cgvkqn7657wqyhisr9jf2abn7isykgslbmas79530flrcv4ni4w";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-orgmode/orgmode/archive/0.4.1.zip";
|
||||
sha256 = "0lrpxfip25afkdbmmm0p9h9bfk909r6g2921xy7cyms8mshqhkdy";
|
||||
url = "https://github.com/nvim-orgmode/orgmode/archive/0.4.2.zip";
|
||||
sha256 = "01rri5d9sc4ng3bs0v4nvfaf9f93ihjnpi0ngpvvkq5ij6wwv2js";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -3191,14 +3215,14 @@ buildLuarocksPackage {
|
|||
rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }:
|
||||
buildLuarocksPackage {
|
||||
pname = "rocks.nvim";
|
||||
version = "2.43.0-1";
|
||||
version = "2.43.1-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/rocks.nvim-2.43.0-1.rockspec";
|
||||
sha256 = "1kzvf6pbda8jhl6xv8mha75va87fb0l59r452mm98mx5kd7kydn0";
|
||||
url = "mirror://luarocks/rocks.nvim-2.43.1-1.rockspec";
|
||||
sha256 = "0d9k3ya358spl2bcj4m1fwjrqf48byhnc5n40076l2lndwc806n0";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.43.0.zip";
|
||||
sha256 = "0yi82b6y4p1vkq9gx5nsk1gyjclwrxn64gnf1398mj9zb81ccyf2";
|
||||
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.43.1.zip";
|
||||
sha256 = "097f3zm7r1qwgd66gq8y31yzkn1p567kgn2p4pbxwkyn070gr787";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -3238,14 +3262,14 @@ buildLuarocksPackage {
|
|||
rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "rustaceanvim";
|
||||
version = "5.24.2-1";
|
||||
version = "5.24.4-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/rustaceanvim-5.24.2-1.rockspec";
|
||||
sha256 = "0sa3v02iahbi054hlyccwc3z8bmjbxv6i03mvkhx1fp2gb4n0az6";
|
||||
url = "mirror://luarocks/rustaceanvim-5.24.4-1.rockspec";
|
||||
sha256 = "1jx85ydafnyl2p9bbg4p3612iwcgp0xwp0cq0avay404vwcg6byp";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.24.2.zip";
|
||||
sha256 = "0s3x5c5fr927fa0rwix6q2459xz2d5p8m3lrslj5q37rpi8p8n4b";
|
||||
url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.24.4.zip";
|
||||
sha256 = "09rldlwgsi22ih0gd3lg7ajagdy7bj03zr6w1rh0gn7scgcp7y2g";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -3487,6 +3511,7 @@ buildLuarocksPackage {
|
|||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
nativeBuildInputs = [ luarocks-build-rust-mlua ];
|
||||
propagatedBuildInputs = [ luarocks-build-rust-mlua ];
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
imageio,
|
||||
matplotlib,
|
||||
numpy,
|
||||
pandas,
|
||||
pyopengl,
|
||||
scikit-image,
|
||||
seaborn,
|
||||
snakeviz,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boxx";
|
||||
version = "0.10.14";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-unGnmPksEuqFXHTWJkj9Gv2G/qPDgT6AZXYiG2gtkEA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
imageio
|
||||
matplotlib
|
||||
numpy
|
||||
pandas
|
||||
pyopengl
|
||||
scikit-image
|
||||
seaborn
|
||||
snakeviz
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "boxx" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool-box for efficient build and debug for Scientific Computing and Computer Vision";
|
||||
homepage = "https://github.com/DIYer22/boxx";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lucasew ];
|
||||
};
|
||||
}
|
|
@ -1,80 +0,0 @@
|
|||
# based on https://github.com/DIYer22/bpycv/blob/c576e01622d87eb3534f73bf1a5686bd2463de97/example/ycb_demo.py
|
||||
import bpy
|
||||
import bpycv
|
||||
|
||||
import os
|
||||
import glob
|
||||
import random
|
||||
from pathlib import Path
|
||||
|
||||
example_data_dir = os.environ['BPY_EXAMPLE_DATA']
|
||||
out_dir = Path(os.environ['out'])
|
||||
out_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
models = sorted(glob.glob(os.path.join(example_data_dir, "model", "*", "*.obj")))
|
||||
cat_id_to_model_path = dict(enumerate(sorted(models), 1))
|
||||
|
||||
distractors = sorted(glob.glob(os.path.join(example_data_dir, "distractor", "*.obj")))
|
||||
|
||||
bpycv.clear_all()
|
||||
bpy.context.scene.frame_set(1)
|
||||
bpy.context.scene.render.engine = "CYCLES"
|
||||
bpy.context.scene.cycles.samples = 32
|
||||
bpy.context.scene.render.resolution_y = 1024
|
||||
bpy.context.scene.render.resolution_x = 1024
|
||||
bpy.context.view_layer.cycles.denoising_store_passes = False
|
||||
|
||||
# A transparency stage for holding rigid body
|
||||
stage = bpycv.add_stage(transparency=True)
|
||||
|
||||
bpycv.set_cam_pose(cam_radius=1, cam_deg=45)
|
||||
|
||||
hdri_dir = os.path.join(example_data_dir, "background_and_light")
|
||||
hdri_manager = bpycv.HdriManager(
|
||||
hdri_dir=hdri_dir, download=False
|
||||
) # if download is True, will auto download .hdr file from HDRI Haven
|
||||
hdri_path = hdri_manager.sample()
|
||||
bpycv.load_hdri_world(hdri_path, random_rotate_z=True)
|
||||
|
||||
# load 5 objects
|
||||
for index in range(5):
|
||||
cat_id = random.choice(list(cat_id_to_model_path))
|
||||
model_path = cat_id_to_model_path[cat_id]
|
||||
obj = bpycv.load_obj(model_path)
|
||||
obj.location = (
|
||||
random.uniform(-0.2, 0.2),
|
||||
random.uniform(-0.2, 0.2),
|
||||
random.uniform(0.1, 0.3),
|
||||
)
|
||||
obj.rotation_euler = [random.uniform(-3.1415, 3.1415) for _ in range(3)]
|
||||
# set each instance a unique inst_id, which is used to generate instance annotation.
|
||||
obj["inst_id"] = cat_id * 1000 + index
|
||||
with bpycv.activate_obj(obj):
|
||||
bpy.ops.rigidbody.object_add()
|
||||
|
||||
# load 6 distractors
|
||||
for index in range(6):
|
||||
distractor_path = random.choice(distractors)
|
||||
target_size = random.uniform(0.1, 0.3)
|
||||
distractor = bpycv.load_distractor(distractor_path, target_size=target_size)
|
||||
distractor.location = (
|
||||
random.uniform(-0.2, 0.2),
|
||||
random.uniform(-0.2, 0.2),
|
||||
random.uniform(0.1, 0.3),
|
||||
)
|
||||
distractor.rotation_euler = [random.uniform(-3.1415, 3.1415) for _ in range(3)]
|
||||
with bpycv.activate_obj(distractor):
|
||||
bpy.ops.rigidbody.object_add()
|
||||
|
||||
# run pyhsic engine for 20 frames
|
||||
for i in range(20):
|
||||
bpy.context.scene.frame_set(bpy.context.scene.frame_current + 1)
|
||||
|
||||
# render image, instance annoatation and depth in one line code
|
||||
result = bpycv.render_data()
|
||||
|
||||
|
||||
result.save(dataset_dir=str(out_dir.resolve()), fname="0", save_blend=True)
|
||||
print(f'Save to "{out_dir}"')
|
||||
print(f'Open "{out_dir}/vis/" to see visualize result.')
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
beautifulsoup4,
|
||||
blender,
|
||||
boxx,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchPypi,
|
||||
minexr,
|
||||
opencv-python,
|
||||
requests,
|
||||
runCommand,
|
||||
zcs,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bpycv";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qqNGemDB0aagCXjrECuh6kLksf+KujPejpnXVqFG8GY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautifulsoup4
|
||||
minexr
|
||||
zcs
|
||||
requests
|
||||
opencv-python
|
||||
boxx
|
||||
];
|
||||
|
||||
# pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests = {
|
||||
render =
|
||||
runCommand "bpycv-render-test"
|
||||
{
|
||||
BPY_EXAMPLE_DATA = fetchFromGitHub {
|
||||
owner = "DIYer22";
|
||||
repo = "bpycv_example_data";
|
||||
hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q=";
|
||||
rev = "6ce0e65c107d572011394da16ffdf851e988dbb4";
|
||||
};
|
||||
}
|
||||
''
|
||||
${blender.withPackages (ps: [ ps.bpycv ])}/bin/blender-wrapped -b -P ${./bpycv-test.py}
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Computer vision utils for Blender";
|
||||
homepage = "https://github.com/DIYer22/bpycv";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.lucasew ];
|
||||
inherit (blender.meta) platforms;
|
||||
};
|
||||
}
|
|
@ -1,39 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchpatch,
|
||||
fetchPypi,
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fn";
|
||||
version = "0.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
# Python 3.11 changed the API of the `inspect` module and fn was never
|
||||
# updated to adapt; last commit was in 2014.
|
||||
disabled = pythonAtLeast "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1nmsjmn8jb4gp22ksx0j0hhdf4y0zm8rjykyy2i6flzimg6q1kgq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/kachayev/fn.py/commit/a54fc0bd8aeae277de2db726131d249ce607c0c2.patch";
|
||||
hash = "sha256-I0ZISOgVibsc1k7gwSfeW6qV9PspQqdaHlRLr/IusQ8=";
|
||||
excludes = [ "fn/monad.py" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Functional programming in Python: implementation of missing
|
||||
features to enjoy FP
|
||||
'';
|
||||
homepage = "https://github.com/kachayev/fn.py";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
|
@ -1,41 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
python,
|
||||
yacs,
|
||||
boxx,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zcs";
|
||||
version = "0.1.25";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/QIyRQtxLDVW+vcQi5bL8rJ0o3+OhqGhQEALR1YO1pg=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-test-yaml.patch ];
|
||||
|
||||
propagatedBuildInputs = [ yacs ];
|
||||
|
||||
pythonImportsCheck = [ "zcs" ];
|
||||
|
||||
nativeCheckInputs = [ boxx ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} test/test_zcs.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Configuration system which takes advantage of both argparse and yacs";
|
||||
homepage = "https://github.com/DIYer22/zcs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lucasew ];
|
||||
};
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/test/test_zcs.py b/test/test_zcs.py
|
||||
index e4981d3..893999f 100644
|
||||
--- a/test/test_zcs.py
|
||||
+++ b/test/test_zcs.py
|
||||
@@ -65,7 +65,7 @@ class TestCfgNode(unittest.TestCase):
|
||||
cfg = self.cfg.clone()
|
||||
yamlp = pathjoin(tmpboxx(), "test.yaml")
|
||||
cfg.dump(yamlp)
|
||||
- cfg_dict = yaml.load(open(yamlp))
|
||||
+ cfg_dict = yaml.load(open(yamlp), yaml.Loader)
|
||||
cfgd = CfgNode(cfg_dict)
|
||||
self.assertTrue(str(cfg.dump()) == str(cfgd.dump()))
|
||||
|
|
@ -7,9 +7,11 @@
|
|||
cudaSupport ? config.cudaSupport,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
minizip,
|
||||
opencl-headers,
|
||||
ocl-icd,
|
||||
xxHash,
|
||||
zlib,
|
||||
Foundation,
|
||||
IOKit,
|
||||
Metal,
|
||||
|
@ -46,8 +48,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs =
|
||||
[
|
||||
minizip
|
||||
opencl-headers
|
||||
xxHash
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Foundation
|
||||
|
@ -64,6 +68,7 @@ stdenv.mkDerivation rec {
|
|||
"VERSION_TAG=${version}"
|
||||
"USE_SYSTEM_OPENCL=1"
|
||||
"USE_SYSTEM_XXHASH=1"
|
||||
"USE_SYSTEM_ZLIB=1"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [
|
||||
"IS_APPLE_SILICON='${if stdenv.hostPlatform.isAarch64 then "1" else "0"}'"
|
||||
|
|
|
@ -92,6 +92,8 @@ mapAliases ({
|
|||
BlinkStick = blinkstick; # added 2023-02-19
|
||||
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
|
||||
boto = throw "boto was removed as it is deprecated upstream, had not been updated since 2018, and failed to build; please use boto3 and botocore"; # Added 2024-09-22
|
||||
boxx = throw "boxx was removed as it is no longer used by any packages in nixpkgs."; # added 2025-02-08
|
||||
bpycv = throw "bpycv was removed as it is incompatible with blender version 4 or later."; # added 2025-02-08
|
||||
bsblan = python-bsblan; # added 2022-11-04
|
||||
btchip = btchip-python; # added 2023-03-03
|
||||
bugz = throw "use pkgs.pybugz instead"; # added 2024-12-31
|
||||
|
@ -239,6 +241,7 @@ mapAliases ({
|
|||
flufl_bounce = flufl-bounce; # added 2023-11-03
|
||||
flufl_i18n = flufl-i18n; # added 2023-11-03
|
||||
flufl_lock = flufl-lock; # added 2023-11-03
|
||||
fn = throw "fn was removed as it is no longer used by any package in nixpkgs, it is not compatible with python 3.11 or newer and it was last updated in 2014."; # added 2025-02-08
|
||||
forbiddenfruit = throw "forbiddenfruit has been removed, because it was unmaintained and relied on the nose test framework"; # added 2024-07-08
|
||||
FormEncode = formencode; # added 2023-02-19
|
||||
foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
|
||||
|
@ -761,6 +764,7 @@ mapAliases ({
|
|||
zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules";
|
||||
zc-buildout221 = zc-buildout; # added 2021-07-21
|
||||
zc_lockfile = zc-lockfile; # added 2024-01-06
|
||||
zcs = throw "zcs was removed as it is no longer used by any packages in nixpkgs."; # added 2025-02-08
|
||||
zipstream = throw "zipstream has been removed, because it has been unmaintained for 6 years and there are no dependent packages"; # added 2024-05-26
|
||||
zipstream-new = throw "zipstream-new has been removed, because it was packaged as a dependency for octoprint, which has switched to zipstream-ng since."; # added 2024-01-05
|
||||
zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26
|
||||
|
|
|
@ -1876,12 +1876,8 @@ self: super: with self; {
|
|||
|
||||
bottleneck = callPackage ../development/python-modules/bottleneck { };
|
||||
|
||||
boxx = callPackage ../development/python-modules/boxx { };
|
||||
|
||||
bpemb = callPackage ../development/python-modules/bpemb { };
|
||||
|
||||
bpycv = callPackage ../development/python-modules/bpycv {};
|
||||
|
||||
bpylist2 = callPackage ../development/python-modules/bpylist2 { };
|
||||
|
||||
bpython = callPackage ../development/python-modules/bpython { };
|
||||
|
@ -4898,8 +4894,6 @@ self: super: with self; {
|
|||
|
||||
flynt = callPackage ../development/python-modules/flynt { };
|
||||
|
||||
fn = callPackage ../development/python-modules/fn { };
|
||||
|
||||
fnv-hash-fast = callPackage ../development/python-modules/fnv-hash-fast { };
|
||||
|
||||
fnvhash = callPackage ../development/python-modules/fnvhash { };
|
||||
|
@ -18689,8 +18683,6 @@ self: super: with self; {
|
|||
|
||||
zconfig = callPackage ../development/python-modules/zconfig { };
|
||||
|
||||
zcs = callPackage ../development/python-modules/zcs { };
|
||||
|
||||
zdaemon = callPackage ../development/python-modules/zdaemon { };
|
||||
|
||||
zeek = (toPythonModule (pkgs.zeek.broker.override {
|
||||
|
|
|
@ -117,8 +117,6 @@ let
|
|||
xgboost = linux;
|
||||
|
||||
python3Packages = {
|
||||
boxx = linux;
|
||||
bpycv = linux;
|
||||
catboost = linux;
|
||||
cupy = linux;
|
||||
faiss = linux;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue