gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-08-02 18:01:06 +00:00
committed by GitHub
parent 10521e96e3 ecf7c683c2
commit 3a3ed4a644
44 changed files with 509 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/CODEOWNERS
+3
View File
@@ -267,6 +267,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/applications/editors/emacs @adisbladis
/pkgs/top-level/emacs-packages.nix @adisbladis
# Kakoune
/pkgs/applications/editors/kakoune @philiptaron
# Neovim
/pkgs/applications/editors/neovim @figsoda @teto
nixos/modules/services/backup/restic.nix
+1 -1
View File
@@ -374,7 +374,7 @@ in
${resticCmd} cat config > /dev/null || ${resticCmd} init
''}
${optionalString (backup.paths != null && backup.paths != []) ''
cat ${pkgs.writeText "staticPaths" (concatStringsSep "\n" backup.paths)} >> ${filesFromTmpFile}
cat ${pkgs.writeText "staticPaths" (concatLines backup.paths)} >> ${filesFromTmpFile}
''}
${optionalString (backup.dynamicFilesFrom != null) ''
${pkgs.writeScript "dynamicFilesFromScript" backup.dynamicFilesFrom} >> ${filesFromTmpFile}
nixos/modules/services/cluster/k3s/default.nix
+5 -1
View File
@@ -351,12 +351,16 @@ in
sha256 = "0imblp0kw9vkcr7sp962jmj20fpmb3hvd3hmf4cs4x04klnq3k90";
finalImageTag = "21.1.2-debian-11-r0";
})
config.services.k3s.package.airgapImages
]
'';
description = ''
List of derivations that provide container images.
All images are linked to {file}`${imageDir}` before k3s starts and consequently imported
by the k3s agent. This option only makes sense on nodes with an enabled agent.
by the k3s agent. Consider importing the k3s airgap images archive of the k3s package in
use, if you want to pre-provision this node with all k3s container images. This option
only makes sense on nodes with an enabled agent.
'';
};
nixos/tests/k3s/airgap-images.nix
+42
View File
@@ -0,0 +1,42 @@
# A test that imports k3s airgapped images and verifies that all expected images are present
import ../make-test-python.nix (
{ lib, k3s, ... }:
{
name = "${k3s.name}-airgap-images";
meta.maintainers = lib.teams.k3s.members;
nodes.machine = _: {
# k3s uses enough resources the default vm fails.
virtualisation.memorySize = 1536;
virtualisation.diskSize = 4096;
services.k3s = {
enable = true;
role = "server";
package = k3s;
# Slightly reduce resource usage
extraFlags = [
"--disable coredns"
"--disable local-storage"
"--disable metrics-server"
"--disable servicelb"
"--disable traefik"
];
images = [ k3s.airgapImages ];
};
};
testScript = ''
import json
start_all()
machine.wait_for_unit("k3s")
machine.wait_until_succeeds("journalctl -r --no-pager -u k3s | grep \"Imported images from /var/lib/rancher/k3s/agent/images/\"", timeout=60)
images = json.loads(machine.succeed("crictl img -o json"))
image_names = [i["repoTags"][0] for i in images["images"]]
with open("${k3s.imagesList}") as expected_images:
for line in expected_images:
assert line.rstrip() in image_names, f"The image {line.rstrip()} is not present in the airgap images archive"
'';
}
)
nixos/tests/k3s/default.nix
+3
View File
@@ -7,6 +7,9 @@ let
allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs;
in
{
airgap-images = lib.mapAttrs (
_: k3s: import ./airgap-images.nix { inherit system pkgs k3s; }
) allK3s;
auto-deploy = lib.mapAttrs (_: k3s: import ./auto-deploy.nix { inherit system pkgs k3s; }) allK3s;
etcd = lib.mapAttrs (
_: k3s:
nixos/tests/restic.nix
+11 -4
View File
@@ -27,6 +27,7 @@ import ./make-test-python.nix (
echo some_other_file > $out/some_other_file
mkdir $out/a_dir
echo a_file > $out/a_dir/a_file
echo a_file_2 > $out/a_dir/a_file_2
'';
};
@@ -62,7 +63,10 @@ import ./make-test-python.nix (
inherit passwordFile exclude pruneOpts;
initialize = true;
repositoryFile = pkgs.writeText "repositoryFile" remoteFromFileRepository;
paths = [ "/opt/a_dir" ];
paths = [
"/opt/a_dir/a_file"
"/opt/a_dir/a_file_2"
];
dynamicFilesFrom = ''
find /opt -mindepth 1 -maxdepth 1 ! -name a_dir # all files in /opt except for a_dir
'';
@@ -144,15 +148,18 @@ import ./make-test-python.nix (
# test that remote-from-file-backup produces a snapshot
"systemctl start restic-backups-remote-from-file-backup.service",
'restic-remote-from-file-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
"mkdir /tmp/restore-2",
"restic-remote-from-file-backup restore latest -t /tmp/restore-2",
"diff -ru ${testDir} /tmp/restore-2/opt",
# test that remote-noinit-backup produces a snapshot
"systemctl start restic-backups-remote-noinit-backup.service",
'restic-remote-noinit-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
# test that restoring that snapshot produces the same directory
"mkdir /tmp/restore-2",
"${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} restore latest -t /tmp/restore-2",
"diff -ru ${testDir} /tmp/restore-2/opt",
"mkdir /tmp/restore-3",
"${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} restore latest -t /tmp/restore-3",
"diff -ru ${testDir} /tmp/restore-3/opt",
# test that rclonebackup produces a snapshot
"systemctl start restic-backups-rclonebackup.service",
pkgs/applications/editors/kakoune/default.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Vim inspired text editor";
license = licenses.publicDomain;
mainProgram = "kak";
maintainers = [ ];
maintainers = with maintainers; [ philiptaron ];
platforms = platforms.unix;
};
})
pkgs/applications/editors/kakoune/plugins/overrides.nix
+3 -3
View File
@@ -58,7 +58,7 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter}
description = "Kakoune support for rendering ANSI code";
homepage = "https://github.com/eraserhd/kak-ansi";
license = licenses.unlicense;
maintainers = with maintainers; [ eraserhd ];
maintainers = with maintainers; [ eraserhd philiptaron ];
platforms = platforms.all;
};
};
@@ -88,7 +88,7 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter}
description = "Kakoune integration with the Plan 9 plumber";
homepage = "https://github.com/eraserhd/kak-plumb";
license = licenses.unlicense;
maintainers = with maintainers; [ eraserhd ];
maintainers = with maintainers; [ eraserhd philiptaron ];
platforms = platforms.all;
};
};
@@ -119,7 +119,7 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter}
description = "Help Kakoune save and restore state between sessions";
homepage = "https://gitlab.com/Screwtapello/kakoune-state-save";
license = licenses.mit;
maintainers = with maintainers; [ Flakebi ];
maintainers = with maintainers; [ Flakebi philiptaron ];
platforms = platforms.all;
};
};
pkgs/applications/misc/translatelocally/default.nix
+4 -3
View File
@@ -4,17 +4,17 @@
}:
let
rev = "a210037760ca3ca9016ca1831c97531318df70fe";
rev = "27771d884d3607cf6331da16b15e27aba819573d";
in stdenv.mkDerivation (finalAttrs: {
pname = "translatelocally";
version = "unstable-2023-09-20";
version = "0-unstable-2024-05-12";
src = fetchFromGitHub {
owner = "XapaJIaMnu";
repo = "translateLocally";
inherit rev;
hash = "sha256-T7cZdR09yDrPTwYxvDIaKTdV4mrB+gTHYVfch5BQ+PE=";
hash = "sha256-oPtiyONqkZ5xOIhDezk8mkmi9O8gNYwHo0gcqSa89qI=";
fetchSubmodules = true;
};
@@ -42,6 +42,7 @@ in stdenv.mkDerivation (finalAttrs: {
qt6.qttools
qt6.qtbase
qt6.qtsvg
qt6.qtwayland
libarchive
pcre2
protobuf
pkgs/applications/networking/cluster/k3s/1_28/images-versions.json
+18
View File
@@ -0,0 +1,18 @@
{
"airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-airgap-images-amd64.tar.zst",
"sha256": "199nxfxwr52cddk2ljchhxaigyi0al3lzyc0jy2am4aljlm0jivy"
},
"airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-airgap-images-arm.tar.zst",
"sha256": "02riiiwwr0h3zhlxxmjn5p8ws354rr2gk44x3kz9d7sxqn17sz4w"
},
"airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-airgap-images-arm64.tar.zst",
"sha256": "0bs9wj33appb9xpsb2v1xz4xck4qq6g74flnc0mxf9warwr4988r"
},
"images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-images.txt",
"sha256": "0245zra2h8756kq2v8nwl6gji749xlvy1y1bkab8vz5b0vpqhfxy"
}
}
pkgs/applications/networking/cluster/k3s/1_28/versions.nix
+1
View File
@@ -4,6 +4,7 @@
k3sRepoSha256 = "1k1k3qmxc7n2h2i0g52ad4gnpq0qrvxnl7p2y0g9dss1ancgqwsd";
k3sVendorHash = "sha256-tzcMcsTmY8lG+9EyYkzYJm1YU/8tGpxpH7oZ4Jl/yNU=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sCNIVersion = "1.4.0-k3s2";
pkgs/applications/networking/cluster/k3s/1_29/images-versions.json
+18
View File
@@ -0,0 +1,18 @@
{
"airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-airgap-images-amd64.tar.zst",
"sha256": "1d1adpjxxgkflm4xqzynsib67pga85r1qmhkhh540nl0rppbq7gr"
},
"airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-airgap-images-arm.tar.zst",
"sha256": "07c085y5qy8h5ja2ms3np61d7wkp6gic82snx70qlsm5fm3ak3z7"
},
"airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-airgap-images-arm64.tar.zst",
"sha256": "0ljajvz0n0mmwkdl1rwpwqmhgxqivakdpfyaqsascdzfk0qpv5gp"
},
"images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-images.txt",
"sha256": "0245zra2h8756kq2v8nwl6gji749xlvy1y1bkab8vz5b0vpqhfxy"
}
}
pkgs/applications/networking/cluster/k3s/1_29/versions.nix
+1
View File
@@ -4,6 +4,7 @@
k3sRepoSha256 = "0wagfh4vbvyi62np6zx7b4p6myn0xavw691y78rnbl32jckiy14f";
k3sVendorHash = "sha256-o36gf3q7Vv+RoY681cL44rU2QFrdFW3EbRpw3dLcVTI=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.13.0";
k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj";
k3sCNIVersion = "1.4.0-k3s2";
pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
+18
View File
@@ -0,0 +1,18 @@
{
"airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-airgap-images-amd64.tar.zst",
"sha256": "1d1adpjxxgkflm4xqzynsib67pga85r1qmhkhh540nl0rppbq7gr"
},
"airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-airgap-images-arm.tar.zst",
"sha256": "1hjhlj4b5ddaqhpmqbbvhvgzryi5j84i8bmpl3yij87yjkz3kld7"
},
"airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-airgap-images-arm64.tar.zst",
"sha256": "1r9rd70qp8x57j3hdpgwgkzchykphw0x4yd8c1jwjfaqm5df1w0d"
},
"images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-images.txt",
"sha256": "0245zra2h8756kq2v8nwl6gji749xlvy1y1bkab8vz5b0vpqhfxy"
}
}
pkgs/applications/networking/cluster/k3s/1_30/versions.nix
+1
View File
@@ -4,6 +4,7 @@
k3sRepoSha256 = "0hy0f44hj5n5nscr0p52dbklvj2ki2vs7k0cgh1r8xlg4p6fn1b0";
k3sVendorHash = "sha256-Mj9Q3TgqZoJluG4/nyuw2WHnB3OJ+/mlV7duzWt1B1A=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.13.0";
k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj";
k3sCNIVersion = "1.4.0-k3s2";
pkgs/applications/networking/cluster/k3s/builder.nix
+81 -40
View File
@@ -12,6 +12,8 @@ lib:
# Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32
# see also https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/manifests/traefik.yaml#L8
chartVersions,
# Air gap container images that are released as assets with every k3s release
imagesVersions,
# taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45
k3sCNIVersion,
k3sCNISha256 ? lib.fakeHash,
@@ -30,41 +32,42 @@ lib:
# It is likely we will have to split out additional builders for additional
# versions in the future, or customize this one further.
{
lib,
makeWrapper,
socat,
iptables,
iproute2,
ipset,
bash,
bridge-utils,
btrfs-progs,
conntrack-tools,
buildGoModule,
runc,
rsync,
kmod,
libseccomp,
pkg-config,
conntrack-tools,
coreutils,
ethtool,
util-linux,
fetchFromGitHub,
fetchgit,
fetchurl,
fetchzip,
fetchgit,
zstd,
yq-go,
sqlite,
nixosTests,
pkgsBuildBuild,
go,
runCommand,
bash,
procps,
coreutils,
gnugrep,
findutils,
gnugrep,
gnused,
go,
iproute2,
ipset,
iptables,
kmod,
lib,
libseccomp,
makeWrapper,
nixosTests,
pkg-config,
pkgsBuildBuild,
procps,
rsync,
runc,
runCommand,
socat,
sqlite,
stdenv,
systemd,
util-linux,
yq-go,
zstd,
}:
# k3s is a kinda weird derivation. One of the main points of k3s is the
@@ -122,6 +125,39 @@ let
traefikChart = fetchurl chartVersions.traefik;
traefik-crdChart = fetchurl chartVersions.traefik-crd;
mutFirstChar =
f: s:
let
firstChar = f (lib.substring 0 1 s);
rest = lib.substring 1 (-1) s;
in
firstChar + rest;
kebabToCamel =
s:
mutFirstChar lib.toLower (lib.concatMapStrings (mutFirstChar lib.toUpper) (lib.splitString "-" s));
# finds the images archive for the desired architecture, aborts in case no suitable archive is found
findImagesArchive =
arch:
let
imagesVersionsNames = builtins.attrNames imagesVersions;
in
lib.findFirst (
n: lib.hasInfix arch n
) (abort "k3s: no airgap images for ${arch} available") imagesVersionsNames;
# a shortcut that provides the images archive for the host platform. Currently only supports
# aarch64 (arm64) and x86_64 (amd64), aborts on other architectures.
airgapImages = fetchurl (
if stdenv.isAarch64 then
imagesVersions.${findImagesArchive "arm64"}
else if stdenv.isx86_64 then
imagesVersions.${findImagesArchive "amd64"}
else
abort "k3s: airgap images cannot be found automatically for architecture ${stdenv.hostPlatform.linuxArch}, consider using an image archive with an explicit architecture."
);
# 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
@@ -417,21 +453,26 @@ buildGoModule rec {
runHook postInstallCheck
'';
passthru = {
k3sCNIPlugins = k3sCNIPlugins;
k3sContainerd = k3sContainerd;
k3sRepo = k3sRepo;
k3sRoot = k3sRoot;
k3sServer = k3sServer;
mkTests =
version:
let
k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version);
in
lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s;
tests = passthru.mkTests k3sVersion;
updateScript = updateScript;
};
passthru =
{
inherit airgapImages;
k3sCNIPlugins = k3sCNIPlugins;
k3sContainerd = k3sContainerd;
k3sRepo = k3sRepo;
k3sRoot = k3sRoot;
k3sServer = k3sServer;
mkTests =
version:
let
k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version);
in
lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s;
tests = passthru.mkTests k3sVersion;
updateScript = updateScript;
}
// (lib.mapAttrs' (
name: _: lib.nameValuePair (kebabToCamel name) (fetchurl imagesVersions.${name})
) imagesVersions);
meta = baseMeta;
}
pkgs/applications/networking/cluster/k3s/update-script.sh
+19
View File
@@ -69,6 +69,24 @@ cat > chart-versions.nix.update <<EOF
EOF
mv chart-versions.nix.update chart-versions.nix
# Get all airgap images files associated with this release
IMAGES_ARCHIVES=$(curl "https://api.github.com/repos/k3s-io/k3s/releases/tags/v${K3S_VERSION}" | \
# Filter the assets so that only zstd archives and text files that have "images" in their name remain
# Modify the name and write the modified name and download URL to a string
jq -r '.assets[] | select(.name | contains("images")) |
select(.content_type == "application/zstd" or .content_type == "text/plain; charset=utf-8") |
.name = (.name | sub("k3s-"; "") | sub(".tar.zst"; "") | sub(".txt"; "-list")) |
"\(.name) \(.browser_download_url)"')
# Create a JSON object for each airgap images file and prefetch all download URLs in the process
# Combine all JSON objects and write the result to images-versions.json
while read -r name url; do
jq --null-input --arg name "$name" \
--arg url "$url" \
--arg sha256 "$(nix-prefetch-url --quiet "${url}")" \
'{$name: {"url": $url, "sha256": $sha256}}'
done <<<"${IMAGES_ARCHIVES}" | jq --slurp 'reduce .[] as $item ({}; . * $item)' > images-versions.json
FILE_GO_MOD=${WORKDIR}/go.mod
curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/go.mod > $FILE_GO_MOD
@@ -105,6 +123,7 @@ cat >versions.nix <<EOF
k3sRepoSha256 = "${K3S_REPO_SHA256}";
k3sVendorHash = "${FAKE_HASH}";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "${K3S_ROOT_VERSION}";
k3sRootSha256 = "${K3S_ROOT_SHA256}";
k3sCNIVersion = "${CNIPLUGINS_VERSION}";
pkgs/by-name/cl/clippy-sarif/package.nix
+3 -3
View File
@@ -8,14 +8,14 @@
}:
rustPlatform.buildRustPackage rec {
pname = "clippy-sarif";
version = "0.5.0";
version = "0.6.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-ylfL4N1BtbB1R7+Glwtgn5E6/v3wQ6oXWdmeyKNHdOw=";
hash = "sha256-VFwLys5lVVQw3dmfY1nrI+Bi0tm7kjD2/1c1DLczLwk=";
};
cargoHash = "sha256-O0bLgj7rWwbEswVMfexsBGgJyObxseOohYht21Y6HpU=";
cargoHash = "sha256-zktbOyBa200YSZBuLs3xU95bh9kvj5XZQKb7tpiTs1I=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
pkgs/by-name/ha/hadolint-sarif/package.nix
+3 -3
View File
@@ -7,14 +7,14 @@
}:
rustPlatform.buildRustPackage rec {
pname = "hadolint-sarif";
version = "0.5.0";
version = "0.6.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-Zh3y31Q+ue1TqncZpdX+fAp2yfEnv8W8jkzUW7UvrKg=";
hash = "sha256-7i3fhXZJ82+a4kbMPMxW8dV42qxQfQggwkm8FA1TUkw=";
};
cargoHash = "sha256-bwEQ9lZXvZL6JN24N8gRdbV5gcFiH1fQ59PQILfW1z8=";
cargoHash = "sha256-DXCdxpvWaOn/g7kuqgmtGkd94NVnjPI9VkDCuPg7wCw=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
pkgs/by-name/ka/kakoune-lsp/package.nix
+1 -1
View File
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
description = "Kakoune Language Server Protocol Client";
homepage = "https://github.com/kakoune-lsp/kakoune-lsp";
license = with licenses; [ unlicense /* or */ mit ];
maintainers = with maintainers; [ spacekookie poweredbypie ];
maintainers = with maintainers; [ philiptaron spacekookie poweredbypie ];
mainProgram = "kak-lsp";
};
}
pkgs/by-name/ol/ollama/package.nix
+1 -1
View File
@@ -46,7 +46,7 @@ let
owner = "ollama";
repo = "ollama";
rev = "v${version}";
hash = "sha256-iD7LX4OstnNL2FZKObh4z9krkN0sfUUbFEZxu6OvdBs=";
hash = "sha256-ctz9xh1wisG0YUxglygKHIvU9bMgMLkGqDoknb8qSAU=";
fetchSubmodules = true;
};
pkgs/by-name/we/werf/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "werf";
version = "2.8.0";
version = "2.9.3";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-+IwDj2K+PyOczIEm4EB+2P/8ilhScdftmE0v9iBFidk=";
hash = "sha256-UswVkf4wo8GfrhXu+ayUYHYzBFnGGz/7C0BBMpyuyXc=";
};
vendorHash = "sha256-Ta2owh1Z7mB4e85ZHK1maL5GoBMzM0mf3wsU6ho+4Z0=";
pkgs/by-name/ze/zed-editor/Cargo.lock
Generated
+1 -1
View File
@@ -13597,7 +13597,7 @@ dependencies = [
[[package]]
name = "zed"
version = "0.146.3"
version = "0.146.4"
dependencies = [
"activity_indicator",
"anyhow",
pkgs/by-name/ze/zed-editor/package.nix
+2 -2
View File
@@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux;
rustPlatform.buildRustPackage rec {
pname = "zed";
version = "0.146.3";
version = "0.146.4";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
rev = "refs/tags/v${version}";
hash = "sha256-7KDoJ9yEZkPl6PBYXLQ+c+pnJk50LOn3qxBjBEq8nFY=";
hash = "sha256-U/PTPmZjhmsY9MVH7/SbooyTCR7ATHTWswv0IOokIu4=";
fetchSubmodules = true;
};
pkgs/development/libraries/ffmpeg/generic.nix
+2 -3
View File
@@ -129,9 +129,8 @@
, withXcbShape ? withFullDeps # X11 grabbing shape rendering
, withXcbShm ? withFullDeps # X11 grabbing shm communication
, withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering
# Currently only supports gcc and msvc as compiler, the limitation for clang get removed in the next release, but that does not fix building on darwin.
, withXevd ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 && stdenv.cc.isGNU # MPEG-5 EVC decoding
, withXeve ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 && stdenv.cc.isGNU # MPEG-5 EVC encoding
, withXevd ? withFullDeps && lib.versionAtLeast version "7" && !xevd.meta.broken # MPEG-5 EVC decoding
, withXeve ? withFullDeps && lib.versionAtLeast version "7" && !xeve.meta.broken # MPEG-5 EVC encoding
, withXlib ? withFullDeps # Xlib support
, withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers
, withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists
pkgs/development/libraries/nss/latest.nix
+2 -2
View File
@@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.102.1";
hash = "sha256-rHPDPLSatEk1ZVvtEM/Ct1V5MFpCiW9kwSBQzSz0lak=";
version = "3.103";
hash = "sha256-e57HN50lHT4+nkdZPyixpWFyTD0c+xZBk23BhmIumV8=";
}
pkgs/development/python-modules/http-ece/default.nix
+20 -22
View File
@@ -2,41 +2,39 @@
lib,
buildPythonPackage,
cryptography,
fetchPypi,
mock,
nose,
pythonOlder,
fetchFromGitHub,
setuptools,
pytestCheckHook,
pytest-cov-stub,
}:
buildPythonPackage rec {
pname = "http-ece";
version = "1.2.0";
version = "1.2.1";
pyproject = true;
src = fetchPypi {
pname = "http_ece";
inherit version;
hash = "sha256-tZIPjvuOG1+wJXE+Ozb9pUM2JiAQY0sm3B+Y+F0es94=";
src = fetchFromGitHub {
owner = "web-push-libs";
repo = "encrypted-content-encoding";
rev = version;
hash = "sha256-HjXJWoOvCVOdEto4Ss4HPUuf+uNcQkfvj/cxJGHOhQ8=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail '"nose",' "" \
--replace-fail '"coverage",' ""
'';
sourceRoot = "${src.name}/python";
propagatedBuildInputs = [ cryptography ];
build-system = [ setuptools ];
doCheck = pythonOlder "3.12";
dependencies = [ cryptography ];
nativeCheckInputs = [
mock
nose
pytestCheckHook
pytest-cov-stub
];
meta = with lib; {
meta = {
description = "Encipher HTTP Messages";
homepage = "https://github.com/martinthomson/encrypted-content-encoding";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
homepage = "https://github.com/web-push-libs/encrypted-content-encoding";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ peterhoeg ];
};
}
pkgs/development/python-modules/nose3/default.nix
-42
View File
@@ -1,42 +0,0 @@
{
lib,
buildPythonPackage,
coverage,
fetchPypi,
isPyPy,
isPy311,
python,
pythonAtLeast,
stdenv,
}:
buildPythonPackage rec {
pname = "nose3";
version = "1.3.8";
format = "setuptools";
# https://github.com/jayvdb/nose3/issues/5
disabled = pythonAtLeast "3.12";
src = fetchPypi {
inherit pname version;
hash = "sha256-diquIsrbiYsAudT0u7n46H+ODd5sSaiM0MVU9OWSW3Y=";
};
propagatedBuildInputs = [ coverage ];
# PyPy hangs for unknwon reason
# Darwin and python 3.11 fail at various assertions and I didn't find an easy way to find skip those tests
doCheck = !isPyPy && !stdenv.isDarwin && !isPy311;
checkPhase = ''
${python.pythonOnBuildForHost.interpreter} selftest.py
'';
meta = with lib; {
description = "Fork of nose v1 not using lib2to3 for compatibility with Python 3";
homepage = "https://github.com/jayvdb/nose3";
license = licenses.lgpl3;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
pkgs/development/python-modules/pkutils/default.nix
-45
View File
@@ -1,45 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
nose3,
pythonOlder,
semver,
}:
buildPythonPackage rec {
pname = "pkutils";
version = "3.0.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "reubano";
repo = "pkutils";
rev = "refs/tags/v${version}";
hash = "sha256-AK+xX+LPz6IVLZedsqMUm7G28ue0s3pXgIzxS4EHHLE=";
};
pythonRelaxDeps = [ "semver" ];
propagatedBuildInputs = [ semver ];
nativeCheckInputs = [ nose3 ];
checkPhase = ''
runHook preCheck
nosetests
runHook postCheck
'';
pythonImportsCheck = [ "pkutils" ];
meta = with lib; {
description = "Python packaging utility library";
homepage = "https://github.com/reubano/pkutils/";
license = licenses.mit;
maintainers = with maintainers; [ drewrisinger ];
};
}
pkgs/development/python-modules/sse-starlette/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "sse-starlette";
version = "2.1.2";
version = "2.1.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "sysid";
repo = "sse-starlette";
rev = "refs/tags/v${version}";
hash = "sha256-/aL0IkMdHNt7Ms1Et+xf00B9FGI31FuHAiJbxVMm3w0=";
hash = "sha256-cnUx3wYawyqt/m/FB6abxknMbc64k09a1kAJoA4yN6w=";
};
build-system = [ pdm-backend ];
pkgs/development/tools/rye/Cargo.lock
Generated
+1 -1
View File
@@ -1799,7 +1799,7 @@ dependencies = [
[[package]]
name = "rye"
version = "0.37.0"
version = "0.38.0"
dependencies = [
"age",
"anyhow",
pkgs/development/tools/rye/default.nix
+4 -2
View File
@@ -15,13 +15,13 @@
rustPlatform.buildRustPackage rec {
pname = "rye";
version = "0.37.0";
version = "0.38.0";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "rye";
rev = "refs/tags/${version}";
hash = "sha256-jrtqH5Ur7yXFwYORSkS839s5Q3BtllAJBJC78vOddZ8=";
hash = "sha256-mTVpNyFEovaOdOBTcASSRejKfSs50cqpDuStDAkcdkQ=";
};
cargoLock = {
@@ -60,11 +60,13 @@ rustPlatform.buildRustPackage rec {
# The following require internet access to fetch a python binary
"--skip=test_add_and_sync_no_auto_sync"
"--skip=test_add_autosync"
"--skip=test_add_dev"
"--skip=test_add_explicit_version_or_url"
"--skip=test_add_flask"
"--skip=test_add_from_find_links"
"--skip=test_autosync_remember"
"--skip=test_basic_list"
"--skip=test_basic_script"
"--skip=test_basic_tool_behavior"
"--skip=test_config_empty"
"--skip=test_config_get_set_multiple"
pkgs/misc/translatelocally-models/default.nix
-5
View File
@@ -37,10 +37,5 @@ let
lib.listToAttrs (map (withCodeAsKey mkModelPackage) modelSpecs);
in allModelPkgs // {
is-en-tiny = allModelPkgs.is-en-tiny.overrideAttrs (super: {
# missing model https://github.com/XapaJIaMnu/translateLocally/issues/147
meta = super.meta // { broken = true; };
});
} // {
passthru.updateScript = ./update.sh;
}
pkgs/misc/translatelocally-models/models.json
+125 -41
View File
@@ -1,149 +1,233 @@
[
{
"version": 1,
"checksum": "3714539160d5b4dce3ce0d829939315e3daffeaff53647249cc6336d745c09f2",
"url": "https://data.statmt.org/bergamot/models/csen/csen.student.base.tar.gz",
"checksum": "cd5418ba6a412fc7e06288e3b879e5ac9155508f6ddab75c175039e0277486fa",
"url": "https://data.statmt.org/bergamot/models/csen/csen.student.base.v1.cd5418ba6a412fc7.tar.gz",
"name": "Czech-English base",
"code": "cs-en-base"
},
{
"version": 1,
"checksum": "693aa14ecb86275169ad4b01cbca294f3bd38d8d9bc1fad8dd89fa7e937e7d2c",
"url": "https://data.statmt.org/bergamot/models/csen/csen.student.tiny11.tar.gz",
"checksum": "8f603aded58f0a3c97d4498550dd070a356465109229f3c98cc61f2571bb1089",
"url": "https://data.statmt.org/bergamot/models/csen/csen.student.tiny11.v1.8f603aded58f0a3c.tar.gz",
"name": "Czech-English tiny",
"code": "cs-en-tiny"
},
{
"version": 1,
"checksum": "7a57b4e3a11a2c5e03fc6855ffc2b8f61ce3f1a68aeefa4592577a9eebe25031",
"url": "https://data.statmt.org/bergamot/models/csen/encs.student.base.tar.gz",
"checksum": "db770d87e491b0dc26d34e96a63188232f39198db157048fed5d111391a63cd0",
"url": "https://data.statmt.org/bergamot/models/csen/encs.student.base.v1.db770d87e491b0dc.tar.gz",
"name": "English-Czech base",
"code": "en-cs-base"
},
{
"version": 1,
"checksum": "f999d6511bdb4f1ff246b0563fdf9b71d836e1c3037fe5306a61836d3b5b8d19",
"url": "https://data.statmt.org/bergamot/models/csen/encs.student.tiny11.tar.gz",
"checksum": "b5c1ff605296b0e5a55ae6876db434fded62ae0c947e153f758d7b8a58c2c3dd",
"url": "https://data.statmt.org/bergamot/models/csen/encs.student.tiny11.v1.b5c1ff605296b0e5.tar.gz",
"name": "English-Czech tiny",
"code": "en-cs-tiny"
},
{
"version": 2,
"checksum": "e7362faa83c4f61e552adf8fbd4bc528fe706746eb9fc1c286ec9af7566e3daf",
"url": "https://data.statmt.org/bergamot/models/deen/deen.student.base.tar.gz",
"checksum": "caa7c0ce3c8eaf05d333dc9458683f4b0375e5eeb604f6fb2c8585f7b70d398b",
"url": "https://data.statmt.org/bergamot/models/deen/deen.student.base.v2.caa7c0ce3c8eaf05.tar.gz",
"name": "German-English base",
"code": "de-en-base"
},
{
"version": 2,
"checksum": "5c11b6ccfa0533fd5632b3cbccbb054972076266e2d1d989d3babb0ec0b10e28",
"url": "https://data.statmt.org/bergamot/models/deen/deen.student.tiny11.tar.gz",
"checksum": "9f70fcb17bf9572d969aee69ed34c5d8b54c896c60dfe057da37f2e51d46895f",
"url": "https://data.statmt.org/bergamot/models/deen/deen.student.tiny11.v2.9f70fcb17bf9572d.tar.gz",
"name": "German-English tiny",
"code": "de-en-tiny"
},
{
"version": 2,
"checksum": "cf9ab5a41ce359672ab47579686f9af50fc1fe040552c375ca86912f0fce7827",
"url": "https://data.statmt.org/bergamot/models/deen/ende.student.base.tar.gz",
"checksum": "37b172bc9b594f9b60460f6d5c4ac1eb6af723ecccbdfa2c213308223a8a420f",
"url": "https://data.statmt.org/bergamot/models/deen/ende.student.base.v2.37b172bc9b594f9b.tar.gz",
"name": "English-German base",
"code": "en-de-base"
},
{
"version": 2,
"checksum": "0e85d1d7ee4f8a3ec12680696ffc11fa97d67a54d068ceafcf390a87df94877f",
"url": "https://data.statmt.org/bergamot/models/deen/ende.student.tiny11.tar.gz",
"checksum": "93821e13b3c511b5390f9fb79f476f738d66e3656889bf076e906897e614fed2",
"url": "https://data.statmt.org/bergamot/models/deen/ende.student.tiny11.v2.93821e13b3c511b5.tar.gz",
"name": "English-German tiny",
"code": "en-de-tiny"
},
{
"version": 1,
"checksum": "adf49d0e2f21b82414bc353ae1f0904d93360caa92203ae9f2fc209a83882d81",
"url": "https://data.statmt.org/bergamot/models/esen/esen.student.tiny11.tar.gz",
"checksum": "09576f06d0ad805e6851defdd63434840729c3bcc5cf19db732f00298dcdb5d9",
"url": "https://data.statmt.org/bergamot/models/esen/esen.student.tiny11.v1.09576f06d0ad805e.tar.gz",
"name": "Spanish-English tiny",
"code": "es-en-tiny"
},
{
"version": 1,
"checksum": "6594dda2a4f5d333969c30f8356f4a9f3fe15a9f8a5fd018b0d85b9d9ad2abb0",
"url": "https://data.statmt.org/bergamot/models/esen/enes.student.tiny11.tar.gz",
"checksum": "a7203a8f8e9daea85698d5912f25cca6fecae3e4097b188a0c31ed2d58e13c61",
"url": "https://data.statmt.org/bergamot/models/esen/enes.student.tiny11.v1.a7203a8f8e9daea8.tar.gz",
"name": "English-Spanish tiny",
"code": "en-es-tiny"
},
{
"version": 1,
"checksum": "05c6525549c9c621e348f8de74533764ad7696aba8245fc9a504116f8ef4053c",
"url": "https://data.statmt.org/bergamot/models/eten/eten.student.tiny11.tar.gz",
"checksum": "38de61c668e42f36a6b8acd564f3044b283d0cd61ebdb3947c490a99e297a2d5",
"url": "https://data.statmt.org/bergamot/models/eten/eten.student.tiny11.v1.38de61c668e42f36.tar.gz",
"name": "Estonian-English tiny",
"code": "et-en-tiny"
},
{
"version": 1,
"checksum": "afce6c566270abdd4db332e8dcf4fe22057ada3b2a1171aab04d0d4817396fb5",
"url": "https://data.statmt.org/bergamot/models/eten/enet.student.tiny11.tar.gz",
"checksum": "0b8f835b0c154aaa01f612bfcf1bdcd41f86f1088f1226f2d3d6fa8155cb80a0",
"url": "https://data.statmt.org/bergamot/models/eten/enet.student.tiny11.v1.0b8f835b0c154aaa.tar.gz",
"name": "English-Estonian tiny",
"code": "en-et-tiny"
},
{
"version": 1,
"checksum": "5c1696747590d1a75bef67348dce96bcd3889eb5a06a0f670c3d7232ed79f60e",
"url": "https://data.statmt.org/bergamot/models/isen/isen.student.tiny11.tar.gz",
"version": 2.0,
"checksum": "536d6b8808a5c0765e058a8dc98f0ed667d6e14747708ca885aacbd21a99e795",
"url": "https://data.statmt.org/bergamot/models/isen/isen.student.base.v2.536d6b8808a5c076.tar.gz",
"name": "Icelandic-English base",
"code": "is-en-base"
},
{
"version": 2.0,
"checksum": "829203cf37b7bdc4ac0cbee206d40eb48bb8d8f6d73fba0c0e6dec8cd25a3448",
"url": "https://data.statmt.org/bergamot/models/isen/isen.student.tiny11.v2.829203cf37b7bdc4.tar.gz",
"name": "Icelandic-English tiny",
"code": "is-en-tiny"
},
{
"version": 1,
"checksum": "9f5dde2f4f87438c24c9561990636e624c53b527ddc8505f822b22b073069de8",
"url": "https://data.statmt.org/bergamot/models/nben/nben.student.tiny11.tar.gz",
"checksum": "e410ce34f8337aabe2e105af14f44669f29cfae40f92f90b107323cf8f4188a9",
"url": "https://data.statmt.org/bergamot/models/nben/nben.student.tiny11.v1.e410ce34f8337aab.tar.gz",
"name": "Norwegian (Bokmål)-English tiny",
"code": "nb-en-tiny"
},
{
"version": 1,
"checksum": "0bb4b83560caaffae95940574d939999092800a7803fae4c79a97e6481887a4f",
"url": "https://data.statmt.org/bergamot/models/nnen/nnen.student.tiny11.tar.gz",
"checksum": "0efa37c16887eea4ccd579e5de52bf09708893d93c7b0d4656d5a13e0bc9a07f",
"url": "https://data.statmt.org/bergamot/models/nnen/nnen.student.tiny11.v1.0efa37c16887eea4.tar.gz",
"name": "Norwegian (Nynorsk)-English tiny",
"code": "nn-en-tiny"
},
{
"version": 1,
"checksum": "ecfe9c2b0be3406c0205ad2da58f4005893a4ae969e81dd9c523093cf5c7abc3",
"url": "https://data.statmt.org/bergamot/models/bgen/bgen.student.tiny11.tar.gz",
"checksum": "f9c89a3a25ff8dca84413b28c1afe722ebc969f4aa84e7ecd14ea03ba77c8ae5",
"url": "https://data.statmt.org/bergamot/models/bgen/bgen.student.tiny11.v1.f9c89a3a25ff8dca.tar.gz",
"name": "Bulgarian-English tiny",
"code": "bg-en-tiny"
},
{
"version": 1,
"checksum": "eb9a7511ae9c89fb91ab6da1e9d5061946ad752e5801351f39c8eddca9705c74",
"url": "https://data.statmt.org/bergamot/models/bgen/enbg.student.tiny11.tar.gz",
"checksum": "3ea060c1b76470a7769dc1f32010a99fcc9a2e868a58c429cd8e8251fa1330c8",
"url": "https://data.statmt.org/bergamot/models/bgen/enbg.student.tiny11.v1.3ea060c1b76470a7.tar.gz",
"name": "English-Bulgarian tiny",
"code": "en-bg-tiny"
},
{
"version": 1,
"checksum": "87148203cbda28421d76fffbd7d3cd6c1fc0d6dae2843c248870274d6512a388",
"url": "https://data.statmt.org/bergamot/models/plen/plen.student.tiny11.tar.gz",
"url": "https://data.statmt.org/bergamot/models/plen/plen.student.tiny11.v1.87148203cbda2842.tar.gz",
"name": "Polish-English tiny",
"code": "pl-en-tiny"
},
{
"version": 1,
"checksum": "c33219daa12e7872cf7ac8a1b86a2f3e0592ebadd7e756bf11d16d9a7725cf9b",
"url": "https://data.statmt.org/bergamot/models/plen/enpl.student.tiny11.tar.gz",
"url": "https://data.statmt.org/bergamot/models/plen/enpl.student.tiny11.v1.c33219daa12e7872.tar.gz",
"name": "English-Polish tiny",
"code": "en-pl-tiny"
},
{
"version": 1,
"checksum": "817a45ed9ec3228bfb797e5e14781ab7fe9f388fe1e834e280031f05089809f8",
"url": "https://data.statmt.org/bergamot/models/fren/fren.student.tiny11.tar.gz",
"checksum": "dccea16d03c0a3897b4ce085db676ae4bb2777f7e2b1755c04c0f92efa894b01",
"url": "https://data.statmt.org/bergamot/models/fren/fren.student.tiny11.v1.dccea16d03c0a389.tar.gz",
"name": "French-English tiny",
"code": "fr-en-tiny"
},
{
"version": 1,
"checksum": "28deea86d2a02102a7fedf19391a7628386f01f1f532d430306a9728dc5ec2d6",
"url": "https://data.statmt.org/bergamot/models/fren/enfr.student.tiny11.tar.gz",
"checksum": "805d112122af03d0fe2769eacaaaf5a9eac2c4b97e862a5b2cf0eb95862a7efb",
"url": "https://data.statmt.org/bergamot/models/fren/enfr.student.tiny11.v1.805d112122af03d0.tar.gz",
"name": "English-French tiny",
"code": "en-fr-tiny"
},
{
"version": 2.0,
"checksum": "536d6b8808a5c0765e058a8dc98f0ed667d6e14747708ca885aacbd21a99e795",
"url": "https://data.statmt.org/bergamot/models/isen/isen.student.base.v2.536d6b8808a5c076.tar.gz",
"name": "Icelandic-English base",
"code": "is-en-base"
},
{
"version": 2.0,
"checksum": "829203cf37b7bdc4ac0cbee206d40eb48bb8d8f6d73fba0c0e6dec8cd25a3448",
"url": "https://data.statmt.org/bergamot/models/isen/isen.student.tiny11.v2.829203cf37b7bdc4.tar.gz",
"name": "Icelandic-English tiny",
"code": "is-en-tiny"
},
{
"version": 1.0,
"checksum": "fa8a29e01a5332ba78801ae269b0d1e33b2777e19cc1c23aa0c487b884236858",
"url": "https://data.statmt.org/bergamot/models/hbseng/hbseng.student.tiny11.v1.fa8a29e01a5332ba.tar.gz",
"name": "SerboCroatian-English tiny",
"code": "hbs-eng-tiny"
},
{
"version": 1.0,
"checksum": "d029034e49c3bb0843cb540d60a3f2d8e5c2fda70e6856427a3d41f383e8bda9",
"url": "https://data.statmt.org/bergamot/models/slen/slen.student.tiny11.v1.d029034e49c3bb08.tar.gz",
"name": "Slovene-English tiny",
"code": "sl-en-tiny"
},
{
"version": 1.0,
"checksum": "dd03ef56f4695c7bf967072df97cdfa3884c9a816b2da8515779da2b2879145b",
"url": "https://data.statmt.org/bergamot/models/mken/mken.student.tiny11.v1.dd03ef56f4695c7b.tar.gz",
"name": "Macedonian-English tiny",
"code": "mk-en-tiny"
},
{
"version": 1.0,
"checksum": "4089a5a036eff1c3e646415b30ee3d1455b942a122fe427d4f087cd417963c5e",
"url": "https://data.statmt.org/bergamot/models/mten/mten.student.tiny11.v1.4089a5a036eff1c3.tar.gz",
"name": "Maltese-English tiny",
"code": "mt-en-tiny"
},
{
"version": 1.0,
"checksum": "d7728d17a313230a7a12b99106c5d588c3ac7a65950211b2aac455b258ca0b30",
"url": "https://data.statmt.org/bergamot/models/tren/tren.student.tiny11.v1.d7728d17a313230a.tar.gz",
"name": "Turkish-English tiny",
"code": "tr-en-tiny"
},
{
"version": 1.0,
"checksum": "6ead0c9b236f942bd2b059996730f349861b9e99ed462618fef1c0aefccb289c",
"url": "https://data.statmt.org/bergamot/models/sqen/sqen.student.tiny11.v1.6ead0c9b236f942b.tar.gz",
"name": "Albanian-English tiny",
"code": "sq-en-tiny"
},
{
"version": 1.0,
"checksum": "edaf67d1938e80d3ad082056c08be8c19d8cd178375de1211b17c8d0cd06aec7",
"url": "https://data.statmt.org/bergamot/models/caen/caen.student.tiny11.v1.edaf67d1938e80d3.tar.gz",
"name": "Catalan-English tiny",
"code": "ca-en-tiny"
},
{
"version": 1.0,
"checksum": "000644283159637882bf8901a57bb39dce29319717e86274720c44676a158d71",
"url": "https://data.statmt.org/bergamot/models/elen/elen.student.tiny11.v1.0006442831596378.tar.gz",
"name": "Greek-English tiny",
"code": "el-en-tiny"
},
{
"version": 1.0,
"checksum": "108d04d1e160153a9dc92e676010b79cc8a5de1ec0112a997db0a834a8457420",
"url": "https://data.statmt.org/bergamot/models/uken/uken.student.tiny11.v1.108d04d1e160153a.tar.gz",
"name": "Ukrainian-English tiny",
"code": "uk-en-tiny"
}
]
pkgs/os-specific/darwin/raycast/default.nix
+2 -2
View File
@@ -11,12 +11,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.79.0";
version = "1.80.0";
src = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
hash = "sha256-LwnB4ORTmDNECRTfVFPcccPemab59R6xbj5n6kSVml4=";
hash = "sha256-ZNvgMlKowSMz5nLNRyIZa5xLYe2oH6ANoXL0jUM1HwY=";
};
dontPatch = true;
pkgs/servers/zigbee2mqtt/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "zigbee2mqtt";
version = "1.39.0";
version = "1.39.1";
src = fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
hash = "sha256-+JpL6LadrD5FDxtiv+YNkfqylYEp/1aSlkLIaFXl5mw=";
hash = "sha256-mshQdb28vSEbHeSDLrVxx3sSgpRBMeqsVljiLtwTsF0=";
};
npmDepsHash = "sha256-HMRYbVw4mfxOoPaAzquCEBy97hUC3tR6s1Z8MppJgzY=";
npmDepsHash = "sha256-+/WLjypVYDE4b6gcxXInU9ukntPH5GZpd8T3rlqrINs=";
buildInputs = lib.optionals withSystemd [
systemdMinimal
pkgs/tools/admin/gixy/default.nix
+34 -19
View File
@@ -1,7 +1,13 @@
{ lib, fetchFromGitHub, python311 }:
{
lib,
fetchFromGitHub,
fetchpatch2,
python3,
nginx,
}:
let
python = python311.override {
python = python3.override {
packageOverrides = self: super: {
pyparsing = super.pyparsing.overridePythonAttrs rec {
version = "2.4.7";
@@ -11,9 +17,7 @@ let
rev = "pyparsing_${version}";
sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h";
};
nativeBuildInputs = [
super.setuptools
];
nativeBuildInputs = [ super.setuptools ];
};
};
};
@@ -21,10 +25,7 @@ in
python.pkgs.buildPythonApplication rec {
pname = "gixy";
version = "0.1.20";
format = "setuptools";
# package is only compatible with python 2.7 and 3.5+
disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27);
pyproject = true;
# fetching from GitHub because the PyPi source is missing the tests
src = fetchFromGitHub {
@@ -34,21 +35,34 @@ python.pkgs.buildPythonApplication rec {
sha256 = "14arz3fjidb8z37m08xcpih1391varj8s0v3gri79z3qb4zq5k6b";
};
postPatch = ''
sed -ie '/argparse/d' setup.py
'';
patches = [
# Migrate tests to pytest
# https://github.com/yandex/gixy/pull/146
(fetchpatch2 {
url = "https://github.com/yandex/gixy/compare/6f68624a7540ee51316651bda656894dc14c9a3e...b1c6899b3733b619c244368f0121a01be028e8c2.patch";
hash = "sha256-6VUF2eQ2Haat/yk8I5qIXhHdG9zLQgEXJMLfe25OKEo=";
})
];
propagatedBuildInputs = with python.pkgs; [
build-system = [ python.pkgs.setuptools ];
dependencies = with python.pkgs; [
cached-property
configargparse
pyparsing
jinja2
nose3
setuptools
six
];
meta = with lib; {
nativeCheckInputs = [ python.pkgs.pytestCheckHook ];
pythonRemoveDeps = [ "argparse" ];
passthru = {
inherit (nginx.passthru) tests;
};
meta = {
description = "Nginx configuration static analyzer";
mainProgram = "gixy";
longDescription = ''
@@ -56,8 +70,9 @@ python.pkgs.buildPythonApplication rec {
The main goal of Gixy is to prevent security misconfiguration and automate flaw detection.
'';
homepage = "https://github.com/yandex/gixy";
license = licenses.mpl20;
maintainers = [ maintainers.willibutz ];
platforms = platforms.unix;
sourceProvenance = [ lib.sourceTypes.fromSource ];
license = lib.licenses.mpl20;
maintainers = [ lib.maintainers.willibutz ];
platforms = lib.platforms.unix;
};
}
pkgs/tools/misc/kakoune-cr/default.nix
+1 -1
View File
@@ -44,7 +44,7 @@ crystal.buildCrystalPackage rec {
homepage = "https://github.com/alexherbo2/kakoune.cr";
description = "Command-line tool for Kakoune";
license = licenses.unlicense;
maintainers = with maintainers; [ malte-v ];
maintainers = with maintainers; [ philiptaron malte-v ];
platforms = platforms.unix;
};
}
pkgs/tools/misc/svtplay-dl/default.nix
+50 -41
View File
@@ -1,27 +1,34 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, python3Packages
, perl
, zip
, gitMinimal
, ffmpeg
{
lib,
fetchFromGitHub,
installShellFiles,
python3Packages,
perl,
ffmpeg,
}:
let
inherit (python3Packages)
python pytest nose3 cryptography pyyaml requests mock requests-mock
python-dateutil setuptools;
buildPythonApplication
setuptools
requests
pysocks
cryptography
pyyaml
pytestCheckHook
mock
requests-mock
;
version = "4.97.1";
in
stdenv.mkDerivation rec {
buildPythonApplication {
pname = "svtplay-dl";
inherit version;
pyproject = true;
src = fetchFromGitHub {
owner = "spaam";
@@ -30,47 +37,49 @@ stdenv.mkDerivation rec {
hash = "sha256-9h3hHRRL7DKeCpEXL5w72hYi1nTS+a+x5e9ArMmVgYQ=";
};
pythonPaths = [ cryptography pyyaml requests ];
buildInputs = [ python perl python-dateutil setuptools ] ++ pythonPaths;
nativeBuildInputs = [ gitMinimal zip makeWrapper ];
nativeCheckInputs = [ nose3 pytest mock requests-mock ];
build-system = [ setuptools ];
postPatch = ''
substituteInPlace scripts/run-tests.sh \
--replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH'
dependencies = [
requests
pysocks
cryptography
pyyaml
];
sed -i '/def test_sublang2\?(/ i\ @unittest.skip("accesses network")' \
lib/svtplay_dl/tests/test_postprocess.py
nativeBuildInputs = [
# For `pod2man(1)`.
perl
installShellFiles
];
nativeCheckInputs = [
pytestCheckHook
mock
requests-mock
];
pytestFlagsArray = [
"--doctest-modules"
"lib"
];
postBuild = ''
make svtplay-dl.1
'';
makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" "PYTHON=${python.interpreter}" ];
postInstall = ''
wrapProgram "$out/bin/svtplay-dl" \
--prefix PATH : "${ffmpeg}" \
--prefix PYTHONPATH : "$PYTHONPATH"
installManPage svtplay-dl.1
makeWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ ffmpeg ]}")
'';
doCheck = python3Packages.pythonOlder "3.12";
checkPhase = ''
runHook preCheck
sh scripts/run-tests.sh -2
runHook postCheck
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
postInstallCheck = ''
$out/bin/svtplay-dl --help > /dev/null
runHook postInstallCheck
'';
meta = with lib; {
meta = {
homepage = "https://github.com/spaam/svtplay-dl";
description = "Command-line tool to download videos from svtplay.se and other sites";
license = licenses.mit;
license = lib.licenses.mit;
platforms = lib.platforms.unix;
mainProgram = "svtplay-dl";
};
pkgs/tools/networking/ntp/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ntp";
version = "4.2.8p17";
version = "4.2.8p18";
src = fetchurl {
url = "https://archive.ntp.org/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz";
hash = "sha256-ED3ScuambFuN8H3OXpoCVV/NbxOXvft4IjcyjonTqGY=";
hash = "sha256-z4TF8/saKVKElCYk2CP/+mNBROCWz8T5lprJjvX0aOU=";
};
configureFlags = [
pkgs/tools/text/grin/default.nix
+13 -17
View File
@@ -1,29 +1,25 @@
{ lib, fetchFromGitHub, fetchpatch, python3Packages }:
{
lib,
fetchFromGitHub,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication {
pname = "grin";
version = "1.3.0";
version = "1.3.0-unstable-2023-08-30";
namePrefix = "";
pyproject = true;
src = fetchFromGitHub {
owner = "matthew-brett";
repo = pname;
rev = "1.3.0";
hash = "sha256-exKUy7LaDtpq0rJLSuNYsIcynpB4QLtLIE6T/ncB7RQ=";
repo = "grin";
rev = "00e11ebf17bbb37dc33d282eac1282c0bcc07e82";
hash = "sha256-0lrCOXFb2v0hCxWd9O7ysbn8CjPd8NHOJhARYzJJcYg=";
};
patches = [
# https://github.com/matthew-brett/grin/pull/4
(fetchpatch {
name = "replace-nose-with-nose3.patch";
url = "https://github.com/matthew-brett/grin/commit/ba473fa4f5da1b337ee80d7d31772a4e41ffa62d.patch";
hash = "sha256-CnWHynKSsXYjSsTLdPuwpcIndrCdq3cQYS8teg5EM0A=";
})
];
build-system = [ python3Packages.setuptools ];
nativeCheckInputs = with python3Packages; [
nose3
];
nativeCheckInputs = [ python3Packages.pytestCheckHook ];
meta = {
homepage = "https://github.com/matthew-brett/grin";
pkgs/tools/wayland/hyprland-per-window-layout/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "hyprland-per-window-layout";
version = "2.11";
version = "2.12";
src = fetchFromGitHub {
owner = "coffebar";
repo = pname;
rev = version;
hash = "sha256-euq+RRUeoKFmEmNJ6dOI01SAp6XywaspmGG5wCspkiA=";
hash = "sha256-iDRNlE+NFu8doFDTXxyFhMCm5IUVt1zdfHFqG1WeXHc=";
};
cargoHash = "sha256-sK1X3CNZ1PTNaLcGVAx4pk9EXDSfSjptJDwC73DFq7w=";
cargoHash = "sha256-k5GKi9LIHiqJGmoj8M52+Seww7cNirp49VKI4Y2SMqw=";
meta = with lib; {
description = "Per window keyboard layout (language) for Hyprland wayland compositor";
pkgs/top-level/python-aliases.nix
+2
View File
@@ -327,6 +327,7 @@ mapAliases ({
net2grid = gridnet; # add 2022-04-22
nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08
ninja-python = ninja; # add 2022-08-03
nose3 = throw "nose3 has been removed since it is unmaintained and does not work with Python 3.12"; # added 2024-07-28
nosejs = throw "nosejs has been removed since it has not been maintained for 15 years and there are no dependent packages"; # added 2024-05-21
nose-cov = throw "nose-cov has been removed, it was archived and unmaintained since 2012"; # added 2024-05-21
nosexcover = throw "nosexcover has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21
@@ -360,6 +361,7 @@ mapAliases ({
pdfposter = throw "pdfposter was promoted to a top-level attribute"; # Added 2023-06-29
pdfminer = pdfminer-six; # added 2022-05-25
pep257 = pydocstyle; # added 2022-04-12
pkutils = throw "pkutils was removed as it was unused and is not applicable to modern Python build tools"; # added 2024-07-28
poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09
poetry2conda = throw "poetry2conda was promoted to a top-level attribute"; # Added 2022-10-02
Polygon3 = polygon3; # Added 2023-08-08
pkgs/top-level/python-packages.nix
-4
View File
@@ -9144,8 +9144,6 @@ self: super: with self; {
nose2pytest = callPackage ../development/python-modules/nose2pytest { };
nose3 = callPackage ../development/python-modules/nose3 { };
notebook = callPackage ../development/python-modules/notebook { };
notebook-shim = callPackage ../development/python-modules/notebook-shim { };
@@ -10470,8 +10468,6 @@ self: super: with self; {
pyzipper = callPackage ../development/python-modules/pyzipper { };
pkutils = callPackage ../development/python-modules/pkutils { };
plac = callPackage ../development/python-modules/plac { };
plaid-python = callPackage ../development/python-modules/plaid-python { };