Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5844313b95
|
|
@ -2096,6 +2096,12 @@
|
|||
githubId = 16330;
|
||||
name = "Mathijs Kwik";
|
||||
};
|
||||
blusk = {
|
||||
email = "bluskript@gmail.com";
|
||||
github = "Bluskript";
|
||||
githubId = 52386117;
|
||||
name = "Blusk";
|
||||
};
|
||||
bmilanov = {
|
||||
name = "Biser Milanov";
|
||||
email = "bmilanov11+nixpkgs@gmail.com";
|
||||
|
|
|
|||
|
|
@ -113,10 +113,15 @@ let
|
|||
]};
|
||||
'') (filterAttrs (name: conf: conf.enable) cfg.proxyCachePath));
|
||||
|
||||
toUpstreamParameter = key: value:
|
||||
if builtins.isBool value
|
||||
then lib.optionalString value key
|
||||
else "${key}=${toString value}";
|
||||
|
||||
upstreamConfig = toString (flip mapAttrsToList cfg.upstreams (name: upstream: ''
|
||||
upstream ${name} {
|
||||
${toString (flip mapAttrsToList upstream.servers (name: server: ''
|
||||
server ${name} ${optionalString server.backup "backup"};
|
||||
server ${name} ${concatStringsSep " " (mapAttrsToList toUpstreamParameter server)};
|
||||
''))}
|
||||
${upstream.extraConfig}
|
||||
}
|
||||
|
|
@ -922,6 +927,7 @@ in
|
|||
options = {
|
||||
servers = mkOption {
|
||||
type = types.attrsOf (types.submodule {
|
||||
freeformType = types.attrsOf (types.oneOf [ types.bool types.int types.str ]);
|
||||
options = {
|
||||
backup = mkOption {
|
||||
type = types.bool;
|
||||
|
|
@ -935,9 +941,11 @@ in
|
|||
});
|
||||
description = lib.mdDoc ''
|
||||
Defines the address and other parameters of the upstream servers.
|
||||
See [the documentation](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#server)
|
||||
for the available parameters.
|
||||
'';
|
||||
default = {};
|
||||
example = { "127.0.0.1:8000" = {}; };
|
||||
example = lib.literalMD "see [](#opt-services.nginx.upstreams)";
|
||||
};
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
|
|
@ -952,14 +960,23 @@ in
|
|||
Defines a group of servers to use as proxy target.
|
||||
'';
|
||||
default = {};
|
||||
example = literalExpression ''
|
||||
"backend_server" = {
|
||||
servers = { "127.0.0.1:8000" = {}; };
|
||||
extraConfig = ''''
|
||||
example = {
|
||||
"backend" = {
|
||||
servers = {
|
||||
"backend1.example.com:8080" = { weight = 5; };
|
||||
"backend2.example.com" = { max_fails = 3; fail_timeout = "30s"; };
|
||||
"backend3.example.com" = {};
|
||||
"backup1.example.com" = { backup = true; };
|
||||
"backup2.example.com" = { backup = true; };
|
||||
};
|
||||
extraConfig = ''
|
||||
keepalive 16;
|
||||
'''';
|
||||
'';
|
||||
};
|
||||
'';
|
||||
"memcached" = {
|
||||
servers."unix:/run//memcached/memcached.sock" = {};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
virtualHosts = mkOption {
|
||||
|
|
|
|||
|
|
@ -70,6 +70,9 @@ let
|
|||
"CombinedChannels"
|
||||
"RxBufferSize"
|
||||
"TxBufferSize"
|
||||
"ReceiveQueues"
|
||||
"TransmitQueues"
|
||||
"TransmitQueueLength"
|
||||
])
|
||||
(assertValueOneOf "MACAddressPolicy" ["persistent" "random" "none"])
|
||||
(assertMacAddress "MACAddress")
|
||||
|
|
@ -96,6 +99,9 @@ let
|
|||
(assertRange "CombinedChannels" 1 4294967295)
|
||||
(assertInt "RxBufferSize")
|
||||
(assertInt "TxBufferSize")
|
||||
(assertRange "ReceiveQueues" 1 4096)
|
||||
(assertRange "TransmitQueues" 1 4096)
|
||||
(assertRange "TransmitQueueLength" 1 4294967294)
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -61,13 +61,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audacity";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "Audacity-${version}";
|
||||
hash = "sha256-4L5ggu1izm9kichZBsJHAFq74q59xWGVYC11gy3K9go=";
|
||||
hash = "sha256-/DjTmanPzkShNoMFNbnQzzwEzk/a2uUYvVW9dsvl5uY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.10";
|
||||
version = "10.11";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${
|
||||
builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
|
||||
sha256 = "sha256-fDH7F9xLfR9Q2T3HCirBWdKB7Kb1vxyo8g0PNzHzMCY=";
|
||||
sha256 = "sha256-sA1JXRbyHMHBCsWau9GrlxeRiCzxZfCTuLFebZmIoRE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pdfcpu";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdfcpu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l3vJDF2c6h/trfnAGxu7XEoDoj7bB4tATBUlxKFYfUs=";
|
||||
sha256 = "sha256-4crBl0aQFsSB1D3iuAVcwcet8KSUB3/tUi1kD1VmpAI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-611eLYm+OPIdmax2KwYNjuQEGqyZd6SXvhUHzRdLzaI=";
|
||||
vendorHash = "sha256-qFupm0ymDw9neAu6Xl3fQ/mMWn9f40Vdf7uOLOBkcaE=";
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "geoipupdate";
|
||||
version = "5.0.4";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxmind";
|
||||
repo = "geoipupdate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jes4MWJh0y5ddWjU/Hp6xwZU7/HUi/q0vF5AYQRBKiE=";
|
||||
sha256 = "sha256-DYZqvLuPcoek07YJLur/By9Wi2VxDz6C7jAOVmdKt4Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OnByMNjs6C3R7v5PRDYGYekamsesz9yq2KNsI+NHcQ4=";
|
||||
vendorHash = "sha256-t6uhFvuR54Q4nYur/3oBzAbBTaIjzHfx7GeEk6X/0os=";
|
||||
|
||||
ldflags = [ "-X main.version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ let
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -62,8 +62,8 @@ rec {
|
|||
};
|
||||
|
||||
kops_1_26 = mkKops rec {
|
||||
version = "1.26.2";
|
||||
sha256 = "sha256-PY/dcKyciPg3OyUPeBwYed6ADprpI2/+8d8SuGTXWqc=";
|
||||
version = "1.26.3";
|
||||
sha256 = "sha256-8IQbVFqH5r8H7z7U441Aox4yp3KF/sqs3+JpMru8qwQ=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
32
pkgs/applications/networking/feedreaders/russ/default.nix
Normal file
32
pkgs/applications/networking/feedreaders/russ/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, xorg
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "russ";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ckampfe";
|
||||
repo = "russ";
|
||||
rev = "1482bb1df13738fdd4ea1badf2146a9ed8e6656e";
|
||||
hash = "sha256-MvTMo2q/cQ/LQNdUV8SmHgGlA42kLl0i9mdcoAFV/I4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ObWrwXMGXkLqqM7VXhOXArshk2lVkbOTXhrQImDQp1s=";
|
||||
|
||||
# tests are network based :(
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TUI RSS reader with vim-like controls and a local-first, offline-first focus";
|
||||
homepage = "https://github.com/ckampfe/russ";
|
||||
license = with licenses; [ agpl3Only ];
|
||||
maintainers = with maintainers; [ blusk ];
|
||||
changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md";
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chatterino2";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chatterino";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d/rsY4pgPpA4JcMmoD6AG1DzHovfSERaeuYkMY603kA=";
|
||||
sha256 = "sha256-M8WTgZv3+8SRGNfxCv10GldjgRYBUVo1B3X4s+QAuYs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wee-slack";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "wee-slack";
|
||||
owner = "wee-slack";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WMZo+X8G/Dnl1Vv0LuBYcvxdfll9cy/3Z/fpNJSxCQY=";
|
||||
sha256 = "sha256-f5CRJmvNZlKOE1XsU214R42dYo0s5xSRXC8TKOniEf4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
let
|
||||
pname = "localsend";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.AppImage";
|
||||
hash = "sha256-i5/haQHsw3BAOFGsHO41oiop1JgMISTr1Dw0tAeYupU=";
|
||||
hash = "sha256-YAhGkJwDno8GeOepyokHv068IhY8H+L88VrKP76VHjU=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
|
||||
hash = "sha256-Ibojcg5To288c+v6IKMOjuLz970osiKJU7/K0VnIs8k=";
|
||||
hash = "sha256-GXyFSsTK3S8nhwixDgZTQEwRt3SOcsnbARzb/BhTk8w=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "4ti2";
|
||||
version = "1.6.9";
|
||||
version = "1.6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "Release_${builtins.replaceStrings ["."] ["_"] version}";
|
||||
hash = "sha256-cywneIM0sHt1iQsNfjyQDoDfdRjxpz4l3rfysi9YN20=";
|
||||
hash = "sha256-Rz8O1Tf81kzpTGPq7dkZJvv444F1/VqKu7VuRvH59kQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@
|
|||
, meson
|
||||
, ninja
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland-protocols";
|
||||
version = "unstable-2023-01-13";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = pname;
|
||||
rev = "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90";
|
||||
hash = "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0=";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with lib.maintainers; [ fufexan ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -36,27 +36,27 @@ let
|
|||
'';
|
||||
in
|
||||
assert assertXWayland;
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + lib.optionalString debug "-debug";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zbtxX0NezuNg46PAKscmDfFfNID4rAq2qGNf1BE3Cqc=";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Npf48UUfywneFYGEc7NQ59xudwvw7EJjwweT4tHguIY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# make meson use the provided dependencies instead of the git submodules
|
||||
"${src}/nix/meson-build.patch"
|
||||
"${finalAttrs.src}/nix/meson-build.patch"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix hardcoded paths to /usr installation
|
||||
sed -i "s#/usr#$out#" src/render/OpenGL.cpp
|
||||
substituteInPlace meson.build \
|
||||
--replace "@GIT_COMMIT_HASH@" '${version}' \
|
||||
--replace "@GIT_COMMIT_HASH@" '${finalAttrs.src.rev}' \
|
||||
--replace "@GIT_DIRTY@" ""
|
||||
'';
|
||||
|
||||
|
|
@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
"dev"
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
|
@ -103,7 +104,6 @@ stdenv.mkDerivation rec {
|
|||
(lib.optional withSystemd "-Dsystemd=enabled")
|
||||
];
|
||||
|
||||
|
||||
passthru.providedSessions = [ "hyprland" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -114,4 +114,4 @@ stdenv.mkDerivation rec {
|
|||
mainProgram = "Hyprland";
|
||||
platforms = wlroots.meta.platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
|
|||
domain = "gitlab.freedesktop.org";
|
||||
owner = "wlroots";
|
||||
repo = "wlroots";
|
||||
rev = "7abda952d0000b72d240fe1d41457b9288f0b6e5";
|
||||
hash = "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=";
|
||||
rev = "6830bfc17fd94709e2cdd4da0af989f102a26e59";
|
||||
hash = "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=";
|
||||
};
|
||||
|
||||
pname =
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpaper";
|
||||
version = "unstable-2023-04-05";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprpaper";
|
||||
rev = "9182de9ffc8c76fbf24d16dec0ea7a9430597a06";
|
||||
hash = "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o=";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@
|
|||
, libXdmcp
|
||||
, debug ? false
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpicker" + lib.optionalString debug "-debug";
|
||||
version = "unstable-2023-03-31";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprpicker";
|
||||
rev = "cc6b3234b2966acd61c8a2e5caae947774666601";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8Tc8am5+iQvzRdnTYIpD3Ewge6TIctrm8tr0H+RvcsE=";
|
||||
};
|
||||
|
||||
|
|
@ -92,4 +92,4 @@ stdenv.mkDerivation {
|
|||
maintainers = with maintainers; [ fufexan ];
|
||||
platforms = wayland.meta.platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, hyprland-share-picker
|
||||
, inih
|
||||
, libdrm
|
||||
, libuuid
|
||||
, mesa
|
||||
, pipewire
|
||||
, systemd
|
||||
|
|
@ -36,6 +37,7 @@ stdenv.mkDerivation {
|
|||
hyprland-protocols
|
||||
inih
|
||||
libdrm
|
||||
libuuid
|
||||
mesa
|
||||
pipewire
|
||||
systemd
|
||||
|
|
|
|||
|
|
@ -2,14 +2,17 @@
|
|||
, fetchFromGitHub
|
||||
, wayland
|
||||
}:
|
||||
let
|
||||
version = "0.3.1";
|
||||
in
|
||||
{
|
||||
version = "unstable-2023-04-06";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "xdg-desktop-portal-hyprland";
|
||||
rev = "803c00db1191604d50766358dbc5be2de4fcb4e7";
|
||||
hash = "sha256-+AagxTHrzKgngG+guIWAIV5hX1HkkvMbDxbUq2IVwAM=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -18,5 +18,6 @@
|
|||
"taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { };
|
||||
"tilingnome@rliang.github.com" = callPackage ./tilingnome { };
|
||||
"TopIcons@phocean.net" = callPackage ./topicons-plus { };
|
||||
"valent@andyholmes.ca" = callPackage ./valent { };
|
||||
"window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { };
|
||||
}
|
||||
|
|
|
|||
37
pkgs/desktops/gnome/extensions/valent/default.nix
Normal file
37
pkgs/desktops/gnome/extensions/valent/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-valent";
|
||||
version = "unstable-2023-03-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andyholmes";
|
||||
repo = "gnome-shell-extension-valent";
|
||||
rev = "e7f759047c45833cd211ef18a8554008cb1b8b12";
|
||||
hash = "sha256-ylCyQbFbzCuSM2YrLuI36eXL2qQjTt1mYewJlCywKvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
passthru = {
|
||||
extensionUuid = "valent@andyholmes.ca";
|
||||
extensionPortalSlug = "valent";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNOME Shell integration for Valent";
|
||||
homepage = "https://valent.andyholmes.ca/";
|
||||
changelog = "https://github.com/andyholmes/gnome-shell-extension-valent/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.federicoschonborn ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -97,6 +97,8 @@ let
|
|||
inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication;
|
||||
};
|
||||
|
||||
swift-format = callPackage ./swift-format { };
|
||||
|
||||
};
|
||||
|
||||
in self
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ let
|
|||
swift-docc-render-artifact = "sha256-vdSyICXOjlNSjZXzPRxa/5305pg6PG4xww9GYEV9m10=";
|
||||
swift-driver = "sha256-7xsG3Bpf+wqisCMaPEuEg8CjGYO/0r8BX3pMUmRrezE=";
|
||||
swift-experimental-string-processing = "sha256-ioXG6pQKjlAc2oF38Z7TGighyZN8w2ZAAtFUq83Ow6Q=";
|
||||
swift-format = "sha256-uKhIcbJb0DDHKACfVrhQ4fSyXVUkAj090eUZsOrtEqw=";
|
||||
swift-package-manager = "sha256-xd6ZpeXfMoHyVrJxz6XcDLPKBvc2nl1lgWXuLrJdq+E=";
|
||||
swift-syntax = "sha256-gkpx/1sWWi9y917OJ1GSNFYXrJb6e2qI4JlV+38laRQ=";
|
||||
};
|
||||
|
|
|
|||
40
pkgs/development/compilers/swift/swift-format/default.nix
Normal file
40
pkgs/development/compilers/swift/swift-format/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, swift
|
||||
, swiftpm
|
||||
, swiftpm2nix
|
||||
, Foundation
|
||||
}:
|
||||
let
|
||||
sources = callPackage ../sources.nix { };
|
||||
generated = swiftpm2nix.helpers ./generated;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "swift-format";
|
||||
|
||||
inherit (sources) version;
|
||||
src = sources.swift-format;
|
||||
|
||||
nativeBuildInputs = [ swift swiftpm ];
|
||||
buildInputs = [ Foundation ];
|
||||
|
||||
configurePhase = generated.configure;
|
||||
|
||||
# We only install the swift-format binary, so don't need the other products.
|
||||
swiftpmFlags = "--product swift-format";
|
||||
|
||||
installPhase = ''
|
||||
binPath="$(swiftpmBinPath)"
|
||||
mkdir -p $out/bin
|
||||
cp $binPath/swift-format $out/bin/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Formatting technology for Swift source code";
|
||||
homepage = "https://github.com/apple/swift-format";
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
# This file was generated by swiftpm2nix.
|
||||
{
|
||||
workspaceStateFile = ./workspace-state.json;
|
||||
hashes = {
|
||||
"swift-argument-parser" = "01p814snzlfpby2qj67a3dcnsa6038fbk8411npi28440w1hzpzx";
|
||||
"swift-syntax" = "05394mzznmcrw246lyzsjsn1fmilj98jgkjyyxr2ynhnbgzp2jl2";
|
||||
"swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";
|
||||
"swift-tools-support-core" = "16kp0y1akr99v319j46x0zwc8kzh5klnqcvjhsb57ah5xr0l29bk";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,76 @@
|
|||
{
|
||||
"object": {
|
||||
"artifacts": [],
|
||||
"dependencies": [
|
||||
{
|
||||
"basedOn": null,
|
||||
"packageRef": {
|
||||
"identity": "swift-argument-parser",
|
||||
"kind": "remoteSourceControl",
|
||||
"location": "https://github.com/apple/swift-argument-parser.git",
|
||||
"name": "swift-argument-parser"
|
||||
},
|
||||
"state": {
|
||||
"checkoutState": {
|
||||
"branch": "main",
|
||||
"revision": "c5050aa63ed5bb23209e7120b7ff6618ee06e0ee"
|
||||
},
|
||||
"name": "sourceControlCheckout"
|
||||
},
|
||||
"subpath": "swift-argument-parser"
|
||||
},
|
||||
{
|
||||
"basedOn": null,
|
||||
"packageRef": {
|
||||
"identity": "swift-syntax",
|
||||
"kind": "remoteSourceControl",
|
||||
"location": "https://github.com/apple/swift-syntax.git",
|
||||
"name": "SwiftSyntax"
|
||||
},
|
||||
"state": {
|
||||
"checkoutState": {
|
||||
"branch": "main",
|
||||
"revision": "cd793adf5680e138bf2bcbaacc292490175d0dcd"
|
||||
},
|
||||
"name": "sourceControlCheckout"
|
||||
},
|
||||
"subpath": "swift-syntax"
|
||||
},
|
||||
{
|
||||
"basedOn": null,
|
||||
"packageRef": {
|
||||
"identity": "swift-system",
|
||||
"kind": "remoteSourceControl",
|
||||
"location": "https://github.com/apple/swift-system.git",
|
||||
"name": "swift-system"
|
||||
},
|
||||
"state": {
|
||||
"checkoutState": {
|
||||
"revision": "836bc4557b74fe6d2660218d56e3ce96aff76574",
|
||||
"version": "1.1.1"
|
||||
},
|
||||
"name": "sourceControlCheckout"
|
||||
},
|
||||
"subpath": "swift-system"
|
||||
},
|
||||
{
|
||||
"basedOn": null,
|
||||
"packageRef": {
|
||||
"identity": "swift-tools-support-core",
|
||||
"kind": "remoteSourceControl",
|
||||
"location": "https://github.com/apple/swift-tools-support-core.git",
|
||||
"name": "swift-tools-support-core"
|
||||
},
|
||||
"state": {
|
||||
"checkoutState": {
|
||||
"branch": "main",
|
||||
"revision": "1296d2f11b0226c4b83540010936c7238d21c12b"
|
||||
},
|
||||
"name": "sourceControlCheckout"
|
||||
},
|
||||
"subpath": "swift-tools-support-core"
|
||||
}
|
||||
]
|
||||
},
|
||||
"version": 6
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "25.3.1";
|
||||
sha256 = "dMMw4UbZMsmb3t0S2X2EpbTKZPKTaWWbSP4OUGWnC4c=";
|
||||
version = "25.3.2";
|
||||
sha256 = "cuFeHwyAyS8R7rXcJJxzE7LTZGgDr4x3qMZx63PIowM=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdcm";
|
||||
version = "3.0.21";
|
||||
version = "3.0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "malaterre";
|
||||
repo = "GDCM";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BmUJCqCGt+BvVpLG4bzCH4lsqmhWHU0gbOIU2CCIMGU=";
|
||||
hash = "sha256-geWNGbBJGKPs5hNO42vtVOj0rOWyM6zmcocvRhWW4s0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libjwt";
|
||||
version = "1.15.2";
|
||||
version = "1.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benmcollins";
|
||||
repo = "libjwt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fdMrJaD0jq4aQtxNLUvPVP6dWMwp3Mz4TuW2zX6r7QA=";
|
||||
sha256 = "sha256-as4tqvRY559Q2R3s4GZHovqsCboXNz/NcV5lo+qCeOk=";
|
||||
};
|
||||
|
||||
buildInputs = [ jansson openssl ];
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-spectacular";
|
||||
version = "0.26.0";
|
||||
version = "0.26.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tfranzel";
|
||||
repo = "drf-spectacular";
|
||||
rev = version;
|
||||
hash = "sha256-yq+aTkoHI3zSsrYjokbn5UoPm/43LCnyTqdFtkrU92M=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wwR7ZdbWFNRgxQubdgriDke5W6u7VNsNZV9xqQypSrY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "0.27.5";
|
||||
version = "0.27.6v2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7.1";
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8C5D+zKZtKaF2Jy+9vQeNkf9YDxTo86tgn3rxTDvHjQ=";
|
||||
hash = "sha256-kL5/4NP9nEhcn77HJWgM16g8I/iQ4sNAlSZPBD2UkMg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcs-api-client";
|
||||
version = "0.21.4";
|
||||
version = "0.21.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
owner = "rigetti";
|
||||
repo = "qcs-api-client-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eEN2K2x67dqTNsYMerLJIMV5xtRi4wiYvVql6JOcZh4=";
|
||||
hash = "sha256-lw6jswIaqDFExz/hjIrpZf4BC757l83MeCfOyZaTbfg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchFromGitHub }:
|
||||
let
|
||||
version = "0.15.7";
|
||||
srcSha256 = "sha256-Y6ew9CychStC26A7uyjChvkR+oDis3GZq8kYLHS7AXQ=";
|
||||
version = "0.15.8";
|
||||
srcSha256 = "sha256-7CTRx7I47VEKfPvkWhmpyHV3hkeLyHymFMrkyYQ1wl8=";
|
||||
yarnSha256 = "sha256-PY0BIBbjyi2DG+n5x/IPc0AwrFSwII4huMDU+FeZ/Sc=";
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "packer";
|
||||
version = "1.8.6";
|
||||
version = "1.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "packer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Nc4H7qx+TmbG80Ogw4zRofux5VwqeQZIg9gLqZprgVE=";
|
||||
sha256 = "sha256-M37JFKAv1GMtMr0UQ8lFEcTuboSMmCQ29dr6OP07HB8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-poTBx62m9Q4az5BECFKmFAE37B8C/DVIyHeC80P+VYQ=";
|
||||
vendorHash = "sha256-uQQv89562bPOoKDu5qEEs+p+N8HPRmgFZKUc5YEsz/w=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "refinery-cli";
|
||||
version = "0.8.7";
|
||||
version = "0.8.9";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "refinery_cli";
|
||||
inherit version;
|
||||
sha256 = "sha256-M4Kq1Sy5kJayESv0hHIktCf1bQgNOEFQcjg4RCqFCK4=";
|
||||
sha256 = "sha256-KNidO4HO4fcGXWJxFYsat2duZTzUA8XFcaK+Qzb1HFI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-LObxOh2lOtSTm4gITTbQ2S9rMlyUOAAvMJmtvZy5bJs=";
|
||||
cargoHash = "sha256-nYqOGSFQ4GdUdLkZ2Xtx+bRj2sX6joxKjNqm9CloODU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.553";
|
||||
version = "0.0.558";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EYb8v11laI3yh2hHWPsSu/eaFzRZpHSoJTltV3KCbTs=";
|
||||
hash = "sha256-L9DPj3pbWSpCWsLX09usoqmLmYzXL10Jkm1CGC7g3KQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gqx7Q55AnXCUamrccm8WVxxw+YolJAEGNw5Qxr3iZK0=";
|
||||
vendorHash = "sha256-63GZztiH5E1c/hJEAo35JKTzkKDss7aEOhrKUBpO3ho=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sssd";
|
||||
version = "2.8.2";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SSSD";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-nEMfwOvWd3FRk+1RS1NPT+LcfWi4lDLCGYqH7KuPw7o=";
|
||||
sha256 = "sha256-H9Snh2RzbnjGPqvC9fJHeZvAkGX/O/vmVsl143yb194=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.5.0";
|
||||
version = "2023.5.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5aWt+x1KpLzC9ApV9n/lSJb6HweKMIJGZzAwvbFel1k=";
|
||||
hash = "sha256-JWPVubhKLXwY877fbRej04g27vaJTM8qgScLq9IjdiE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "zed";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authzed";
|
||||
repo = "zed";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hSm8k4QnUDaKNOX7f019nDwWijrqljZ3X0g7hE1TdsY=";
|
||||
hash = "sha256-ZI5aoL4CCqSv7Sw5RApa4AeVVE97tA5HXM5tdF12hqE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aRXlyj8QHGsynSc09Earwz6eihRW3bu21+OTtiWPCCg=";
|
||||
vendorHash = "sha256-hIhByVm4QpDhnXuWbscKYIgE/Bi0psBE0PvmuCq2NhQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line for managing SpiceDB";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpufetch";
|
||||
version = "1.03";
|
||||
version = "1.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dr-Noob";
|
||||
repo = "cpufetch";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SiIRw2nWCoe3pfFp1xyzkuFK5fe++0ypSxblYViRgZY=";
|
||||
sha256 = "sha256-+vfAhUVEMKkt3cvMczUn7O55DnkEHkk0xeuLd5L2MMU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "du-dust";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bootandy";
|
||||
repo = "dust";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NP87I2D3+hKfyeK+QawVopSJOKYmGNH9XvNR9GTQcls=";
|
||||
sha256 = "sha256-PEW13paHNQ1JAz9g3pIdCB1f1KqIz8XC4gGE0z/glOk=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-weg1etimlSenKP6UNuO8iM7gbH3+7XP98xYE4VlHhhs=";
|
||||
cargoHash = "sha256-VJBmVidLkx4nIQULtDoywV4QGmgf53YAAXLJH/LZ/j0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13150,6 +13150,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
russ = callPackage ../applications/networking/feedreaders/russ { };
|
||||
|
||||
tunnelto = callPackage ../tools/networking/tunnelto {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
@ -16453,7 +16455,7 @@ with pkgs;
|
|||
svdtools = callPackage ../development/embedded/svdtools { };
|
||||
|
||||
swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { });
|
||||
inherit (swiftPackages) swift swiftpm sourcekit-lsp;
|
||||
inherit (swiftPackages) swift swiftpm sourcekit-lsp swift-format;
|
||||
|
||||
swiftpm2nix = callPackage ../development/tools/swiftpm2nix { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue