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

This commit is contained in:
K900 2024-11-12 21:14:32 +03:00
commit 9c85c8a22a
101 changed files with 1961 additions and 1069 deletions

View File

@ -1834,6 +1834,12 @@
githubId = 10587952;
name = "Armijn Hemel";
};
arminius-smh = {
email = "armin@sprejz.de";
github = "arminius-smh";
githubId = 159054879;
name = "Armin Manfred Sprejz";
};
arnarg = {
email = "arnarg@fastmail.com";
github = "arnarg";
@ -10297,6 +10303,13 @@
githubId = 2502736;
name = "James Hillyerd";
};
jhol = {
name = "Joel Holdsworth";
email = "joel@airwebreathe.org.uk";
github = "jhol";
githubId = 1449493;
keys = [ { fingerprint = "08F7 2546 95DE EAEF 03DE B0E4 D874 562D DC99 D889"; } ];
};
jhollowe = {
email = "jhollowe@johnhollowell.com";
github = "jhollowe";
@ -16537,6 +16550,13 @@
githubId = 120342602;
name = "Michael Paepcke";
};
pagedMov = {
email = "kylerclay@proton.me";
github = "pagedMov";
githubId = 19557376;
name = "Kyler Clay";
keys = [ { fingerprint = "784B 3623 94E7 8F11 0B9D AE0F 56FD CFA6 2A93 B51E"; } ];
};
paholg = {
email = "paho@paholg.com";
github = "paholg";
@ -23458,6 +23478,12 @@
githubId = 7121530;
name = "Wolf Honoré";
};
whtsht = {
email = "whiteshirt0079@gmail.com";
github = "whtsht";
githubId = 85547207;
name = "Hinata Toma";
};
wietsedv = {
email = "wietsedv@proton.me";
github = "wietsedv";

View File

@ -123,6 +123,8 @@
- [HomeBox](https://github.com/sysadminsmedia/homebox), an inventory and organization system built for the home user. Available as [services.homebox](#opt-services.homebox.enable).
- [evremap](https://github.com/wez/evremap), a keyboard input remapper for Linux/Wayland systems. Available as [services.evremap](options.html#opt-services.evremap).
- [matrix-hookshot](https://matrix-org.github.io/matrix-hookshot), a Matrix bot for connecting to external services. Available as [services.matrix-hookshot](#opt-services.matrix-hookshot.enable).
- [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various Git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable).

View File

@ -752,6 +752,7 @@
./services/misc/etebase-server.nix
./services/misc/etesync-dav.nix
./services/misc/evdevremapkeys.nix
./services/misc/evremap.nix
./services/misc/felix.nix
./services/misc/flaresolverr.nix
./services/misc/forgejo.nix

View File

@ -0,0 +1,167 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.evremap;
format = pkgs.formats.toml { };
key = lib.types.strMatching "KEY_[[:upper:]]+" // {
description = "key ID prefixed with KEY_";
};
mkKeyOption =
description:
lib.mkOption {
type = key;
description = ''
${description}
You can get a list of keys by running `evremap list-keys`.
'';
};
mkKeySeqOption =
description:
(mkKeyOption description)
// {
type = lib.types.listOf key;
};
dualRoleModule = lib.types.submodule {
options = {
input = mkKeyOption "The key that should be remapped.";
hold = mkKeySeqOption "The key sequence that should be output when the input key is held.";
tap = mkKeySeqOption "The key sequence that should be output when the input key is tapped.";
};
};
remapModule = lib.types.submodule {
options = {
input = mkKeySeqOption "The key sequence that should be remapped.";
output = mkKeySeqOption "The key sequence that should be output when the input sequence is entered.";
};
};
in
{
options.services.evremap = {
enable = lib.mkEnableOption "evremap, a keyboard input remapper for Linux/Wayland systems";
settings = lib.mkOption {
type = lib.types.submodule {
freeformType = format.type;
options = {
device_name = lib.mkOption {
type = lib.types.str;
example = "AT Translated Set 2 keyboard";
description = ''
The name of the device that should be remapped.
You can get a list of devices by running `evremap list-devices` with elevated permissions.
'';
};
dual_role = lib.mkOption {
type = lib.types.listOf dualRoleModule;
default = [ ];
example = [
{
input = "KEY_CAPSLOCK";
hold = [ "KEY_LEFTCTRL" ];
tap = [ "KEY_ESC" ];
}
];
description = ''
List of dual-role remappings that output different key sequences based on whether the
input key is held or tapped.
'';
};
remap = lib.mkOption {
type = lib.types.listOf remapModule;
default = [ ];
example = [
{
input = [
"KEY_LEFTALT"
"KEY_UP"
];
output = [ "KEY_PAGEUP" ];
}
];
description = ''
List of remappings.
'';
};
};
};
description = ''
Settings for evremap.
See the [upstream documentation](https://github.com/wez/evremap/blob/master/README.md#configuration)
for how to configure evremap.
'';
default = { };
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.evremap ];
hardware.uinput.enable = true;
systemd.services.evremap = {
description = "evremap - keyboard input remapper";
wantedBy = [ "multi-user.target" ];
script = "${lib.getExe pkgs.evremap} remap ${format.generate "evremap.toml" cfg.settings}";
serviceConfig = {
DynamicUser = true;
User = "evremap";
SupplementaryGroups = [
config.users.groups.input.name
config.users.groups.uinput.name
];
Restart = "on-failure";
RestartSec = 5;
TimeoutSec = 20;
# Hardening
ProtectClock = true;
ProtectKernelLogs = true;
ProtectControlGroups = true;
ProtectKernelModules = true;
ProtectHostname = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
ProtectHome = true;
ProcSubset = "pid";
PrivateTmp = true;
PrivateNetwork = true;
PrivateUsers = true;
RestrictRealtime = true;
RestrictNamespaces = true;
RestrictAddressFamilies = "none";
MemoryDenyWriteExecute = true;
LockPersonality = true;
IPAddressDeny = "any";
AmbientCapabilities = "";
CapabilityBoundingSet = "";
SystemCallArchitectures = "native";
SystemCallFilter = [
"@system-service"
"~@resources"
"~@privileged"
];
UMask = "0027";
};
};
};
}

View File

@ -177,7 +177,7 @@ in
type = types.nullOr types.str;
example = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)";
description = ''
"bantime.formula" used by default to calculate next value of ban time, default value bellow,
"bantime.formula" used by default to calculate next value of ban time, default value below,
the same ban time growing will be reached by multipliers 1, 2, 4, 8, 16, 32 ...
'';
};

View File

@ -129,9 +129,6 @@ in
services.changedetection-io = {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
preStart = ''
mkdir -p ${cfg.datastorePath}
'';
serviceConfig = {
User = cfg.user;
Group = cfg.group;
@ -153,7 +150,7 @@ in
Restart = "on-failure";
};
};
tmpfiles.rules = mkIf defaultStateDir [
tmpfiles.rules = mkIf (!defaultStateDir) [
"d ${cfg.datastorePath} 0750 ${cfg.user} ${cfg.group} - -"
];
};

View File

@ -1,5 +1,13 @@
{ lib, stdenv, fetchFromGitHub, pythonPackages, wrapGAppsNoGuiHook
, gst_all_1, glib-networking, gobject-introspection
{
lib,
stdenv,
fetchFromGitHub,
pythonPackages,
wrapGAppsNoGuiHook,
gst_all_1,
glib-networking,
gobject-introspection,
pipewire,
}:
pythonPackages.buildPythonApplication rec {
@ -24,17 +32,22 @@ pythonPackages.buildPythonApplication rec {
gst-plugins-rs
];
propagatedBuildInputs = [
gobject-introspection
] ++ (with pythonPackages; [
gst-python
pygobject3
pykka
requests
setuptools
tornado
] ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python
);
propagatedBuildInputs =
[
gobject-introspection
]
++ (
with pythonPackages;
[
gst-python
pygobject3
pykka
requests
setuptools
tornado
]
++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python
);
propagatedNativeBuildInputs = [
gobject-introspection
@ -43,12 +56,18 @@ pythonPackages.buildPythonApplication rec {
# There are no tests
doCheck = false;
preFixup = ''
gappsWrapperArgs+=(
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${pipewire}/lib/gstreamer-1.0"
)
'';
meta = with lib; {
homepage = "https://www.mopidy.com/";
description = "Extensible music server that plays music from local disk, Spotify, SoundCloud, and more";
mainProgram = "mopidy";
license = licenses.asl20;
maintainers = [ maintainers.fpletz ];
hydraPlatforms = [];
hydraPlatforms = [ ];
};
}

View File

@ -5,10 +5,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "132.0.1";
version = "132.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "10d5b05f61628deb9a69cb34b2cf3c75bb6b8768f5a718cef2157d5feb1671ede0d583439562e1c1221914eb6ed37fdf415dd651b1465c056be174136cd80b9d";
sha512 = "9ea95d9fb1a941ac5a5b50da67e224f3ccf8c401f26cb61bb74ad7f4e1e8706d469c4b6325714f2cb9cdf50c32710377d6bca18dd65b55db2c39ef2b27a57fae";
};
extraPatches = [

View File

@ -23,4 +23,8 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru = {
inherit conf;
};
}

View File

@ -1,9 +1,9 @@
{
"version" = "1.11.84";
"version" = "1.11.85";
"hashes" = {
"desktopSrcHash" = "sha256-XpXyLMYaxXTnDeJJio729TFMLn5BpUQnSb4/Rn434uo=";
"desktopSrcHash" = "sha256-KNt7UgQBKoieV3IV/qFjk6PKYlgjHk4tLA8cZZlYtIw=";
"desktopYarnHash" = "1wh867yw7ic3nx623c5dknn9wk4zgq9b000p9mdf79spfp57lqlw";
"webSrcHash" = "sha256-va3r2Gk1zaP2fK/RGmU7wj52jVYo4PI5Gm/rRQGpuvo=";
"webYarnHash" = "0w48744ick4ji1vwh9ma6ywsb4j5hfq4knw86zqqh0ciflylcywc";
"webSrcHash" = "sha256-JR7kA2thttBle+BT/zH8QjIjp5mJPsRMYx8nd/I3IEw=";
"webYarnHash" = "0f38gizj9cnb7dqj10wljxkbjfabznh3s407n9vsl7ig0hm91zf9";
};
}

View File

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "netmaker";
version = "0.25.0";
version = "0.26.0";
src = fetchFromGitHub {
owner = "gravitl";
repo = pname;
rev = "v${version}";
hash = "sha256-1mrodzW51nbqfWQjjmHYnInJd61FsWtQcYbKhJAiQ8Q=";
hash = "sha256-f6R7Dc5M3MUjsCXvQAqamU9FFuqYEZoxYKwKhk4ilPc=";
};
vendorHash = "sha256-/iuXnnO8OhGhQWg5nU/hza4yZMSIHKOTPFqojgY8w74=";
vendorHash = "sha256-g9JyIuqYJZK47xQYM0+d1hcHcNBGLH3lW60hI6UkD84=";
inherit subPackages;

View File

@ -6,6 +6,7 @@
makeWrapper,
lib,
zlib,
testers,
}:
let
platform =
@ -18,15 +19,15 @@ let
hash =
{
x86_64-linux = "sha256-dB8reN5rTlY5czFH7BaRya7qBa6czAIH2NkFWZh81ek=";
x86_64-darwin = "sha256-tpUcduCPCbVVaYZZOhWdPlN6SW3LGZPWSO9bDStVDms=";
aarch64-darwin = "sha256-V8QGF3Dpuy9I6CqKsJRHBHRdaLhc4XKZkv/rI7zs+qQ=";
x86_64-linux = "sha256-Tp354ecJAZfTRrg1Rmot7nFGYfcp0ZBEn/ygTRkCBCM=";
x86_64-darwin = "sha256-1tgFHdbrGGVofhSxJIw1oXkI6q5SJvN8L9bqRyj75j8=";
aarch64-darwin = "sha256-UB0SoUwg9C8F8F2/CTKVNcqAofHkU7Rop04mMwBSIyY=";
}
."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}");
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "bleep";
version = "0.0.7";
version = "0.0.9";
src = fetchzip {
url = "https://github.com/oyvindberg/bleep/releases/download/v${finalAttrs.version}/bleep-${platform}.tar.gz";
@ -59,6 +60,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
--zsh <(bleep install-tab-completions-zsh --stdout) \
'';
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "bleep --help | sed -n '/Bleeping/s/[^0-9.]//gp'";
};
meta = {
homepage = "https://bleep.build/";
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];

View File

@ -13,16 +13,16 @@
}:
buildGoModule rec {
pname = "buildkite-agent";
version = "3.85.1";
version = "3.86.0";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
hash = "sha256-aRgjXzwTC1wCWZ7n0MJpNHcHZgvendFPr4vCrBnCJCk=";
hash = "sha256-qvwJ8NFFJbD9btTAs8x7V4tbDDo4L7O679XYp2t9MpE=";
};
vendorHash = "sha256-UMnDVxZgqI4430IlA8fSygKEOT86RjCwuzGsvkQ8XIo=";
vendorHash = "sha256-Ovi1xK+TtWli6ZG0s5Pu0JGAjtbyUWBgiKCBybVbcXk=";
postPatch = ''
substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "civo";
version = "1.1.91";
version = "1.1.92";
src = fetchFromGitHub {
owner = "civo";
repo = "cli";
rev = "v${version}";
hash = "sha256-1RemtyaIyL5OqAfl+njL/DeFXPMUT5vghXwHOjmsgl0=";
hash = "sha256-nsH/6OVvCOU4f9UZNFOm9AtyN9L4tXB285580g3SsxE=";
};
vendorHash = "sha256-dzhSfC864ievkbM0Mt6itlAzlk3211tQmpFrCYFR0s8=";
vendorHash = "sha256-G3ijLi3ZbURVHkjUwylFWwxRyxroppVUFJveKw5qLq8=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -7,16 +7,16 @@
}:
buildGoModule rec {
pname = "cloudflare-dynamic-dns";
version = "4.3.5";
version = "4.3.9";
src = fetchFromGitHub {
owner = "zebradil";
repo = "cloudflare-dynamic-dns";
rev = "refs/tags/${version}";
hash = "sha256-9WJeWWgI96+LjMFl7TkDc7udsLvi54eAN3Y9iv2e+F4=";
hash = "sha256-kM2arX2QOZd0FzE2gDHZlN58hpBs92AJHVd9P8oaEdU=";
};
vendorHash = "sha256-KtTZcFYzJOH2qwoeHYfksXN7sDVV9ERCFVrrqzdh3M0=";
vendorHash = "sha256-JMjpVp99PliZnPh34MKRZ52AuHMjNSupndmnpeIc18Y=";
subPackages = ".";

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.19.1";
version = "2.19.3";
dontConfigure = true;
dontBuild = true;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
hash = "sha256-OUfNlaGNJDRkg5OGVPakB2TfEP4GFNVVFpXKW8SBpfM=";
hash = "sha256-MLX4xyK0nFMyiXCL3+q0kOjP3S7uK1tVF9lnhyxbTSE=";
};
nativeBuildInputs = [

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "dufs";
version = "0.42.0";
version = "0.43.0";
src = fetchFromGitHub {
owner = "sigoden";
repo = "dufs";
rev = "v${version}";
hash = "sha256-eada2xQlzB1kknwitwxZhFiv6myTbtYHHFkQtppa0tc=";
hash = "sha256-KkuP9UE9VT9aJ50QH1Y/2f+t0tLOMyNovxCaLq0Jz0s=";
};
cargoHash = "sha256-juT3trREV7LmjBz+x7Od4XoTGuL1XRhknbU4Nopg2HU=";
cargoHash = "sha256-KyFE8TpbkSZQE3CL7jbvSE3JDWjnyqhiWXO7LZ4ZpgI=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -0,0 +1,31 @@
{
lib,
fetchFromGitHub,
buildGoModule,
fetchgit,
}:
buildGoModule rec {
pname = "ecsk";
version = "0.9.3";
src = fetchFromGitHub {
owner = "yukiarrr";
repo = "ecsk";
rev = "refs/tags/v${version}";
hash = "sha256-1nrV7NslOIXQDHsc7c5YfaWhoJ8kfkEQseoVVeENrHM=";
fetchSubmodules = true;
};
vendorHash = "sha256-Eyqpc7GyG/7u/I4tStADQikxcbIatjeAJN9wUDgzdFY=";
subPackages = [ "cmd/ecsk" ];
meta = {
description = "Interactively call Amazon ECS APIs, copy files between ECS and local, and view logs";
license = lib.licenses.mit;
mainProgram = "ecsk";
homepage = "https://github.com/yukiarrr/ecsk";
maintainers = with lib.maintainers; [ whtsht ];
};
}

View File

@ -0,0 +1,36 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
libevdev,
nix-update-script,
}:
rustPlatform.buildRustPackage {
pname = "evremap";
version = "0-unstable-2024-06-17";
src = fetchFromGitHub {
owner = "wez";
repo = "evremap";
rev = "cc618e8b973f5c6f66682d1477b3b868a768c545";
hash = "sha256-aAAnlGlSFPOK3h8UuAOlFyrKTEuzbyh613IiPE7xWaA=";
};
cargoHash = "sha256-uFej58+51+JX36K1Rr1ZmBe7rHojOjmTO2VWINS6MvU=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libevdev ];
passthru.updateScript = nix-update-script {
extraArgs = [ "--version=branch" ];
};
meta = {
description = "Keyboard input remapper for Linux/Wayland systems";
homepage = "https://github.com/wez/evremap";
maintainers = with lib.maintainers; [ pluiedev ];
license = with lib.licenses; [ mit ];
mainProgram = "evremap";
};
}

