mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge staging-next into staging
This commit is contained in:
commit
51f9ea2d15
@ -7606,6 +7606,12 @@
|
||||
githubId = 287769;
|
||||
name = "Sergii Paryzhskyi";
|
||||
};
|
||||
heijligen = {
|
||||
email = "src@posteo.de";
|
||||
github = "heijligen";
|
||||
githubId = 19170376;
|
||||
name = "Thomas Heijligen";
|
||||
};
|
||||
heisfer = {
|
||||
email = "heisfer@refract.dev";
|
||||
github = "heisfer";
|
||||
|
@ -16,6 +16,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- `linuxPackages_testing_bcachefs` is now fully deprecated by `linuxPackages_latest`, and is therefore no longer available.
|
||||
|
||||
- The default kernel package has been updated from 6.1 to 6.6. All supported kernels remain available.
|
||||
|
||||
- NixOS now installs a stub ELF loader that prints an informative error message when users attempt to run binaries not made for NixOS.
|
||||
- This can be disabled through the `environment.stub-ld.enable` option.
|
||||
- If you use `programs.nix-ld.enable`, no changes are needed. The stub will be disabled automatically.
|
||||
|
@ -36,6 +36,17 @@ in
|
||||
provisioned outside of Nix store.
|
||||
'';
|
||||
};
|
||||
nutVariables = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
List of NUT variable names to monitor.
|
||||
|
||||
If no variables are set, all numeric variables will be exported automatically.
|
||||
See the [upstream docs](https://github.com/DRuggeri/nut_exporter?tab=readme-ov-file#variables-and-information)
|
||||
for more information.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
script = ''
|
||||
@ -44,7 +55,9 @@ in
|
||||
${pkgs.prometheus-nut-exporter}/bin/nut_exporter \
|
||||
--nut.server=${cfg.nutServer} \
|
||||
--web.listen-address="${cfg.listenAddress}:${toString cfg.port}" \
|
||||
${optionalString (cfg.nutUser != "") "--nut.username=${cfg.nutUser}"}
|
||||
${optionalString (cfg.nutUser != "") "--nut.username=${cfg.nutUser}"} \
|
||||
${optionalString (cfg.nutVariables != []) "--nut.vars_enable=${concatStringsSep "," cfg.nutVariables}"} \
|
||||
${concatStringsSep " " cfg.extraFlags}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
@ -6,6 +6,11 @@ let
|
||||
allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs;
|
||||
in
|
||||
{
|
||||
# Testing K3s with Etcd backend
|
||||
etcd = lib.mapAttrs (_: k3s: import ./etcd.nix {
|
||||
inherit system pkgs k3s;
|
||||
inherit (pkgs) etcd;
|
||||
}) allK3s;
|
||||
# Run a single node k3s cluster and verify a pod can run
|
||||
single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s;
|
||||
# Run a multi-node k3s cluster and verify pod networking works across nodes
|
||||
|
100
nixos/tests/k3s/etcd.nix
Normal file
100
nixos/tests/k3s/etcd.nix
Normal file
@ -0,0 +1,100 @@
|
||||
import ../make-test-python.nix ({ pkgs, lib, k3s, etcd, ... }:
|
||||
|
||||
{
|
||||
name = "${k3s.name}-etcd";
|
||||
|
||||
nodes = {
|
||||
|
||||
etcd = { ... }: {
|
||||
services.etcd = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
listenClientUrls = [ "http://192.168.1.1:2379" "http://127.0.0.1:2379" ];
|
||||
listenPeerUrls = [ "http://192.168.1.1:2380" ];
|
||||
initialAdvertisePeerUrls = [ "http://192.168.1.1:2380" ];
|
||||
initialCluster = [ "etcd=http://192.168.1.1:2380" ];
|
||||
};
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
defaultGateway = "192.168.1.1";
|
||||
interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [
|
||||
{ address = "192.168.1.1"; prefixLength = 24; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
k3s = { pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [ jq ];
|
||||
# k3s uses enough resources the default vm fails.
|
||||
virtualisation.memorySize = 1536;
|
||||
virtualisation.diskSize = 4096;
|
||||
|
||||
services.k3s = {
|
||||
enable = true;
|
||||
role = "server";
|
||||
extraFlags = builtins.toString [
|
||||
"--datastore-endpoint=\"http://192.168.1.1:2379\""
|
||||
"--disable" "coredns"
|
||||
"--disable" "local-storage"
|
||||
"--disable" "metrics-server"
|
||||
"--disable" "servicelb"
|
||||
"--disable" "traefik"
|
||||
"--node-ip" "192.168.1.2"
|
||||
];
|
||||
};
|
||||
|
||||
networking = {
|
||||
firewall = {
|
||||
allowedTCPPorts = [ 2379 2380 6443 ];
|
||||
allowedUDPPorts = [ 8472 ];
|
||||
};
|
||||
useDHCP = false;
|
||||
defaultGateway = "192.168.1.2";
|
||||
interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [
|
||||
{ address = "192.168.1.2"; prefixLength = 24; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
with subtest("should start etcd"):
|
||||
etcd.start()
|
||||
etcd.wait_for_unit("etcd.service")
|
||||
|
||||
with subtest("should wait for etcdctl endpoint status to succeed"):
|
||||
etcd.wait_until_succeeds("etcdctl endpoint status")
|
||||
|
||||
with subtest("should start k3s"):
|
||||
k3s.start()
|
||||
k3s.wait_for_unit("k3s")
|
||||
|
||||
with subtest("should test if kubectl works"):
|
||||
k3s.wait_until_succeeds("k3s kubectl get node")
|
||||
|
||||
with subtest("should wait for service account to show up; takes a sec"):
|
||||
k3s.wait_until_succeeds("k3s kubectl get serviceaccount default")
|
||||
|
||||
with subtest("should create a sample secret object"):
|
||||
k3s.succeed("k3s kubectl create secret generic nixossecret --from-literal thesecret=abacadabra")
|
||||
|
||||
with subtest("should check if secret is correct"):
|
||||
k3s.wait_until_succeeds("[[ $(kubectl get secrets nixossecret -o json | jq -r .data.thesecret | base64 -d) == abacadabra ]]")
|
||||
|
||||
with subtest("should have a secret in database"):
|
||||
etcd.wait_until_succeeds("[[ $(etcdctl get /registry/secrets/default/nixossecret | head -c1 | wc -c) -ne 0 ]]")
|
||||
|
||||
with subtest("should delete the secret"):
|
||||
k3s.succeed("k3s kubectl delete secret nixossecret")
|
||||
|
||||
with subtest("should not have a secret in database"):
|
||||
etcd.wait_until_fails("[[ $(etcdctl get /registry/secrets/default/nixossecret | head -c1 | wc -c) -ne 0 ]]")
|
||||
|
||||
with subtest("should shutdown k3s and etcd"):
|
||||
k3s.shutdown()
|
||||
etcd.shutdown()
|
||||
'';
|
||||
|
||||
meta.maintainers = etcd.meta.maintainers ++ k3s.meta.maintainers;
|
||||
})
|
@ -2,12 +2,12 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy-muse";
|
||||
version = "0.0.30";
|
||||
version = "0.0.33";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Mopidy-Muse";
|
||||
sha256 = "sha256-uFptv2niq8LVvEmMEteEN+RzghDiPC7z5EsAmxifDmw=";
|
||||
sha256 = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -14,14 +14,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.2.26.1187.g36b715a1";
|
||||
version = "1.2.31.1205.g4d59ad7c";
|
||||
# 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 = "74";
|
||||
rev = "75";
|
||||
|
||||
deps = [
|
||||
alsa-lib
|
||||
@ -87,7 +87,7 @@ 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";
|
||||
hash = "sha512-Muurn4ih54oVTvLGuRfTPCgGSRImE8O0S5k7gZ4Utgrz3TKgVrthY9AXldP8v+qLcfIrrYwixJy2WGuur9E0jg==";
|
||||
hash = "sha512-o4iLcbNqbsxo9YJMy0SXO7Udv4CMhhBcsf53UuqWKFFWY/jKVN+Lb+dB7Jf9+UowpmbrP44w97Oi+dnbfFXYjQ==";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rednotebook";
|
||||
version = "2.31";
|
||||
version = "2.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jendrikseipp";
|
||||
repo = "rednotebook";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-TggbHXJqgQ4vFSCLncgzrqJLRT9zQs6YsTQ3/Z4Mixg=";
|
||||
sha256 = "sha256-sYgiJ4Sc/5Ns3DSlwT03gt54UdzdcvMx1+c27amhulQ=";
|
||||
};
|
||||
|
||||
# We have not packaged tests.
|
||||
|
@ -69,9 +69,9 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the hash for staging as well.
|
||||
version = "9.2";
|
||||
version = "9.3";
|
||||
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
|
||||
hash = "sha256-goHFoILMR6w8LJHOqt5fFzllU7Oa3LMudBJThltlgWI=";
|
||||
hash = "sha256-FIsuNBR9H6FIQVY3xyPJn0N26SyE6QzB0OAK1O07F5M=";
|
||||
inherit (stable) patches;
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
@ -117,7 +117,7 @@ in rec {
|
||||
staging = fetchFromGitLab rec {
|
||||
# https://gitlab.winehq.org/wine/wine-staging
|
||||
inherit (unstable) version;
|
||||
hash = "sha256-VQ4j4PuXRoXbCUZ16snVO+jRvuKD4Rjn14R7bhwdAco=";
|
||||
hash = "sha256-1k7HHcsosce5MX86IMiFrfjg0li4DuP0utjyal1Iwkc=";
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = "wine-staging";
|
||||
|
@ -35,11 +35,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gthumb";
|
||||
version = "3.12.4";
|
||||
version = "3.12.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-rdaTrArrmjDYKboDoGIIKJ0/aGjcOwJXNUnogZDHlOg=";
|
||||
sha256 = "sha256-9jhd9F/oxyYuw0nhP4FRLpDpl5jdI3eTLkKR1jNZ86s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -4,35 +4,34 @@
|
||||
, SDL2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "johnny-reborn-engine";
|
||||
version = "unstable-2020-12-06";
|
||||
version = "0.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jno6809";
|
||||
owner = "xesf";
|
||||
repo = "jc_reborn";
|
||||
rev = "524a5803e4fa65f840379c781f40ce39a927032e";
|
||||
hash = "sha256-YKAOCgdRnvNMzL6LJVXN0pLvjyJk4Zv/RCqGtDPFR90=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-n3ELNFvjeDzbamyQIdM9mf/A1sstuhCGzrL9NuXf90Y=";
|
||||
};
|
||||
|
||||
makefile = "Makefile.linux";
|
||||
|
||||
buildInputs = [ SDL2 ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp jc_reborn $out/
|
||||
mkdir -p $out/bin
|
||||
cp jc_reborn $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (engine only)";
|
||||
homepage = "https://github.com/jno6809/jc_reborn";
|
||||
homepage = "https://github.com/xesf/jc_reborn";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ pedrohlc ];
|
||||
mainProgram = "jc_reborn";
|
||||
inherit (SDL2.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
@ -6,7 +6,6 @@
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
|
||||
let
|
||||
sounds = fetchFromGitHub {
|
||||
owner = "nivs1978";
|
||||
@ -39,15 +38,15 @@ stdenvNoCC.mkDerivation {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -t $out/ \
|
||||
mkdir -p $out/share/jc_reborn/data
|
||||
cp -t $out/share/jc_reborn/data/ \
|
||||
../scrantic-source/RESOURCE.* \
|
||||
JCOS/Resources/sound*.wav
|
||||
|
||||
makeWrapper \
|
||||
${johnny-reborn-engine}/jc_reborn \
|
||||
$out/jc_reborn \
|
||||
--chdir $out
|
||||
${johnny-reborn-engine}/bin/jc_reborn \
|
||||
$out/bin/jc_reborn \
|
||||
--chdir $out/share/jc_reborn
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@ -56,6 +55,6 @@ stdenvNoCC.mkDerivation {
|
||||
description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (ready to use, with resources)";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ pedrohlc ];
|
||||
inherit (johnny-reborn-engine.meta) homepage platforms;
|
||||
inherit (johnny-reborn-engine.meta) homepage platforms mainProgram;
|
||||
};
|
||||
}
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kratos";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ory";
|
||||
repo = "kratos";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KDpc0zc65rvvpPojghFEujoS0aewyjv7B/bmpC2i1dA=";
|
||||
hash = "sha256-zrII2lpffZkwFauPAilh1QaqRKvpj1mlHZA7in1ljYg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y/Sd2hu1bPUb0TQRD1pANz+rtqKcHBXvjKpYwKgxHMQ=";
|
||||
vendorHash = "sha256-TSB7jCPOVwub+ZQaaUSmsz/R4HAfmnWb0wTf2w4aeuk=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "avalanchego";
|
||||
version = "1.10.19";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Pvl4t0nUHAwTdkR2fEFuFpLn2Hz5kw3IBFYDWSmGyXA=";
|
||||
hash = "sha256-uRoo2+1R1sPYN41ybrwGK+msYa2AC02w5h6hzeh9ASs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WYewelAUkXLD6cwnJQ/jAYP99qq4HjEnJ4HwNUksHZU=";
|
||||
vendorHash = "sha256-x8AgsJuo2q5vRts4axMgL5rTJKQBfuIW341HnUhzvOI=";
|
||||
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
|
||||
proxyVendor = true;
|
||||
|
||||
|
@ -355,6 +355,7 @@ buildGoModule rec {
|
||||
passthru.mkTests = version:
|
||||
let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version);
|
||||
in {
|
||||
etcd = nixosTests.k3s.etcd.${k3s_version};
|
||||
single-node = nixosTests.k3s.single-node.${k3s_version};
|
||||
multi-node = nixosTests.k3s.multi-node.${k3s_version};
|
||||
};
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubetail";
|
||||
version = "1.6.19";
|
||||
version = "1.6.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johanhaleby";
|
||||
repo = "kubetail";
|
||||
rev = version;
|
||||
sha256 = "sha256-s+rz30VWG4RijeJuRYEhCmgFDjaxJ+4twgXrGkNc5c8=";
|
||||
sha256 = "sha256-RbbZHKXRtbs42cCbw+xb8TLul6ebUeCiNclMFF39c3M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
@ -51,16 +51,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rio";
|
||||
version = "0.0.34";
|
||||
version = "0.0.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphamorim";
|
||||
repo = "rio";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UHA2j7NOPBl7qrCu5bWLHjpVgWxlydtj0F7lfAlQZXg=";
|
||||
hash = "sha256-e+GiNwvjwIi5wCyI+IQ0BZ8IR8by5RUq8dk1JO50mjU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xqLticREnGxsuo2d7d3VaFWbGJ5A1L7GvDwV7qQ61xs=";
|
||||
cargoHash = "sha256-voQQjouCOwVLzOKtDUCa1lZLgx0JB7mvCqOY4BhmMr4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
ncurses
|
||||
|
@ -31,7 +31,7 @@ let
|
||||
davinci = (
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
|
||||
version = "18.6.4";
|
||||
version = "18.6.5";
|
||||
|
||||
nativeBuildInputs = [
|
||||
(appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } )
|
||||
@ -52,8 +52,8 @@ let
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash =
|
||||
if studioVariant
|
||||
then "sha256-Us8DsxdGwBxUL+yUHT9DNJFIV7EO+J9CSN2Juyf8VQ4="
|
||||
else "sha256-yPdfmS42ID7MOTB3XlGXfOqp46kRLR8martJ9gWqDjA=";
|
||||
then "sha256-Ua5R0G4okBpz9SyyA2zn6nVflY9AlWch7Kx6PrW/nMg="
|
||||
else "sha256-oCK7w5jB7h4PSKg2IJwriyAVi/kj4TurloBcfDAe6BQ=";
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
|
46
pkgs/by-name/ap/apt-mirror/package.nix
Normal file
46
pkgs/by-name/ap/apt-mirror/package.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, perl
|
||||
, wget
|
||||
, makeWrapper
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apt-mirror";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apt-mirror";
|
||||
repo = "apt-mirror";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-GNsyXP/O56Y+8QhoSfMm+ig5lK/K3Cm085jxRt9ZRmI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
"PREFIX=''"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/apt-mirror \
|
||||
--prefix PATH : ${lib.makeBinPath [wget]}
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool that provides the ability to mirror any parts of apt sources";
|
||||
homepage = "https://github.com/apt-mirror/apt-mirror";
|
||||
changelog = "https://github.com/apt-mirror/apt-mirror/blob/${finalAttrs.src.rev}/CHANGELOG";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ arthsmn ];
|
||||
mainProgram = "apt-mirror";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.19.2";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-u9VoLGf8Qfy6wtU+rWZvIxOj1Q3RUKjE+LKISKtTKfA=";
|
||||
hash = "sha256-nqKDBRH2/YsSmirxJ84BgUTLfgPzZ/EQxqy6Fa7Mfxs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IPZ0R7SMdZi/h51lInXhRZFBAyEu/D8fwnUUkWV9Ivg=";
|
||||
cargoHash = "sha256-48ZVbRJkpMO+kJE5Kz96McjXhMtu4TzzjfyYdggNWkQ=";
|
||||
|
||||
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
|
40
pkgs/by-name/bp/bpftop/package.nix
Normal file
40
pkgs/by-name/bp/bpftop/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, elfutils
|
||||
, zlib
|
||||
, libbpf
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bpftop";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Netflix";
|
||||
repo = "bpftop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HP8ubzCfBNgISrAyLACylH4PHxLhJPzIQFmIWEL5gjo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+zh7GZ/fbhxLNQkkHFZqtJxy2IeS+KX5s2Qi5N21u/0=";
|
||||
|
||||
buildInputs = [
|
||||
elfutils
|
||||
libbpf
|
||||
zlib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A dynamic real-time view of running eBPF programs";
|
||||
homepage = "https://github.com/Netflix/bpftop";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ mfrw ];
|
||||
mainProgram = "bpftop";
|
||||
};
|
||||
}
|
98
pkgs/by-name/by/byobu/package.nix
Normal file
98
pkgs/by-name/by/byobu/package.nix
Normal file
@ -0,0 +1,98 @@
|
||||
{ lib
|
||||
, autoreconfHook
|
||||
, bc
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, makeWrapper
|
||||
, perl
|
||||
, python3
|
||||
, screen
|
||||
, stdenv
|
||||
, vim
|
||||
, tmux
|
||||
}:
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages (ps: with ps; [ snack ]);
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "byobu";
|
||||
version = "6.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dustinkirkland";
|
||||
repo = "byobu";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-NzC9Njsnz14mfKnERGDZw8O3vux0wnfCKwjUeTBQswc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gettext
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
perl # perl is needed for `lib/byobu/include/*` scripts
|
||||
screen
|
||||
tmux
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
strictDeps = true;
|
||||
|
||||
postPatch = ''
|
||||
for file in usr/bin/byobu-export.in usr/lib/byobu/menu; do
|
||||
substituteInPlace $file \
|
||||
--replace "gettext" "${gettext}/bin/gettext"
|
||||
done
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# By some reason the po files are not being compiled
|
||||
for po in po/*.po; do
|
||||
lang=''${po#po/}
|
||||
lang=''${lang%.po}
|
||||
# Path where byobu looks for translations, as observed in the source code
|
||||
# and strace
|
||||
mkdir -p $out/share/byobu/po/$lang/LC_MESSAGES/
|
||||
msgfmt --verbose $po -o $out/share/byobu/po/$lang/LC_MESSAGES/byobu.mo
|
||||
done
|
||||
|
||||
# Override the symlinks, otherwise they mess with the wrapping
|
||||
cp --remove-destination $out/bin/byobu $out/bin/byobu-screen
|
||||
cp --remove-destination $out/bin/byobu $out/bin/byobu-tmux
|
||||
|
||||
for file in $out/bin/byobu*; do
|
||||
# We don't use the usual "-wrapped" suffix because arg0 within the shebang
|
||||
# scripts points to the filename and byobu matches against this to know
|
||||
# which backend to start with
|
||||
bname="$(basename $file)"
|
||||
mv "$file" "$out/bin/.$bname"
|
||||
makeWrapper "$out/bin/.$bname" "$out/bin/$bname" \
|
||||
--argv0 $bname \
|
||||
--prefix PATH ":" "$out/bin" \
|
||||
--set BYOBU_PATH ${lib.makeBinPath [ vim bc ]} \
|
||||
--set BYOBU_PYTHON "${pythonEnv}/bin/python"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.byobu.org/";
|
||||
description = "Text-based window manager and terminal multiplexer";
|
||||
longDescription = ''
|
||||
Byobu is a text-based window manager and terminal multiplexer. It was
|
||||
originally designed to provide elegant enhancements to the otherwise
|
||||
functional, plain, practical GNU Screen, for the Ubuntu server
|
||||
distribution. Byobu now includes an enhanced profiles, convenient
|
||||
keybindings, configuration utilities, and toggle-able system status
|
||||
notifications for both the GNU Screen window manager and the more modern
|
||||
Tmux terminal multiplexer, and works on most Linux, BSD, and Mac
|
||||
distributions.
|
||||
'';
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
mainProgram = "byobu";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
29
pkgs/by-name/el/elf-info/package.nix
Normal file
29
pkgs/by-name/el/elf-info/package.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elf-info";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevin-lesenechal";
|
||||
repo = "elf-info";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wbFVuoarOoxV9FqmuHJ9eZlG4rRqy1rsnuqbGorC2Rk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-r4GcJhQn9x5c2hbL+813mS3HbIg8OwNDsMg/fHQoL9Y=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Inspect and dissect an ELF file with pretty formatting";
|
||||
homepage = "https://github.com/kevin-lesenechal/elf-info";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ viperML ];
|
||||
mainProgram = "elf";
|
||||
};
|
||||
}
|
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-releaser";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-releaser";
|
||||
repo = "git-releaser";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rgnOXon68QMfVbyYhERy5z2pUlLCBwum7a/U9kdp5M0=";
|
||||
hash = "sha256-27xUsqFuAu02jYLi3LiTnVjifqZIr39lPwMfJea7a4A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-O6Rqdf6yZvW8aix51oIziip+WcVIiyDZZ2VOQfwP8Fs=";
|
||||
vendorHash = "sha256-uKS7MwCak/CjnMjzFKqYypBVZFl+3hD1xVaOPvQV9E0=";
|
||||
|
||||
ldflags = [ "-X main.version=${version}" ];
|
||||
|
||||
|
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.123.3";
|
||||
version = "0.123.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-agFXyxjqtnL2JsOfIhp+o46kzw/F/Ggq1ALPPgZy+Gg=";
|
||||
hash = "sha256-AJ/uK2eunQgsCcXR8FcQ9TVvMXs56J0gpfXRQCX78qY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1cd0w9eIPSlhznOQaIiaPoIBnQ4DycVUbZwLOlJ+t8o=";
|
||||
vendorHash = "sha256-6qNICaj+P0VRl/crbiucZ7CpBG1vwFURkvOdaH6WidU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
80
pkgs/by-name/hy/hyprlock/package.nix
Normal file
80
pkgs/by-name/hy/hyprlock/package.nix
Normal file
@ -0,0 +1,80 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, libGL
|
||||
, libxkbcommon
|
||||
, hyprlang
|
||||
, pam
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, cairo
|
||||
, pango
|
||||
, libdrm
|
||||
, mesa
|
||||
, nix-update-script
|
||||
, expat
|
||||
, libXdmcp
|
||||
, pcre2
|
||||
, util-linux
|
||||
, libselinux
|
||||
, libsepol
|
||||
, pcre
|
||||
, fribidi
|
||||
, libthai
|
||||
, libdatrie
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprlock";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprlock";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-SX3VRcewkqeAIY6ptgfk9+C6KB9aCEUOacb2pKl3kO0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
expat
|
||||
fribidi
|
||||
hyprlang
|
||||
libdatrie
|
||||
libdrm
|
||||
libGL
|
||||
libselinux
|
||||
libsepol
|
||||
libthai
|
||||
libXdmcp
|
||||
libxkbcommon
|
||||
mesa
|
||||
pam
|
||||
pango
|
||||
pcre
|
||||
pcre2
|
||||
util-linux
|
||||
wayland
|
||||
wayland-protocols
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Hyprland's GPU-accelerated screen locking utility";
|
||||
homepage = "https://github.com/hyprwm/hyprlock";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ eclairevoyant ];
|
||||
mainProgram = "hyprlock";
|
||||
platforms = [ "aarch64-linux" "x86_64-linux" ];
|
||||
};
|
||||
})
|
@ -3,6 +3,7 @@
|
||||
, cmake
|
||||
, llvm
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, mbedtls
|
||||
, gtk3
|
||||
, pkg-config
|
||||
@ -22,16 +23,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
# FIXME: unstable, stable needs #252945 (details in #258964)
|
||||
# Next version bump should be stabilized
|
||||
version = "unstable-2023-10-01";
|
||||
patterns_version = "1.31.0";
|
||||
version = "1.32.2";
|
||||
patterns_version = "1.32.2";
|
||||
|
||||
patterns_src = fetchFromGitHub {
|
||||
owner = "WerWolv";
|
||||
repo = "ImHex-Patterns";
|
||||
rev = "ImHex-v${patterns_version}";
|
||||
hash = "sha256-lTTXu9RxoD582lXWI789gNcWvJmxmBIlBRIiyY3DseM=";
|
||||
hash = "sha256-K+LiQvykCrOwhEVy37lh7VSf5YJyBQtLz8AGFsuRznQ=";
|
||||
};
|
||||
|
||||
in
|
||||
@ -43,10 +42,20 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
owner = "WerWolv";
|
||||
repo = pname;
|
||||
rev = "a62ede784018f9d5aaf40587f71a1271429ab50b";
|
||||
hash = "sha256-L3ncmM7Ro60DvOF/Y0fjo2Smlw2LL8cPa8H6yVGdGAk=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MYOZHQMYbbP01z0FyoCgTzwY1/71eUCmJYYfYvN9+so=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backport fixes (and fix to fix) for default plugin not being loaded.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WerWolv/PatternLanguage/compare/ImHex-v1.32.2..1adcdd358d3772681242267ddd3459c9d0913796.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "lib/external/pattern_language/";
|
||||
hash = "sha256-aGvt7vQ6PtFE3sw4rAXUP7Pq8cL29LEKyC0rJKkxOZI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake llvm python3 perl pkg-config rsync ];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "livekit";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "livekit";
|
||||
repo = "livekit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Z1N6iYXd3HswRJql3YZMot5fdkdFFbJuxyGDgLsbtQI=";
|
||||
hash = "sha256-2MooX+wy7KetxEBgQoVoL4GuVkm+SbTzYgfWyLL7KU8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-O0rlezMdhoRHdK37BGKW3CHLpYfkFC1d83o5u54LQ8k=";
|
||||
vendorHash = "sha256-8YR0Bl+sQsqpFtD+1GeYaydBdHeM0rRL2NbgAh9kCj0=";
|
||||
|
||||
subPackages = [ "cmd/server" ];
|
||||
|
||||
|
35
pkgs/by-name/rq/rqbit/Cargo.lock
generated
35
pkgs/by-name/rq/rqbit/Cargo.lock
generated
@ -175,18 +175,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "axum"
|
||||
version = "0.7.3"
|
||||
version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d09dbe0e490df5da9d69b36dca48a76635288a82f92eca90024883a56202026d"
|
||||
checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"axum-core 0.4.2",
|
||||
"axum-core 0.4.3",
|
||||
"bytes",
|
||||
"futures-util",
|
||||
"http 1.0.0",
|
||||
"http-body 1.0.0",
|
||||
"http-body-util",
|
||||
"hyper 1.1.0",
|
||||
"hyper 1.2.0",
|
||||
"hyper-util",
|
||||
"itoa",
|
||||
"matchit",
|
||||
@ -226,9 +226,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "axum-core"
|
||||
version = "0.4.2"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e87c8503f93e6d144ee5690907ba22db7ba79ab001a932ab99034f0fe836b3df"
|
||||
checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bytes",
|
||||
@ -868,9 +868,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "h2"
|
||||
version = "0.4.0"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a"
|
||||
checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"fnv",
|
||||
@ -1034,20 +1034,21 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "1.1.0"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
|
||||
checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"futures-channel",
|
||||
"futures-util",
|
||||
"h2 0.4.0",
|
||||
"h2 0.4.2",
|
||||
"http 1.0.0",
|
||||
"http-body 1.0.0",
|
||||
"httparse",
|
||||
"httpdate",
|
||||
"itoa",
|
||||
"pin-project-lite",
|
||||
"smallvec",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
@ -1101,7 +1102,7 @@ dependencies = [
|
||||
"futures-util",
|
||||
"http 1.0.0",
|
||||
"http-body 1.0.0",
|
||||
"hyper 1.1.0",
|
||||
"hyper 1.2.0",
|
||||
"pin-project-lite",
|
||||
"socket2",
|
||||
"tokio",
|
||||
@ -1253,10 +1254,10 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "librqbit"
|
||||
version = "5.4.2"
|
||||
version = "5.5.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"axum 0.7.3",
|
||||
"axum 0.7.4",
|
||||
"backoff",
|
||||
"base64",
|
||||
"bincode",
|
||||
@ -2025,7 +2026,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rqbit"
|
||||
version = "5.4.2"
|
||||
version = "5.5.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bytes",
|
||||
@ -2291,9 +2292,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.11.2"
|
||||
version = "1.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
|
||||
checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rqbit";
|
||||
version = "5.4.2";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikatson";
|
||||
repo = "rqbit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZC68RQi0UcdALKVgwRUyO0+ZmKtGMjudYQabsAnghzg=";
|
||||
hash = "sha256-3Wqej2Zb/RxxOOhWscZiyafGftl3ShozqVkUF7V0fP4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
4060
pkgs/by-name/sq/squirreldisk/Cargo.lock
generated
Normal file
4060
pkgs/by-name/sq/squirreldisk/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
40
pkgs/by-name/sq/squirreldisk/package.json
Normal file
40
pkgs/by-name/sq/squirreldisk/package.json
Normal file
@ -0,0 +1,40 @@
|
||||
{
|
||||
"name": "squirreldisk-tauri",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc && vite build",
|
||||
"preview": "vite preview",
|
||||
"tauri": "tauri"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tauri-apps/api": "^1.2.0",
|
||||
"d3": "^7.8.2",
|
||||
"mongoid-js": "^1.3.0",
|
||||
"pretty-bytes": "^6.0.0",
|
||||
"react": "^18.2.0",
|
||||
"react-beautiful-dnd": "^13.1.1",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-router-dom": "^6.8.0",
|
||||
"shade-blend-color": "^1.0.0",
|
||||
"uuid": "^9.0.0",
|
||||
"vscode-icons-js": "^11.6.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tauri-apps/cli": "^1.2.2",
|
||||
"@types/d3": "^7.4.0",
|
||||
"@types/node": "^18.7.10",
|
||||
"@types/react": "^18.0.15",
|
||||
"@types/react-beautiful-dnd": "^13.1.3",
|
||||
"@types/react-dom": "^18.0.6",
|
||||
"@types/uuid": "^9.0.0",
|
||||
"@vitejs/plugin-react": "^3.0.0",
|
||||
"autoprefixer": "^10.4.13",
|
||||
"postcss": "^8.4.21",
|
||||
"tailwindcss": "^3.2.4",
|
||||
"typescript": "^4.6.4",
|
||||
"vite": "^4.0.0"
|
||||
}
|
||||
}
|
89
pkgs/by-name/sq/squirreldisk/package.nix
Normal file
89
pkgs/by-name/sq/squirreldisk/package.nix
Normal file
@ -0,0 +1,89 @@
|
||||
{
|
||||
dbus,
|
||||
openssl,
|
||||
freetype,
|
||||
libsoup,
|
||||
gtk3,
|
||||
webkitgtk,
|
||||
pkg-config,
|
||||
wrapGAppsHook,
|
||||
parallel-disk-usage,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
rustPlatform,
|
||||
lib,
|
||||
stdenv,
|
||||
}: let
|
||||
pname = "squirreldisk";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adileo";
|
||||
repo = "squirreldisk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-As2nvc68knjeLPuX0QLBoybj8vuvkpS5Vr+7U7E5CjA=";
|
||||
};
|
||||
frontend-build = buildNpmPackage {
|
||||
inherit version src;
|
||||
pname = "squirreldisk-ui";
|
||||
|
||||
npmDepsHash = "sha256-Japcn0KYP7aYIDK8+Ns+mrnbbAb0fLWXHIV2+yltI6I=";
|
||||
|
||||
packageJSON = ./package.json;
|
||||
postBuild = ''
|
||||
cp -r dist/ $out
|
||||
'';
|
||||
distPhase = "true";
|
||||
dontInstall = true;
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version src pname;
|
||||
|
||||
sourceRoot = "${src.name}/src-tauri";
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"window-shadows-0.2.1" = "sha256-3meM04TG63PvB0M5wUH1cDMBo7ObcB0zdgwGt2aKHMs=";
|
||||
};
|
||||
};
|
||||
|
||||
# copy the frontend static resources to final build directory
|
||||
# Also modify tauri.conf.json so that it expects the resources at the new location
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
|
||||
mkdir -p frontend-build
|
||||
cp -r ${frontend-build}/* frontend-build
|
||||
|
||||
substituteInPlace tauri.conf.json --replace-fail '"distDir": "../dist"' '"distDir": "./frontend-build"'
|
||||
|
||||
# Copy pdu binary from nixpkgs, since the default packaged binary has issues.
|
||||
cp ${parallel-disk-usage}/bin/pdu bin/pdu-${stdenv.hostPlatform.config}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [pkg-config wrapGAppsHook];
|
||||
buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk];
|
||||
|
||||
# Disable checkPhase, since the project doesn't contain tests
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/squirreldisk-tauri $out/bin/squirreldisk
|
||||
'';
|
||||
|
||||
# WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/squirreldisk" \
|
||||
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform disk usage analysis tool";
|
||||
homepage = "https://www.squirreldisk.com/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [peret];
|
||||
mainProgram = "squirreldisk";
|
||||
};
|
||||
}
|
@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, cli11
|
||||
, openssl
|
||||
, zeromq
|
||||
, cppzmq
|
||||
@ -16,6 +15,9 @@
|
||||
, libsixel
|
||||
, microsoft-gsl
|
||||
, chafa
|
||||
, cli11
|
||||
, libexif
|
||||
, range-v3
|
||||
, enableOpencv ? stdenv.isLinux
|
||||
, opencv
|
||||
, enableWayland ? stdenv.isLinux
|
||||
@ -28,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ueberzugpp";
|
||||
version = "2.9.2";
|
||||
version = "2.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jstkdng";
|
||||
repo = "ueberzugpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yIohpJRytmwt+6DLCWpmBiuCm9GcCHsGmpTI64/3d8U=";
|
||||
hash = "sha256-D+7a+3Vxrt+XUq7c2F2eqi8ZGQ2eZd37aTqighWEKPs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -58,6 +60,8 @@ stdenv.mkDerivation rec {
|
||||
microsoft-gsl
|
||||
chafa
|
||||
cli11
|
||||
libexif
|
||||
range-v3
|
||||
] ++ lib.optionals enableOpencv [
|
||||
opencv
|
||||
] ++ lib.optionals enableWayland [
|
@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "g
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2023-06-07";
|
||||
version = "2024-02-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-drEAjIY/lacqncSeVeNmeRX6v4PnLvGo66Na1fuFXRg=";
|
||||
hash = "sha256-Cadp2+4kBZ74kdD5x0O85FszxvN6/sg6yccxughyX1Q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 jdupes ];
|
||||
|
@ -40,13 +40,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whitesur-gtk-theme";
|
||||
version = "2023-10-13";
|
||||
version = "2024-02-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-H8QdKCX6C36J7AfFd0VV9Rnm8LGXSfkxj5Yp2p+PduE=";
|
||||
sha256 = "sha256-9HYsORTd5n0jUYmwiObPZ90mOGhR2j+tzs6Y1NNnrn4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -393,22 +393,22 @@ self: super: {
|
||||
|
||||
# Manually maintained
|
||||
cachix-api = overrideCabal (drv: {
|
||||
version = "1.7.1";
|
||||
version = "1.7";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "cachix";
|
||||
rev = "v1.7.1";
|
||||
sha256 = "sha256-neN8zGZuGXnLVdQw468z67o96mn8o1p4WGqPINl+NjU=";
|
||||
rev = "v1.7";
|
||||
sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s=";
|
||||
};
|
||||
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
|
||||
}) super.cachix-api;
|
||||
cachix = (overrideCabal (drv: {
|
||||
version = "1.7.1";
|
||||
version = "1.7";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "cachix";
|
||||
rev = "v1.7.1";
|
||||
sha256 = "sha256-neN8zGZuGXnLVdQw468z67o96mn8o1p4WGqPINl+NjU=";
|
||||
rev = "v1.7";
|
||||
sha256 = "sha256-d9BohugsKajvjNgt+VyXHuDdLOFKr9mhwpdUNkpIP3s=";
|
||||
};
|
||||
postUnpack = "sourceRoot=$sourceRoot/cachix";
|
||||
}) (lib.pipe
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudpathlib";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "drivendataorg";
|
||||
repo = "cloudpathlib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rj8v4EUMPdB5zmbP4VQli2H6GjDor3BHaA95GwoKS5E=";
|
||||
hash = "sha256-4CwwCdGUKUmie9PmAmrVxpAhk3b2WG+Cmx3QAADkyYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deebot-client";
|
||||
version = "5.2.2";
|
||||
version = "6.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "DeebotUniverse";
|
||||
repo = "client.py";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ybZ8f3tqhj0SPbwjtgTB45y4Tx/lIyNZ5vShYsbIrfU=";
|
||||
hash = "sha256-PjM2bh79o4bBv3zQyFYehhdlvXKFW8Hk0ZKfZDAuiQU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ buildPythonPackage
|
||||
{ autoPatchelfHook
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, coverage
|
||||
, distro
|
||||
@ -6,12 +7,14 @@
|
||||
, httpretty
|
||||
, lib
|
||||
, mock
|
||||
, packaging
|
||||
, psutil
|
||||
, pytest
|
||||
, pytest-socket
|
||||
, python-dateutil
|
||||
, pyyaml
|
||||
, requests
|
||||
, requests-cache
|
||||
, requests-toolbelt
|
||||
, stdenv
|
||||
, setuptools
|
||||
@ -24,26 +27,40 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "e3-core";
|
||||
version = "22.3.1";
|
||||
version = "22.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdaCore";
|
||||
repo = "e3-core";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4StHOJldfeqApdF6D14Euzg9HvZ2e7G4/OQ0UrEbEIw=";
|
||||
hash = "sha256-dgEk2/qRfAYwUz+e5TWKUy/aPLpmyWZ32OV1i7QM9Fs=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-use-distro-over-ld.patch ];
|
||||
patches = [
|
||||
./0001-use-distro-over-ld.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorama pyyaml python-dateutil requests requests-toolbelt tqdm stevedore
|
||||
colorama
|
||||
packaging
|
||||
pyyaml
|
||||
python-dateutil
|
||||
requests
|
||||
requests-cache
|
||||
requests-toolbelt
|
||||
tqdm
|
||||
stevedore
|
||||
] ++ lib.optional stdenv.isLinux [
|
||||
# See setup.py:24. These are required only on Linux. Darwin has its own set
|
||||
# of requirements.
|
||||
psutil distro
|
||||
psutil
|
||||
distro
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "e3" ];
|
||||
|
39
pkgs/development/python-modules/e3-testsuite/default.nix
Normal file
39
pkgs/development/python-modules/e3-testsuite/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ buildPythonPackage
|
||||
, e3-core
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, setuptools
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "e3-testsuite";
|
||||
version = "26.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdaCore";
|
||||
repo = "e3-testsuite";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V20tX0zi2DRHO42udUcW/CDMyBxh1uSTgac0zZGubsI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
e3-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "e3" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${src.rev}";
|
||||
homepage = "https://github.com/AdaCore/e3-testsuite/";
|
||||
description = "Generic testsuite framework in Python";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ heijligen ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -2,27 +2,36 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, doxygen
|
||||
, boost
|
||||
, eigen
|
||||
, numpy
|
||||
, scipy
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eigenpy";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stack-of-tasks";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-INOg1oL5APMI2YZDe4yOJadhMsG7b+NfEcSr9FsdqeU=";
|
||||
hash = "sha256-/k5eltoeUW05FTjvStAOw+tguWLUaUced8TArrk4UDI=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DINSTALL_DOCUMENTATION=ON"
|
||||
"-DBUILD_TESTING_SCIPY=ON"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
scipy
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -1,24 +1,26 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cloudpickle
|
||||
, einops
|
||||
, fetchFromGitHub
|
||||
, jaxlib
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools-scm
|
||||
, jax
|
||||
, jaxlib
|
||||
, keras
|
||||
, matplotlib
|
||||
, msgpack
|
||||
, numpy
|
||||
, optax
|
||||
, pyyaml
|
||||
, rich
|
||||
, tensorstore
|
||||
, typing-extensions
|
||||
, matplotlib
|
||||
, cloudpickle
|
||||
, einops
|
||||
, keras
|
||||
, orbax-checkpoint
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, pyyaml
|
||||
, rich
|
||||
, setuptools-scm
|
||||
, tensorflow
|
||||
, tensorstore
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -26,6 +28,8 @@ buildPythonPackage rec {
|
||||
version = "0.7.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "flax";
|
||||
@ -44,6 +48,7 @@ buildPythonPackage rec {
|
||||
msgpack
|
||||
numpy
|
||||
optax
|
||||
orbax-checkpoint
|
||||
pyyaml
|
||||
rich
|
||||
tensorstore
|
||||
@ -75,7 +80,6 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# Docs test, needs extra deps + we're not interested in it.
|
||||
"docs/_ext/codediff_test.py"
|
||||
|
||||
# The tests in `examples` are not designed to be executed from a single test
|
||||
# session and thus either have the modules that conflict with each other or
|
||||
# wrong import paths, depending on how they're invoked. Many tests also have
|
||||
@ -83,12 +87,15 @@ buildPythonPackage rec {
|
||||
# `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them
|
||||
# would be limited anyway.
|
||||
"examples/*"
|
||||
|
||||
# See https://github.com/google/flax/issues/3232.
|
||||
"tests/jax_utils_test.py"
|
||||
# Requires tree
|
||||
"tests/tensorboard_test.py"
|
||||
];
|
||||
|
||||
# Requires orbax which is not packaged as of 2023-07-27.
|
||||
"tests/checkpoints_test.py"
|
||||
disabledTests = [
|
||||
# ValueError: Checkpoint path should be absolute
|
||||
"test_overwrite_checkpoints0"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
12
pkgs/development/python-modules/floret/cstdint.patch
Normal file
12
pkgs/development/python-modules/floret/cstdint.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/src/args.cc b/src/args.cc
|
||||
index a8975e81624c..99854c919341 100644
|
||||
--- a/src/args.cc
|
||||
+++ b/src/args.cc
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
@ -23,6 +23,8 @@ buildPythonPackage rec {
|
||||
hash = "sha256-7vkw6H0ZQoHEwNusY6QWh/vPbSCdP1ZaaqABHsZH6hQ=";
|
||||
};
|
||||
|
||||
patches = [./cstdint.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pybind11
|
||||
setuptools
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "holidays";
|
||||
version = "0.42";
|
||||
version = "0.43";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "vacanza";
|
||||
repo = "python-holidays";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oVuzX/H5jj/c4dbPGmXUnZeDbgSd9v9qP2dXe6+PaUQ=";
|
||||
hash = "sha256-8Qm8hzGVkaYLwqUcqUxcY4iDR1jrhnSoBS8E2Wewb+U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "indexed_bzip2";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tKf9odadfQZQYJz//vWYpeB99Z8VLg+hEPvfEHXgdnM=";
|
||||
hash = "sha256-3HUiigZR91/nbOAMOuSHGcPtqkkEaj3VepyMhmKOHpI=";
|
||||
};
|
||||
|
||||
# has no tests
|
||||
|
@ -1,36 +1,38 @@
|
||||
{ lib
|
||||
, azure-storage-blob
|
||||
, boto3
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, python-dotenv
|
||||
, pythonOlder
|
||||
|
||||
# build
|
||||
, requests
|
||||
, responses
|
||||
, setuptools
|
||||
, setuptools-git-versioning
|
||||
, setuptools-scm
|
||||
|
||||
# propagates
|
||||
, azure-storage-blob
|
||||
, boto3
|
||||
, requests
|
||||
|
||||
# tests
|
||||
, responses
|
||||
, unittestCheckHook
|
||||
, urllib3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sapi-python-client";
|
||||
version = "0.7.1";
|
||||
format = "pyproject";
|
||||
version = "0.7.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keboola";
|
||||
repo = pname;
|
||||
repo = "sapi-python-client";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-74sChw6eMkBtfHV6hiaaLNOr/J0Sa73LB93Z8muLaiI=";
|
||||
hash = "sha256-uZo2kEq7zIMGRlhX36kZyihQPZegw5XgVzgVQQOmpc4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "urllib3<2.0.0" "urllib3"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-git-versioning
|
||||
@ -40,18 +42,16 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
azure-storage-blob
|
||||
boto3
|
||||
python-dotenv
|
||||
requests
|
||||
responses
|
||||
urllib3
|
||||
];
|
||||
|
||||
# Requires API token and an active Keboola bucket
|
||||
# ValueError: Root URL is required.
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
responses
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kbcstorage"
|
||||
"kbcstorage.buckets"
|
||||
|
@ -16,13 +16,13 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "pinecone-client";
|
||||
version = "3.0.3";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pinecone_client";
|
||||
inherit version;
|
||||
hash = "sha256-KtPvdiftxNnuJI2XgYYcQ0HW0noVvAX2vvU9lYg303Q=";
|
||||
hash = "sha256-RbggYBP5GpgrmU8fuqOefoyZ0w7zd4qfMZxDuMmS/EI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ratarmount";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-P+p0h+KuOsunPsXbRwxzAhr1XcEqMjQxHeHmA29+pDQ=";
|
||||
hash = "sha256-TrOYf9kbcRM8E9vq6sjswK2BQ0eA5zSGAIiNAfIZtnk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ratarmountcore fusepy ];
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "4.1.5";
|
||||
version = "4.1.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-m7Qhx8vdQAtvBtJS+4nQQSh0qnp/TRXoch/WJgk/7EI=";
|
||||
hash = "sha256-ps99+3JDyKuB25G1hho6MClDFp48N/dBarHZUpcZK30=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xknx";
|
||||
version = "2.12.0";
|
||||
version = "2.12.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "XKNX";
|
||||
repo = "xknx";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Fwo76tvkLLx8QJeokuGohhnt83eGBMyWIUSHJGuQWJ4=";
|
||||
hash = "sha256-O8xhih/EVULTq4jdmxInzXRO4m6PJA9pyzsHjR+58dQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -53,6 +53,15 @@ buildPythonPackage rec {
|
||||
"test_scan_timeout"
|
||||
"test_start_secure_routing_knx_keys"
|
||||
"test_start_secure_routing_manual"
|
||||
# RuntimeError: Event loop is closed
|
||||
"test_has_group_address_localtime"
|
||||
"test_invalid_authentication"
|
||||
"test_invalid_frames"
|
||||
"test_no_authentication"
|
||||
"test_process_read_localtime"
|
||||
"test_sync_date"
|
||||
"test_sync_datetime"
|
||||
"test_sync_time_local"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xknxproject";
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "XKNX";
|
||||
repo = "xknxproject";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7WK4TgrTuUwR33d1N8+VmgZ6iylyfIJbFCyxh49luL0=";
|
||||
hash = "sha256-tw/hHiiW4ZGlrbQmuIihJmhyIL++Rjpg6q8AdKNsn14=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -23,13 +23,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "github-runner";
|
||||
version = "2.313.0";
|
||||
version = "2.314.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0CclkbJ8AfffdfVNXacnpgFOS+ONk6eP1LTyFa12xU4=";
|
||||
hash = "sha256-qwFNEH29lu+RFqZBRD2Bo6E8gI07nnhFooWQNrgOQx0=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git-revision
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle_7, openjdk17, git, perl, cmake }:
|
||||
let
|
||||
pname = "fastddsgen";
|
||||
version = "3.2.1";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eProsima";
|
||||
repo = "Fast-DDS-Gen";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-3REInKZ787RSXED8iAMlt2mJodJTp5+/ldQsbUGpn0g=";
|
||||
hash = "sha256-oqbSIzsYUwD8bTqGKZ9he9d18EDq9mHZFoNUp0RK0qU=";
|
||||
};
|
||||
|
||||
gradle = gradle_7;
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "reviewdog";
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zr98hzWU27d+HCKvzTch7FkpUOWkHvpuMIq2cfWNRHQ=";
|
||||
hash = "sha256-l7jQaOFNhhWqkYaTd8BdH9au/wjlnWZnV5DAco93qlQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-S5SEM6EFXI2Vig8ze5kGOCIL5bLF6CMy/TKV+/3zAjI=";
|
||||
vendorHash = "sha256-p/WvGGadf/O2DFIUWjw7mpg8DhcaIYlgp1xgKV89+GM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
pname = "cargo-mobile2";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@ -20,14 +20,14 @@ rustPlatform.buildRustPackage {
|
||||
owner = "tauri-apps";
|
||||
repo = pname;
|
||||
rev = "cargo-mobile2-v${version}";
|
||||
hash = "sha256-LRQfntEbY8K1kepgn2Gww1ixWmvKHuw6DPT9j9MG118=";
|
||||
hash = "sha256-awf4BvDUeRfg66mv7unN0uKviLI6f1m7s1sQKEeBm2E=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
# sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-yWkyIwZ3KPMhlVajCIAYonFveGFqzB5qBGO5WdzjxNs=";
|
||||
cargoHash = "sha256-rqNhkuQVQ6MHUX1hcwqPS46LpsDZwJ6COvJztap7X4w=";
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p $out/share/
|
||||
|
@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wails";
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wailsapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KC5BkIaDLWT1soHr1FpfZWnEzyZTMUPaGMTap7P1W98=";
|
||||
hash = "sha256-MHwIRanmgpjTKM+ILSQheCd9+XUwVTCVrREqntxpv7Q=";
|
||||
} + "/v2";
|
||||
|
||||
vendorHash = "sha256-EoWsDo39tS4KbcOVgrd1esSzEseC2+ZfMj4+KvymwF8=";
|
||||
vendorHash = "sha256-0cGmJEi7OfMZS7ObPBLHOVqKfvnlpHBiGRjSdV6wxE4=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wxformbuilder";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wxFormBuilder";
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace "\$Format:%(describe)\$" "$(git -C $out rev-parse --short HEAD)"
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
hash = "sha256-Lqta+u9WVwUREsR7aH+2DJn0oM5QwlwRSBImuwNkmS4=";
|
||||
hash = "sha256-Ob+6MAf2iQGd3lgeN+dLfscpmYYrzD3dsN+2ZmvJog0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipset";
|
||||
version = "7.19";
|
||||
version = "7.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-m8H7pI1leG4+C2Pca2aahmgj13hAxpkMDGsjB47CxNY=";
|
||||
sha256 = "sha256-4sbOT886yziTyl01yGk1+ArXb8XMrmARhYQt92DgvGk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"testing": {
|
||||
"version": "6.8-rc5",
|
||||
"hash": "sha256:0cfv90lf0vccpasqxilr62p23qy5in5b9pz2916iifqs9sngj469"
|
||||
"version": "6.8-rc6",
|
||||
"hash": "sha256:03ci53snbv917ccyjdm3xzl2fwijq5da7nkg05dpwb99wrzp8fkd"
|
||||
},
|
||||
"6.5": {
|
||||
"version": "6.5.13",
|
||||
|
@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "19489";
|
||||
sha256 = "1adnk4710iyq87bj48bfxzmzhv5hk0x3fmyz6ydk5af364fl87mk";
|
||||
rev = "19491";
|
||||
sha256 = "047gvbg8dlmnwqll17hkla2rqf97g8p90z4jncqdk5hf2v5wqgi7";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests, k3s }:
|
||||
|
||||
let
|
||||
version = "3.5.12";
|
||||
@ -67,7 +67,10 @@ symlinkJoin {
|
||||
|
||||
passthru = {
|
||||
inherit etcdserver etcdutl etcdctl;
|
||||
tests = { inherit (nixosTests) etcd etcd-cluster; };
|
||||
tests = {
|
||||
inherit (nixosTests) etcd etcd-cluster;
|
||||
k3s = k3s.passthru.tests.etcd;
|
||||
};
|
||||
};
|
||||
|
||||
paths = [
|
||||
|
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2024.2.3";
|
||||
version = "2024.2.4";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
@ -453,7 +453,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2024.2.3";
|
||||
hassVersion = "2024.2.4";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -471,13 +471,13 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-di9KdglYg+bzGvjGKgNbGRfH1tu96o82WzRUIaAejik=";
|
||||
hash = "sha256-k1Rfx8TsMBbLFfaY6FAn5ebyZlHbxg0k/HYXVRIkNMU=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iCcDuQb+l6+SV+E9dPtKlU3v94Q9On75csT5STMdqVo=";
|
||||
hash = "sha256-rkD1rZz4sYV1L78c2gc4g/cGoxJRYqK41SUOskeoqYg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2024.2.3";
|
||||
version = "2024.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kBr9NaP1FBTMBloAXEpx4s4iMe1T45i7Gui1aULQPXg=";
|
||||
hash = "sha256-cKVVP69IIY/KPnEsM3ann0oZ2GUNN+2Ee8EnqjcFTDk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
maven.buildMavenPackage {
|
||||
pname = "scim-keycloak-user-storage-spi";
|
||||
version = "unstable-2023-07-10";
|
||||
version = "unstable-2024-02-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "justin-stephenson";
|
||||
repo = "scim-keycloak-user-storage-spi";
|
||||
rev = "54a3fd77b05079c9ebd931e8b6a3725310a1f7b7";
|
||||
hash = "sha256-rQR8+LevFHTFLoyCPSu50jdSXu4YgBibjVB804rEsFs=";
|
||||
rev = "6c59915836d9a559983326bbb87f895324bb75e4";
|
||||
hash = "sha256-BSso9lU542Aroxu0RIX6NARc10lGZ04A/WIWOVtdxHw=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-vNPSNoOmtD1UMfWvLm8CH7RRatyeu3fnX9zteZpkay0=";
|
||||
mvnHash = "sha256-xbGlVZl3YtbF372kCDh+UdK5pLe6C6WnGgbEXahlyLw=";
|
||||
|
||||
installPhase = ''
|
||||
install -D "target/scim-user-spi-0.0.1-SNAPSHOT.jar" "$out/scim-user-spi-0.0.1-SNAPSHOT.jar"
|
||||
|
@ -1,76 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper
|
||||
, python3, perl, textual-window-manager
|
||||
, gettext, vim, bc, screen }:
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages (ps: with ps; [ snack ]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.133";
|
||||
pname = "byobu";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz";
|
||||
sha256 = "0qvmmdnvwqbgbhn5c8asmrmjhclcl029py2d2zvmd7h5ij7s93jd";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
strictdeps = true;
|
||||
nativeBuildInputs = [ makeWrapper gettext ];
|
||||
buildInputs = [ perl ]; # perl is needed for `lib/byobu/include/*` scripts
|
||||
propagatedBuildInputs = [ textual-window-manager screen ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace usr/bin/byobu-export.in \
|
||||
--replace "gettext" "${gettext}/bin/gettext"
|
||||
substituteInPlace usr/lib/byobu/menu \
|
||||
--replace "gettext" "${gettext}/bin/gettext"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Byobu does not compile its po files for some reason
|
||||
for po in po/*.po; do
|
||||
lang=''${po#po/}
|
||||
lang=''${lang%.po}
|
||||
# Path where byobu looks for translations as observed in the source code and strace
|
||||
mkdir -p $out/share/byobu/po/$lang/LC_MESSAGES/
|
||||
msgfmt $po -o $out/share/byobu/po/$lang/LC_MESSAGES/byobu.mo
|
||||
done
|
||||
|
||||
# Override the symlinks otherwise they mess with the wrapping
|
||||
cp --remove-destination $out/bin/byobu $out/bin/byobu-screen
|
||||
cp --remove-destination $out/bin/byobu $out/bin/byobu-tmux
|
||||
|
||||
for i in $out/bin/byobu*; do
|
||||
# We don't use the usual ".$package-wrapped" because arg0 within the shebang scripts
|
||||
# points to the filename and byobu matches against this to know which backend
|
||||
# to start with
|
||||
file=".$(basename $i)"
|
||||
mv $i $out/bin/$file
|
||||
makeWrapper "$out/bin/$file" "$out/bin/$(basename $i)" --argv0 $(basename $i) \
|
||||
--set BYOBU_PATH ${lib.escapeShellArg (lib.makeBinPath [ vim bc ])} \
|
||||
--set BYOBU_PYTHON "${pythonEnv}/bin/python"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://launchpad.net/byobu/";
|
||||
description = "Text-based window manager and terminal multiplexer";
|
||||
|
||||
longDescription =
|
||||
''Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
|
||||
It was originally designed to provide elegant enhancements to the otherwise functional,
|
||||
plain, practical GNU Screen, for the Ubuntu server distribution.
|
||||
Byobu now includes an enhanced profiles, convenient keybindings,
|
||||
configuration utilities, and toggle-able system status notifications for both
|
||||
the GNU Screen window manager and the more modern Tmux terminal multiplexer,
|
||||
and works on most Linux, BSD, and Mac distributions.
|
||||
'';
|
||||
|
||||
license = licenses.gpl3;
|
||||
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ qknight berbiche ];
|
||||
};
|
||||
}
|
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "faraday-cli";
|
||||
version = "2.1.10";
|
||||
version = "2.1.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infobyte";
|
||||
repo = pname;
|
||||
repo = "faraday-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7Yg2m0xHpBPZ58gJodSYO8vXaxSlr4GK1Lin63WozOE=";
|
||||
hash = "sha256-bCiiX5dYodnWkKeNo2j3PGMz17F5y2X4ECZiStDdK5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
@ -4506,11 +4506,6 @@ with pkgs;
|
||||
|
||||
bws = callPackage ../tools/security/bws { };
|
||||
|
||||
byobu = callPackage ../tools/misc/byobu {
|
||||
# Choices: [ tmux screen ];
|
||||
textual-window-manager = tmux;
|
||||
};
|
||||
|
||||
bsh = fetchurl {
|
||||
url = "http://www.beanshell.org/bsh-2.0b5.jar";
|
||||
hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw=";
|
||||
@ -32592,6 +32587,10 @@ with pkgs;
|
||||
|
||||
imgp = python3Packages.callPackage ../applications/graphics/imgp { };
|
||||
|
||||
imhex = callPackage ../by-name/im/imhex/package.nix {
|
||||
llvm = llvm_17;
|
||||
};
|
||||
|
||||
inframap = callPackage ../applications/networking/cluster/inframap { };
|
||||
|
||||
inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
|
||||
@ -35746,7 +35745,9 @@ with pkgs;
|
||||
|
||||
ueberzug = with python3Packages; toPythonApplication ueberzug;
|
||||
|
||||
ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { };
|
||||
ueberzugpp = callPackage ../by-name/ue/ueberzugpp/package.nix {
|
||||
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
|
||||
};
|
||||
|
||||
uefi-run = callPackage ../tools/virtualization/uefi-run { };
|
||||
|
||||
|
@ -669,7 +669,7 @@ in {
|
||||
});
|
||||
|
||||
packageAliases = {
|
||||
linux_default = packages.linux_6_1;
|
||||
linux_default = packages.linux_6_6;
|
||||
# Update this when adding the newest kernel major version!
|
||||
linux_latest = packages.linux_6_7;
|
||||
linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
|
||||
|
@ -3554,6 +3554,8 @@ self: super: with self; {
|
||||
|
||||
e3-core = callPackage ../development/python-modules/e3-core { };
|
||||
|
||||
e3-testsuite = callPackage ../development/python-modules/e3-testsuite { };
|
||||
|
||||
eagle100 = callPackage ../development/python-modules/eagle100 { };
|
||||
|
||||
easydict = callPackage ../development/python-modules/easydict { };
|
||||
|
Loading…
Reference in New Issue
Block a user