Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
7e508acf19
@ -2,7 +2,9 @@
|
||||
{ lib }:
|
||||
let
|
||||
|
||||
inherit (builtins) length;
|
||||
inherit (builtins) length;
|
||||
|
||||
inherit (lib.trivial) warnIf;
|
||||
|
||||
asciiTable = import ./ascii-table.nix;
|
||||
|
||||
@ -207,7 +209,20 @@ rec {
|
||||
normalizePath "/a//b///c/"
|
||||
=> "/a/b/c/"
|
||||
*/
|
||||
normalizePath = s: (builtins.foldl' (x: y: if y == "/" && hasSuffix "/" x then x else x+y) "" (stringToCharacters s));
|
||||
normalizePath = s:
|
||||
warnIf
|
||||
(isPath s)
|
||||
''
|
||||
lib.strings.normalizePath: The argument (${toString s}) is a path value, but only strings are supported.
|
||||
Path values are always normalised in Nix, so there's no need to call this function on them.
|
||||
This function also copies the path to the Nix store and returns the store path, the same as "''${path}" will, which may not be what you want.
|
||||
This behavior is deprecated and will throw an error in the future.''
|
||||
(
|
||||
builtins.foldl'
|
||||
(x: y: if y == "/" && hasSuffix "/" x then x else x+y)
|
||||
""
|
||||
(stringToCharacters s)
|
||||
);
|
||||
|
||||
/* Depending on the boolean `cond', return either the given string
|
||||
or the empty string. Useful to concatenate against a bigger string.
|
||||
@ -240,7 +255,17 @@ rec {
|
||||
# Prefix to check for
|
||||
pref:
|
||||
# Input string
|
||||
str: substring 0 (stringLength pref) str == pref;
|
||||
str:
|
||||
# Before 23.05, paths would be copied to the store before converting them
|
||||
# to strings and comparing. This was surprising and confusing.
|
||||
warnIf
|
||||
(isPath pref)
|
||||
''
|
||||
lib.strings.hasPrefix: The first argument (${toString pref}) is a path value, but only strings are supported.
|
||||
There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
|
||||
This function also copies the path to the Nix store, which may not be what you want.
|
||||
This behavior is deprecated and will throw an error in the future.''
|
||||
(substring 0 (stringLength pref) str == pref);
|
||||
|
||||
/* Determine whether a string has given suffix.
|
||||
|
||||
@ -260,8 +285,20 @@ rec {
|
||||
let
|
||||
lenContent = stringLength content;
|
||||
lenSuffix = stringLength suffix;
|
||||
in lenContent >= lenSuffix &&
|
||||
substring (lenContent - lenSuffix) lenContent content == suffix;
|
||||
in
|
||||
# Before 23.05, paths would be copied to the store before converting them
|
||||
# to strings and comparing. This was surprising and confusing.
|
||||
warnIf
|
||||
(isPath suffix)
|
||||
''
|
||||
lib.strings.hasSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported.
|
||||
There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
|
||||
This function also copies the path to the Nix store, which may not be what you want.
|
||||
This behavior is deprecated and will throw an error in the future.''
|
||||
(
|
||||
lenContent >= lenSuffix
|
||||
&& substring (lenContent - lenSuffix) lenContent content == suffix
|
||||
);
|
||||
|
||||
/* Determine whether a string contains the given infix
|
||||
|
||||
@ -278,7 +315,16 @@ rec {
|
||||
=> false
|
||||
*/
|
||||
hasInfix = infix: content:
|
||||
builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
|
||||
# Before 23.05, paths would be copied to the store before converting them
|
||||
# to strings and comparing. This was surprising and confusing.
|
||||
warnIf
|
||||
(isPath infix)
|
||||
''
|
||||
lib.strings.hasInfix: The first argument (${toString infix}) is a path value, but only strings are supported.
|
||||
There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
|
||||
This function also copies the path to the Nix store, which may not be what you want.
|
||||
This behavior is deprecated and will throw an error in the future.''
|
||||
(builtins.match ".*${escapeRegex infix}.*" "${content}" != null);
|
||||
|
||||
/* Convert a string to a list of characters (i.e. singleton strings).
|
||||
This allows you to, e.g., map a function over each character. However,
|
||||
@ -570,14 +616,23 @@ rec {
|
||||
prefix:
|
||||
# Input string
|
||||
str:
|
||||
let
|
||||
# Before 23.05, paths would be copied to the store before converting them
|
||||
# to strings and comparing. This was surprising and confusing.
|
||||
warnIf
|
||||
(isPath prefix)
|
||||
''
|
||||
lib.strings.removePrefix: The first argument (${toString prefix}) is a path value, but only strings are supported.
|
||||
There is almost certainly a bug in the calling code, since this function never removes any prefix in such a case.
|
||||
This function also copies the path to the Nix store, which may not be what you want.
|
||||
This behavior is deprecated and will throw an error in the future.''
|
||||
(let
|
||||
preLen = stringLength prefix;
|
||||
sLen = stringLength str;
|
||||
in
|
||||
if hasPrefix prefix str then
|
||||
if substring 0 preLen str == prefix then
|
||||
substring preLen (sLen - preLen) str
|
||||
else
|
||||
str;
|
||||
str);
|
||||
|
||||
/* Return a string without the specified suffix, if the suffix matches.
|
||||
|
||||
@ -594,14 +649,23 @@ rec {
|
||||
suffix:
|
||||
# Input string
|
||||
str:
|
||||
let
|
||||
# Before 23.05, paths would be copied to the store before converting them
|
||||
# to strings and comparing. This was surprising and confusing.
|
||||
warnIf
|
||||
(isPath suffix)
|
||||
''
|
||||
lib.strings.removeSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported.
|
||||
There is almost certainly a bug in the calling code, since this function never removes any suffix in such a case.
|
||||
This function also copies the path to the Nix store, which may not be what you want.
|
||||
This behavior is deprecated and will throw an error in the future.''
|
||||
(let
|
||||
sufLen = stringLength suffix;
|
||||
sLen = stringLength str;
|
||||
in
|
||||
if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then
|
||||
substring 0 (sLen - sufLen) str
|
||||
else
|
||||
str;
|
||||
str);
|
||||
|
||||
/* Return true if string v1 denotes a version older than v2.
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype
|
||||
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype
|
||||
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
|
||||
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
|
||||
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
|
||||
@ -13,14 +13,14 @@ let
|
||||
# If an update breaks things, one of those might have valuable info:
|
||||
# https://aur.archlinux.org/packages/spotify/
|
||||
# https://community.spotify.com/t5/Desktop-Linux
|
||||
version = "1.1.84.716.gc5f8b819";
|
||||
version = "1.1.99.878.g1e4ccc6e";
|
||||
# To get the latest stable revision:
|
||||
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
|
||||
# To get general information:
|
||||
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
|
||||
# More examples of api usage:
|
||||
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
|
||||
rev = "60";
|
||||
rev = "62";
|
||||
|
||||
deps = [
|
||||
alsa-lib
|
||||
@ -75,7 +75,7 @@ stdenv.mkDerivation {
|
||||
|
||||
# fetch from snapcraft instead of the debian repository most repos fetch from.
|
||||
# That is a bit more cumbersome. But the debian repository only keeps the last
|
||||
# two versions, while snapcraft should provide versions indefinately:
|
||||
# two versions, while snapcraft should provide versions indefinitely:
|
||||
# https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512
|
||||
|
||||
# This is the next-best thing, since we're not allowed to re-distribute
|
||||
@ -83,10 +83,10 @@ stdenv.mkDerivation {
|
||||
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
|
||||
src = fetchurl {
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
|
||||
sha512 = "1209b956822d8bb661daa2c88616bed403ec26dc22c6b866cecff59235c56112284c2f99aa06352fc0df6fcd15225a6ad60afd3b4ff4d7b948ab83e70ab31a71";
|
||||
sha512 = "339r2q13nnpwi7gjd1axc6z2gycfm9gwz3x9dnqyaqd1g3rw7nk6nfbp6bmpkr68lfq1jfgvqwnimcgs84rsi7nmgsiabv3cz0673wv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];
|
||||
nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
@ -144,13 +144,14 @@ stdenv.mkDerivation {
|
||||
--set-rpath $rpath $out/share/spotify/spotify
|
||||
|
||||
librarypath="${lib.makeLibraryPath deps}:$libdir"
|
||||
wrapProgram $out/share/spotify/spotify \
|
||||
wrapProgramShell $out/share/spotify/spotify \
|
||||
''${gappsWrapperArgs[@]} \
|
||||
${lib.optionalString (deviceScaleFactor != null) ''
|
||||
--add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
|
||||
''} \
|
||||
--prefix LD_LIBRARY_PATH : "$librarypath" \
|
||||
--prefix PATH : "${gnome.zenity}/bin"
|
||||
--prefix PATH : "${gnome.zenity}/bin" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
# fix Icon line in the desktop file (#48062)
|
||||
sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop"
|
||||
|
||||
@ -78,6 +78,7 @@ sed --regexp-extended \
|
||||
# try to build the updated version
|
||||
#
|
||||
|
||||
export NIXPKGS_ALLOW_UNFREE=1
|
||||
if ! nix-build -A spotify "$nixpkgs"; then
|
||||
echo "The updated spotify failed to build."
|
||||
exit 1
|
||||
|
||||
@ -941,6 +941,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/sblumentritt/bitbake.vim/";
|
||||
};
|
||||
|
||||
blamer-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "blamer.nvim";
|
||||
version = "2021-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "APZelos";
|
||||
repo = "blamer.nvim";
|
||||
rev = "f4eb22a9013642c411725fdda945ae45f8d93181";
|
||||
sha256 = "1czjagkfjw57f2nvjjgbma1gcy1ylcd68dyfc5ivr2wc6fdw5lks";
|
||||
};
|
||||
meta.homepage = "https://github.com/APZelos/blamer.nvim/";
|
||||
};
|
||||
|
||||
blueballs-neovim = buildVimPluginFrom2Nix {
|
||||
pname = "blueballs-neovim";
|
||||
version = "2021-11-28";
|
||||
|
||||
@ -1354,6 +1354,13 @@ self: super: {
|
||||
|
||||
vim-wakatime = super.vim-wakatime.overrideAttrs (old: {
|
||||
buildInputs = [ python3 ];
|
||||
patchPhase = ''
|
||||
substituteInPlace plugin/wakatime.vim \
|
||||
--replace 'autocmd BufEnter,VimEnter' \
|
||||
'autocmd VimEnter' \
|
||||
--replace 'autocmd CursorMoved,CursorMovedI' \
|
||||
'autocmd CursorMoved,CursorMovedI,BufEnter'
|
||||
'';
|
||||
});
|
||||
|
||||
vim-xdebug = super.vim-xdebug.overrideAttrs (old: {
|
||||
|
||||
@ -77,6 +77,7 @@ https://github.com/vim-scripts/bats.vim/,,
|
||||
https://github.com/rbgrouleff/bclose.vim/,,
|
||||
https://github.com/max397574/better-escape.nvim/,,
|
||||
https://github.com/sblumentritt/bitbake.vim/,,
|
||||
https://github.com/APZelos/blamer.nvim/,HEAD,
|
||||
https://github.com/blueballs-theme/blueballs-neovim/,,
|
||||
https://github.com/nat-418/boole.nvim/,HEAD,
|
||||
https://github.com/turbio/bracey.vim/,,
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz";
|
||||
sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz";
|
||||
sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6";
|
||||
};
|
||||
}
|
||||
@ -1,331 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, makeWrapper
|
||||
, socat
|
||||
, iptables
|
||||
, iproute2
|
||||
, ipset
|
||||
, bridge-utils
|
||||
, btrfs-progs
|
||||
, conntrack-tools
|
||||
, buildGoModule
|
||||
, runc
|
||||
, rsync
|
||||
, kmod
|
||||
, libseccomp
|
||||
, pkg-config
|
||||
, ethtool
|
||||
, util-linux
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, fetchgit
|
||||
, zstd
|
||||
, yq-go
|
||||
, sqlite
|
||||
, nixosTests
|
||||
, k3s
|
||||
, pkgsBuildBuild
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
# k3s is a kinda weird derivation. One of the main points of k3s is the
|
||||
# simplicity of it being one binary that can perform several tasks.
|
||||
# However, when you have a good package manager (like nix), that doesn't
|
||||
# actually make much of a difference; you don't really care if it's one binary
|
||||
# or 10 since with a good package manager, installing and running it is
|
||||
# identical.
|
||||
# Since upstream k3s packages itself as one large binary with several
|
||||
# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s
|
||||
# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with
|
||||
# some exceptions.
|
||||
# K3s also carries patches to some packages (such as containerd and cni
|
||||
# plugins), so we intentionally use the k3s versions of those binaries for k3s,
|
||||
# even if the upstream version of those binaries exist in nixpkgs already. In
|
||||
# the end, that means we have a thick k3s binary that behaves like the upstream
|
||||
# one for the most part.
|
||||
# However, k3s also bundles several pieces of unpatched software, from the
|
||||
# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc.
|
||||
# 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.16+k3s1"; # k3s git tag
|
||||
k3sCommit = "64b0feeb36c2a26976a364a110f23ebcf971f976"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "sha256-H6aaYa5OYAaD5hjSi8+RNXiP1zhRZCgKXQA6eU7AWBk=";
|
||||
k3sVendorSha256 = "sha256-+xygljXp27NahsHSgoigMANBQCRwGFYwGHQEwlI9YsQ=";
|
||||
|
||||
# Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/download#L29-L32
|
||||
# see also https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/manifests/traefik.yaml#L8-L16
|
||||
# At the time of writing, there are two traefik charts, and that's it
|
||||
charts = import ./chart-versions.nix;
|
||||
|
||||
# taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L54
|
||||
k3sRootVersion = "0.12.1";
|
||||
k3sRootSha256 = "sha256-xCXbarWztnvW2xn3cGa84hie3OevVZeGEDWh+Uf3RBw=";
|
||||
|
||||
# taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L47
|
||||
k3sCNIVersion = "1.1.1-k3s1";
|
||||
k3sCNISha256 = "sha256-1Br7s+iMtfiPjM0EcNPuFdSlp9dVPjSG1UGuiPUfq5I=";
|
||||
|
||||
# taken from go.mod, the 'github.com/containerd/containerd' line
|
||||
# run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
|
||||
# https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L9
|
||||
containerdVersion = "1.5.16-k3s2-1-22";
|
||||
containerdSha256 = "sha256-PRrp05Jgx368Ox4hTC66lbCInWuex0OtAuCY4l8geqA=";
|
||||
|
||||
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
|
||||
# https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L19
|
||||
criCtlVersion = "1.22.0-k3s1";
|
||||
|
||||
baseMeta = k3s.meta;
|
||||
|
||||
# https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40
|
||||
versionldflags = [
|
||||
"-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}"
|
||||
"-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}"
|
||||
"-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}"
|
||||
"-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}"
|
||||
"-X k8s.io/client-go/pkg/version.gitTreeState=clean"
|
||||
"-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z"
|
||||
"-X k8s.io/component-base/version.gitVersion=v${k3sVersion}"
|
||||
"-X k8s.io/component-base/version.gitCommit=${k3sCommit}"
|
||||
"-X k8s.io/component-base/version.gitTreeState=clean"
|
||||
"-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z"
|
||||
"-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}"
|
||||
"-X github.com/containerd/containerd/version.Version=v${containerdVersion}"
|
||||
"-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd"
|
||||
];
|
||||
|
||||
# bundled into the k3s binary
|
||||
traefikChart = fetchurl charts.traefik;
|
||||
traefik-crdChart = fetchurl charts.traefik-crd;
|
||||
|
||||
# so, k3s is a complicated thing to package
|
||||
# This derivation attempts to avoid including any random binaries from the
|
||||
# internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which
|
||||
# we don't care about doing, we can add those as build or runtime
|
||||
# dependencies using a real package manager).
|
||||
# In addition to those binaries, it's also configuration though (right now
|
||||
# mostly strongswan configuration), and k3s does use those files.
|
||||
# As such, we download it in order to grab 'etc' and bundle it into the final
|
||||
# k3s binary.
|
||||
k3sRoot = fetchzip {
|
||||
# Note: marked as apache 2.0 license
|
||||
url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
|
||||
sha256 = k3sRootSha256;
|
||||
stripRoot = false;
|
||||
};
|
||||
k3sCNIPlugins = buildGoModule rec {
|
||||
pname = "k3s-cni-plugins";
|
||||
version = k3sCNIVersion;
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "plugins";
|
||||
rev = "v${version}";
|
||||
sha256 = k3sCNISha256;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/plugins $out/bin/cni
|
||||
'';
|
||||
|
||||
meta = baseMeta // {
|
||||
description = "CNI plugins, as patched by rancher for k3s";
|
||||
};
|
||||
};
|
||||
# Grab this separately from a build because it's used by both stages of the
|
||||
# k3s build.
|
||||
k3sRepo = fetchgit {
|
||||
url = "https://github.com/k3s-io/k3s";
|
||||
rev = "v${k3sVersion}";
|
||||
sha256 = k3sRepoSha256;
|
||||
};
|
||||
# Stage 1 of the k3s build:
|
||||
# Let's talk about how k3s is structured.
|
||||
# One of the ideas of k3s is that there's the single "k3s" binary which can
|
||||
# do everything you need, from running a k3s server, to being a worker node,
|
||||
# to running kubectl.
|
||||
# The way that actually works is that k3s is a single go binary that contains
|
||||
# a bunch of bindata that it unpacks at runtime into directories (either the
|
||||
# user's home directory or /var/lib/rancher if run as root).
|
||||
# This bindata includes both binaries and configuration.
|
||||
# In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations.
|
||||
# First, we build all the binaries that get packed into the thick k3s binary
|
||||
# (and output them from one derivation so they'll all be suitably patched up).
|
||||
# Then, we bundle those binaries into our thick k3s binary and use that as
|
||||
# the final single output.
|
||||
# This approach was chosen because it ensures the bundled binaries all are
|
||||
# correctly built to run with nix (we can lean on the existing buildGoModule
|
||||
# stuff), and we can again lean on that tooling for the final k3s binary too.
|
||||
# Other alternatives would be to manually run the
|
||||
# strip/patchelf/remove-references step ourselves in the installPhase of the
|
||||
# derivation when we've built all the binaries, but haven't bundled them in
|
||||
# with generated bindata yet.
|
||||
|
||||
k3sServer = buildGoModule rec {
|
||||
pname = "k3s-server";
|
||||
version = k3sVersion;
|
||||
|
||||
src = k3sRepo;
|
||||
vendorSha256 = k3sVendorSha256;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libseccomp sqlite.dev ];
|
||||
|
||||
subPackages = [ "cmd/server" ];
|
||||
ldflags = versionldflags;
|
||||
|
||||
tags = [ "libsqlite3" "linux" ];
|
||||
|
||||
# create the multicall symlinks for k3s
|
||||
postInstall = ''
|
||||
mv $out/bin/server $out/bin/k3s
|
||||
pushd $out
|
||||
# taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/build#L123-L131
|
||||
ln -s k3s ./bin/k3s-agent
|
||||
ln -s k3s ./bin/k3s-server
|
||||
ln -s k3s ./bin/k3s-etcd-snapshot
|
||||
ln -s k3s ./bin/k3s-secrets-encrypt
|
||||
ln -s k3s ./bin/k3s-certificate
|
||||
ln -s k3s ./bin/k3s-completion
|
||||
ln -s k3s ./bin/kubectl
|
||||
ln -s k3s ./bin/crictl
|
||||
ln -s k3s ./bin/ctr
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = baseMeta // {
|
||||
description = "The various binaries that get packaged into the final k3s binary";
|
||||
};
|
||||
};
|
||||
k3sContainerd = buildGoModule {
|
||||
pname = "k3s-containerd";
|
||||
version = containerdVersion;
|
||||
src = fetchFromGitHub {
|
||||
owner = "k3s-io";
|
||||
repo = "containerd";
|
||||
rev = "v${containerdVersion}";
|
||||
sha256 = containerdSha256;
|
||||
};
|
||||
vendorSha256 = null;
|
||||
buildInputs = [ btrfs-progs ];
|
||||
subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ];
|
||||
ldflags = versionldflags;
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "k3s";
|
||||
version = k3sVersion;
|
||||
|
||||
src = k3sRepo;
|
||||
vendorSha256 = k3sVendorSha256;
|
||||
|
||||
postPatch = ''
|
||||
# Nix prefers dynamically linked binaries over static binary.
|
||||
|
||||
substituteInPlace scripts/package-cli \
|
||||
--replace '"$LDFLAGS $STATIC" -o' \
|
||||
'"$LDFLAGS" -o' \
|
||||
--replace "STATIC=\"-extldflags \'-static\'\"" \
|
||||
""
|
||||
|
||||
# Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate':
|
||||
|
||||
substituteInPlace scripts/package-cli \
|
||||
--replace '"''${GO}" generate' \
|
||||
'GOFLAGS="" \
|
||||
GOOS="${pkgsBuildBuild.go.GOOS}" \
|
||||
GOARCH="${pkgsBuildBuild.go.GOARCH}" \
|
||||
CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \
|
||||
"''${GO}" generate'
|
||||
'';
|
||||
|
||||
# Important utilities used by the kubelet, see
|
||||
# https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494
|
||||
# Note the list in that issue is stale and some aren't relevant for k3s.
|
||||
k3sRuntimeDeps = [
|
||||
kmod
|
||||
socat
|
||||
iptables
|
||||
iproute2
|
||||
ipset
|
||||
bridge-utils
|
||||
ethtool
|
||||
util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
|
||||
conntrack-tools
|
||||
];
|
||||
|
||||
buildInputs = k3sRuntimeDeps;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
rsync
|
||||
yq-go
|
||||
zstd
|
||||
];
|
||||
|
||||
# embedded in the final k3s cli
|
||||
propagatedBuildInputs = [
|
||||
k3sCNIPlugins
|
||||
k3sContainerd
|
||||
k3sServer
|
||||
runc
|
||||
];
|
||||
|
||||
# We override most of buildPhase due to peculiarities in k3s's build.
|
||||
# Specifically, it has a 'go generate' which runs part of the package. See
|
||||
# this comment:
|
||||
# https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694
|
||||
# So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily.
|
||||
buildPhase = ''
|
||||
patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload
|
||||
|
||||
# copy needed 'go generate' inputs into place
|
||||
mkdir -p ./bin/aux
|
||||
rsync -a --no-perms ${k3sServer}/bin/ ./bin/
|
||||
ln -vsf ${runc}/bin/runc ./bin/runc
|
||||
ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni
|
||||
ln -vsf ${k3sContainerd}/bin/* ./bin/
|
||||
rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/
|
||||
mkdir -p ./build/static/charts
|
||||
|
||||
cp ${traefikChart} ./build/static/charts
|
||||
cp ${traefik-crdChart} ./build/static/charts
|
||||
|
||||
export ARCH=$GOARCH
|
||||
export DRONE_TAG="v${k3sVersion}"
|
||||
export DRONE_COMMIT="${k3sCommit}"
|
||||
# use ./scripts/package-cli to run 'go generate' + 'go build'
|
||||
|
||||
./scripts/package-cli
|
||||
mkdir -p $out/bin
|
||||
'';
|
||||
|
||||
# Otherwise it depends on 'getGoDirs', which is normally set in buildPhase
|
||||
doCheck = false;
|
||||
|
||||
installPhase = ''
|
||||
# wildcard to match the arm64 build too
|
||||
install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s
|
||||
wrapProgram $out/bin/k3s \
|
||||
--prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \
|
||||
--prefix PATH : "$out/bin"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null
|
||||
'';
|
||||
|
||||
# Fix-Me: Needs to be adapted specifically for 1.23
|
||||
# passthru.updateScript = ./update.sh;
|
||||
|
||||
passthru.tests = k3s.passthru.mkTests k3sVersion;
|
||||
|
||||
meta = baseMeta;
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, callPackage
|
||||
, pkg-config
|
||||
, cmake
|
||||
@ -70,10 +71,17 @@ let
|
||||
cxxStandard = "20";
|
||||
};
|
||||
};
|
||||
glibmm = glibmm_2_68.overrideAttrs (_: {
|
||||
version = "2.76.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glibmm/2.76/glibmm-2.76.0.tar.xz";
|
||||
sha256 = "sha256-hjfYDOq9lP3dbkiXCggqJkVY1KuCaE4V/8h+fvNGKrI=";
|
||||
};
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.6.5";
|
||||
version = "4.7.1";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
@ -82,7 +90,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0c65ry82ffmh1qzc2lnsyjs78r9jllv62p9vglpz0ikg86zf36sk";
|
||||
sha256 = "1qv8029xzp2j1j58b1lkw3q53cwaaazvp2la80mfbjv348c29iyk";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -140,7 +148,7 @@ stdenv.mkDerivation rec {
|
||||
range-v3
|
||||
tl-expected
|
||||
hunspell
|
||||
glibmm_2_68
|
||||
glibmm
|
||||
webkitgtk_4_1
|
||||
jemalloc
|
||||
rnnoise
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tg_owt";
|
||||
version = "unstable-2023-01-05";
|
||||
version = "unstable-2023-03-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desktop-app";
|
||||
repo = "tg_owt";
|
||||
rev = "5098730b9eb6173f0b52068fe2555b7c1015123a";
|
||||
sha256 = "0dnh0l9qb9q43cvm4wfgmgqp48grqqz9fb7f48nvys1b6pzhh3pk";
|
||||
rev = "1a18da2ed4d5ce134e984d1586b915738e0da257";
|
||||
sha256 = "18srnl688ng8grfpmgcjpdyr4cw87yjdvyw94b2jjq5jmnq9n3a3";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.3/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.4/ -A '*.tar.xz' )
|
||||
|
||||
@ -4,483 +4,475 @@
|
||||
|
||||
{
|
||||
aura-browser = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/aura-browser-5.27.3.tar.xz";
|
||||
sha256 = "00ysfwf4r9x5csyxws7c7fazvcpr6240f8wshrg9dqsp5bwd86bl";
|
||||
name = "aura-browser-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/aura-browser-5.27.4.tar.xz";
|
||||
sha256 = "0m69p3pnb4kwpibqi8p4kg15sd47298hbhxgkj6ijpbd0422p4c9";
|
||||
name = "aura-browser-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
bluedevil = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/bluedevil-5.27.3.tar.xz";
|
||||
sha256 = "1n8v2vdjp3mby2p9dpf53rjzsjwgw5z63s4lhm17090a152jwc1b";
|
||||
name = "bluedevil-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/bluedevil-5.27.4.tar.xz";
|
||||
sha256 = "18wnr31rdpk70g7l3ig03kw99ss6qkfjmhqysrkyd6m1dpsp260h";
|
||||
name = "bluedevil-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/breeze-5.27.3.tar.xz";
|
||||
sha256 = "12krg073i08dly13zhy8jxpw6asdl7cc1dvafp48gr4irsygar3p";
|
||||
name = "breeze-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/breeze-5.27.4.tar.xz";
|
||||
sha256 = "008rdgyn10wdm393hgxvshfcqrxg6y5yr6xi0nzj4y0cd6yhxn32";
|
||||
name = "breeze-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-grub = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/breeze-grub-5.27.3.tar.xz";
|
||||
sha256 = "0mpjvll5ca0rg4nxsplqynrnc6bmlwg9m2xdvgbljpa7yiwymw06";
|
||||
name = "breeze-grub-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/breeze-grub-5.27.4.tar.xz";
|
||||
sha256 = "0ymivw0pwia1vbf45pr04f825r8w6gsgn450s5x35144vg6lqkqb";
|
||||
name = "breeze-grub-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-gtk = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/breeze-gtk-5.27.3.tar.xz";
|
||||
sha256 = "0ydz7xrmjfwq4nmdrazhyzm8n0jlqi3p8srydk2ivcjaq24v3f9p";
|
||||
name = "breeze-gtk-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/breeze-gtk-5.27.4.tar.xz";
|
||||
sha256 = "17wr4ri1jxsfx8pcm41mp0fsszlf6wi80gxlkixghrc04p6pv5nb";
|
||||
name = "breeze-gtk-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-plymouth = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/breeze-plymouth-5.27.3.tar.xz";
|
||||
sha256 = "0kqls4ss7m0dxzhqm747b2wig4nfbwcj1fi7qdwqy4lf1fw3r4sm";
|
||||
name = "breeze-plymouth-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/breeze-plymouth-5.27.4.tar.xz";
|
||||
sha256 = "1fzidj0dqmr5baphffr5fyxww7v6bigfvbj1hndhk5silm28krkv";
|
||||
name = "breeze-plymouth-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
discover = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/discover-5.27.3.tar.xz";
|
||||
sha256 = "1nqav8zh6290c5jxjs1vfgxxbq5szzln7skhqvx0v0mkd1889i48";
|
||||
name = "discover-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/discover-5.27.4.tar.xz";
|
||||
sha256 = "0rpr0c87nlm3fanv5fxs930rp5mrw357cfar6d81mwacmp86d7yw";
|
||||
name = "discover-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
drkonqi = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/drkonqi-5.27.3.tar.xz";
|
||||
sha256 = "1p1mv0qbnbpj640sv4w965jry4w9179w0mvq1avv2hkpj6mx7jy3";
|
||||
name = "drkonqi-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/drkonqi-5.27.4.tar.xz";
|
||||
sha256 = "1lcidwcsm216acr6ybhyma64gl37n1pn7y8ilkh2iilwm1fwwfnn";
|
||||
name = "drkonqi-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
flatpak-kcm = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/flatpak-kcm-5.27.3.tar.xz";
|
||||
sha256 = "1zjv7p8r3bic9jkla629n9a1g347d7mv22w0znpiah4xcdzci49n";
|
||||
name = "flatpak-kcm-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/flatpak-kcm-5.27.4.tar.xz";
|
||||
sha256 = "0i917li4cm8p0qq28m4jfasy5lph58spf9bfsbp3ka1x7i25cqdd";
|
||||
name = "flatpak-kcm-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivitymanagerd = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kactivitymanagerd-5.27.3.tar.xz";
|
||||
sha256 = "097fx3rqilqihgs4miylgx7vwgmrrwac7c1g9l7ydc20ihx4l434";
|
||||
name = "kactivitymanagerd-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kactivitymanagerd-5.27.4.tar.xz";
|
||||
sha256 = "0wnsj5mbzjc3bylzyhgj8bw0qsf5c9jcyxmfr0h7w4hj414zvqfr";
|
||||
name = "kactivitymanagerd-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-cli-tools = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kde-cli-tools-5.27.3.tar.xz";
|
||||
sha256 = "191sz7v39fzhhpf81hjdxhw08p45fx83s1mfyyd3w39bfmv038m1";
|
||||
name = "kde-cli-tools-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kde-cli-tools-5.27.4.tar.xz";
|
||||
sha256 = "06dl811mwssjylgkn74wjhxi98q1qacf5c2m0jfyny7hbphgv565";
|
||||
name = "kde-cli-tools-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-gtk-config = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kde-gtk-config-5.27.3.tar.xz";
|
||||
sha256 = "04bix5d6n480qwfkhihss3nqpra3kcp939ppa4kws5ry1s759b5a";
|
||||
name = "kde-gtk-config-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kde-gtk-config-5.27.4.tar.xz";
|
||||
sha256 = "1qi0cbx9yilbxs19nbh8iplj5hi19mllk63ldyah2vn5bgwavxcq";
|
||||
name = "kde-gtk-config-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kdecoration = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kdecoration-5.27.3.tar.xz";
|
||||
sha256 = "1nzym6qf7pqsk03qs3583lisf9vzcy13mwwhcjpri0bng57ih3h7";
|
||||
name = "kdecoration-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kdecoration-5.27.4.tar.xz";
|
||||
sha256 = "0vpshfjb2m1m4lx4sh1mhfpx70wvy6laaids9q1cip3k22i24ps1";
|
||||
name = "kdecoration-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeplasma-addons = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kdeplasma-addons-5.27.3.tar.xz";
|
||||
sha256 = "17rvsxg1fsbm5vyrm4sq4q0x720wj2y89i9n5w4v41fygarbia8w";
|
||||
name = "kdeplasma-addons-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kdeplasma-addons-5.27.4.tar.xz";
|
||||
sha256 = "128zjkbvxkibh1d5d1m5xsg3f6hrkgs1f0k371bk8dpki1wsb0ka";
|
||||
name = "kdeplasma-addons-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kgamma5 = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kgamma5-5.27.3.tar.xz";
|
||||
sha256 = "0z5ngivlg9zz844k55m2sxvzpjdivlggml38l0rzcqpzdqaab2fy";
|
||||
name = "kgamma5-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kgamma5-5.27.4.tar.xz";
|
||||
sha256 = "00jq6pc40k1dd6g38bjyb52z8xf3iz9s2n0bwvqaddcngw5wb0aa";
|
||||
name = "kgamma5-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
khotkeys = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/khotkeys-5.27.3.tar.xz";
|
||||
sha256 = "1sq6p22bikjdxbb43l9s8rgzamyl83h00y5ksp281287k3swn6z6";
|
||||
name = "khotkeys-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/khotkeys-5.27.4.tar.xz";
|
||||
sha256 = "08qhj9m5dkg1vgjyzm93ns8c5yvbwfa5r6z7xgn0filvlzg284l4";
|
||||
name = "khotkeys-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kinfocenter = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kinfocenter-5.27.3.tar.xz";
|
||||
sha256 = "12wqryghhvs1a1l80k7zmwldyclvp3c2cdaaank7xwy3nyrnnzw4";
|
||||
name = "kinfocenter-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kinfocenter-5.27.4.tar.xz";
|
||||
sha256 = "15g4czd8pm4vliaax8kgy8zdgxqj73x1icy4gc09y4zwqhaclxb8";
|
||||
name = "kinfocenter-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kmenuedit = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kmenuedit-5.27.3.tar.xz";
|
||||
sha256 = "126wcw38abnwpfcapkbhk8xi2m5gp7qshvayzh23xdajg0lkh47p";
|
||||
name = "kmenuedit-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kmenuedit-5.27.4.tar.xz";
|
||||
sha256 = "1cx7ih68by4slrxrgf8yh49fxszfrzgfhrajk8xjgq9s34nvgarp";
|
||||
name = "kmenuedit-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kpipewire = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kpipewire-5.27.3.tar.xz";
|
||||
sha256 = "0b95jjkfpkvc2ld3x6p7nw6kn6fkqba9q7x95ywvgag2b00jdb56";
|
||||
name = "kpipewire-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kpipewire-5.27.4.tar.xz";
|
||||
sha256 = "0r9ii0mwv2d8nlq3p0g5hsp3m0j8my17ji1an7hzw5pajf340lx6";
|
||||
name = "kpipewire-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreen = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kscreen-5.27.3.tar.xz";
|
||||
sha256 = "0ddxd0rmzq6bp00nw65z854pc8dsgiqdvwhkfrs9cprjdprnf3n1";
|
||||
name = "kscreen-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kscreen-5.27.4.tar.xz";
|
||||
sha256 = "1vf5lhbm1r55l1y06sib1fdv5mbmd77ns1xmq3f0ff7mfabj8vs5";
|
||||
name = "kscreen-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreenlocker = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kscreenlocker-5.27.3.tar.xz";
|
||||
sha256 = "0m48bjrq95psmd11hny15nwqb4ypbfp7sik40hzzx216pqs9ma8s";
|
||||
name = "kscreenlocker-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kscreenlocker-5.27.4.tar.xz";
|
||||
sha256 = "14bip40nkkj6xhmws14hqzjmw23348dpvip4vad8fdgyndcpznm9";
|
||||
name = "kscreenlocker-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
ksshaskpass = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/ksshaskpass-5.27.3.tar.xz";
|
||||
sha256 = "0bgnxx0k62a26pkq2alvb8r9kqyd80wnxci3sxa7rppdx8z3ahd5";
|
||||
name = "ksshaskpass-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/ksshaskpass-5.27.4.tar.xz";
|
||||
sha256 = "0spl7v7narfpvx37f1fqyk9mbsqhymy7jvd3gbxyln0x31j041d9";
|
||||
name = "ksshaskpass-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
ksystemstats = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/ksystemstats-5.27.3.tar.xz";
|
||||
sha256 = "0rk34pav5zkw01h51m97i7jhq2wslhzap3wdp32v1xgsgmjlhs22";
|
||||
name = "ksystemstats-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/ksystemstats-5.27.4.tar.xz";
|
||||
sha256 = "1knykvf6ygg75y7qj8087v8sg6m54ywsk8v9d5yc7f0g8mhqkmhz";
|
||||
name = "ksystemstats-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet-pam = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kwallet-pam-5.27.3.tar.xz";
|
||||
sha256 = "1nqzx8pxk9yqqxpmra3mi8m61b7vl03vjpmnyrlh7krzynfjj672";
|
||||
name = "kwallet-pam-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kwallet-pam-5.27.4.tar.xz";
|
||||
sha256 = "0v0jzkmdbwry6k70nk4gmzv758744q4qi50gry9bcz619imkz8ff";
|
||||
name = "kwallet-pam-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland-integration = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kwayland-integration-5.27.3.tar.xz";
|
||||
sha256 = "0jkgkzh9zp1yb72npzgfbhq79zmgwzf7vzw8xxbz3vsmk3rih0fd";
|
||||
name = "kwayland-integration-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kwayland-integration-5.27.4.tar.xz";
|
||||
sha256 = "027y4r02g26mv5a76s2yr0fxyx7dq81md41lgjnr3gg0jdm8ajpp";
|
||||
name = "kwayland-integration-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kwin = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kwin-5.27.3.tar.xz";
|
||||
sha256 = "1ry0mwah77ly1b4ywhiprjq5aqrb0njawqik11997q0k720i4b78";
|
||||
name = "kwin-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.tar.xz";
|
||||
sha256 = "1d76m6vp9kg4qgr62ppb5wyi7g49j84kzb75zqkq5racsr9r0i2q";
|
||||
name = "kwin-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
kwrited = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/kwrited-5.27.3.tar.xz";
|
||||
sha256 = "1m2qcqnsq3nbqa00y0fa0bnya8j7741pp3zgn58hjvhfbrh52262";
|
||||
name = "kwrited-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/kwrited-5.27.4.tar.xz";
|
||||
sha256 = "1z07fjw3b8q7cgy7vvlh1bmx4qm609mipgm5wjf6lb63ss04nfpd";
|
||||
name = "kwrited-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
layer-shell-qt = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/layer-shell-qt-5.27.3.tar.xz";
|
||||
sha256 = "1rvjkw11nxcj0fl9b45hfv20xaqq87jvfrxz72xkmixnsv3wv70f";
|
||||
name = "layer-shell-qt-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/layer-shell-qt-5.27.4.tar.xz";
|
||||
sha256 = "1znhwg86wnjrmw5lfbwarl2va90zf4b0lpafia73q0i39g0ysfiv";
|
||||
name = "layer-shell-qt-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
libkscreen = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/libkscreen-5.27.3.tar.xz";
|
||||
sha256 = "0py6x6l0bc64wakd3x6j4lmcnqzjxx0a4qr2p3i94rrx68b73mw5";
|
||||
name = "libkscreen-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/libkscreen-5.27.4.tar.xz";
|
||||
sha256 = "0zps0z0j4yln2yda4sj15rn3i6y3qipb5yb4q90qm5a0iiggp7d8";
|
||||
name = "libkscreen-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
libksysguard = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/libksysguard-5.27.3.tar.xz";
|
||||
sha256 = "07xvs6pr605p9mjm6s8f5x53lyv2mscxvm4xfa0y056ngipvpwiz";
|
||||
name = "libksysguard-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/libksysguard-5.27.4.tar.xz";
|
||||
sha256 = "1y7q4bkgpg1j9yw9glm0566fbx6vf9ccz9f46vg3zfjwa468s4p0";
|
||||
name = "libksysguard-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
milou = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/milou-5.27.3.tar.xz";
|
||||
sha256 = "07vf2mi6jnmw28r8bw5qj7f7467ja5mhsdp1k8hb32ivls92sv7b";
|
||||
name = "milou-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/milou-5.27.4.tar.xz";
|
||||
sha256 = "1a2p3y3zcmjigwywl7k7mgwvilpyjzjnbylx8zadp0051yw6f3sd";
|
||||
name = "milou-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/oxygen-5.27.3.tar.xz";
|
||||
sha256 = "1drmjf8bgzm9gzpy887wbyi4zd71vlilhx7057qr8df6sbnzh4ch";
|
||||
name = "oxygen-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/oxygen-5.27.4.tar.xz";
|
||||
sha256 = "1sz3rnsz8qabln3jn5bg1f5vgijgmm13242k65kiksvigfdrc3p2";
|
||||
name = "oxygen-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen-sounds = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/oxygen-sounds-5.27.3.tar.xz";
|
||||
sha256 = "1kppckhyll3v973jg2csp5z3ryxbipp9jpg6hfqrw1rqkv83rf8d";
|
||||
name = "oxygen-sounds-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/oxygen-sounds-5.27.4.tar.xz";
|
||||
sha256 = "1v44jcy0zkvpqkc6yih55j6xmb0g3pd26szk95mpjkn7jxsav8wy";
|
||||
name = "oxygen-sounds-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plank-player = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plank-player-5.27.3.tar.xz";
|
||||
sha256 = "0iv26dics4w89j9xfms9bi4fs9b1cq4wnjgz1jv5w6834imvplrw";
|
||||
name = "plank-player-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plank-player-5.27.4.tar.xz";
|
||||
sha256 = "0650v644nvbnl9b0caa83pbq8y7jrklqzqxdlcrml6km85avhx5n";
|
||||
name = "plank-player-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-bigscreen = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-bigscreen-5.27.3.tar.xz";
|
||||
sha256 = "0vp1n2048d9f15hnfiz2jkkk209n6zn6z45s9xa4a622xrqbvr3x";
|
||||
name = "plasma-bigscreen-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-bigscreen-5.27.4.tar.xz";
|
||||
sha256 = "18jdgk3aydk394r91c279fnlhyrvmklqznxjikq25mx449wa3acp";
|
||||
name = "plasma-bigscreen-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-browser-integration = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-browser-integration-5.27.3.tar.xz";
|
||||
sha256 = "10ivly31xb2s1d2cizjppm805qxdh8lij8cry46fbgg51r5w1qnd";
|
||||
name = "plasma-browser-integration-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-browser-integration-5.27.4.tar.xz";
|
||||
sha256 = "0rpljxnir2nbh4ww5ycgpdrj739cr1dg46mmfqj65h8yn60zfynk";
|
||||
name = "plasma-browser-integration-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-desktop = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-desktop-5.27.3.tar.xz";
|
||||
sha256 = "1q9lyc213fyvrjv816mhm0b0dzsjqy2m2hli9a70cy5i36id3pg2";
|
||||
name = "plasma-desktop-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-desktop-5.27.4.tar.xz";
|
||||
sha256 = "0068wcm586gv31aqjgppj1n5a81jv10q01spsxl24c91y7aiqkxr";
|
||||
name = "plasma-desktop-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-disks = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-disks-5.27.3.tar.xz";
|
||||
sha256 = "0m9wdqf1k346kbpc6c2d5z2xiqiyp598k1973g06jr1af0b2pi9f";
|
||||
name = "plasma-disks-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-disks-5.27.4.tar.xz";
|
||||
sha256 = "08w3x7hd3wkgj41g9xcaylsz8lsjv1d4pgmzq7dy436vwbiaxx4p";
|
||||
name = "plasma-disks-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-firewall = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-firewall-5.27.3.tar.xz";
|
||||
sha256 = "0qd40ihgd60znxmsr6s7vpr9af8r5dbasm4yjld4p7250pjvvn01";
|
||||
name = "plasma-firewall-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-firewall-5.27.4.tar.xz";
|
||||
sha256 = "1b538c9jngyj5zg6bvih2x7nskzdn8g9g04bxdjnayldj2hb979l";
|
||||
name = "plasma-firewall-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-integration = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-integration-5.27.3.tar.xz";
|
||||
sha256 = "13lrg0r4zq71wvfah8brm53v9cbsn7zpknafi948nq3smbd1h196";
|
||||
name = "plasma-integration-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-integration-5.27.4.tar.xz";
|
||||
sha256 = "0bl99gr2clqs6wxlx0652gcypgxqw9s34yxvhc9df0fn53v9b84s";
|
||||
name = "plasma-integration-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-mobile = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-mobile-5.27.3.tar.xz";
|
||||
sha256 = "0rf09rqc2avcma61r6ngc6bc1lmrivrvi7rkv73mrw8klnh3vf9f";
|
||||
name = "plasma-mobile-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-mobile-5.27.4.tar.xz";
|
||||
sha256 = "1a05lnhnxnizzs9fswsrlddwb0629xfl3wmm2rw635gqldd0f66m";
|
||||
name = "plasma-mobile-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nano = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-nano-5.27.3.tar.xz";
|
||||
sha256 = "11ivbr03dv75ryp0lcmj9iyw7y2x7pplybglpavmfz2ryq2vsy93";
|
||||
name = "plasma-nano-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-nano-5.27.4.tar.xz";
|
||||
sha256 = "1z70bj5s3qkx2rbrbn9xqf4vzyj7yx9vq9givcagncxnldi1x3pa";
|
||||
name = "plasma-nano-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nm = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-nm-5.27.3.tar.xz";
|
||||
sha256 = "02646jl8qq28b11hgxg73xycb2biy6girxkgpxnpdb1gxmfmfnvn";
|
||||
name = "plasma-nm-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-nm-5.27.4.tar.xz";
|
||||
sha256 = "0jr1a4d9qj43925abr36nvc9fhvyd58qhdg4w5i805p533wbzrif";
|
||||
name = "plasma-nm-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-pa = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-pa-5.27.3.tar.xz";
|
||||
sha256 = "177hwsr75xif0r36hib1gh6bjyljnilb4s9zyzvr5z1lwiz10y91";
|
||||
name = "plasma-pa-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-pa-5.27.4.tar.xz";
|
||||
sha256 = "1rpjscmfb7i9h50m9xglxf4rgca63y0i8x341jgmf5kmpm9lad7d";
|
||||
name = "plasma-pa-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-remotecontrollers = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-remotecontrollers-5.27.3.tar.xz";
|
||||
sha256 = "04am5shh882k86yic1ca42j60l2rnqn9487i30k0332kzd0wir1w";
|
||||
name = "plasma-remotecontrollers-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-remotecontrollers-5.27.4.tar.xz";
|
||||
sha256 = "0l9n0q318720yx02whrp9qfhhwcnw261sdvyw78y9c3n4v22k31n";
|
||||
name = "plasma-remotecontrollers-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-sdk = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-sdk-5.27.3.tar.xz";
|
||||
sha256 = "0rsz846x3rldz950zm31aj8192b0h5d33fvizmgxnxjibxxf2q24";
|
||||
name = "plasma-sdk-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-sdk-5.27.4.tar.xz";
|
||||
sha256 = "08fv6rnb7vc3wxkwk3xrrvb3k1gac7sncjdvk0lik6y1c7ilk27r";
|
||||
name = "plasma-sdk-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-systemmonitor = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-systemmonitor-5.27.3.tar.xz";
|
||||
sha256 = "122rw8nfzhk0808d1bk54ld41b45616fg3hca9jg4ib6k7nka367";
|
||||
name = "plasma-systemmonitor-5.27.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-tests = {
|
||||
version = "5.27.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-tests-5.27.3.tar.xz";
|
||||
sha256 = "1ijh1lfr81bwdw8nla55n6snxkmmz95qf3j8wbf61v64r9n3w2zp";
|
||||
name = "plasma-tests-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-systemmonitor-5.27.4.tar.xz";
|
||||
sha256 = "1sy38lmkrvma4kkf96n68f65hdjvpyaszx13hynhrplsgn24fj19";
|
||||
name = "plasma-systemmonitor-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-thunderbolt = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-thunderbolt-5.27.3.tar.xz";
|
||||
sha256 = "17hs1mrr7lkd9nkxs9269bs3hs4c8qxg3ksirksrgnbz4zas1m55";
|
||||
name = "plasma-thunderbolt-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-thunderbolt-5.27.4.tar.xz";
|
||||
sha256 = "1zzl59qyajf8xcxxs5lijx85v8gm3y4izf3qd502smq2841hbxi8";
|
||||
name = "plasma-thunderbolt-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-vault = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-vault-5.27.3.tar.xz";
|
||||
sha256 = "0ilpkdd0nfg9z2klyf5s02npmqr1ypb0wgm584zi27q048hnicls";
|
||||
name = "plasma-vault-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-vault-5.27.4.1.tar.xz";
|
||||
sha256 = "1bh2662ghdq5qkvn4347yc2dh6c616qiax4k4yylkf37czqdil77";
|
||||
name = "plasma-vault-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-welcome = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-welcome-5.27.3.tar.xz";
|
||||
sha256 = "1m6mpzbcyy7cimhcsbbmk1v86pibcrp86b22dh7pwgrg309ihsm4";
|
||||
name = "plasma-welcome-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-welcome-5.27.4.1.tar.xz";
|
||||
sha256 = "0rg80rc07q63z0ds4q8lf9yrv3ys9cvjcfwx39ibjy9nrkismrca";
|
||||
name = "plasma-welcome-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-workspace-5.27.3.tar.xz";
|
||||
sha256 = "0g710y1l2hpxnjg6r1k60dkvn6gf98fg5yhx72wa2y1in3nkglzl";
|
||||
name = "plasma-workspace-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-workspace-5.27.4.1.tar.xz";
|
||||
sha256 = "19b5mydi995aa634v57dlc769nmbz6mb2hs8c620gzabjnn0cffb";
|
||||
name = "plasma-workspace-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace-wallpapers = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plasma-workspace-wallpapers-5.27.3.tar.xz";
|
||||
sha256 = "1ppsi5ic6yp9wnqwmz37jsmjs3l5jxafjarxa0xasalg69k10k4c";
|
||||
name = "plasma-workspace-wallpapers-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-workspace-wallpapers-5.27.4.1.tar.xz";
|
||||
sha256 = "0sv58kp088vxqd5dfs3hvc93xlydk7nyxm1ly0xy377r2v3pnkg4";
|
||||
name = "plasma-workspace-wallpapers-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
plymouth-kcm = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/plymouth-kcm-5.27.3.tar.xz";
|
||||
sha256 = "09p6ii29lq08h8999zb1ddbaa4l7piykcr5xmhwir75pi7gnnacg";
|
||||
name = "plymouth-kcm-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/plymouth-kcm-5.27.4.1.tar.xz";
|
||||
sha256 = "0x20dswpy1vg1rh01m7pbicd1fn0rbh5gfaqdlizdcpnd6gjjfh5";
|
||||
name = "plymouth-kcm-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
polkit-kde-agent = {
|
||||
version = "1-5.27.3";
|
||||
version = "1-5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/polkit-kde-agent-1-5.27.3.tar.xz";
|
||||
sha256 = "1axgqg07xm12qrrww8jvbh8yvhi7pf2x4ssq65qja0zz9kxiahcx";
|
||||
name = "polkit-kde-agent-1-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/polkit-kde-agent-1-5.27.4.1.tar.xz";
|
||||
sha256 = "1ikhrs17ffrsji6phwxhz8b6gxldksjb4625zpin8vkf07v9brr6";
|
||||
name = "polkit-kde-agent-1-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
powerdevil = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/powerdevil-5.27.3.tar.xz";
|
||||
sha256 = "16bcnm56g5amwygzkdz0sy396dfn47n6wiynnvr7nfhpzbfx81y8";
|
||||
name = "powerdevil-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/powerdevil-5.27.4.1.tar.xz";
|
||||
sha256 = "0s6k7kcfa717lcjdlx61h21ldk4fg67is6r2vzcq0507gp3r8jb4";
|
||||
name = "powerdevil-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qqc2-breeze-style = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/qqc2-breeze-style-5.27.3.tar.xz";
|
||||
sha256 = "13hd2f08cb6gjdyns1qfszq7sn1ckr78l3lhl6g6yiab3jn1v6b4";
|
||||
name = "qqc2-breeze-style-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/qqc2-breeze-style-5.27.4.tar.xz";
|
||||
sha256 = "0x96xa5j3726i4ci6g51hk364hhcq9xip4jrb1qssb9l0v1324n4";
|
||||
name = "qqc2-breeze-style-5.27.4.tar.xz";
|
||||
};
|
||||
};
|
||||
sddm-kcm = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/sddm-kcm-5.27.3.tar.xz";
|
||||
sha256 = "0hicpzsyym1r3amd6crz964gk19rhg5z9g87fr6i77r77iavb1ds";
|
||||
name = "sddm-kcm-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/sddm-kcm-5.27.4.1.tar.xz";
|
||||
sha256 = "0l85mk8mj3g5fga6z93w5k88pkpf8wrx6vaf4f1q9lgy2dkm4ylp";
|
||||
name = "sddm-kcm-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
systemsettings = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/systemsettings-5.27.3.tar.xz";
|
||||
sha256 = "0gjh9hny0h2x5cqqsn5scm1k9hjfl3vgpmsjqqc66hb1ac8a9g04";
|
||||
name = "systemsettings-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/systemsettings-5.27.4.1.tar.xz";
|
||||
sha256 = "03kk2bangg9nixdwpyrp2k4wgv3r3d3ymklqfx37b7c25wpiv7az";
|
||||
name = "systemsettings-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
xdg-desktop-portal-kde = {
|
||||
version = "5.27.3";
|
||||
version = "5.27.4.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.3/xdg-desktop-portal-kde-5.27.3.tar.xz";
|
||||
sha256 = "0d47kx9y4bfylmn3q4s11vg6fzz1yjlcbxmpgpd9al8nils2ifnd";
|
||||
name = "xdg-desktop-portal-kde-5.27.3.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.4/xdg-desktop-portal-kde-5.27.4.1.tar.xz";
|
||||
sha256 = "0hrxlql13yab3w778wgdsr92g65q81qk5dvlqnn0fdc9lbfw5ipg";
|
||||
name = "xdg-desktop-portal-kde-5.27.4.1.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,10 +4,11 @@
|
||||
, cmake
|
||||
, coreutils
|
||||
, fetchpatch
|
||||
, jq
|
||||
, ncurses
|
||||
, python3
|
||||
, z3Support ? true
|
||||
, z3 ? null
|
||||
, z3_4_11 ? null
|
||||
, cvc4Support ? gccStdenv.isLinux
|
||||
, cvc4 ? null
|
||||
, cln ? null
|
||||
@ -16,8 +17,9 @@
|
||||
|
||||
# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin,
|
||||
# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS
|
||||
let z3 = z3_4_11; in
|
||||
|
||||
assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0";
|
||||
assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.11.0";
|
||||
assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
|
||||
|
||||
let
|
||||
@ -28,11 +30,11 @@ let
|
||||
sha256 = "1vbhi503rgwarf275ajfdb8vpdcbn1f7917wjkf8jghqwb1c24lq";
|
||||
};
|
||||
|
||||
range3Version = "0.11.0";
|
||||
range3Version = "0.12.0";
|
||||
range3Url = "https://github.com/ericniebler/range-v3/archive/${range3Version}.tar.gz";
|
||||
range3 = fetchzip {
|
||||
url = range3Url;
|
||||
sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh";
|
||||
sha256 = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU=";
|
||||
};
|
||||
|
||||
fmtlibVersion = "8.0.1";
|
||||
@ -43,7 +45,7 @@ let
|
||||
};
|
||||
|
||||
pname = "solc";
|
||||
version = "0.8.13";
|
||||
version = "0.8.19";
|
||||
meta = with lib; {
|
||||
description = "Compiler for Ethereum smart contract language Solidity";
|
||||
homepage = "https://github.com/ethereum/solidity";
|
||||
@ -57,9 +59,13 @@ let
|
||||
# upstream suggests avoid using archive generated by github
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
|
||||
hash = "sha256-cFC9M65kSYgYq9rhBXZKEdfvIMbMaDiDwdPmU8v9s7k=";
|
||||
sha256 = "sha256-xh/QPYNEWxPtDaVmBeIE/Ch98g0ox9gJ/lR6ziOu+bg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./tests.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmake/jsoncpp.cmake \
|
||||
--replace "${jsoncppUrl}" ${jsoncpp}
|
||||
@ -84,7 +90,7 @@ let
|
||||
buildInputs = [ boost ]
|
||||
++ lib.optionals z3Support [ z3 ]
|
||||
++ lib.optionals cvc4Support [ cvc4 cln gmp ];
|
||||
nativeCheckInputs = [ ncurses python3 ];
|
||||
nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3 ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3
|
||||
|
||||
# tests take 60+ minutes to complete, only run as part of passthru tests
|
||||
doCheck = false;
|
||||
@ -96,7 +102,8 @@ let
|
||||
for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do
|
||||
patchShebangs "$i"
|
||||
done
|
||||
TERM=xterm ./scripts/tests.sh ${lib.optionalString z3Support "--no-smt"}
|
||||
## TODO: reenable tests below after adding evmone and hera and their dependencies to nixpkgs
|
||||
#TERM=xterm ./scripts/tests.sh ${lib.optionalString z3Support "--no-smt"}
|
||||
popd
|
||||
'';
|
||||
|
||||
@ -113,7 +120,7 @@ let
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos";
|
||||
sha256 = "sha256-FNTvAT6oKtlekf2Um3+nt4JxpIP/GnnEPWzFi4JvW+o=";
|
||||
sha256 = "sha256-OMhSOrZ+Cz4hxIGJ1r+5mtaHm5zgLg2ALsi+WYuyYi0=";
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
|
||||
14
pkgs/development/compilers/solc/tests.patch
Normal file
14
pkgs/development/compilers/solc/tests.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/test/lsp.py b/test/lsp.py
|
||||
index 669951ca4..11007ae82 100755
|
||||
--- a/test/lsp.py
|
||||
+++ b/test/lsp.py
|
||||
@@ -28,7 +28,8 @@ else:
|
||||
import tty
|
||||
# Turn off user input buffering so we get the input immediately,
|
||||
# not only after a line break
|
||||
- tty.setcbreak(sys.stdin.fileno())
|
||||
+ if os.isatty(sys.stdin.fileno()):
|
||||
+ tty.setcbreak(sys.stdin.fileno())
|
||||
|
||||
|
||||
# Type for the pure test name without .sol suffix or sub directory
|
||||
@ -3,15 +3,17 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, flask
|
||||
, hatchling
|
||||
, hatch-vcs
|
||||
, isPy27
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "picobox";
|
||||
version = "2.2.0";
|
||||
version = "3.0.0";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
@ -19,26 +21,14 @@ buildPythonPackage rec {
|
||||
owner = "ikalnytskyi";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-B2A8GMhBFU/mb/JiiqtP+HvpPj5FYwaYO3gQN2QI6z0=";
|
||||
hash = "sha256-LQiSurL+eFRJ9iQheoo66o44BlfBtAatk8deuMFROcc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# already in master, but no new release yet.
|
||||
# https://github.com/ikalnytskyi/picobox/issues/55
|
||||
url = "https://github.com/ikalnytskyi/picobox/commit/1fcc4a0c26a7cd50ee3ef6694139177b5dfb2be0.patch";
|
||||
hash = "sha256-/NIEzTFlZ5wG7jHT/YdySYoxT/UhSk29Up9/VqjG/jg=";
|
||||
includes = [
|
||||
"tests/test_box.py"
|
||||
"tests/test_stack.py"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
, pytest-lazy-fixture
|
||||
, pkg-config
|
||||
, scipy
|
||||
, fetchpatch
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
@ -84,6 +85,15 @@ buildPythonPackage rec {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
# fix on current master
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/apache/arrow/commit/bce43175aa8cfb4534d3efbcc092f697f25f0f5a.patch";
|
||||
hash = "sha256-naOAQjQgSKIoCAGCKr7N4dCkOMtweAdfggGOQKDY3k0=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export PYARROW_PARALLEL=$NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
47
pkgs/development/python-modules/rustworkx/default.nix
Normal file
47
pkgs/development/python-modules/rustworkx/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, rustPlatform
|
||||
, setuptools-rust
|
||||
, numpy
|
||||
, fixtures
|
||||
, networkx
|
||||
, libiconv
|
||||
, stdenv
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rustworkx";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qiskit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-d/KCxhJdyzhTjwJZ+GsXJE4ww30iPaXcPngpCi4hBZw=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
hash = "sha256-imhiPj763iumRQb+oeBOpICD1nCvzZx+3yQWu1QRRQQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
rust.rustc
|
||||
]);
|
||||
|
||||
buildInputs = [ numpy ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
checkInputs = [ fixtures networkx ];
|
||||
|
||||
pythonImportsCheck = [ "rustworkx" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high performance Python graph library implemented in Rust.";
|
||||
homepage = "https://github.com/Qiskit/rustworkx";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ raitobezarius ];
|
||||
};
|
||||
}
|
||||
@ -199,5 +199,26 @@ in buildPythonPackage {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jyp abbradar cdepillabout ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
knownVulnerabilities = optionals (versionOlder packages.version "2.12.0") [
|
||||
"CVE-2023-27579"
|
||||
"CVE-2023-25801"
|
||||
"CVE-2023-25676"
|
||||
"CVE-2023-25675"
|
||||
"CVE-2023-25674"
|
||||
"CVE-2023-25673"
|
||||
"CVE-2023-25671"
|
||||
"CVE-2023-25670"
|
||||
"CVE-2023-25669"
|
||||
"CVE-2023-25668"
|
||||
"CVE-2023-25667"
|
||||
"CVE-2023-25665"
|
||||
"CVE-2023-25666"
|
||||
"CVE-2023-25664"
|
||||
"CVE-2023-25663"
|
||||
"CVE-2023-25662"
|
||||
"CVE-2023-25660"
|
||||
"CVE-2023-25659"
|
||||
"CVE-2023-25658"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -448,6 +448,27 @@ let
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
broken = !(xlaSupport -> cudaSupport);
|
||||
knownVulnerabilities = [
|
||||
"CVE-2023-27579"
|
||||
"CVE-2023-25801"
|
||||
"CVE-2023-25676"
|
||||
"CVE-2023-25675"
|
||||
"CVE-2023-25674"
|
||||
"CVE-2023-25673"
|
||||
"CVE-2023-25671"
|
||||
"CVE-2023-25670"
|
||||
"CVE-2023-25669"
|
||||
"CVE-2023-25668"
|
||||
"CVE-2023-25667"
|
||||
"CVE-2023-25665"
|
||||
"CVE-2023-25666"
|
||||
"CVE-2023-25664"
|
||||
"CVE-2023-25663"
|
||||
"CVE-2023-25662"
|
||||
"CVE-2023-25660"
|
||||
"CVE-2023-25659"
|
||||
"CVE-2023-25658"
|
||||
];
|
||||
} // lib.optionalAttrs stdenv.isDarwin {
|
||||
timeout = 86400; # 24 hours
|
||||
maxSilent = 14400; # 4h, double the default of 7200s
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
let
|
||||
pname = "gptcommit";
|
||||
version = "0.1.15";
|
||||
version = "0.5.6";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@ -19,13 +19,16 @@ rustPlatform.buildRustPackage {
|
||||
owner = "zurawiki";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ykcKvJJg+K2mDiz7hDYzoL1CYI1zOidlqz4xLUY1NW0=";
|
||||
sha256 = "sha256-ZrJRXmtwHLUqaYhoAD9lo9k9t06TMGMLf33kgvbC0m8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-/BASGNwfdAHLKdceRQe4GNfLy6uanHwH0yohGO7V60Q=";
|
||||
cargoSha256 = "sha256-625OFsFNNwILAFUC5eWcNETt7F1KpYE1N/Gf8pv9Gbw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
# 0.5.6 release has failing tests
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals stdenv.isLinux [ openssl ];
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -45,9 +45,11 @@ stdenv.mkDerivation (drvAttrs // {
|
||||
source="$1"
|
||||
target="$out/share/fish/vendor_$2.d"
|
||||
|
||||
[ -d $source ] || return 0
|
||||
# Check if any .fish file exists in $source
|
||||
[ -n "$(shopt -s nullglob; echo $source/*.fish)" ] || return 0
|
||||
|
||||
mkdir -p $target
|
||||
cp -r $source/*.fish "$target/"
|
||||
cp $source/*.fish "$target/"
|
||||
}
|
||||
|
||||
install_vendor_files completions completions
|
||||
|
||||
@ -1,22 +1,20 @@
|
||||
{ lib, buildFishPlugin, fetchFromGitHub, git, fzf }:
|
||||
{ lib, buildFishPlugin, fetchFromGitHub }:
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "forgit";
|
||||
version = "unstable-2022-10-14";
|
||||
|
||||
preFixup = ''
|
||||
substituteInPlace $out/share/fish/vendor_conf.d/forgit.plugin.fish \
|
||||
--replace "fzf " "${fzf}/bin/fzf " \
|
||||
--replace "git " "${git}/bin/git "
|
||||
'';
|
||||
version = "23.04.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = "2872548075e63bc83a0b960e2813b16571998563";
|
||||
sha256 = "sha256-NKL4c4k9Nath8NQ3sWUTGUzp517jRX4v0qVaKMJSMrw=";
|
||||
rev = version;
|
||||
sha256 = "sha256-3lvYIuzuJw0CQlaAQG6hAyfUgSXM+3BOmKRVDNFUN/U=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
cp -r bin $out/share/fish/vendor_conf.d/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility tool powered by fzf for using git interactively.";
|
||||
homepage = "https://github.com/wfxr/forgit";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "chatgpt";
|
||||
version = "0.6.0-beta";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "j178";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qIa0eU3aFyDC5cm/J/BmZfcJe1DARqAtmpUMqlaqsF4=";
|
||||
hash = "sha256-7PQ390KX/+Yu730pluO+jL1NNZ1yB1CO+YTj41/OByo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JlBAPHtMm5mq91aOtsNMDu48net9i3W/AxCiKalYkm4=";
|
||||
vendorHash = "sha256-MSqCFcBY6z16neinGsxH+YFA7R2p+4kwolgqGxjQVq4=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qrcp";
|
||||
version = "0.9.1";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "claudiodangelis";
|
||||
repo = "qrcp";
|
||||
rev = version;
|
||||
sha256 = "sha256-oXtFkjCnbfjV15XWkmmJmhG82GyaY4FAcF5NrGnxHm0=";
|
||||
sha256 = "sha256-pGFqKnOZhwuyN0lHmQPLQ4bJhMsMYoxbh0oEJdK1wAQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4";
|
||||
vendorSha256 = "sha256-XVBDPhQsnUdftS+jZ1zWZlfSbFXxXrKSqiGTPpLq5i0=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sing-box";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SagerNet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0JQlyDeRvmpkBQ69Y7nXUHDVa1NbX7k7ZgdfNfFTO3I=";
|
||||
hash = "sha256-IHYg3X1LBH7Ne83j0caJHHkBDMy7EcMKSFd0U5sHabI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BofHamNzBxQI148eRxGYylcyaktD4Xg7c6m4WiK0hP0=";
|
||||
vendorHash = "sha256-J9KGtAZ+J7EJKJOEEH44bhG8Gln8Gv87ryB3nswxDO0=";
|
||||
|
||||
tags = [
|
||||
"with_quic"
|
||||
|
||||
@ -31266,7 +31266,6 @@ with pkgs;
|
||||
|
||||
jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
|
||||
|
||||
k3s_1_23 = callPackage ../applications/networking/cluster/k3s/1_23 { };
|
||||
k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { };
|
||||
k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { };
|
||||
k3s_1_26 = callPackage ../applications/networking/cluster/k3s/1_26 { };
|
||||
|
||||
@ -12125,6 +12125,8 @@ self: super: with self; {
|
||||
|
||||
tzlocal = callPackage ../development/python-modules/tzlocal { };
|
||||
|
||||
rustworkx = callPackage ../development/python-modules/rustworkx { };
|
||||
|
||||
uamqp = callPackage ../development/python-modules/uamqp {
|
||||
openssl = pkgs.openssl_1_1;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork CoreFoundation Security;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user