View File

@ -7,13 +7,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fastcompmgr";
version = "0.4";
version = "0.5";
src = fetchFromGitHub {
owner = "tycho-kirchner";
repo = "fastcompmgr";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-FrPM6k4280SNnmi/jiwKU/O2eBue+5h8aNDCiIqZ3+c=";
hash = "sha256-yH/+E2IBe9KZxKTiP8oNcb9fJcZ0ukuenqTSv97ed44=";
};
nativeBuildInputs = [ pkgs.pkg-config ];

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "function-runner";
version = "6.2.1";
version = "6.3.0";
src = fetchFromGitHub {
owner = "Shopify";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5X/d6phYXmJcCacHvGkk5o/J91SdlFamxJrqc5X/Y4Y=";
sha256 = "sha256-DJX9P3Dauzc8qrpvqIGgr85gwIPeYwVDyFlIVh1RIq0=";
};
cargoHash = "sha256-D6BTP/a3wOpcOLnGUASyBL3pzAieAllLzEZuaEv2Oco=";
cargoHash = "sha256-rlQGAHISrLuXTsoM9RWRD3roQi/sgU6BPBlOj0ecgn4=";
meta = with lib; {
description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";

View File

@ -0,0 +1,51 @@
{
lib,
stdenv,
fetchurl,
dpkg,
autoPatchelfHook,
qt5,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gfie";
version = "4.2";
src = fetchurl {
url = "http://greenfishsoftware.org/dl/gfie/gfie-${finalAttrs.version}.deb";
hash = "sha256-hyL0t66jRTVF1Hq2FRUobsfjLGmYgsMGDE/DBdoXhCI=";
};
unpackCmd = "dpkg -x $curSrc source";
nativeBuildInputs = [
dpkg
autoPatchelfHook
qt5.wrapQtAppsHook
];
buildInputs = with qt5; [
qtbase
qtsvg
qtwebengine
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv usr/share opt $out
ln -s $out/opt/gfie-${finalAttrs.version}/gfie $out/bin/gfie
runHook postInstall
'';
meta = {
description = "Powerful open source image editor, especially suitable for creating icons, cursors, animations and icon libraries";
homepage = "http://greenfishsoftware.org/gfie.php";
license = with lib.licenses; [ gpl3 ];
maintainers = with lib.maintainers; [ pluiedev ];
platforms = [ "x86_64-linux" ];
mainProgram = "gfie";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gittuf";
version = "0.6.2";
version = "0.7.0";
src = fetchFromGitHub {
owner = "gittuf";
repo = pname;
rev = "v${version}";
hash = "sha256-iPaYwZUnIu9GeyY4kBhj+9gIINYx+pGSWJqPekh535g=";
hash = "sha256-IS330rgX6nXerqbaKslq1UvPnBVezZs8Q97IQvSs4sE=";
};
vendorHash = "sha256-mafN+Nrr0AtfMjnXNoEIuz90kJa58pgY2vUOlv7v+TE=";
vendorHash = "sha256-2EEE7M16MO0M9X0W1tPXBiKlokXMoHSJjscdjaerEjE=";
ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ];

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gomplate";
version = "4.1.0";
version = "4.2.0";
src = fetchFromGitHub {
owner = "hairyhenderson";
repo = "gomplate";
rev = "refs/tags/v${version}";
hash = "sha256-shbG0q86wlSjoCK2K7hNdUCwNPiQp94GWQJ1e71A1T0=";
hash = "sha256-PupwL0VzZiWz+96Mv1o6QSmj7iLyvVIQMcdRlGqmpRs=";
};
vendorHash = "sha256-UKqSKypAm6gt2JUCZh/DyfWo8uJeMp0M+4FiqwzzHIA=";
vendorHash = "sha256-1BOrffMtYz/cEsVaMseZQJlGsAdax+c1CvebwP8jaL4=";
ldflags = [
"-s"

View File

@ -0,0 +1,45 @@
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
glib,
pango,
gtk4,
wrapGAppsHook4,
}:
rustPlatform.buildRustPackage rec {
pname = "hyprlauncher";
version = "0.1.2";
src = fetchFromGitHub {
owner = "hyprutils";
repo = "hyprlauncher";
rev = "refs/tags/v${version}";
hash = "sha256-SxsCfEHrJpFSi2BEFFqmJLGJIVzkluDU6ogKkTRT9e8=";
};
cargoHash = "sha256-MENreS+DXdJIurWUqHbeb0cCJlRnjjW1bmGdg0QoxlQ=";
strictDeps = true;
nativeBuildInputs = [
pkg-config
wrapGAppsHook4
];
buildInputs = [
glib
pango
gtk4
];
meta = {
description = "GUI for launching applications, written in Rust";
homepage = "https://github.com/hyprutils/hyprlauncher";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ arminius-smh ];
platforms = lib.platforms.linux;
mainProgram = "hyprlauncher";
};
}

View File

@ -19,9 +19,6 @@ python.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml --replace-fail 'fastapi-slim' 'fastapi'
# AttributeError: module 'cv2' has no attribute 'Mat'
substituteInPlace app/test_main.py --replace-fail ": cv2.Mat" ""
'';
pythonRelaxDeps = [

View File

@ -23,6 +23,7 @@
imagemagick,
libraw,
libheif,
perl,
vips,
}:
let
@ -188,8 +189,6 @@ buildNpmPackage' {
# If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH
rm -r node_modules/exiftool-vendored.*
substituteInPlace node_modules/exiftool-vendored/dist/DefaultExifToolOptions.js \
--replace-fail "checkPerl: !(0, IsWin32_1.isWin32)()," "checkPerl: false,"
'';
installPhase = ''
@ -212,6 +211,7 @@ buildNpmPackage' {
lib.makeBinPath [
exiftool
jellyfin-ffmpeg
perl # exiftool-vendored checks for Perl even if exiftool comes from $PATH
]
}"

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "juju";
version = "3.5.3";
version = "3.5.4";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "v${version}";
hash = "sha256-PdNUmPfPYqOYEphY0ZlwEikUV/bKSPOGQuAJsi8+g/E=";
hash = "sha256-0vLZfnbLnGESYtdX9QYJhlglIc5UCTwfYnjtKNn92Pc=";
};
vendorHash = "sha256-FCN+0Wx2fYQcj5CRgPubAWbGGyVQcSSfu/Om6SUB6TQ=";
vendorHash = "sha256-xc+v34GLQ+2nKNJhMX020utObpganRIWjtwOHr5M2dY=";
subPackages = [
"cmd/juju"

View File

@ -2,7 +2,6 @@
lib,
fetchFromGitHub,
flutter,
stdenv,
webkitgtk_4_1,
alsa-lib,
libayatana-appindicator,
@ -11,24 +10,18 @@
wrapGAppsHook3,
gst_all_1,
at-spi2-atk,
fetchurl,
}:
let
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "Predidit";
repo = "Kazumi";
rev = version;
hash = "sha256-LRlJo2zuE3Y3i4vBcjxIYQEDVJ2x85Fn77K4LVtTlg8=";
};
mdk-sdk = fetchurl {
url = "https://github.com/wang-bin/mdk-sdk/releases/download/v0.29.1/mdk-sdk-linux-x64.tar.xz";
hash = "sha256-7dkvm5kP3gcQwXOE9DrjoOTzKRiwk/PVeRr7poLdCU0=";
hash = "sha256-irX+BmvJ/WI92RQmaSoBQuUqAEiy3bEstZmKMKHTvPY=";
};
in
flutter.buildFlutterApplication {
pname = "kazumi";
inherit version src;
pubspecLock = lib.importJSON ./pubspec.lock.json;
@ -52,41 +45,6 @@ flutter.buildFlutterApplication {
gst_all_1.gst-plugins-base
];
customSourceBuilders = {
flutter_volume_controller =
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "flutter_volume_controller";
inherit version src;
inherit (src) passthru;
postPatch = ''
substituteInPlace linux/CMakeLists.txt \
--replace-fail '# Include ALSA' 'find_package(PkgConfig REQUIRED)' \
--replace-fail 'find_package(ALSA REQUIRED)' 'pkg_check_modules(ALSA REQUIRED alsa)'
'';
installPhase = ''
runHook preInstall
mkdir $out
cp -r ./* $out/
runHook postInstall
'';
};
fvp =
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "fvp";
inherit version src;
inherit (src) passthru;
installPhase = ''
runHook preInstall
tar -xf ${mdk-sdk} -C ./linux
mkdir $out
cp -r ./* $out/
runHook postInstall
'';
};
};
gitHashes = {
desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=";
webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE=";
@ -94,8 +52,8 @@ flutter.buildFlutterApplication {
postInstall = ''
mkdir -p $out/share/applications/ $out/share/icons/hicolor/512x512/apps/
cp ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications
cp ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
install -Dm0644 ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications/io.github.Predidit.Kazumi.desktop
install -Dm0644 ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
'';
meta = {
@ -104,6 +62,6 @@ flutter.buildFlutterApplication {
mainProgram = "kazumi";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
platforms = lib.platforms.linux;
platforms = [ "x86_64-linux" ];
};
}

View File

@ -210,11 +210,11 @@
"dependency": "direct main",
"description": {
"name": "canvas_danmaku",
"sha256": "3e5f72c169484898b6a2e0022fa66753f6d70adfa3be25f45748037ae99c2010",
"sha256": "e5eebd19588cae528123fa14c0ad080fdc96881c3018f944f910024988ddb67e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.1"
"version": "0.2.2"
},
"characters": {
"dependency": "transitive",
@ -955,11 +955,11 @@
"dependency": "transitive",
"description": {
"name": "package_info_plus",
"sha256": "df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998",
"sha256": "da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.1.0"
"version": "8.1.1"
},
"package_info_plus_platform_interface": {
"dependency": "transitive",
@ -1265,11 +1265,11 @@
"dependency": "direct main",
"description": {
"name": "scrollview_observer",
"sha256": "fa408bcfd41e19da841eb53fc471f8f952d5ef818b854d2505c4bb3f0c876381",
"sha256": "8537ba32e5a15ade301e5c77ae858fd8591695defaad1821eca9eeb4ac28a157",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.22.0"
"version": "1.23.0"
},
"shared_preferences": {
"dependency": "transitive",
@ -1421,11 +1421,11 @@
"dependency": "transitive",
"description": {
"name": "sqflite",
"sha256": "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62",
"sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.0"
"version": "2.4.1"
},
"sqflite_android": {
"dependency": "transitive",
@ -1451,11 +1451,11 @@
"dependency": "transitive",
"description": {
"name": "sqflite_darwin",
"sha256": "769733dddf94622d5541c73e4ddc6aa7b252d865285914b6fcd54a63c4b4f027",
"sha256": "96a698e2bc82bd770a4d6aab00b42396a7c63d9e33513a56945cbccb594c2474",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.1-1"
"version": "2.4.1"
},
"sqflite_platform_interface": {
"dependency": "transitive",
@ -1821,11 +1821,11 @@
"dependency": "transitive",
"description": {
"name": "webview_flutter_android",
"sha256": "74693a212d990b32e0b7055d27db973a18abf31c53942063948cdfaaef9787ba",
"sha256": "dec83a8da0a2dcd8a25418534cc59348dbc2855fa1dd0cc929c62b6029fde392",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.0"
"version": "4.0.1"
},
"webview_flutter_platform_interface": {
"dependency": "transitive",
@ -1841,11 +1841,11 @@
"dependency": "transitive",
"description": {
"name": "webview_flutter_wkwebview",
"sha256": "d4034901d96357beb1b6717ebf7d583c88e40cfc6eb85fe76dd1bf0979a9f251",
"sha256": "f14ee08021772fed913da8daebcfdeb46be457081e521e93e9918fe6cd1ce9e8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.16.0"
"version": "3.16.1"
},
"webview_windows": {
"dependency": "direct main",
@ -1862,11 +1862,11 @@
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454",
"sha256": "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.7.2"
"version": "5.8.0"
},
"win32_registry": {
"dependency": "transitive",

View File

@ -1,29 +1,36 @@
{ lib, stdenv, fetchFromGitHub, openssl }:
{
lib,
stdenv,
fetchFromGitHub,
cmake,
openssl,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libamqpcpp";
version = "4.3.27";
src = fetchFromGitHub {
owner = "CopernicaMarketingSoftware";
repo = "AMQP-CPP";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "sha256-iaOXdDIJOBXHyjE07CvU4ApTh71lmtMCyU46AV+MGXQ=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl ];
patches = [ ./libamqpcpp-darwin.patch ];
makeFlags = [ "PREFIX=$(out)" ];
enableParallelBuilding = true;
doCheck = true;
meta = with lib; {
meta = {
description = "Library for communicating with a RabbitMQ server";
homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP";
license = licenses.asl20;
maintainers = [ maintainers.mjp ];
platforms = platforms.all;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ mjp ];
platforms = lib.platforms.all;
};
}
})

View File

@ -12,13 +12,13 @@ let
in
stdenv.mkDerivation rec {
pname = "librime";
version = "1.11.2";
version = "1.12.0";
src = fetchFromGitHub {
owner = "rime";
repo = pname;
rev = version;
sha256 = "sha256-QHuzpitxSYQ4EcBPY1f0R5zl4UFtefu0bFXA76Iv+j0=";
sha256 = "sha256-NwtWpH1FxIZP/+oOJbsaEmySLxXlxkCCIG+SEGo242Q=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -160,13 +160,13 @@ let
in
stdenv.mkDerivation {
pname = "linux-wallpaperengine";
version = "0-unstable-2024-10-13";
version = "0-unstable-2024-11-8";
src = fetchFromGitHub {
owner = "Almamu";
repo = "linux-wallpaperengine";
rev = "ec60a8a57153e49e3684c864a6d809fe9601336b";
hash = "sha256-M77Wp6tCXO2oFgfZ0+mdBT07CCYLsDDyHjeHtaDVvu8=";
rev = "4a063d0b84d331a0086b3f4605358ee177328d41";
hash = "sha256-IRTGFxHPRRRSg0J07pq8fpo1XbMT4aZC+wMVimZlH/Y=";
};
nativeBuildInputs = [

View File

@ -1,24 +1,36 @@
{ lib
, python3Packages
, fetchPypi
{
lib,
python3Packages,
fetchFromGitHub,
}:
python3Packages.buildPythonApplication rec {
pname = "litecli";
version = "1.11.0";
version = "1.12.3";
src = fetchPypi {
inherit pname version;
hash = "sha256-YW3mjYfSuxi/XmaetrWmjVuTfqgaitQ5wfUaJdHIH1Y=";
pyproject = true;
src = fetchFromGitHub {
owner = "dbcli";
repo = "litecli";
rev = "v${version}";
hash = "sha256-TPwzXfb4n6wTe6raQ5IowKdhGkKrf2pmSS2+Q03NKYk=";
};
propagatedBuildInputs = with python3Packages; [
cli-helpers
click
configobj
prompt-toolkit
pygments
sqlparse
dependencies =
with python3Packages;
[
cli-helpers
click
configobj
prompt-toolkit
pygments
sqlparse
]
++ cli-helpers.optional-dependencies.styles;
build-system = with python3Packages; [
setuptools
];
nativeCheckInputs = with python3Packages; [

View File

@ -5,12 +5,12 @@
haskellPackages.mkDerivation {
pname = "lngen";
version = "unstable-2023-10-17";
version = "unstable-2024-10-22";
src = fetchFromGitHub {
owner = "plclub";
repo = "lngen";
rev = "c7645001404e0e2fec2c56f128e30079b5b3fac6";
hash = "sha256-2vUYHtl9yAadwdTtsjTI0klP+nRSYGXVpaSwD9EBTTI=";
rev = "c034c8d95264e6a5d490bc4096534ccd54f0d393";
hash = "sha256-XzcB/mNXure6aZRmwgUWGHSEaknrbP8Onk2CisVuhiw=";
};
isLibrary = true;
isExecutable = true;

View File

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "lxgw-neoxihei";
version = "1.207";
version = "1.211";
src = fetchurl {
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
hash = "sha256-voFR2qkomj1CRv4OWtrYJmpVxoUl6db/HnkaobCmBzY=";
hash = "sha256-w3Rk0NDYXPzzg1JGsC6zIvr0SiM3ZzHHW9NwHNAhnaM=";
};
dontUnpack = true;

View File

@ -1,17 +1,18 @@
{ stdenv
, lib
, SDL2
, SDL2_mixer
, libGLU
, libconfig
, meson
, ninja
, pkg-config
, fetchFromGitHub
, fetchpatch
{
stdenv,
lib,
SDL2,
SDL2_mixer,
libGLU,
libconfig,
meson,
ninja,
pkg-config,
fetchFromGitHub,
fetchpatch,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs:{
pname = "MAR1D";
version = "unstable-2023-02-02";
@ -22,7 +23,17 @@ stdenv.mkDerivation rec {
owner = "Radvendii";
};
nativeBuildInputs = [ meson ninja pkg-config ];
env = {
NIXPKGS_CFLAGS_COMPILE = toString [
"-Wno-error=array-parameter"
];
};
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
SDL2
@ -40,7 +51,7 @@ stdenv.mkDerivation rec {
})
];
meta = with lib; {
meta = {
description = "First person Super Mario Bros";
mainProgram = "MAR1D";
longDescription = ''
@ -50,8 +61,8 @@ stdenv.mkDerivation rec {
You must view the world as mario does, as a one dimensional line.
'';
homepage = "https://mar1d.com";
license = licenses.agpl3Only;
maintainers = with maintainers; [ taeer ];
platforms = platforms.unix;
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ taeer ];
platforms = lib.platforms.unix;
};
}
})

View File

@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchurl {
url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/mac-Miru-${version}-mac.zip";
hash = "sha256-odMJ5OCXDajm4z+oHCqtpew+U73ymghmDa/F019dAcY=";
hash = "sha256-GTw5RislcL5s6gwUeCmLglXt/BZEpq3aau/ij1E7kso=";
};
sourceRoot = ".";

View File

@ -19,7 +19,7 @@ appimageTools.wrapType2 rec {
src = fetchurl {
url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage";
name = "${pname}-${version}.AppImage";
hash = "sha256-yfavGhH/QROChWB0MxYt8+dssYo0+/1bV+h2Ce951RE=";
hash = "sha256-4ueVgIcIi/RIFRoDKStiNqszfaIXZ9dfagddzCVaSRs=";
};
extraInstallCommands =

View File

@ -5,18 +5,18 @@
}:
let
pname = "miru";
version = "5.5.6";
meta = with lib; {
version = "5.5.8";
meta = {
description = "Stream anime torrents, real-time with no waiting for downloads";
homepage = "https://miru.watch";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
d4ilyrun
matteopacini
];
mainProgram = "miru";
platforms = [ "x86_64-linux" ] ++ platforms.darwin;
platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
longDescription = ''

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ndstool";
version = "2.1.2";
version = "2.3.1";
src = fetchFromGitHub {
owner = "devkitPro";
repo = "ndstool";
rev = "v${version}";
sha256 = "0isnm0is5k6dgi2n2c3mysyr5hpwikp5g0s3ix7ms928z04l8ccm";
sha256 = "sha256-121xEmbt1WBR1wi4RLw9/iLHqkpyXImXKiCNnLCYnJs=";
};
nativeBuildInputs = [ autoconf automake ];

View File

@ -0,0 +1,33 @@
{
lib,
fetchFromGitHub,
stdenvNoCC,
}:
stdenvNoCC.mkDerivation rec {
pname = "notonoto";
version = "0.0.3";
src = fetchFromGitHub {
owner = "yuru7";
repo = "NOTONOTO";
rev = "refs/tags/v${version}";
hash = "sha256-1dbx4yC8gL41OEAE/LNDyoDb4xhAwV5h8oRmdlPULUo=";
};
installPhase = ''
runHook preInstall
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/notonoto {} \;
runHook postInstall
'';
meta = {
description = "Programming font that combines Noto Sans Mono and Noto Sans JP";
homepage = "https://github.com/yuru7/NOTONOTO";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "notonoto";
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "oauth2-proxy";
version = "7.6.0";
version = "7.7.1";
src = fetchFromGitHub {
repo = pname;
owner = "oauth2-proxy";
sha256 = "sha256-7DmeXl/aDVFdwUiuljM79CttgjzdTVsSeAYrETuJG0M=";
sha256 = "sha256-SKewLChFKPx1aEKYRqw6IxjLdpKehqcnPT6oQoP8uaU=";
rev = "v${version}";
};
vendorHash = "sha256-ihFNFtfiCGGyJqB2o4SMYleKdjGR4P5JewkynOsC1f0=";
vendorHash = "sha256-MBsvTYJ8G/WeTp8wQJhBDrKjJX/7Utve4mh1yXbD6uc=";
# Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile
ldflags = [ "-X main.VERSION=${version}" ];

View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "openmm";
version = "8.1.2";
version = "8.2.0";
src = fetchFromGitHub {
owner = "openmm";
repo = pname;
rev = version;
hash = "sha256-2UFccB+xXAw3uRw0G1TKlqTVl9tUl1sRPFG4H05vq04=";
hash = "sha256-p0zjr8ONqGK4Vbnhljt16DeyeZ0bR1kE+YdiIlw/1L0=";
};
# "This test is stochastic and may occassionally fail". It does.

View File

@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "pcsx2-bin";
version = "2.1.231";
version = "2.3.10";
src = fetchurl {
url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz";
hash = "sha256-c1Tvti8NatGct0OAwcWdFNBQhv6Zwiy2ECJ2qyCs9qA=";
hash = "sha256-szQgGIBH+h/mH18zY3RQGiyhoYwQ07+rq/zX3uNfgME=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "picocrypt-cli";
version = "2.08";
version = "2.09";
src = fetchFromGitHub {
owner = "Picocrypt";
repo = "CLI";
rev = version;
hash = "sha256-6/VmacOXQOCkjLFyzDPyohOueF3WKJu7XCAD9oiFXEc=";
hash = "sha256-DV+L3s479PqSiqi2xigZWwXVNCdkayD0wCpnlR0TljY=";
};
sourceRoot = "${src.name}/picocrypt";
vendorHash = "sha256-QIeuqdoC17gqxFgKJ/IU024dgofBCizWTj2S7CCmED4=";
vendorHash = "sha256-F+t/VL9IzBfz8cfpaw+aEPxTPGUq3SbWbyqPWeLrh6E=";
ldflags = [
"-s"

View File

@ -15,18 +15,18 @@
buildGoModule rec {
pname = "picocrypt";
version = "1.43";
version = "1.44";
src = fetchFromGitHub {
owner = "Picocrypt";
repo = "Picocrypt";
rev = "refs/tags/${version}";
hash = "sha256-xxlmerEGujBvghC+OpMW0gkDl7zPOW4r6cM7T6qOc6A=";
hash = "sha256-+0co9JwXGJVXStyQSggJACQlQYwQ3dQtLsTAeCavLa8=";
};
sourceRoot = "${src.name}/src";
vendorHash = "sha256-QeNFXmWeA/hkYdFzJoHj61bo/DmGWakdhFRLtSYG7+Y=";
vendorHash = "sha256-zJDPIRRckrlbmEpxXXMxeguxdcwVS9beHbM1dr5eMz8=";
ldflags = [
"-s"

View File

@ -0,0 +1,48 @@
{
stdenvNoCC,
fetchurl,
lib,
}:
stdenvNoCC.mkDerivation rec {
pname = "plymouth-blahaj-theme";
version = "1.0.0";
src = fetchurl {
url = "https://github.com/190n/plymouth-blahaj/releases/download/v${version}/blahaj.tar.gz";
sha256 = "sha256-JSCu/3SK1FlSiRwxnjQvHtPGGkPc6u/YjaoIvw0PU8A=";
};
patchPhase = ''
runHook prePatch
shopt -s extglob
# deal with all the non ascii stuff
mv !(*([[:graph:]])) blahaj.plymouth
sed -i 's/\xc3\xa5/a/g' blahaj.plymouth
sed -i 's/\xc3\x85/A/g' blahaj.plymouth
runHook postPatch
'';
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/plymouth/themes/blahaj
cp * $out/share/plymouth/themes/blahaj
find $out/share/plymouth/themes/ -name \*.plymouth -exec sed -i "s@\/usr\/@$out\/@" {} \;
runHook postInstall
'';
meta = {
description = "Plymouth theme featuring IKEA's 1m soft toy shark";
homepage = "https://github.com/190n/plymouth-blahaj";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ miampf ];
};
}

View File

@ -0,0 +1,57 @@
{
lib,
fetchFromGitHub,
swiftPackages,
swift,
swiftpm,
nix-update-script,
}:
let
stdenv = swiftPackages.stdenv;
in
stdenv.mkDerivation (finalAttrs: {
pname = "protoc-gen-swift";
version = "1.28.2";
src = fetchFromGitHub {
owner = "apple";
repo = "swift-protobuf";
rev = "${finalAttrs.version}";
hash = "sha256-YOEr73xDjNrc4TTkIBY8AdAUX2MBtF9ED1UF2IjTu44=";
};
nativeBuildInputs = [
swift
swiftpm
];
# Not needed for darwin, as `apple-sdk` is implicit and part of the stdenv
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
swiftPackages.Foundation
swiftPackages.Dispatch
];
# swiftpm fails to found libdispatch.so on Linux
LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux (
lib.makeLibraryPath [
swiftPackages.Dispatch
]
);
installPhase = ''
runHook preInstall
install -Dm755 .build/release/protoc-gen-swift $out/bin/protoc-gen-swift
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Protobuf plugin for generating Swift code";
homepage = "https://github.com/apple/swift-protobuf";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ matteopacini ];
mainProgram = "protoc-gen-swift";
inherit (swift.meta) platforms badPlatforms;
};
})

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "redka";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitHub {
owner = "nalgeon";
repo = "redka";
rev = "v${version}";
hash = "sha256-KpfXnhwz3uUdG89XdNqm1WyKwYhA5ImDg4DzzefKMz8=";
hash = "sha256-CCTPhcarLFs2wyhu7OqifunVSil2QU61JViY3uTjVg8=";
};
vendorHash = "sha256-aX0X6TWVEouo884LunCt+UzLyvDHgmvuxdV0wh0r7Ro=";

View File

@ -12,7 +12,7 @@
}:
let
pname = "rustlings";
version = "6.3.0";
version = "6.4.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
owner = "rust-lang";
repo = "rustlings";
rev = "v${version}";
hash = "sha256-te7DYgbEtWWSSvO28ajkJucRb3c9L8La1wfGW0WSxW0=";
hash = "sha256-VdIIcpyoCuid3MECVc9aKeIOUlxGlxcG7znqbqo9pjc=";
};
cargoHash = "sha256-Vq4Os4CKkEz4HggIZhlbIo9Cu+BVJPdybL1CNvz5wEQ=";
cargoHash = "sha256-AU6OUGSWuxKmdoQLk+UiFzA7NRviDAgXrBDMdkjxOpA=";
# Disabled test that does not work well in an isolated environment
checkFlags = [

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "scalr-cli";
version = "0.16.0";
version = "0.16.2";
src = fetchFromGitHub {
owner = "Scalr";
repo = "scalr-cli";
rev = "v${version}";
hash = "sha256-9osB3bsc8IvH1ishG9uiIUnAwC1yZd0rFhiZdzYucI8=";
hash = "sha256-Pw3ZEmQHlRmhEINQRQ21aCt6t1f7aqH/n8zfIzOF0lo=";
};
vendorHash = "sha256-0p4f+KKD04IFAUQG8F3b+2sx9suYemt3wbgSNNOOIlk=";

View File

@ -0,0 +1,68 @@
{
stdenv,
fetchurl,
lib,
mitschemeX11,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "scmutils";
version = "20230902";
src = fetchurl {
url = "https://groups.csail.mit.edu/mac/users/gjs/6946/mechanics-system-installation/native-code/${finalAttrs.pname}-src-${finalAttrs.version}.tar.gz";
hash = "sha256-9/shOxoKwJ4uDTHmvXqhemgy3W+GUCmoqFm5e1t3W0M=";
};
buildInputs = [ mitschemeX11 ];
configurePhase = ''
runHook preConfigure
ln -r -s kernel/ghelper-pro.scm kernel/ghelper.scm
ln -r -s solve/nnsolve.scm solve/solve.scm
substituteInPlace load.scm \
--replace-fail '/usr/local/scmutils/' "$out/lib/mit-scheme/"
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
echo '(load "compile")' | mit-scheme --no-init-file --batch-mode --interactive
echo '(load "load") (disk-save "edwin-mechanics.com")' | mit-scheme --no-init-file --batch-mode --interactive
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p "$out/lib/mit-scheme/" "$out/share/scmutils" "$out/bin"
cp edwin-mechanics.com "$out/lib/mit-scheme/"
declare -r TARGET="$out/lib/mit-scheme/"
for SRC in $(find * -type f -name '*.bci'); do
install -d "$TARGET"scmutils/"$(dirname "$SRC")"
cp -a "$SRC" "$TARGET"scmutils/"$SRC"
done
# Convenience script to load the band
declare -r CMD="exec ${mitschemeX11}/bin/mit-scheme --band $out/lib/mit-scheme/edwin-mechanics.com"
echo "#!$SHELL" > $out/bin/scmutils
echo "$CMD" "\"\$@\"" >> $out/bin/scmutils
echo "#!$SHELL" > $out/bin/edwin-scmutils
echo "$CMD" "--edit" "\"\$@\"" >> $out/bin/edwin-scmutils
chmod uog+rx "$out/bin/scmutils" "$out/bin/edwin-scmutils"
ln -r -s "$out/bin/edwin-scmutils" "$out/bin/mechanics"
runHook postInstall
'';
meta = {
description = "Scheme library for mathematical physics";
longDescription = ''
Scmutils system is an integrated library of procedures,
embedded in the programming language Scheme, and intended
to support teaching and research in mathematical physics
and electrical engineering.
'';
homepage = "https://groups.csail.mit.edu/mac/users/gjs/6.5160/installation.html";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.fbeffa ];
};
})

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "sqlboiler";
version = "4.16.2";
version = "4.17.0";
src = fetchFromGitHub {
owner = "volatiletech";
repo = "sqlboiler";
rev = "refs/tags/v${version}";
hash = "sha256-akfXYFgBbG/GCatoT820w4adXWqfG9wvHuChaqkewXs=";
hash = "sha256-6qTbF/b6QkxkutoP80owfxjp7Y1WpbZsF6w1XSRHo3Q=";
};
vendorHash = "sha256-BTrQPWThfJ7gWXi/Y1l/s2BmkW5lVYS/PP0WRwntQxA=";
vendorHash = "sha256-ZGGoTWSbGtsmrEQcZI40z6QF6qh4t3LN17Sox4KHQMA=";
tags = [
"mysql"

View File

@ -7,13 +7,13 @@
}:
stdenv.mkDerivation rec {
pname = "superhtml";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "refs/tags/v${version}";
hash = "sha256-E4IVDYps6K+SdemkfwtTjOE+Rdu8m4Itfd3Kv0XO7qk=";
hash = "sha256-ubFFFHlYTYmivVI5hd/Mj+jFIBuPQ/IycNv3BLxkeuc=";
};
nativeBuildInputs = [

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "swapspace";
version = "1.18";
version = "1.18.1";
src = fetchFromGitHub {
owner = "Tookmund";
repo = "Swapspace";
rev = "v${version}";
sha256 = "sha256-tzsw10cpu5hldkm0psWcFnWToWQejout/oGHJais6yw=";
sha256 = "sha256-KrPdmF1H7WFI78ZJlLqDyfxbs7fymSUQpXL+7XjN9bI=";
};
nativeBuildInputs = [

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ticker";
version = "4.6.3";
version = "4.7.0";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-EjQLJG1/AEnOKGcGh2C1HdRAVUnZLhehxTtpWlvD+jw=";
hash = "sha256-CSOaLFINg1ppTecDAI0tmFY8QMGwWKaeLly+9XI3YPM=";
};
vendorHash = "sha256-bWdyypcIagbKTMnhT0X4UmoPVjyTasCSud6pX1L3oIc=";
vendorHash = "sha256-XrZdv6QpR1HGN2o/Itbw+7hOkgVjzvx3jwlHeaJ2m0U=";
ldflags = [
"-s"

View File

@ -0,0 +1,40 @@
{
stdenv,
fetchFromGitHub,
lib,
}:
stdenv.mkDerivation rec {
pname = "tinyfetch";
version = "0.2";
src = fetchFromGitHub {
owner = "abrik1";
repo = "tinyfetch";
rev = "refs/tags/${version}";
hash = "sha256-I0OurcPKKZntZn7Bk9AnWdpSrU9olGp7kghdOajPDeQ=";
};
sourceRoot = "${src.name}/src";
buildPhase = ''
runHook preBuild
$CC tinyfetch.c -o tinyfetch
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 tinyfetch -t $out/bin
runHook postInstall
'';
meta = {
description = "Simple fetch in C which is tiny and fast";
homepage = "https://github.com/abrik1/tinyfetch";
license = lib.licenses.mit;
mainProgram = "tinyfetch";
maintainers = with lib.maintainers; [ pagedMov ];
platforms = lib.platforms.unix;
};
}

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "tui-journal";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "AmmarAbouZor";
repo = "tui-journal";
rev = "v${version}";
hash = "sha256-A3uSbd3tXrXe3jvlppndyg3L2gi5eiaxIrPTKqD5vog=";
hash = "sha256-BVTH5NF0/9wLHwTgXUO+v97d332SwAgTeWbVoQjgRfA=";
};
cargoHash = "sha256-b3loo6ZzZs3XwBI4JT9oth57vP3Aaulp24B7YDSnhhQ=";
cargoHash = "sha256-BnFWv/DcJ8WR67QV/gLK6dBaFvcm7NT4yfCQv0V0mSk=";
nativeBuildInputs = [
pkg-config

View File

@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "wlink";
version = "0.0.9";
version = "0.1.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-Jr494jsw9nStU88j1rHc3gyQR1jcMfDIyQ2u0SwkXt0=";
hash = "sha256-YiplnKcebDVEHoSP8XTPl0qXUwu2g32M864wbc3dyX8=";
};
cargoHash = "sha256-rPiSEfRFESYxFOat92oMUABvmz0idZu/I1S7I3g5BgY=";
cargoHash = "sha256-JZ10VhFbrjIOiKRrYltdcVnv315QasgmDWlMzUUmNhw=";
nativeBuildInputs = [ pkg-config ];

View File

@ -1,26 +1,26 @@
{ lib
, stdenv
, fetchurl
, aspell
, boost
, expat
, intltool
, pkg-config
, libxml2
, libxslt
, pcre2
, wxGTK32
, xercesc
, Cocoa
{
lib,
stdenv,
fetchurl,
aspell,
boost,
expat,
intltool,
pkg-config,
libxml2,
libxslt,
pcre2,
wxGTK32,
xercesc,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "xmlcopyeditor";
version = "1.3.1.0";
src = fetchurl {
url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz";
sha256 = "sha256-6HHKl7hqyvF3gJ9vmjLjTT49prJ8KhEEV0qPsJfQfJE=";
url = "mirror://sourceforge/xml-copy-editor/xmlcopyeditor-${finalAttrs.version}.tar.gz";
hash = "sha256-6HHKl7hqyvF3gJ9vmjLjTT49prJ8KhEEV0qPsJfQfJE=";
};
patches = [ ./xmlcopyeditor.patch ];
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
# with an rvalue of type 'const xmlError *' (aka 'const _xmlError *')
postPatch = ''
substituteInPlace src/wraplibxml.cpp \
--replace "xmlErrorPtr err" "const xmlError *err"
--replace-fail "xmlErrorPtr err" "const xmlError *err"
'';
nativeBuildInputs = [
@ -46,18 +46,21 @@ stdenv.mkDerivation rec {
pcre2
wxGTK32
xercesc
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Cocoa
];
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
enableParallelBuilding = true;
meta = with lib; {
meta = {
description = "Fast, free, validating XML editor";
homepage = "https://xml-copy-editor.sourceforge.io/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ candeira wegank ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
candeira
wegank
];
mainProgram = "xmlcopyeditor";
};
}
})

View File

@ -2,6 +2,8 @@
{
flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { };
flutter_volume_controller = callPackage ./flutter_volume_controller { };
fvp = callPackage ./fvp { };
handy_window = callPackage ./handy-window { };
matrix = callPackage ./matrix { };
media_kit_libs_linux = callPackage ./media_kit_libs_linux { };

View File

@ -0,0 +1,25 @@
{
stdenv,
mdk-sdk,
}:
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "flutter_volume_controller";
inherit version src;
inherit (src) passthru;
postPatch = ''
substituteInPlace linux/CMakeLists.txt \
--replace-fail '# Include ALSA' 'find_package(PkgConfig REQUIRED)' \
--replace-fail 'find_package(ALSA REQUIRED)' 'pkg_check_modules(ALSA REQUIRED alsa)'
'';
installPhase = ''
runHook preInstall
mkdir $out
cp -r ./* $out/
runHook postInstall
'';
}

View File

@ -0,0 +1,20 @@
{
stdenv,
mdk-sdk,
}:
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "fvp";
inherit version src;
inherit (src) passthru;
installPhase = ''
runHook preInstall
mkdir $out
tar -xf ${mdk-sdk.src} -C ./linux
cp -r ./* $out/
runHook postInstall
'';
}

View File

@ -13,7 +13,10 @@
}:
let params =
if lib.versionAtLeast ppxlib.version "0.20" then {
if lib.versionAtLeast ppxlib.version "0.32" then {
version = "6.0.3";
sha256 = "sha256-N0qpezLF4BwJqXgQpIv6IYwhO1tknkRSEBRVrBnJSm0=";
} else if lib.versionAtLeast ppxlib.version "0.20" then {
version = "5.2.1";
sha256 = "11h75dsbv3rs03pl67hdd3lbim7wjzh257ij9c75fcknbfr5ysz9";
} else if lib.versionAtLeast ppxlib.version "0.15" then {
@ -30,7 +33,7 @@ buildDunePackage rec {
inherit (params) version;
src = fetchurl {
url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-v${version}.tbz";
url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-${lib.optionalString (lib.versionOlder version "6.0") "v"}${version}.tbz";
inherit (params) sha256;
};
@ -41,11 +44,10 @@ buildDunePackage rec {
propagatedBuildInputs =
lib.optional (lib.versionOlder version "5.2") ocaml-migrate-parsetree ++ [
ppx_derivers
result
];
] ++ lib.optional (lib.versionOlder version "6.0") result
;
doCheck = lib.versionAtLeast ocaml.version "4.08"
&& lib.versionOlder ocaml.version "5.0";
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [
(if lib.versionAtLeast version "5.2" then ounit2 else ounit)
];

View File

@ -6,6 +6,7 @@
, cmdliner
, ppx_deriving
, ppxlib
, result
, gitUpdater
}:
@ -14,7 +15,6 @@ buildDunePackage rec {
version = "0.6.1";
minimalOCamlVersion = "4.11";
duneVersion = "3";
src = fetchFromGitHub {
owner = "hammerlab";
@ -36,6 +36,7 @@ buildDunePackage rec {
cmdliner
ppx_deriving
ppxlib
result
];
doCheck = true;

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aiorussound";
version = "4.0.5";
version = "4.1.0";
pyproject = true;
# requires newer f-strings introduced in 3.12
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "noahhusby";
repo = "aiorussound";
rev = "refs/tags/${version}";
hash = "sha256-W0vhVK1SmnTsNuXpDn2e1BrBnsdBwgiNyXucC+ASg1M=";
hash = "sha256-uMVmP4wXF6ln5A/iECf075B6gVnEzQxDTEPcyv5osyM=";
};
build-system = [ poetry-core ];

View File

@ -221,6 +221,9 @@ buildPythonPackage rec {
# pbcopy not found
"test_wtf"
# CommandError: 'git -c diff.ignoreSubmodules=none -c core.quotepath=false ls-files -z -m -d' failed with exitcode 128
"test_subsuperdataset_save"
];
nativeCheckInputs = [

View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "emborg";
version = "1.40";
version = "1.41";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "KenKundert";
repo = "emborg";
rev = "refs/tags/v${version}";
hash = "sha256-1cgTKYt2/HiPxsar/nIr4kk2dRMYCJZQilhr+zs1AEg=";
hash = "sha256-ViELR5pbGZc1vMxluHWBARuP6N031u+75WmJEYdckJo=";
};
nativeBuildInputs = [ flit-core ];

View File

@ -1,12 +1,10 @@
{
lib,
backports-zoneinfo,
buildPythonPackage,
cached-property,
defusedxml,
dnspython,
fetchFromGitHub,
flake8,
isodate,
lxml,
oauthlib,
@ -20,7 +18,6 @@
requests-ntlm,
requests-gssapi,
requests-oauthlib,
requests-kerberos,
requests-mock,
setuptools,
tzdata,
@ -29,16 +26,16 @@
buildPythonPackage rec {
pname = "exchangelib";
version = "5.4.3";
version = "5.5.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "ecederstrand";
repo = "exchangelib";
rev = "refs/tags/v${version}";
hash = "sha256-SX5F0OXKdxA2HoDwvCe4M7RftdjUEdQuFbxRyuABC4E=";
hash = "sha256-nu1uhsUc4NhVE08RtaD8h6KL6DFzA8mPcCJ/cX2UYME=";
};
pythonRelaxDeps = [ "defusedxml" ];
@ -56,10 +53,9 @@ buildPythonPackage rec {
requests
requests-ntlm
requests-oauthlib
requests-kerberos
tzdata
tzlocal
] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
];
optional-dependencies = {
complete = [
@ -73,7 +69,6 @@ buildPythonPackage rec {
};
nativeCheckInputs = [
flake8
psutil
python-dateutil
pytz

View File

@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "3.26.0";
version = "3.27.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -38,7 +38,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_bigquery";
inherit version;
hash = "sha256-7b3HiL7qZZ4EwK9/5NzW2RVTRLmJUaDVBVvS8V2kuiM=";
hash = "sha256-N5xSQFTXsJD6VtDCJmLMbmRYpiKbZ1TA5xd+OnNCHSw=";
};
build-system = [ setuptools ];

View File

@ -11,16 +11,16 @@
buildPythonPackage rec {
pname = "htmltools";
version = "0.5.3";
version = "0.6.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "posit-dev";
repo = "py-htmltools";
rev = "refs/tags/v${version}";
hash = "sha256-+BSbJdWmqoEQGEJWBgoTVe4bbvlGJiMyfvvj0lAy9ZA=";
hash = "sha256-ugtDYs5YaVo7Yy9EodyRrypHQUjmOIPpsyhwNnZkiko=";
};
build-system = [

View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "meraki";
version = "1.51.0";
version = "1.52.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-3JUUTi+6oe+mDn4n9NtlWXji4j3E6AZODZZ+PEvSSzg=";
hash = "sha256-8fNrHRZZ58FW0UOBdbUUzI3y+Y6kAyue4uHnPoODdzw=";
};
propagatedBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "psrpcore";
version = "0.3.0";
version = "0.3.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "jborean93";
repo = "psrpcore";
rev = "refs/tags/v${version}";
hash = "sha256-YThumRHMOTyhP6/EmNEew47v/X4Y1aYg1nvgZJz2XUg=";
hash = "sha256-svfqTOKKFKMphIPnvXfAbPZrp1GTV2D+33I0Rajfv1Y=";
};
build-system = [ setuptools ];

View File

@ -2,28 +2,24 @@
lib,
buildPythonPackage,
fetchPypi,
flit,
flit-core,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "pyphen";
version = "0.16.0";
format = "pyproject";
version = "0.17.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-LABrPd8HLJVxq5dgbZqzwmqS6s7UwNWf0dJpiPMI9BM=";
hash = "sha256-HROs0c43o4TXYSlUrmx4AbtMUxbaDiuTeyEnunAqPaQ=";
};
nativeBuildInputs = [ flit ];
preCheck = ''
sed -i '/addopts/d' pyproject.toml
'';
build-system = [ flit-core ];
nativeCheckInputs = [ pytestCheckHook ];

View File

@ -9,21 +9,21 @@
buildPythonPackage rec {
pname = "python-docs-theme";
version = "2024.6";
version = "2024.10";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "python";
repo = "python-docs-theme";
rev = "refs/tags/${version}";
hash = "sha256-YKKF2e1La8jsCRS3M+LT+KmK0HxCRGQOof3MlVkMAuY=";
hash = "sha256-JwuIV+hkBIst8EtC3Xmu/KYTV+SZvD4rb9wHimKLL94=";
};
nativeBuildInputs = [ flit-core ];
build-system = [ flit-core ];
propagatedBuildInputs = [ sphinx ];
dependencies = [ sphinx ];
pythonImportsCheck = [ "python_docs_theme" ];

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvicare";
version = "2.35.0";
version = "2.36.0";
pyproject = true;
src = fetchFromGitHub {
owner = "openviess";
repo = "PyViCare";
rev = "refs/tags/${version}";
hash = "sha256-5VvbbCQTc2EG7YsQlPd3BRwDtJzIuEX2yLs2RWFeFDM=";
hash = "sha256-WkdW1sSA/nVHK8Pp2sOkj3qYc8se4MT6WM4AoQvI5i8=";
};
postPatch = ''

View File

@ -18,20 +18,19 @@
# tests
pytestCheckHook,
pytest-cov-stub,
pythonOlder,
}:
buildPythonPackage rec {
pname = "schwifty";
version = "2024.9.0";
version = "2024.11.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-rO6fUCFYfCVPxfd+vvzWL+sMDDqA/qRSPUUTB90E8zA=";
hash = "sha256-0KrtAxaEA7Qz3lFdZj3wlRaUGucBUoUNo6/jwkIlX2o=";
};
build-system = [
@ -50,7 +49,6 @@ buildPythonPackage rec {
};
nativeCheckInputs = [
pytest-cov-stub
pytestCheckHook
] ++ lib.flatten (lib.attrValues optional-dependencies);

View File

@ -11,7 +11,7 @@
}:
let
version = "1.6.7";
version = "1.6.8";
in
buildPythonPackage {
pname = "sismic";
@ -24,7 +24,7 @@ buildPythonPackage {
owner = "AlexandreDecan";
repo = "sismic";
rev = "refs/tags/${version}";
hash = "sha256-EP78Wc2f6AKqbGBW8wVP0wogEbTo0ndjlRRd+fsUvCo=";
hash = "sha256-0g39jJI3UIniJY/oHQMZ53GCOJIbqdVeOED9PWxlw6E=";
};
pythonRelaxDeps = [ "behave" ];

View File

@ -0,0 +1,40 @@
{
lib,
buildPythonPackage,
defusedxml,
fetchPypi,
hatchling,
pytestCheckHook,
sphinx,
}:
buildPythonPackage rec {
pname = "sphinxcontrib-moderncmakedomain";
version = "3.29.0";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "sphinxcontrib_moderncmakedomain";
hash = "sha256-NYfe8kH/JXfQu+8RgQoILp3sG3ij1LSgZiQLXz3BtbI=";
};
build-system = [ hatchling ];
dependencies = [ sphinx ];
nativeCheckInputs = [
defusedxml
pytestCheckHook
sphinx
];
pythonNamespaces = [ "sphinxcontrib" ];
meta = with lib; {
description = "Sphinx extension which renders CMake documentation";
homepage = "https://github.com/scikit-build/moderncmakedomain";
license = licenses.bsd3;
maintainers = with maintainers; [ jhol ];
};
}

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tensorly";
version = "0.8.2";
version = "0.9.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-kYKyLY2V6M53co+26ZTZP4U6bHkFebKI5Uhh1x1/N58=";
hash = "sha256-kj32N0hwdI/DS0WwpH4cr3xhq+3X53edodU3/SEorqw=";
};
propagatedBuildInputs = [

View File

@ -2,13 +2,16 @@
lib,
buildPythonPackage,
fetchFromGitHub,
scikit-build-core,
setuptools,
setuptools-scm,
cmake,
ninja,
matchpy,
numpy,
astunparse,
typing-extensions,
pytest7CheckHook,
pytestCheckHook,
pytest-cov-stub,
}:
@ -24,11 +27,15 @@ buildPythonPackage rec {
hash = "sha256-q9lMU/xA+G2x38yZy3DxCpXTEmg1lZhZ8GFIHDIKE24=";
};
nativeBuildInputs = [
build-system = [
scikit-build-core
setuptools
setuptools-scm
cmake
ninja
];
build-system = [ setuptools ];
dontUseCmakeConfigure = true;
dependencies = [
astunparse
@ -38,7 +45,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
pytest7CheckHook
pytestCheckHook
pytest-cov-stub
];
@ -58,6 +65,6 @@ buildPythonPackage rec {
description = "Universal array library";
homepage = "https://github.com/Quansight-Labs/uarray";
license = licenses.bsd0;
maintainers = [ ];
maintainers = [ lib.maintainers.pbsds ];
};
}

View File

@ -4,20 +4,21 @@
fetchFromGitHub,
setuptools,
six,
nix-update-script,
pytestCheckHook,
pytest-cov-stub,
}:
buildPythonPackage rec {
pname = "wirerope";
version = "0.4.7";
version = "0.4.8";
pyproject = true;
src = fetchFromGitHub {
owner = "youknowone";
repo = "wirerope";
rev = version;
hash = "sha256-Xi6I/TXttjCregknmZUhV5GAiNR/HmEi4wCZiCmp0DQ=";
hash = "sha256-Qb0gTCtVWdvZnwS6+PHoBr0syHtpfRI8ugh7zO7k9rk=";
};
build-system = [ setuptools ];
@ -31,6 +32,8 @@ buildPythonPackage rec {
pytest-cov-stub
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Wrappers for class callables";
homepage = "https://github.com/youknowone/wirerope";

View File

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "yfinance";
version = "0.2.48";
version = "0.2.49";
pyproject = true;
disabled = pythonOlder "3.7";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "ranaroussi";
repo = "yfinance";
rev = "refs/tags/${version}";
hash = "sha256-7m5N2l80Cg6+NDiW0x49WtHkc6fu07s0BqKlHFCc1v0=";
hash = "sha256-rZU7xMTVabXMOQYGJnZjkDcfegBzHNsx8VNPvKKWEIQ=";
};
build-system = [ setuptools ];

View File

@ -1,49 +1,53 @@
{ stdenv
{
stdenv,
# nix tooling and utilities
, callPackage
, lib
, fetchurl
, makeWrapper
, writeTextFile
, substituteAll
, writeShellApplication
, makeBinaryWrapper
lib,
fetchurl,
makeWrapper,
writeTextFile,
substituteAll,
writeShellApplication,
makeBinaryWrapper,
autoPatchelfHook,
buildFHSEnv,
# this package (through the fixpoint glass)
, bazel_self
# TODO probably still need for tests at some point
bazel_self,
# native build inputs
, runtimeShell
, zip
, unzip
, bash
, coreutils
, which
, gawk
, gnused
, gnutar
, gnugrep
, gzip
, findutils
, diffutils
, gnupatch
, file
, installShellFiles
, lndir
, python3
runtimeShell,
zip,
unzip,
bash,
coreutils,
which,
gawk,
gnused,
gnutar,
gnugrep,
gzip,
findutils,
diffutils,
gnupatch,
file,
installShellFiles,
lndir,
python3,
# Apple dependencies
, cctools
, libcxx
, sigtool
, CoreFoundation
, CoreServices
, Foundation
, IOKit
cctools,
libcxx,
libtool,
sigtool,
CoreFoundation,
CoreServices,
Foundation,
IOKit,
# Allow to independently override the jdks used to build and run respectively
, buildJdk
, runJdk
buildJdk,
runJdk,
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
, enableNixHacks ? false
, version ? "7.1.2"
enableNixHacks ? false,
version ? "7.3.1",
}:
let
@ -51,27 +55,7 @@ let
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
hash = "sha256-nPbtIxnIFpGdlwFe720MWULNGu1I4DxzuggV2VPtYas=";
};
# Use builtins.fetchurl to avoid IFD, in particular on hydra
#lockfile = builtins.fetchurl {
# url = "https://raw.githubusercontent.com/bazelbuild/bazel/release-${version}/MODULE.bazel.lock";
# sha256 = "sha256-5xPpCeWVKVp1s4RVce/GoW2+fH8vniz5G1MNI4uezpc=";
#};
# Use a local copy of the above lockfile to make ofborg happy.
lockfile = ./MODULE.bazel.lock;
# Two-in-one format
distDir = repoCache;
repoCache = callPackage ./bazel-repository-cache.nix {
inherit lockfile;
# We use the release tarball that already has everything bundled so we
# should not need any extra external deps. But our nonprebuilt java
# toolchains hack needs just one non bundled dep.
requiredDepNamePredicate = name:
null != builtins.match "rules_java~.*~toolchains~remote_java_tools" name;
hash = "sha256-8FAfkMn8dM1pM9vcWeF7jWJy1sCfi448QomFxYlxR8c=";
};
defaultShellUtils =
@ -117,8 +101,161 @@ let
unzip
which
zip
makeWrapper
];
# Bootstrap an existing Bazel so we can vendor deps with vendor mode
bazelBootstrap = stdenv.mkDerivation rec {
name = "bazelBootstrap";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64";
hash = "sha256-05fHtz47OilpOVYawB17VRVEDpycfYTIHBmwYCOyPjI=";
}
else if stdenv.hostPlatform.system == "aarch64-linux" then
fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64";
hash = "sha256-olrlIia/oXWleXp12E+LGXv+F1m4/S4jj/t7p2/xGdM=";
}
else if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64";
hash = "sha256-LraN6MSVJQ3NzkyeLl5LvGxf+VNDJiVo/dVJIkyF1jU=";
}
else
fetchurl {
# stdenv.hostPlatform.system == "aarch64-darwin"
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64";
hash = "sha256-mB+CpHC60TSTIrb1HJxv+gqikdqxAU+sQRVDwS5mHf8=";
};
nativeBuildInputs = defaultShellUtils;
buildInputs = [
stdenv.cc.cc
] ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
dontUnpack = true;
dontPatch = true;
dontBuild = true;
dontStrip = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -Dm755 $src $out/bin/bazel
runHook postInstall
'';
postFixup = ''
wrapProgram $out/bin/bazel \
--prefix PATH : ${lib.makeBinPath nativeBuildInputs}
'';
meta.sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
bazelFhs = buildFHSEnv {
name = "bazel";
targetPkgs = _: [ bazelBootstrap ];
runScript = "bazel";
};
# A FOD that vendors the Bazel dependencies using Bazel's new vendor mode.
# See https://bazel.build/versions/7.3.0/external/vendor for details.
# Note that it may be possible to vendor less than the full set of deps in
# the future, as this is approximately 16GB.
bazelDeps =
let
bazelForDeps = if stdenv.hostPlatform.isDarwin then bazelBootstrap else bazelFhs;
in
stdenv.mkDerivation {
name = "bazelDeps";
inherit src version;
sourceRoot = ".";
patches = [
# The repo rule that creates a manifest of the bazel source for testing
# the cli is not reproducible. This patch ensures that it is by sorting
# the results in the repo rule rather than the downstream genrule.
./test_source_sort.patch
];
patchFlags = [
"--no-backup-if-mismatch"
"-p1"
];
nativeBuildInputs = [
unzip
runJdk
bazelForDeps
] ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool;
configurePhase = ''
runHook preConfigure
mkdir bazel_src
shopt -s dotglob extglob
mv !(bazel_src) bazel_src
mkdir vendor_dir
runHook postConfigure
'';
dontFixup = true;
buildPhase = ''
runHook preBuild
export HOME=$(mktemp -d)
(cd bazel_src; ${bazelForDeps}/bin/bazel --server_javabase=${runJdk} mod deps --curses=no;
${bazelForDeps}/bin/bazel --server_javabase=${runJdk} vendor src:bazel_nojdk \
--curses=no \
--vendor_dir ../vendor_dir \
--verbose_failures \
--experimental_strict_java_deps=off \
--strict_proto_deps=off \
--tool_java_runtime_version=local_jdk_21 \
--java_runtime_version=local_jdk_21 \
--tool_java_language_version=21 \
--java_language_version=21)
# Some post-fetch fixup is necessary, because the deps come with some
# baggage that is not reproducible. Luckily, this baggage does not factor
# into the final product, so removing it is enough.
# the GOCACHE is poisonous!
rm -rf vendor_dir/gazelle~~non_module_deps~bazel_gazelle_go_repository_cache/gocache
# as is the go versions file (changes when new versions show up)
rm -f vendor_dir/rules_go~~go_sdk~go_default_sdk/versions.json
# and so are .pyc files
find vendor_dir -name "*.pyc" -type f -delete
# bazel-external is auto-generated and should be removed
# see https://bazel.build/external/vendor#vendor-symlinks for more details
rm vendor_dir/bazel-external
runHook postBuild
'';
installPhase = ''
mkdir -p $out/vendor_dir
cp -r --reflink=auto vendor_dir/* $out/vendor_dir
'';
outputHashMode = "recursive";
outputHash =
if stdenv.hostPlatform.system == "x86_64-linux" then
"sha256-II5R2YjaIejcO4Topdcz1H268eplYsYrW2oLJHKEkYw="
else if stdenv.hostPlatform.system == "aarch64-linux" then
"sha256-n8RMKf8OxJsEkcxLe7xZgMu9RyeU58NESFF9F0nLNC4="
else if stdenv.hostPlatform.system == "aarch64-darwin" then
"sha256-E6j31Sl+aGs6+Xdx+c0Xi6ryfYZ/ms5/HzIyc3QpMHY="
else
# x86_64-darwin
"sha256-VVuNGY4+SFDhcv9iEo8JToYPzqk9NQCrYlLhhae89MM=";
outputHashAlgo = "sha256";
};
defaultShellPath = lib.makeBinPath defaultShellUtils;
bashWithDefaultShellUtilsSh = writeShellApplication {
@ -174,87 +311,88 @@ stdenv.mkDerivation rec {
inherit version src;
inherit sourceRoot;
patches = [
# Remote java toolchains do not work on NixOS because they download binaries,
# so we need to use the @local_jdk//:jdk
# It could in theory be done by registering @local_jdk//:all toolchains,
# but these java toolchains still bundle binaries for ijar and stuff. So we
# need a nonprebult java toolchain (where ijar and stuff is built from
# sources).
# There is no such java toolchain, so we introduce one here.
# By providing no version information, the toolchain will set itself to the
# version of $JAVA_HOME/bin/java, just like the local_jdk does.
# To ensure this toolchain gets used, we can set
# --{,tool_}java_runtime_version=local_jdk and rely on the fact no java
# toolchain registered by default uses the local_jdk, making the selection
# unambiguous.
# This toolchain has the advantage that it can use any ambiant java jdk,
# not only a given, fixed version. It allows bazel to work correctly in any
# environment where JAVA_HOME is set to the right java version, like inside
# nix derivations.
# However, this patch breaks bazel hermeticity, by picking the ambiant java
# version instead of the more hermetic remote_jdk prebuilt binaries that
# rules_java provide by default. It also requires the user to have a
# JAVA_HOME set to the exact version required by the project.
# With more code, we could define java toolchains for all the java versions
# supported by the jdk as in rules_java's
# toolchains/local_java_repository.bzl, but this is not implemented here.
# To recover vanilla behavior, non NixOS users can set
# --{,tool_}java_runtime_version=remote_jdk, effectively reverting the
# effect of this patch and the fake system bazelrc.
./java_toolchain.patch
patches =
[
# Remote java toolchains do not work on NixOS because they download binaries,
# so we need to use the @local_jdk//:jdk
# It could in theory be done by registering @local_jdk//:all toolchains,
# but these java toolchains still bundle binaries for ijar and stuff. So we
# need a nonprebult java toolchain (where ijar and stuff is built from
# sources).
# There is no such java toolchain, so we introduce one here.
# By providing no version information, the toolchain will set itself to the
# version of $JAVA_HOME/bin/java, just like the local_jdk does.
# To ensure this toolchain gets used, we can set
# --{,tool_}java_runtime_version=local_jdk and rely on the fact no java
# toolchain registered by default uses the local_jdk, making the selection
# unambiguous.
# This toolchain has the advantage that it can use any ambiant java jdk,
# not only a given, fixed version. It allows bazel to work correctly in any
# environment where JAVA_HOME is set to the right java version, like inside
# nix derivations.
# However, this patch breaks bazel hermeticity, by picking the ambiant java
# version instead of the more hermetic remote_jdk prebuilt binaries that
# rules_java provide by default. It also requires the user to have a
# JAVA_HOME set to the exact version required by the project.
# With more code, we could define java toolchains for all the java versions
# supported by the jdk as in rules_java's
# toolchains/local_java_repository.bzl, but this is not implemented here.
# To recover vanilla behavior, non NixOS users can set
# --{,tool_}java_runtime_version=remote_jdk, effectively reverting the
# effect of this patch and the fake system bazelrc.
./java_toolchain.patch
# Bazel integrates with apple IOKit to inhibit and track system sleep.
# Inside the darwin sandbox, these API calls are blocked, and bazel
# crashes. It seems possible to allow these APIs inside the sandbox, but it
# feels simpler to patch bazel not to use it at all. So our bazel is
# incapable of preventing system sleep, which is a small price to pay to
# guarantee that it will always run in any nix context.
#
# See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
# NIX_BUILD_TOP env var to conditionnally disable sleep features inside the
# sandbox.
#
# If you want to investigate the sandbox profile path,
# IORegisterForSystemPower can be allowed with
#
# propagatedSandboxProfile = ''
# (allow iokit-open (iokit-user-client-class "RootDomainUserClient"))
# '';
#
# I do not know yet how to allow IOPMAssertion{CreateWithName,Release}
./darwin_sleep.patch
# Bazel integrates with apple IOKit to inhibit and track system sleep.
# Inside the darwin sandbox, these API calls are blocked, and bazel
# crashes. It seems possible to allow these APIs inside the sandbox, but it
# feels simpler to patch bazel not to use it at all. So our bazel is
# incapable of preventing system sleep, which is a small price to pay to
# guarantee that it will always run in any nix context.
#
# See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
# NIX_BUILD_TOP env var to conditionnally disable sleep features inside the
# sandbox.
#
# If you want to investigate the sandbox profile path,
# IORegisterForSystemPower can be allowed with
#
# propagatedSandboxProfile = ''
# (allow iokit-open (iokit-user-client-class "RootDomainUserClient"))
# '';
#
# I do not know yet how to allow IOPMAssertion{CreateWithName,Release}
./darwin_sleep.patch
# Fix DARWIN_XCODE_LOCATOR_COMPILE_COMMAND by removing multi-arch support.
# Nixpkgs toolcahins do not support that (yet?) and get confused.
# Also add an explicit /usr/bin prefix that will be patched below.
./xcode_locator.patch
# Fix DARWIN_XCODE_LOCATOR_COMPILE_COMMAND by removing multi-arch support.
# Nixpkgs toolcahins do not support that (yet?) and get confused.
# Also add an explicit /usr/bin prefix that will be patched below.
./xcode_locator.patch
# On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
# This is breaking the build of any C target. This patch removes the last
# argument if it's found to be an empty string.
../trim-last-argument-to-gcc-if-empty.patch
# On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
# This is breaking the build of any C target. This patch removes the last
# argument if it's found to be an empty string.
../trim-last-argument-to-gcc-if-empty.patch
# --experimental_strict_action_env (which may one day become the default
# see bazelbuild/bazel#2574) hardcodes the default
# action environment to a non hermetic value (e.g. "/usr/local/bin").
# This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
# So we are replacing this bazel paths by defaultShellPath,
# improving hermeticity and making it work in nixos.
(substituteAll {
src = ../strict_action_env.patch;
strictActionEnvPatch = defaultShellPath;
})
# --experimental_strict_action_env (which may one day become the default
# see bazelbuild/bazel#2574) hardcodes the default
# action environment to a non hermetic value (e.g. "/usr/local/bin").
# This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
# So we are replacing this bazel paths by defaultShellPath,
# improving hermeticity and making it work in nixos.
(substituteAll {
src = ../strict_action_env.patch;
strictActionEnvPatch = defaultShellPath;
})
# bazel reads its system bazelrc in /etc
# override this path to a builtin one
(substituteAll {
src = ../bazel_rc.patch;
bazelSystemBazelRCPath = bazelRC;
})
]
# See enableNixHacks argument above.
++ lib.optional enableNixHacks ./nix-hacks.patch;
# bazel reads its system bazelrc in /etc
# override this path to a builtin one
(substituteAll {
src = ../bazel_rc.patch;
bazelSystemBazelRCPath = bazelRC;
})
]
# See enableNixHacks argument above.
++ lib.optional enableNixHacks ./nix-hacks.patch;
postPatch =
let
@ -339,10 +477,6 @@ stdenv.mkDerivation rec {
-e 's!/bin/bash!${bashWithDefaultShellUtils}/bin/bash!g' \
-e 's!shasum -a 256!sha256sum!g'
# Augment bundled repository_cache with our extra paths
${lndir}/bin/lndir ${repoCache}/content_addressable \
$PWD/derived/repository_cache/content_addressable
# Add required flags to bazel command line.
# XXX: It would suit a bazelrc file better, but I found no way to pass it.
# It seems that bazel bootstrapping ignores it.
@ -350,15 +484,16 @@ stdenv.mkDerivation rec {
sedVerbose compile.sh \
-e "/bazel_build /a\ --verbose_failures \\\\" \
-e "/bazel_build /a\ --curses=no \\\\" \
-e "/bazel_build /a\ --features=-layering_check \\\\" \
-e "/bazel_build /a\ --experimental_strict_java_deps=off \\\\" \
-e "/bazel_build /a\ --strict_proto_deps=off \\\\" \
-e "/bazel_build /a\ --toolchain_resolution_debug='@bazel_tools//tools/jdk:(runtime_)?toolchain_type' \\\\" \
-e "/bazel_build /a\ --tool_java_runtime_version=local_jdk_17 \\\\" \
-e "/bazel_build /a\ --java_runtime_version=local_jdk_17 \\\\" \
-e "/bazel_build /a\ --tool_java_language_version=17 \\\\" \
-e "/bazel_build /a\ --java_language_version=17 \\\\" \
-e "/bazel_build /a\ --tool_java_runtime_version=local_jdk_21 \\\\" \
-e "/bazel_build /a\ --java_runtime_version=local_jdk_21 \\\\" \
-e "/bazel_build /a\ --tool_java_language_version=21 \\\\" \
-e "/bazel_build /a\ --java_language_version=21 \\\\" \
-e "/bazel_build /a\ --extra_toolchains=@bazel_tools//tools/jdk:all \\\\" \
-e "/bazel_build /a\ --vendor_dir=../vendor_dir \\\\" \
-e "/bazel_build /a\ --repository_disable_download \\\\" \
-e "/bazel_build /a\ --announce_rc \\\\" \
-e "/bazel_build /a\ --nobuild_python_zip \\\\" \
# Also build parser_deploy.jar with bootstrap bazel
# TODO: Turn into a proper patch
@ -407,25 +542,30 @@ stdenv.mkDerivation rec {
# Bazel starts a local server and needs to bind a local address.
__darwinAllowLocalNetworking = true;
buildInputs = [ buildJdk bashWithDefaultShellUtils ] ++ defaultShellUtils;
buildInputs = [
buildJdk
bashWithDefaultShellUtils
] ++ defaultShellUtils;
# when a command cant be found in a bazel build, you might also
# need to add it to `defaultShellPath`.
nativeBuildInputs = [
installShellFiles
makeWrapper
python3
unzip
which
zip
python3.pkgs.absl-py # Needed to build fish completion
] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
cctools
libcxx
Foundation
CoreFoundation
CoreServices
];
nativeBuildInputs =
[
installShellFiles
makeWrapper
python3
unzip
which
zip
python3.pkgs.absl-py # Needed to build fish completion
]
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
cctools
libcxx
Foundation
CoreFoundation
CoreServices
];
# Bazel makes extensive use of symlinks in the WORKSPACE.
# This causes problems with infinite symlinks if the build output is in the same location as the
@ -437,12 +577,15 @@ stdenv.mkDerivation rec {
mkdir bazel_src
shopt -s dotglob extglob
mv !(bazel_src) bazel_src
# Augment bundled repository_cache with our extra paths
mkdir vendor_dir
${lndir}/bin/lndir ${bazelDeps}/vendor_dir vendor_dir
rm vendor_dir/VENDOR.bazel
find vendor_dir -maxdepth 1 -type d -printf "pin(\"@@%P\")\n" > vendor_dir/VENDOR.bazel
'';
buildPhase = ''
runHook preBuild
# Increasing memory during compilation might be necessary.
# export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
export HOME=$(mktemp -d)
# If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md
# and `git rev-parse --short HEAD` which would result in
@ -452,6 +595,7 @@ stdenv.mkDerivation rec {
# Note that .bazelversion is always correct and is based on bazel-*
# executable name, version checks should work fine
export EMBED_LABEL="${version}- (@non-git)"
echo "Stage 1 - Running bazel bootstrap script"
${bash}/bin/bash ./bazel_src/compile.sh
@ -529,6 +673,7 @@ stdenv.mkDerivation rec {
#!${runtimeShell} -e
exit 1
EOF
chmod +x tools/bazel
# first call should fail if tools/bazel is used
@ -554,16 +699,18 @@ stdenv.mkDerivation rec {
# Save paths to hardcoded dependencies so Nix can detect them.
# This is needed because the templates get tard up into a .jar.
postFixup = ''
mkdir -p $out/nix-support
echo "${defaultShellPath}" >> $out/nix-support/depends
# The string literal specifying the path to the bazel-rc file is sometimes
# stored non-contiguously in the binary due to gcc optimisations, which leads
# Nix to miss the hash when scanning for dependencies
echo "${bazelRC}" >> $out/nix-support/depends
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
echo "${cctools}" >> $out/nix-support/depends
'';
postFixup =
''
mkdir -p $out/nix-support
echo "${defaultShellPath}" >> $out/nix-support/depends
# The string literal specifying the path to the bazel-rc file is sometimes
# stored non-contiguously in the binary due to gcc optimisations, which leads
# Nix to miss the hash when scanning for dependencies
echo "${bazelRC}" >> $out/nix-support/depends
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
echo "${cctools}" >> $out/nix-support/depends
'';
dontStrip = true;
dontPatchELF = true;
@ -574,11 +721,13 @@ stdenv.mkDerivation rec {
# nix-build . -A bazel_7.tests
#
# in the nixpkgs checkout root to exercise them locally.
tests = callPackage ./tests.nix {
inherit Foundation bazel_self lockfile repoCache;
};
# tests = callPackage ./tests.nix {
# inherit Foundation bazel_self lockfile repoCache;
# };
# TODO tests have not been updated yet and will likely need a rewrite
# tests = callPackage ./tests.nix { inherit Foundation bazelDeps bazel_self; };
# For ease of debugging
inherit distDir repoCache lockfile;
inherit bazelDeps bazelFhs bazelBootstrap;
};
}

View File

@ -0,0 +1,12 @@
--- a/src/test/shell/bazel/list_source_repository.bzl
+++ b/src/test/shell/bazel/list_source_repository.bzl
@@ -32,7 +32,8 @@ def _impl(rctx):
if "SRCS_EXCLUDES" in rctx.os.environ:
srcs_excludes = rctx.os.environ["SRCS_EXCLUDES"]
r = rctx.execute(["find", "-L", str(workspace), "-type", "f"])
- rctx.file("find.result.raw", r.stdout.replace(str(workspace) + "/", ""))
+ stdout = "\n".join(sorted(r.stdout.splitlines()))
+ rctx.file("find.result.raw", stdout.replace(str(workspace) + "/", ""))
rctx.file("BUILD", """
genrule(
name = "sources",

View File

@ -17,13 +17,13 @@
buildGoModule rec {
pname = "buildah";
version = "1.37.3";
version = "1.38.0";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
hash = "sha256-YYmgxlW80y6HOlRQbG3N+wTZM5pB58ZzZHEOa6vWbRw=";
hash = "sha256-avQdK7+kMrPc8rp/2nTiUC/ZTW8nUem9v3u0xsE0oGM=";
};
outputs = [ "out" "man" ];

View File

@ -5,29 +5,32 @@ GEM
base64
nkf
rexml
activesupport (7.1.3)
activesupport (7.2.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
bigdecimal (3.1.6)
benchmark (0.3.0)
bigdecimal (3.1.8)
claide (1.1.0)
cocoapods (1.15.2)
cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.15.2)
cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@ -41,8 +44,8 @@ GEM
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.15.2)
xcodeproj (>= 1.27.0, < 2.0)
cocoapods-core (1.16.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
@ -62,43 +65,42 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
drb (2.2.0)
ruby2_keywords
drb (2.2.1)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.1)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
json (2.7.1)
minitest (5.22.2)
json (2.7.6)
logger (1.6.1)
minitest (5.25.1)
molinillo (0.8.0)
mutex_m (0.2.0)
nanaimo (0.3.0)
nanaimo (0.4.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.2.6)
rexml (3.3.9)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
securerandom (0.3.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.24.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)
PLATFORMS
ruby
@ -107,4 +109,4 @@ DEPENDENCIES
cocoapods (>= 1.7.0.beta.1)
BUNDLED WITH
2.4.20
2.5.9

View File

@ -5,29 +5,32 @@ GEM
base64
nkf
rexml
activesupport (7.1.3)
activesupport (7.2.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
bigdecimal (3.1.6)
benchmark (0.3.0)
bigdecimal (3.1.8)
claide (1.1.0)
cocoapods (1.15.2)
cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.15.2)
cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@ -41,8 +44,8 @@ GEM
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.15.2)
xcodeproj (>= 1.27.0, < 2.0)
cocoapods-core (1.16.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
@ -62,43 +65,42 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
drb (2.2.0)
ruby2_keywords
drb (2.2.1)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.1)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
json (2.7.1)
minitest (5.22.2)
json (2.7.6)
logger (1.6.1)
minitest (5.25.1)
molinillo (0.8.0)
mutex_m (0.2.0)
nanaimo (0.3.0)
nanaimo (0.4.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.2.6)
rexml (3.3.9)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
securerandom (0.3.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.24.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)
PLATFORMS
ruby
@ -107,4 +109,4 @@ DEPENDENCIES
cocoapods
BUNDLED WITH
2.4.20
2.5.9

View File

@ -1,14 +1,14 @@
{
activesupport = {
dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
dependencies = ["base64" "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v";
sha256 = "12ijz1mmg70agw4d91hjdyzvma3dzs52mchasslxyn7p9j960qs3";
type = "gem";
};
version = "7.1.3";
version = "7.2.2";
};
addressable = {
dependencies = ["public_suffix"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
version = "2.8.6";
version = "2.8.7";
};
algoliasearch = {
dependencies = ["httpclient" "json"];
@ -52,15 +52,25 @@
};
version = "0.2.0";
};
benchmark = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wghmhwjzv4r9mdcny4xfz2h2cm7ci24md79rvy2x65r4i99k9sc";
type = "gem";
};
version = "0.3.0";
};
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w";
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem";
};
version = "3.1.6";
version = "3.1.8";
};
CFPropertyList = {
dependencies = ["base64" "nkf" "rexml"];
@ -89,10 +99,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02h9lk5w0ilz39cdl7fil0fpmfbzyc23whkgp4rx2a6hx0yibxgh";
sha256 = "0phyvpx78jlrpvldbxjmzq92mfx6l66va2fz2s5xpwrdydhciw8g";
type = "gem";
};
version = "1.15.2";
version = "1.16.2";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@ -100,10 +110,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0di1g9k1f6i80yxzdl3rdlfdk2w89dv6k5m06444rbg1gzcm09ij";
sha256 = "0ay1dwjg79rfa6mbfyy96in0k364dgn7s8ps6v7n07k9432bbcab";
type = "gem";
};
version = "1.15.2";
version = "1.16.2";
};
cocoapods-deintegrate = {
groups = ["default"];
@ -182,10 +192,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
version = "1.2.3";
version = "1.3.4";
};
connection_pool = {
groups = ["default"];
@ -198,15 +208,14 @@
version = "2.4.1";
};
drb = {
dependencies = ["ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79";
sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
type = "gem";
};
version = "2.2.0";
version = "2.2.1";
};
escape = {
groups = ["default"];
@ -234,10 +243,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
type = "gem";
};
version = "1.16.3";
version = "1.17.0";
};
fourflusher = {
groups = ["default"];
@ -285,30 +294,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
version = "1.14.1";
version = "1.14.6";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
sha256 = "03q7kbadhbyfnz21abv2b9dyqnjvxpd51ppqihg40rrimw1vm6id";
type = "gem";
};
version = "2.7.1";
version = "2.7.6";
};
logger = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
type = "gem";
};
version = "1.6.1";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5";
sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
type = "gem";
};
version = "5.22.2";
version = "5.25.1";
};
molinillo = {
groups = ["default"];
@ -320,25 +339,15 @@
};
version = "0.8.0";
};
mutex_m = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
type = "gem";
};
version = "0.2.0";
};
nanaimo = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s";
type = "gem";
};
version = "0.3.0";
version = "0.4.0";
};
nap = {
groups = ["default"];
@ -385,10 +394,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
version = "3.2.6";
version = "3.3.9";
};
ruby-macho = {
groups = ["default"];
@ -400,15 +409,15 @@
};
version = "2.5.1";
};
ruby2_keywords = {
securerandom = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
type = "gem";
};
version = "0.0.5";
version = "0.3.1";
};
typhoeus = {
dependencies = ["ethon"];
@ -438,9 +447,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56";
sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc";
type = "gem";
};
version = "1.24.0";
version = "1.27.0";
};
}

View File

@ -1,14 +1,14 @@
{
activesupport = {
dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
dependencies = ["base64" "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v";
sha256 = "12ijz1mmg70agw4d91hjdyzvma3dzs52mchasslxyn7p9j960qs3";
type = "gem";
};
version = "7.1.3";
version = "7.2.2";
};
addressable = {
dependencies = ["public_suffix"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
version = "2.8.6";
version = "2.8.7";
};
algoliasearch = {
dependencies = ["httpclient" "json"];
@ -50,15 +50,25 @@
};
version = "0.2.0";
};
benchmark = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wghmhwjzv4r9mdcny4xfz2h2cm7ci24md79rvy2x65r4i99k9sc";
type = "gem";
};
version = "0.3.0";
};
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w";
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem";
};
version = "3.1.6";
version = "3.1.8";
};
CFPropertyList = {
dependencies = ["base64" "nkf" "rexml"];
@ -87,10 +97,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02h9lk5w0ilz39cdl7fil0fpmfbzyc23whkgp4rx2a6hx0yibxgh";
sha256 = "0phyvpx78jlrpvldbxjmzq92mfx6l66va2fz2s5xpwrdydhciw8g";
type = "gem";
};
version = "1.15.2";
version = "1.16.2";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@ -98,10 +108,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0di1g9k1f6i80yxzdl3rdlfdk2w89dv6k5m06444rbg1gzcm09ij";
sha256 = "0ay1dwjg79rfa6mbfyy96in0k364dgn7s8ps6v7n07k9432bbcab";
type = "gem";
};
version = "1.15.2";
version = "1.16.2";
};
cocoapods-deintegrate = {
groups = ["default"];
@ -176,10 +186,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
version = "1.2.3";
version = "1.3.4";
};
connection_pool = {
groups = ["default"];
@ -192,15 +202,14 @@
version = "2.4.1";
};
drb = {
dependencies = ["ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79";
sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
type = "gem";
};
version = "2.2.0";
version = "2.2.1";
};
escape = {
source = {
@ -226,10 +235,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
type = "gem";
};
version = "1.16.3";
version = "1.17.0";
};
fourflusher = {
groups = ["default"];
@ -273,30 +282,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
version = "1.14.1";
version = "1.14.6";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
sha256 = "03q7kbadhbyfnz21abv2b9dyqnjvxpd51ppqihg40rrimw1vm6id";
type = "gem";
};
version = "2.7.1";
version = "2.7.6";
};
logger = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
type = "gem";
};
version = "1.6.1";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5";
sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
type = "gem";
};
version = "5.22.2";
version = "5.25.1";
};
molinillo = {
groups = ["default"];
@ -308,25 +327,15 @@
};
version = "0.8.0";
};
mutex_m = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
type = "gem";
};
version = "0.2.0";
};
nanaimo = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s";
type = "gem";
};
version = "0.3.0";
version = "0.4.0";
};
nap = {
source = {
@ -369,10 +378,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
version = "3.2.6";
version = "3.3.9";
};
ruby-macho = {
groups = ["default"];
@ -384,15 +393,15 @@
};
version = "2.5.1";
};
ruby2_keywords = {
securerandom = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
type = "gem";
};
version = "0.0.5";
version = "0.3.1";
};
typhoeus = {
dependencies = ["ethon"];
@ -422,9 +431,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56";
sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc";
type = "gem";
};
version = "1.24.0";
version = "1.27.0";
};
}

View File

@ -21,13 +21,13 @@
let
common = rec {
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nixd";
rev = version;
hash = "sha256-8F97zAu+icDC9ZYS7m+Y58oZQ7R3gVuXMvzAfgkVmJo=";
hash = "sha256-dFPjQcY3jtHIsdR0X1s0qbHtBFroRhHoy/NldEFxlZ0=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "rtl8821cu";
version = "${kernel.version}-unstable-2024-05-03";
version = "${kernel.version}-unstable-2024-09-27";
src = fetchFromGitHub {
owner = "morrownr";
repo = "8821cu-20210916";
rev = "3eacc28b721950b51b0249508cc31e6e54988a0c";
hash = "sha256-JP7mvwhnKqmkb/B0l4vhc11TBjjUA1Ubzbj/IVEXvBM=";
rev = "2dce552dc6aa0cdab427bfa810c3df002eab0078";
hash = "sha256-8hGAfZyDCGl0RnPnYjc7iMEulZvoIGe2ghfIfoiz7ZI=";
};
hardeningDisable = [ "pic" ];
@ -18,9 +18,9 @@ stdenv.mkDerivation {
prePatch = ''
substituteInPlace ./Makefile \
--replace /lib/modules/ "${kernel.dev}/lib/modules/" \
--replace /sbin/depmod \# \
--replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
--replace-fail /lib/modules/ "${kernel.dev}/lib/modules/" \
--replace-fail /sbin/depmod \# \
--replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
preInstall = ''

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "icinga2${nameSuffix}";
version = "2.14.2";
version = "2.14.3";
src = fetchFromGitHub {
owner = "icinga";
repo = "icinga2";
rev = "v${version}";
sha256 = "sha256-vUtLGkTLGObx3zbfRTboNVsl9AmpAkHc+IhWhnKupSM=";
hash = "sha256-QXe/+yQlyyOa78eEiudDni08SCUP3nhTYVpbmVUVKA8=";
};
patches = [

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "junos-czerwonk-exporter";
version = "0.12.4";
version = "0.12.5";
src = fetchFromGitHub {
owner = "czerwonk";
repo = "junos_exporter";
rev = version;
sha256 = "sha256-L6D2gJ6Vt80J6ERJE9I483L9c2mufHzuAbStODaiOy4=";
sha256 = "sha256-iNUNZnSaBXGr8QFjHxW4/9Msuqerq8FcSQ74I2l8h7o=";
};
vendorHash = "sha256-qHs6KuBmJmmkmR23Ae7COadb2F7N8CMUmScx8JFt98Q=";

View File

@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
rimeDataDrv = symlinkJoin {
name = "fcitx5-rime-data";
paths = rimeDataPkgs;
postBuild = "mkdir -p $out/share/rime-data";
};
postInstall = ''

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "hyperfine";
version = "1.18.0";
version = "1.19.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "hyperfine";
rev = "v${version}";
hash = "sha256-9YfnCHiG9TDOsEAcrrb0GOxdq39Q+TiltWKwnr3ObAQ=";
hash = "sha256-c8yK9U8UWRWUSGGGrAds6zAqxAiBLWq/RcZ6pvYNpgk=";
};
cargoHash = "sha256-E2y/hQNcpW6b/ZJBlsp+2RDH2OgpX4kbn36aBHA5X6U=";
cargoHash = "sha256-Ia9L7RxYmhFzTVOzegxAmsgBmx30PPqyVFELayL3dq8=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;

View File

@ -7944,7 +7944,6 @@ with pkgs;
inherit (callPackages ../development/tools/language-servers/nixd {
llvmPackages = llvmPackages_16;
nix = nixVersions.nix_2_19;
}) nixf nixt nixd;
ansible-later = callPackage ../tools/admin/ansible/later.nix { };
@ -8062,8 +8061,8 @@ with pkgs;
bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 {
inherit (darwin) sigtool;
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit;
buildJdk = jdk17_headless;
runJdk = jdk17_headless;
buildJdk = jdk21_headless;
runJdk = jdk21_headless;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv
else if stdenv.cc.isClang then llvmPackages.stdenv
else stdenv;
@ -16668,10 +16667,6 @@ with pkgs;
stdenv = gcc9Stdenv;
};
xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
xmp = callPackage ../applications/audio/xmp {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
};

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