Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f6b0f94b9e
44 changed files with 1813 additions and 1651 deletions
|
|
@ -140,6 +140,12 @@
|
|||
instead.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>k3s</literal> no longer supports docker as runtime
|
||||
due to upstream dropping support.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.11-notable-changes">
|
||||
|
|
|
|||
|
|
@ -57,6 +57,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
|
||||
Use `configure.packages` instead.
|
||||
|
||||
- `k3s` no longer supports docker as runtime due to upstream dropping support.
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Other Notable Changes {#sec-release-22.11-notable-changes}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,14 @@
|
|||
with lib;
|
||||
let
|
||||
cfg = config.services.k3s;
|
||||
removeOption = config: instruction:
|
||||
lib.mkRemovedOptionModule ([ "services" "k3s" ] ++ config) instruction;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(removeOption [ "docker" ] "k3s docker option is no longer supported.")
|
||||
];
|
||||
|
||||
# interface
|
||||
options.services.k3s = {
|
||||
enable = mkEnableOption "k3s";
|
||||
|
|
@ -48,12 +54,6 @@ in
|
|||
default = null;
|
||||
};
|
||||
|
||||
docker = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Use docker to run containers rather than the built-in containerd.";
|
||||
};
|
||||
|
||||
extraFlags = mkOption {
|
||||
description = "Extra flags to pass to the k3s command.";
|
||||
type = types.str;
|
||||
|
|
@ -88,14 +88,11 @@ in
|
|||
}
|
||||
];
|
||||
|
||||
virtualisation.docker = mkIf cfg.docker {
|
||||
enable = mkDefault true;
|
||||
};
|
||||
environment.systemPackages = [ config.services.k3s.package ];
|
||||
|
||||
systemd.services.k3s = {
|
||||
description = "k3s service";
|
||||
after = [ "network.service" "firewall.service" ] ++ (optional cfg.docker "docker.service");
|
||||
after = [ "network.service" "firewall.service" ];
|
||||
wants = [ "network.service" "firewall.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = optional config.boot.zfs.enabled config.boot.zfs.package;
|
||||
|
|
@ -113,8 +110,8 @@ in
|
|||
ExecStart = concatStringsSep " \\\n " (
|
||||
[
|
||||
"${cfg.package}/bin/k3s ${cfg.role}"
|
||||
] ++ (optional cfg.docker "--docker")
|
||||
++ (optional (cfg.docker && config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd")
|
||||
]
|
||||
++ (optional (config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd")
|
||||
++ (optional cfg.disableAgent "--disable-agent")
|
||||
++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}")
|
||||
++ (optional (cfg.token != "") "--token ${cfg.token}")
|
||||
|
|
|
|||
|
|
@ -254,7 +254,6 @@ in {
|
|||
jirafeau = handleTest ./jirafeau.nix {};
|
||||
jitsi-meet = handleTest ./jitsi-meet.nix {};
|
||||
k3s-single-node = handleTest ./k3s-single-node.nix {};
|
||||
k3s-single-node-docker = handleTest ./k3s-single-node-docker.nix {};
|
||||
kafka = handleTest ./kafka.nix {};
|
||||
kanidm = handleTest ./kanidm.nix {};
|
||||
kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
let
|
||||
imageEnv = pkgs.buildEnv {
|
||||
name = "k3s-pause-image-env";
|
||||
paths = with pkgs; [ tini (hiPrio coreutils) busybox ];
|
||||
};
|
||||
pauseImage = pkgs.dockerTools.streamLayeredImage {
|
||||
name = "test.local/pause";
|
||||
tag = "local";
|
||||
contents = imageEnv;
|
||||
config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ];
|
||||
};
|
||||
# Don't use the default service account because there's a race where it may
|
||||
# not be created yet; make our own instead.
|
||||
testPodYaml = pkgs.writeText "test.yml" ''
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: test
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: test
|
||||
spec:
|
||||
serviceAccountName: test
|
||||
containers:
|
||||
- name: test
|
||||
image: test.local/pause:local
|
||||
imagePullPolicy: Never
|
||||
command: ["sh", "-c", "sleep inf"]
|
||||
'';
|
||||
in
|
||||
{
|
||||
name = "k3s";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ euank ];
|
||||
};
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [ k3s gzip ];
|
||||
|
||||
# k3s uses enough resources the default vm fails.
|
||||
virtualisation.memorySize = 1536;
|
||||
virtualisation.diskSize = 4096;
|
||||
|
||||
services.k3s = {
|
||||
enable = true;
|
||||
role = "server";
|
||||
docker = true;
|
||||
# Slightly reduce resource usage
|
||||
extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local";
|
||||
};
|
||||
|
||||
users.users = {
|
||||
noprivs = {
|
||||
isNormalUser = true;
|
||||
description = "Can't access k3s by default";
|
||||
password = "*";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
machine.wait_for_unit("k3s")
|
||||
machine.succeed("k3s kubectl cluster-info")
|
||||
machine.fail("sudo -u noprivs k3s kubectl cluster-info")
|
||||
# FIXME: this fails with the current nixos kernel config; once it passes, we should uncomment it
|
||||
# machine.succeed("k3s check-config")
|
||||
|
||||
machine.succeed(
|
||||
"${pauseImage} | docker load"
|
||||
)
|
||||
|
||||
machine.succeed("k3s kubectl apply -f ${testPodYaml}")
|
||||
machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test")
|
||||
machine.succeed("k3s kubectl delete -f ${testPodYaml}")
|
||||
|
||||
machine.shutdown()
|
||||
'';
|
||||
})
|
||||
|
|
@ -1027,6 +1027,7 @@ self: super: {
|
|||
vim-go = super.vim-go.overrideAttrs (old:
|
||||
let
|
||||
binPath = lib.makeBinPath [
|
||||
# TODO: package commented packages
|
||||
asmfmt
|
||||
delve
|
||||
errcheck
|
||||
|
|
@ -1040,11 +1041,15 @@ self: super: {
|
|||
golangci-lint
|
||||
gomodifytags
|
||||
gopls
|
||||
gotags
|
||||
gotools
|
||||
# gorename
|
||||
# gotags
|
||||
gotools # contains staticcheck
|
||||
# guru
|
||||
iferr
|
||||
impl
|
||||
# keyify
|
||||
reftools
|
||||
# revive
|
||||
];
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -46,10 +46,10 @@ with lib;
|
|||
# Those pieces of software we entirely ignore upstream's handling of, and just
|
||||
# make sure they're in the path if desired.
|
||||
let
|
||||
k3sVersion = "1.23.6+k3s1"; # k3s git tag
|
||||
k3sCommit = "418c3fa858b69b12b9cefbcff0526f666a6236b9"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "0fmw491dn5mpi058mr7sij51i5m4qg2grx30cnl3h2v4s0sdkx2i";
|
||||
k3sVendorSha256 = "sha256-iHg5ySMaiSWXs98YGmxPwdZr4zdBIFma12dNEuf30Hs=";
|
||||
k3sVersion = "1.24.1+k3s1"; # k3s git tag
|
||||
k3sCommit = "0581808f5c160b0c0cafec5b8f20430835f34f44"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "0zh60nav50s0viiaqxdaajhywh28zqckjnpyazlk2fdb077dyi65";
|
||||
k3sVendorSha256 = "sha256-7cJ728vV9GA4/MDUBsnrR12gGf3DXzka3czrdHjsNIM=";
|
||||
|
||||
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
|
||||
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
|
||||
|
|
@ -61,16 +61,16 @@ let
|
|||
k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620";
|
||||
|
||||
# taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45
|
||||
k3sCNIVersion = "1.0.1-k3s1";
|
||||
k3sCNISha256 = "11ihlzzdnqf9p21y0a4ckpbxac016nm7746dcykhj26ym9zxyv92";
|
||||
k3sCNIVersion = "1.1.1-k3s1";
|
||||
k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl";
|
||||
|
||||
# taken from go.mod, the 'github.com/containerd/containerd' line
|
||||
# run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
|
||||
containerdVersion = "1.5.11-k3s2";
|
||||
containerdSha256 = "16132snvrg8r0vwm6c0lz0q6fx686s2ix53nm3aka9a83xs75vf2";
|
||||
containerdVersion = "1.5.13-k3s1";
|
||||
containerdSha256 = "09bj4ghwbsj9whkv1d5icqs52k64m449j8b73dmak2wz62fbzbvp";
|
||||
|
||||
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
|
||||
criCtlVersion = "1.22.0-k3s1";
|
||||
criCtlVersion = "1.24.0-k3s1";
|
||||
|
||||
baseMeta = {
|
||||
description = "A lightweight Kubernetes distribution";
|
||||
|
|
@ -323,7 +323,7 @@ buildGoModule rec {
|
|||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; };
|
||||
passthru.tests = { inherit (nixosTests) k3s-single-node; };
|
||||
|
||||
meta = baseMeta;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.23.7";
|
||||
version = "1.23.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YHlcopB47HVLO/4QI8HxjMBzCpcHVnlAz3EOmZI+EG8=";
|
||||
sha256 = "sha256-mu+jBSypoMNxOugLbS3foH4C4AqSZnlic4Bf1v9dYc8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rancher";
|
||||
version = "2.6.4";
|
||||
version = "2.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5ceyScsCidJpHGfwhsq7/hDd3CClx29cD5Cdc1PSxTU=";
|
||||
sha256 = "sha256-/HI3qcpgNJTurPFEZFlg+H0ndowSgEF6cHp1cuaJjR8=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.10.14",
|
||||
"version": "1.10.15",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "element-web",
|
||||
"version": "1.10.14",
|
||||
"version": "1.10.15",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
"jsrsasign": "^10.2.0",
|
||||
"katex": "^0.12.0",
|
||||
"matrix-js-sdk": "18.1.0",
|
||||
"matrix-react-sdk": "3.46.0",
|
||||
"matrix-react-sdk": "3.47.0",
|
||||
"matrix-widget-api": "^0.1.0-beta.18",
|
||||
"prop-types": "^15.7.2",
|
||||
"react": "17.0.2",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": "1.10.14",
|
||||
"desktopSrcHash": "/y4pJSNQrN0Ksc+yjB3Xl6t8AZLNtZ/Rm0UoAhwlgp8=",
|
||||
"version": "1.10.15",
|
||||
"desktopSrcHash": "2XSTE6NbhWYAH3tr1Kd16vEAGn3ApZ0a9PdpoHJn3uE=",
|
||||
"desktopYarnHash": "1rnzaxy7l7912j6df8w2kw66pqwrs7kg7hd0680i38c1db5f4y6n",
|
||||
"webSrcHash": "2CagKKFulLi8Gl/IPabzKfCFTBmw8SGa22hTM+7IewE=",
|
||||
"webYarnHash": "15jjryjav3v58j4260ig548g1m6g6vhid4iigpv7k8pa4rhcwnyh"
|
||||
"webSrcHash": "lX31OWJ6/S+PbOKvEqYALtOIoaJjwg4ng/wHOfXCSqg=",
|
||||
"webYarnHash": "0j6xv64w5vszhlfqz37asqxsql0m89gscrl270dlxzycd4ybzghz"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.45.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.46.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-ZkQQL05pz06iszguXkrBt/h4PoZcbybX4CmDXOoMYkw=";
|
||||
sha256 = "sha256-zy9nETD82KguML0MXe8hlB4m+fBCMmJ1z/2Neq6QvEU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gromacs";
|
||||
version = "2022.1";
|
||||
version = "2022.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz";
|
||||
sha256 = "sha256-hd2rUZfXlSSnAsSVnCxDvodeD8Rx3zo1Ikk53OhRJFA=";
|
||||
sha256 = "1gq1bvscngsbf8231laam6z0v38lmy95nakxr5225ynjhkw08r35";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -10,24 +10,24 @@ with lib;
|
|||
|
||||
let
|
||||
pname = "gitkraken";
|
||||
version = "8.5.0";
|
||||
version = "8.6.0";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchzip {
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
sha256 = "sha256-2ox7SI5tjoXR2qrhE+S/K2GQfq0wuTduKHAEpIOoulQ=";
|
||||
sha256 = "sha256-BBhKenEm1D680wJ1hmIOM/AdXN1DxoipLf9K4eHESzs=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
|
||||
sha256 = "sha256-+F++2L1WYVem96y7R93aPWiWySnUrg+b1q1gIJX69yw=";
|
||||
sha256 = "sha256-fyRhvaKDGYyKu6lAxHb5ve7Ix+7Tuu5JWXnqBF73ti4=";
|
||||
};
|
||||
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
|
||||
sha256 = "sha256-7WD9drsE93SR53Xqz+cmrnsVd4l4SIoud/Agq32QM4M=";
|
||||
sha256 = "sha256-qbu3gPTo5zY7OQyULY2iIUDQjwjlL4xZdkl68rE3VHA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ let
|
|||
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial${lib.optionalString fullBuild "-full"}";
|
||||
version = "6.1.3";
|
||||
version = "6.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
sha256 = "sha256-4CLB7yjlUCeT9DBnJOhEPF1ycUhBkG9GyjUe/XupG3w=";
|
||||
sha256 = "sha256-82H5gCs241esAZzrcSyhHegzKwfere7Y36kE8Fv3yng=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
|
@ -35,7 +35,7 @@ let
|
|||
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "mercurial-${version}";
|
||||
sha256 = "sha256-NL4rzP9ljhdBtcJOGq759dNnzg2jANhZzMvpez+CbpM=";
|
||||
sha256 = "sha256-GEsRA8od2S9v5xipCwsCmkdLvKKpbbKJGNqPFmrZASQ=";
|
||||
sourceRoot = "mercurial-${version}/rust";
|
||||
} else null;
|
||||
cargoRoot = if rustSupport then "rust" else null;
|
||||
|
|
|
|||
|
|
@ -6,69 +6,68 @@
|
|||
, cmake
|
||||
, extra-cmake-modules
|
||||
, ffmpeg-full
|
||||
, kcodecs
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kfilemetadata
|
||||
, ki18n
|
||||
, kiconthemes
|
||||
, kio
|
||||
, kio-extras
|
||||
, kirigami2
|
||||
, kxmlgui
|
||||
, kdoctools
|
||||
, mpv
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qqc2-desktop-style
|
||||
, qtbase
|
||||
, qtquickcontrols2
|
||||
, qtwayland
|
||||
, youtube-dl
|
||||
, yt-dlp
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "haruna";
|
||||
version = "0.7.3";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "multimedia";
|
||||
repo = "haruna";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pFrmTaRvsqxJw34VULzfjx2k56kJgkB96nJtai2D1wY=";
|
||||
sha256 = "sha256-Lom9iQUKH3lQHrVK4dJzo+FG79xSCg0b4gY/KAevL6I=";
|
||||
domain = "invent.kde.org";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
breeze-icons
|
||||
breeze-qt5
|
||||
qqc2-desktop-style
|
||||
yt-dlp
|
||||
|
||||
ffmpeg-full
|
||||
kcodecs
|
||||
kconfig
|
||||
kcoreaddons
|
||||
kfilemetadata
|
||||
ki18n
|
||||
kiconthemes
|
||||
kio
|
||||
kio-extras
|
||||
kirigami2
|
||||
kxmlgui
|
||||
kdoctools
|
||||
mpv
|
||||
qqc2-desktop-style
|
||||
qtbase
|
||||
qtquickcontrols2
|
||||
qtwayland
|
||||
youtube-dl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/g-fb/haruna";
|
||||
homepage = "https://invent.kde.org/multimedia/haruna";
|
||||
description = "Open source video player built with Qt/QML and libmpv";
|
||||
license = with licenses; [ bsd3 cc-by-40 gpl3Plus wtfpl ];
|
||||
license = with licenses; [ bsd3 cc-by-40 cc-by-sa-40 cc0 gpl2Plus gpl3Plus wtfpl ];
|
||||
maintainers = with maintainers; [ jojosch ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,22 +22,18 @@
|
|||
, qtwebchannel
|
||||
, qtwebengine
|
||||
, qtx11extras
|
||||
, jellyfin-web
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "jellyfin-media-player";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-media-player";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iqwOv95JFxQ1j/9B+oBFAp7mD1/1g2EJYvvUKbrDQes=";
|
||||
};
|
||||
|
||||
jmpDist = fetchzip {
|
||||
url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.3/dist.zip";
|
||||
sha256 = "sha256-P7WEYbVvpaVLwMgqC2e8QtMOaJclg0bX78J1fdGzcCU=";
|
||||
sha256 = "sha256-eDCfqSNkKVm8MC4XA1NhQSByy9zhfyQRPM8OlSKcIvc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -81,9 +77,8 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
preBuild = ''
|
||||
# copy the webclient-files to the expected "dist" directory
|
||||
mkdir -p dist
|
||||
cp -a ${jmpDist}/* dist
|
||||
# link the jellyfin-web files to the expected "dist" directory
|
||||
ln -s ${jellyfin-web}/share/jellyfin-web dist
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
|||
|
|
@ -9,6 +9,15 @@
|
|||
mkDerivation {
|
||||
pname = "powerdevil";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
patches = [
|
||||
# Backported fix for https://bugs.kde.org/show_bug.cgi?id=454161
|
||||
# FIXME: remove for next release
|
||||
(fetchpatch {
|
||||
name = "brightness-overflow-fix";
|
||||
url = "https://invent.kde.org/plasma/powerdevil/-/commit/2ebe655d220c9167b66893a823b2fff2e2b8a531.patch";
|
||||
sha256 = "sha256-Sf2q0CImLYjy1fTp9AWbCeRG05liUkemhfEXL/0MIQI=";
|
||||
})
|
||||
];
|
||||
buildInputs = [
|
||||
kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
|
||||
kglobalaccel ki18n kio kidletime kwayland libkscreen
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "binaryen";
|
||||
version = "102";
|
||||
version = "105";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WebAssembly";
|
||||
repo = "binaryen";
|
||||
rev = "version_${version}";
|
||||
sha256 = "sha256-UlktpY9tyjYNkmiBZM42QGg67kcPo7VDy2B4Ty1YIew=";
|
||||
sha256 = "0yg9rarjv1gfbq225cj9hnbgx99n5az2m19qwfp8z41dwhh71igm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,12 @@
|
|||
, llvmPackages
|
||||
, symlinkJoin, makeWrapper, substituteAll
|
||||
, mkYarnModules
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "emscripten";
|
||||
version = "3.0.0";
|
||||
version = "3.1.10";
|
||||
|
||||
llvmEnv = symlinkJoin {
|
||||
name = "emscripten-llvm-${version}";
|
||||
|
|
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "emscripten-core";
|
||||
repo = "emscripten";
|
||||
sha256 = "sha256-HlXcPKlmBTwEKgTfeMg6QoMKMbK++bpv2fu1DyolrHs=";
|
||||
sha256 = "03k0pd5hna7khrnn3k3ln38h9w0vyaicfzvfqlqbxi4zz8jikrdb";
|
||||
rev = version;
|
||||
};
|
||||
|
||||
|
|
@ -38,6 +39,11 @@ stdenv.mkDerivation rec {
|
|||
src = ./0001-emulate-clang-sysroot-include-logic.patch;
|
||||
resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/";
|
||||
})
|
||||
(fetchpatch {
|
||||
# https://github.com/emscripten-core/emscripten/pull/16986
|
||||
url = "https://github.com/emscripten-core/emscripten/commit/d5ef6937fe395488e23a82c1e582a7ea5c2dab83.patch";
|
||||
sha256 = "sha256-YX5DG8i5x6S7XnU58etEapDd+o5SuzbFIGv8v/9+T3E=";
|
||||
})
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
{
|
||||
"name": "emscripten",
|
||||
"version": "2.0.26",
|
||||
"version": "3.1.10",
|
||||
"private": true,
|
||||
"devDependencies": {
|
||||
"es-check": "^5.2.4",
|
||||
"eslint": "^7.29.0",
|
||||
"es-check": "^6.1.1",
|
||||
"eslint": "^8.6.0",
|
||||
"eslint-config-google": "^0.14.0",
|
||||
"source-map": "0.5.7",
|
||||
"ws": "~0.4.28"
|
||||
"source-map": "0.7.3",
|
||||
"ws": "^8.5.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"acorn": "8.4.1",
|
||||
"google-closure-compiler": "20210601.0.0",
|
||||
"html-minifier-terser": "5.1.1",
|
||||
"acorn": "^8.7.0",
|
||||
"google-closure-compiler": "20220104.0.0",
|
||||
"html-minifier-terser": "6.1.0",
|
||||
"wasm2c": "1.0.0"
|
||||
},
|
||||
"scripts": {
|
||||
"lint": "eslint src/parseTools.js"
|
||||
"lint": "eslint ."
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip
|
||||
, zlib
|
||||
, enablePython ? false, python2Packages
|
||||
, enableGtk2 ? false, gtk2
|
||||
, enableJPEG ? true, libjpeg
|
||||
, enablePNG ? true, libpng
|
||||
|
|
@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs =
|
||||
[ zlib ]
|
||||
++ lib.optional enablePython python2Packages.python
|
||||
++ lib.optional enableGtk2 gtk2
|
||||
++ lib.optional enableJPEG libjpeg
|
||||
++ lib.optional enablePNG libpng
|
||||
|
|
@ -56,8 +54,6 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ]
|
||||
;
|
||||
|
||||
propagatedBuildInputs = lib.optional enablePython python2Packages.numpy;
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config unzip ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
|
||||
|
|
@ -78,8 +74,6 @@ stdenv.mkDerivation rec {
|
|||
sed -i $dev/lib/pkgconfig/opencv.pc -e "s|includedir_new=.*|includedir_new=$dev/include|"
|
||||
'';
|
||||
|
||||
passthru = lib.optionalAttrs enablePython { pythonPath = []; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open Computer Vision Library with more than 500 algorithms";
|
||||
homepage = "https://opencv.org/";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloup";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4dec7e43905b7771884cda4f13ab8b7537bceaee467a92655e7660797ab08c47";
|
||||
sha256 = "sha256-Mq7391NiKN7xP5ZRsvY7XvnVr+vu/aFcD21obrjKbHE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-TS4noRo/spz+0x3I3bWbHJ3orrjQCDyy7OkSYn4z4G0=";
|
||||
sha256 = "sha256-Q0dLstAwLamc2DCN1RMwPFHkvxGeGjLiUnyrkeAol0E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.1217";
|
||||
version = "2.0.1218";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-z1MKLFR/js27/9VxbOOx9LxcKTXOMZpOqUtMjPeIpds=";
|
||||
hash = "sha256-nSW8t1N2qK35SUgxT3VtPxnCj1gaPEA6FWq6tSB0cgk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cambalache";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "jpu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UgPyG1xDt624W+qTb88d0WvOza6YvVAO/YXeUV51Rro=";
|
||||
sha256 = "sha256-/0HMtNR9R/Oq1ZoBaLe4iU0OOVZUozuo8gP0j9J8hdc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jd-diff-patch";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "josephburnett";
|
||||
repo = "jd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nYV72EgYgXWyGp2s09BlaRmOy6aSMtmrTvWCxk9znp0=";
|
||||
sha256 = "sha256-NUga7Rxh/hCEw6bZvbxsqBoIKdG2TTfEXdwHY42cgxE=";
|
||||
};
|
||||
|
||||
# not including web ui
|
||||
|
|
@ -16,8 +16,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-uoMOkCmJY417zxkTsXHGy+BZ/BH29nH4MhFaIKofh4k=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Commandline utility and Go library for diffing and patching JSON values";
|
||||
homepage = "https://github.com/josephburnett/jd";
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
with lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "kubicorn";
|
||||
version = "2018-10-13-${lib.strings.substring 0 7 rev}";
|
||||
rev = "4c7f3623e9188fba43778271afe161a4facfb657";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = rev;
|
||||
owner = "kubicorn";
|
||||
repo = "kubicorn";
|
||||
sha256 = "18h5sj4lcivrwjq2hzn7c3g4mblw17zicb5nma8sh7sakwzyg1k9";
|
||||
};
|
||||
|
||||
subPackages = ["."];
|
||||
goPackagePath = "github.com/kubicorn/kubicorn";
|
||||
|
||||
meta = {
|
||||
description = "Simple, cloud native infrastructure for Kubernetes";
|
||||
homepage = "http://kubicorn.io/";
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
29
pkgs/development/tools/misc/xorg-autoconf/default.nix
Normal file
29
pkgs/development/tools/misc/xorg-autoconf/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, autoreconfHook
|
||||
, fetchFromGitLab
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xorg-autoconf";
|
||||
version = "1.19.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "util";
|
||||
repo = "macros";
|
||||
rev = "util-macros-${version}";
|
||||
sha256 = "sha256-+yEMCjLztdY5LKTNjfhudDS0fdaOj4LKZ3YL5witFR4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNU autoconf macros shared across X.Org projects";
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/util/macros";
|
||||
maintainers = with maintainers; [ raboof ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -25,14 +25,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "pip-audit";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trailofbits";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BcbTu4vDA7ry87gQXpFk3MvH0eFNNgOBf1SlxNUFDbw=";
|
||||
hash = "sha256-pzcphJWRM1OTbytZ4jJyPSQ+961gmBTrfYuLrMGkBQk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slurm";
|
||||
version = "22.05.1.1";
|
||||
version = "22.05.2.1";
|
||||
|
||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||
# because the latter does not keep older releases.
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "slurm";
|
||||
# The release tags use - instead of .
|
||||
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
||||
sha256 = "034qnqvamb7v8gimybjr579442c37qwdq8i2kip6c0zhcl42bvaf";
|
||||
sha256 = "1zfv5n7cqqn3c78h2svjazbdkdchyrk54prn2bq5diw80wgcmyrc";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "matrix-dendrite";
|
||||
version = "0.8.7";
|
||||
version = "0.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "dendrite";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-grMMD85hiJ6Ka8KU0fIAcpflFyZrPEZSZxFsGls5NEI=";
|
||||
sha256 = "sha256-kQSzTFqmxcLi0BNxrd8a9TVBh3IfkHfZgPvafO9I++8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-yTlg1K0Pf1AmF227ca73gLDx12ea5yMamnOUksKGN4U=";
|
||||
vendorSha256 = "sha256-axR+tZH8kwqEIZm0899umTsEkzNKSbi6NdbUv8o+80A=";
|
||||
|
||||
checkInputs = [
|
||||
postgresqlTestHook
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
rev = "v${version}";
|
||||
sha256 = "2F0smK2L9Xj3/65j7vwwGT1OLxcTqkImpn16wB5rWDw=";
|
||||
sha256 = "xKj1iKKzFQFjzXZGqoCDyuwXs55QNmnPdojgxy0dQTY=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorSha256 = "Xv+3dJLOHnOjTp5vDbejmkO/NoDQlWxl0KaMx1C3ch0=";
|
||||
vendorSha256 = "svpUQQI9dDNQoL+LDoxhEch7dtNd20ojG3YHga1r15c=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
36
pkgs/tools/X11/xlogo/default.nix
Normal file
36
pkgs/tools/X11/xlogo/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, xorg
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, xorg-autoconf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xlogo";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "app";
|
||||
repo = "xlogo";
|
||||
rev = "refs/tags/xlogo-${version}";
|
||||
hash = "sha256-AyNFzRZtbCKkGacBCaGZZkLRTAGq5TrA2OXGqwoKq24=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ xorg-autoconf autoreconfHook pkg-config ];
|
||||
|
||||
configureFlags = [ "--with-appdefaultdir=$out/share/X11/app-defaults" ];
|
||||
|
||||
buildInputs = [ xorg.libX11 xorg.libXext xorg.libSM xorg.libXmu xorg.libXaw xorg.libXt ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "X Window System logo display demo";
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/app/xlogo";
|
||||
maintainers = with maintainers; [ raboof ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -15,14 +15,14 @@ let
|
|||
in
|
||||
with python.pkgs; buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2022.5.1";
|
||||
version = "2022.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-pX84pXiRxg0HxB6rOuApqnzaFchmF4xHCGKk8suu4yA=";
|
||||
sha256 = "sha256-Fe58aBEVogYcN+ZFZZ8XSnijVuQoKuMcaor59e5pREw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "phraseapp-client";
|
||||
version = "1.17.1";
|
||||
|
||||
goPackagePath = "github.com/phrase/phraseapp-client";
|
||||
subPackages = [ "." ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phrase";
|
||||
repo = "phraseapp-client";
|
||||
rev = version;
|
||||
sha256 = "0j8fygp9bw68p1736hq7n7qv86rghchxbdm1xibvk5jpgph1nzl7";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/phraseapp-client $out/bin/phraseapp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://docs.phraseapp.com";
|
||||
description = "PhraseApp API v2 Command Line Client";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ manveru ];
|
||||
};
|
||||
}
|
||||
37
pkgs/tools/security/graphw00f/default.nix
Normal file
37
pkgs/tools/security/graphw00f/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "graphw00f";
|
||||
version = "1.1.2";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolevf";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-DzpSbaGYtRXtRjZBn9rgZumuCqdZ/auKiWO5/TYIE34=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
requests
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -vD main.py $out/bin/graphw00f
|
||||
install -vD {conf,version}.py -t $out/${python3.sitePackages}/
|
||||
install -vD graphw00f/* -t $out/${python3.sitePackages}/graphw00f
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "GraphQL Server Engine Fingerprinting utility";
|
||||
homepage = "https://github.com/dolevf/graphw00f";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
25
pkgs/tools/security/jwt-hack/default.nix
Normal file
25
pkgs/tools/security/jwt-hack/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jwt-hack";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hahwul";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-K0ZtEi0zAKRlIGvorrXmtmkcMvyLIXWPnVMQANZbClk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VYh3oRy8bmtXf6AnLNi/M2kA6t+crW3AXBiGovpdt8U=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for attacking JWT";
|
||||
homepage = "https://github.com/hahwul/jwt-hack";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mitmproxy2swagger";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alufers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-NTxRq7lIm3Y5RxOxdXiKVv39Co8GG9YE2kuEryRUw1Y=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7c+SIU5re1GaqKmzjY+wBXwm8CoQ4uaNLNHzUfG0GDA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -675,6 +675,7 @@ mapAliases ({
|
|||
krita-beta = krita; # moved from top-level 2021-12-23
|
||||
kube-aws = throw "kube-aws is deprecated and archived by upstream"; # Added 2022-04-05
|
||||
kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05
|
||||
kubicorn = throw "kubicorn has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-05-30
|
||||
kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22
|
||||
|
||||
### L ###
|
||||
|
|
@ -1017,6 +1018,7 @@ mapAliases ({
|
|||
phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20
|
||||
phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22
|
||||
philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26
|
||||
phraseapp-client = throw "phraseapp-client is archived by upstream. Use phrase-cli instead"; # Added 2022-05-15
|
||||
phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
|
||||
|
||||
# Obsolete PHP version aliases
|
||||
|
|
|
|||
|
|
@ -626,6 +626,8 @@ with pkgs;
|
|||
|
||||
graph-easy = callPackage ../tools/graphics/graph-easy { };
|
||||
|
||||
graphw00f = callPackage ../tools/security/graphw00f { };
|
||||
|
||||
opendrop = python3Packages.callPackage ../tools/networking/opendrop { };
|
||||
|
||||
owl = callPackage ../tools/networking/owl { };
|
||||
|
|
@ -3858,6 +3860,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
jwt-hack = callPackage ../tools/security/jwt-hack { } ;
|
||||
|
||||
kapacitor = callPackage ../servers/monitoring/kapacitor { };
|
||||
|
||||
kaldi = callPackage ../tools/audio/kaldi { };
|
||||
|
|
@ -4367,6 +4371,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
xlogo = callPackage ../tools/X11/xlogo { };
|
||||
|
||||
xmlbeans = callPackage ../tools/misc/xmlbeans { };
|
||||
|
||||
xmlsort = perlPackages.XMLFilterSort;
|
||||
|
|
@ -15866,8 +15872,6 @@ with pkgs;
|
|||
|
||||
kubespy = callPackage ../applications/networking/cluster/kubespy { };
|
||||
|
||||
kubicorn = callPackage ../development/tools/kubicorn { };
|
||||
|
||||
kubie = callPackage ../development/tools/kubie {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
@ -22852,6 +22856,8 @@ with pkgs;
|
|||
or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
|
||||
}) // { inherit xlibsWrapper; } );
|
||||
|
||||
xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { };
|
||||
|
||||
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
|
||||
|
||||
yaws = callPackage ../servers/http/yaws {
|
||||
|
|
@ -24167,6 +24173,8 @@ with pkgs;
|
|||
|
||||
andika = callPackage ../data/fonts/andika { };
|
||||
|
||||
androguard = with python3.pkgs; toPythonApplication androguard;
|
||||
|
||||
android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { };
|
||||
|
||||
ankacoder = callPackage ../data/fonts/ankacoder { };
|
||||
|
|
@ -29046,8 +29054,6 @@ with pkgs;
|
|||
|
||||
phrase-cli = callPackage ../tools/misc/phrase-cli { };
|
||||
|
||||
phraseapp-client = callPackage ../tools/misc/phraseapp-client { };
|
||||
|
||||
pianobar = callPackage ../applications/audio/pianobar { };
|
||||
|
||||
pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; };
|
||||
|
|
|
|||
Loading…
Reference in a new issue