Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -477,6 +477,9 @@ pkgs/development/interpreters/erlang/ @NixOS/beam
|
||||
pkgs/development/interpreters/elixir/ @NixOS/beam
|
||||
pkgs/development/interpreters/lfe/ @NixOS/beam
|
||||
|
||||
# Authelia
|
||||
pkgs/servers/authelia/ @06kellyjac @dit7ya @nicomem
|
||||
|
||||
# OctoDNS
|
||||
pkgs/by-name/oc/octodns/ @anthonyroussel
|
||||
|
||||
|
||||
@@ -309,6 +309,7 @@ let
|
||||
stringLength
|
||||
substring
|
||||
isString
|
||||
replaceString
|
||||
replaceStrings
|
||||
intersperse
|
||||
concatStringsSep
|
||||
|
||||
+2
-2
@@ -18,7 +18,7 @@ let
|
||||
concatStrings
|
||||
escape
|
||||
head
|
||||
replaceStrings
|
||||
replaceString
|
||||
;
|
||||
|
||||
mkPrimitive = t: v: {
|
||||
@@ -451,7 +451,7 @@ rec {
|
||||
mkString =
|
||||
v:
|
||||
let
|
||||
sanitize = s: replaceStrings [ "\n" ] [ "\\n" ] (escape [ "'" "\\" ] s);
|
||||
sanitize = s: replaceString "\n" "\\n" (escape [ "'" "\\" ] s);
|
||||
in
|
||||
mkPrimitive type.string v
|
||||
// {
|
||||
|
||||
+36
-1
@@ -332,6 +332,41 @@ rec {
|
||||
*/
|
||||
concatLines = concatMapStrings (s: s + "\n");
|
||||
|
||||
/**
|
||||
Given string `s`, replace every occurrence of the string `from` with the string `to`.
|
||||
|
||||
# Inputs
|
||||
|
||||
`from`
|
||||
: The string to be replaced
|
||||
|
||||
`to`
|
||||
: The string to replace with
|
||||
|
||||
`s`
|
||||
: The original string where replacements will be made
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
replaceString :: string -> string -> string -> string
|
||||
```
|
||||
|
||||
# Examples
|
||||
:::{.example}
|
||||
## `lib.strings.replaceString` usage example
|
||||
|
||||
```nix
|
||||
replaceString "world" "Nix" "Hello, world!"
|
||||
=> "Hello, Nix!"
|
||||
replaceString "." "_" "v1.2.3"
|
||||
=> "v1_2_3"
|
||||
```
|
||||
|
||||
:::
|
||||
*/
|
||||
replaceString = from: to: replaceStrings [ from ] [ to ];
|
||||
|
||||
/**
|
||||
Repeat a string `n` times,
|
||||
and concatenate the parts into a new string.
|
||||
@@ -1138,7 +1173,7 @@ rec {
|
||||
string = toString arg;
|
||||
in
|
||||
if match "[[:alnum:],._+:@%/-]+" string == null then
|
||||
"'${replaceStrings [ "'" ] [ "'\\''" ] string}'"
|
||||
"'${replaceString "'" "'\\''" string}'"
|
||||
else
|
||||
string;
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ let
|
||||
optionalAttrs
|
||||
optionalString
|
||||
removeSuffix
|
||||
replaceStrings
|
||||
replaceString
|
||||
toUpper
|
||||
;
|
||||
|
||||
@@ -522,7 +522,7 @@ let
|
||||
#
|
||||
# https://github.com/rust-lang/cargo/pull/9169
|
||||
# https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431
|
||||
cargoEnvVarTarget = replaceStrings [ "-" ] [ "_" ] (toUpper final.rust.cargoShortTarget);
|
||||
cargoEnvVarTarget = replaceString "-" "_" (toUpper final.rust.cargoShortTarget);
|
||||
|
||||
# True if the target is no_std
|
||||
# https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421
|
||||
|
||||
@@ -91,6 +91,7 @@ let
|
||||
range
|
||||
recursiveUpdateUntil
|
||||
removePrefix
|
||||
replaceString
|
||||
replicate
|
||||
runTests
|
||||
setFunctionArgs
|
||||
@@ -497,6 +498,11 @@ runTests {
|
||||
expected = "/usr/include:/usr/local/include";
|
||||
};
|
||||
|
||||
testReplaceStringString = {
|
||||
expr = strings.replaceString "." "_" "v1.2.3";
|
||||
expected = "v1_2_3";
|
||||
};
|
||||
|
||||
testReplicateString = {
|
||||
expr = strings.replicate 5 "hello";
|
||||
expected = "hellohellohellohellohello";
|
||||
@@ -1728,6 +1734,11 @@ runTests {
|
||||
];
|
||||
};
|
||||
|
||||
testReplaceString = {
|
||||
expr = replaceString "world" "Nix" "Hello, world!";
|
||||
expected = "Hello, Nix!";
|
||||
};
|
||||
|
||||
testReplicate = {
|
||||
expr = replicate 3 "a";
|
||||
expected = [
|
||||
|
||||
@@ -6554,7 +6554,7 @@
|
||||
name = "DontEatOreo";
|
||||
github = "DontEatOreo";
|
||||
githubId = 57304299;
|
||||
keys = [ { fingerprint = "33CD 5C0A 673C C54D 661E 5E4C 0DB5 361B EEE5 30AB"; } ];
|
||||
matrix = "@donteatoreo:matrix.org";
|
||||
};
|
||||
dopplerian = {
|
||||
name = "Dopplerian";
|
||||
@@ -16598,8 +16598,10 @@
|
||||
moraxyc = {
|
||||
name = "Moraxyc Xu";
|
||||
email = "i@qaq.li";
|
||||
matrix = "@moraxyc:qaq.li";
|
||||
github = "Moraxyc";
|
||||
githubId = 69713071;
|
||||
keys = [ { fingerprint = "7DD1 A4DF 7DD6 AEEB F07B 1108 8296 4F3A B1D9 DE79"; } ];
|
||||
};
|
||||
moredread = {
|
||||
email = "code@apb.name";
|
||||
|
||||
@@ -277,6 +277,7 @@ in
|
||||
# avoid this race condition.
|
||||
after = [ "systemd-modules-load.service" ];
|
||||
wantedBy = [ "${realDevice'}.swap" ];
|
||||
requiredBy = lib.optionals sw.randomEncryption.enable [ "${realDevice'}.swap" ];
|
||||
before = [
|
||||
"${realDevice'}.swap"
|
||||
"shutdown.target"
|
||||
|
||||
@@ -476,4 +476,10 @@ in
|
||||
map (instance: lib.mkIf instance.enable (mkInstanceUsersConfig instance)) instances
|
||||
);
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
jk
|
||||
dit7ya
|
||||
nicomem
|
||||
];
|
||||
}
|
||||
|
||||
@@ -125,7 +125,9 @@ let
|
||||
name = "initrd-${kernel-name}";
|
||||
inherit (config.boot.initrd) compressor compressorArgs prepend;
|
||||
|
||||
contents = lib.filter ({ source, ... }: !lib.elem source cfg.suppressedStorePaths) cfg.storePaths;
|
||||
contents = lib.filter (
|
||||
{ source, enable, ... }: (!lib.elem source cfg.suppressedStorePaths) && enable
|
||||
) cfg.storePaths;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@@ -16,16 +16,16 @@ let
|
||||
inherit tiling_wm;
|
||||
};
|
||||
stableVersion = {
|
||||
version = "2024.3.2.14"; # "Android Studio Meerkat Feature Drop | 2024.3.2"
|
||||
sha256Hash = "sha256-LHtPAJe4Zo2FcYwO0j51vt8QUNPQ2Dwf2UT7H72DyKU=";
|
||||
version = "2024.3.2.15"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Patch 1"
|
||||
sha256Hash = "sha256-L8s8l1/Q4AJEGvdzTLLu9sRZlkNyRDMQvK8moZXOeIE=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2024.3.2.13"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 4"
|
||||
sha256Hash = "sha256-tPRTDFyKGPR1DKuJRBcwjWjNxylS/8Zv/Nd6vBmcujg=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2025.1.1.10"; # "Android Studio Narwhal | 2025.1.1 Canary 10"
|
||||
sha256Hash = "sha256-GKLOlDkA4hSbKeI3Oob3Pmfxq0ji+q2yTK/z2jPV8FU=";
|
||||
version = "2025.1.2.2"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Canary 2"
|
||||
sha256Hash = "sha256-zQ3PK9Fq8iYocSRFsYXNrnJ34QJGUkQoLtSNhFA2Ido=";
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
libchewing,
|
||||
libpinyin,
|
||||
maliit-framework,
|
||||
pcre,
|
||||
presage,
|
||||
qtfeedback,
|
||||
qtmultimedia,
|
||||
@@ -42,7 +41,6 @@ mkDerivation rec {
|
||||
libchewing
|
||||
libpinyin
|
||||
maliit-framework
|
||||
pcre
|
||||
presage
|
||||
qtfeedback
|
||||
qtmultimedia
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
mkHyprlandPlugin hyprland {
|
||||
pluginName = "hypr-dynamic-cursors";
|
||||
version = "0-unstable-2025-05-08";
|
||||
version = "0-unstable-2025-05-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirtCode";
|
||||
repo = "hypr-dynamic-cursors";
|
||||
rev = "1aabd346eb7ad12a614fd18d095d13422d8b95b4";
|
||||
hash = "sha256-KophdgmuoPO4adpgXxhDBAMQoRRoHjngiFWQxLoGgWY=";
|
||||
rev = "761acf0e602e0f6549e5e6c0289a0402e6073489";
|
||||
hash = "sha256-7L2MRMB2ONEh7wlgQzraEoA+0o88EOV87KNqZg7vpHA=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@@ -1,38 +1,38 @@
|
||||
{
|
||||
"stable": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.76.x64.tar.gz",
|
||||
"hash": "sha256-vEbmZP0WQ0Ha92V/owFKtxavahWMpV73vRiflZ1dpzQ="
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.78.x64.tar.gz",
|
||||
"hash": "sha256-COmXSjbCetPsbm40OrWGVtULPheEgnHEO0ZcIgWaG1w="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.76.arm64.tar.gz",
|
||||
"hash": "sha256-4GHFLlpThIJ5oAVgwXUAy4Gb0569RLXK1kdLErOr6j8="
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.78.arm64.tar.gz",
|
||||
"hash": "sha256-diy7VhKRluSnVSR35Ogamf9RDHdqxSJifLOOYmMrJHE="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.76-x86_64.zip",
|
||||
"hash": "sha256-hAIVQ7QVpZzQqW5ikCjp6HsskQWH5bbzM85DNyY0hFQ="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.78-x86_64.zip",
|
||||
"hash": "sha256-8fbjEc/Z0xCdXq/uHp4bQE5Js5hNLbVCRZxnepUdLUs="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.76-aarch64.zip",
|
||||
"hash": "sha256-jfdtLBsd1IvntJHZOJ0pxIrwjIUOcG3thfyjTMNIMK4="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.78-aarch64.zip",
|
||||
"hash": "sha256-x03dZ/eVrvFcbese1cBAvyJKwtWe6rOcgytn0OsEFDQ="
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.76-32.BETA.x64.tar.gz",
|
||||
"hash": "sha256-149kU1CKQ0iLlD6O7jOjrcwwlxMdd5iAm53ILK2mv2o="
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.80-18.BETA.x64.tar.gz",
|
||||
"hash": "sha256-X2Wu/dQQ7fv+tTAU2/70S38wL6WdJuc/DXWoiHZvSP4="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.76-32.BETA.arm64.tar.gz",
|
||||
"hash": "sha256-xHurzI8OcooSOCkQlSgtOH1Bgdur2oO1sNwKUOvSckA="
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.80-18.BETA.arm64.tar.gz",
|
||||
"hash": "sha256-52aRg6QD/fKOzOHoG88q8VNJIizxnISFnpxek7bJ05w="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.76-32.BETA-x86_64.zip",
|
||||
"hash": "sha256-LgDl5DLUdn4bSRXrx11QOv0J6VXyns+KQgbU/Y0JxDU="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.80-18.BETA-x86_64.zip",
|
||||
"hash": "sha256-kUU+nm19DmdY8ZG6d+EJFQXcCy/BOauXh83suQLSvz0="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.76-32.BETA-aarch64.zip",
|
||||
"hash": "sha256-mJFuejGiUKV0PEJF8ajiL3cMRQTRghoaCRyP8afatgY="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.80-18.BETA-aarch64.zip",
|
||||
"hash": "sha256-eZG0QaB5NRwRCYcmlfZA/HTceLq7eUzR+AvzDeOrzAY="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"stable-linux": "8.10.76",
|
||||
"stable-darwin": "8.10.76",
|
||||
"beta-linux":"8.10.76-32.BETA",
|
||||
"beta-darwin": "8.10.76-32.BETA"
|
||||
"stable-linux": "8.10.78",
|
||||
"stable-darwin": "8.10.78",
|
||||
"beta-linux":"8.10.80-18.BETA",
|
||||
"beta-darwin": "8.10.80-18.BETA"
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "airwindows";
|
||||
version = "0-unstable-2025-04-27";
|
||||
version = "0-unstable-2025-05-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airwindows";
|
||||
repo = "airwindows";
|
||||
rev = "f8a3f0d1b4ba5ad15777a7143f338731b9658d1a";
|
||||
hash = "sha256-Kdz8Q71LHeYhH+Lbgg9fhAYsC62LJLdQo5R+h9DwpXY=";
|
||||
rev = "083d3d6df8ce3688fb328fd434e27653fa6433b5";
|
||||
hash = "sha256-Pfh+zVsAqlP7aVtzTzdaTDB0E/d3bJrexsFm6n93ABQ=";
|
||||
};
|
||||
|
||||
# we patch helpers because honestly im spooked out by where those variables
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
makeBinaryWrapper,
|
||||
makeWrapper,
|
||||
patchelf,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
@@ -166,15 +166,15 @@ let
|
||||
qt6.qtbase
|
||||
qt6.qtwayland
|
||||
];
|
||||
commit = "0ffdb845a6a3308cbd9826bb78269d1d05cfb8aa";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cromite";
|
||||
version = "135.0.7049.100";
|
||||
version = "137.0.7151.44";
|
||||
commit = "1abdac0aff0916b1e4a4bd52f1896eec00834262";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${commit}/chrome-lin64.tar.gz";
|
||||
hash = "sha256-bB6CPqgwT1p7aXIKauOrRhG4dhCQ9tyO+HHRrkbrsPQ=";
|
||||
url = "https://github.com/uazo/cromite/releases/download/v${finalAttrs.version}-${finalAttrs.commit}/chrome-lin64.tar.gz";
|
||||
hash = "sha256-33GS4uD3RJHy9M0S5TRB6kRb1SZR+ABLyOR1oeVLQto=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
makeWrapper
|
||||
patchelf
|
||||
copyDesktopItems
|
||||
];
|
||||
@@ -234,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
|
||||
--set CHROME_WRAPPER "cromite" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
|
||||
--add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
# Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so
|
||||
@@ -247,6 +248,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/uazo/cromite/releases";
|
||||
description = "Bromite fork with ad blocking and privacy enhancements";
|
||||
|
||||
Executable
+18
@@ -0,0 +1,18 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix bash coreutils nix-update common-updater-scripts
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/uazo/cromite/releases/latest | jq --raw-output .tag_name | sed 's/^v//')
|
||||
latestVersion="${latestTag%-*}"
|
||||
commit="${latestTag#*-}"
|
||||
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; cromite.version or (lib.getVersion cromite)" | tr -d '"')
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "package is up-to-date: $currentVersion"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version cromite $commit --version-key=commit || true
|
||||
nix-update cromite --version $latestVersion
|
||||
@@ -1,9 +1,9 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
bigdecimal (3.1.7)
|
||||
builder (3.2.4)
|
||||
cucumber (9.2.0)
|
||||
bigdecimal (3.1.9)
|
||||
builder (3.3.0)
|
||||
cucumber (9.2.1)
|
||||
builder (~> 3.2)
|
||||
cucumber-ci-environment (> 9, < 11)
|
||||
cucumber-core (> 13, < 14)
|
||||
@@ -16,23 +16,23 @@ GEM
|
||||
multi_test (~> 1.1)
|
||||
sys-uname (~> 1.2)
|
||||
cucumber-ci-environment (10.0.1)
|
||||
cucumber-core (13.0.1)
|
||||
cucumber-core (13.0.3)
|
||||
cucumber-gherkin (>= 27, < 28)
|
||||
cucumber-messages (>= 20, < 23)
|
||||
cucumber-tag-expressions (> 5, < 7)
|
||||
cucumber-cucumber-expressions (17.0.2)
|
||||
cucumber-cucumber-expressions (17.1.0)
|
||||
bigdecimal
|
||||
cucumber-gherkin (27.0.0)
|
||||
cucumber-messages (>= 19.1.4, < 23)
|
||||
cucumber-html-formatter (21.3.0)
|
||||
cucumber-messages (> 19, < 25)
|
||||
cucumber-html-formatter (21.9.0)
|
||||
cucumber-messages (> 19, < 28)
|
||||
cucumber-messages (22.0.0)
|
||||
cucumber-tag-expressions (6.1.0)
|
||||
diff-lcs (1.5.1)
|
||||
ffi (1.16.3)
|
||||
cucumber-tag-expressions (6.1.2)
|
||||
diff-lcs (1.6.2)
|
||||
ffi (1.17.2)
|
||||
mini_mime (1.1.5)
|
||||
multi_test (1.1.0)
|
||||
sys-uname (1.2.3)
|
||||
sys-uname (1.3.1)
|
||||
ffi (~> 1.1)
|
||||
|
||||
PLATFORMS
|
||||
@@ -42,4 +42,4 @@ DEPENDENCIES
|
||||
cucumber
|
||||
|
||||
BUNDLED WITH
|
||||
2.5.6
|
||||
2.6.6
|
||||
|
||||
@@ -4,20 +4,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7";
|
||||
sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.7";
|
||||
version = "3.1.9";
|
||||
};
|
||||
builder = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
|
||||
sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.4";
|
||||
version = "3.3.0";
|
||||
};
|
||||
cucumber = {
|
||||
dependencies = [
|
||||
@@ -37,10 +37,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "19qsfgahkah4k0pajxc04mjn8pig7g4n9nkcarg1nzs2612c29s8";
|
||||
sha256 = "0cbi1g6qwdh38z2jxm8a1mc63iz887108747c99s3g452hwn2hgs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "9.2.0";
|
||||
version = "9.2.1";
|
||||
};
|
||||
cucumber-ci-environment = {
|
||||
groups = [ "default" ];
|
||||
@@ -62,10 +62,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1jf5ngxfc1q2y7l2nci3p91gp253aqdhkhazkz0yxq72n6zrszvm";
|
||||
sha256 = "0i2k5j3l8yy1367hzmg7x3xy984bnmihnzjh0ic8s2nwb3b2h770";
|
||||
type = "gem";
|
||||
};
|
||||
version = "13.0.1";
|
||||
version = "13.0.3";
|
||||
};
|
||||
cucumber-cucumber-expressions = {
|
||||
dependencies = [ "bigdecimal" ];
|
||||
@@ -73,10 +73,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0wsczwaqws1hbkirjhl0lh5s5xhc7cpmj2f790lkx10nr85rbpxi";
|
||||
sha256 = "14fkk7bfzm9cyacgcyzgkjc3nblflz4rcnlyz0pzd1ypwpqrvgm1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "17.0.2";
|
||||
version = "17.1.0";
|
||||
};
|
||||
cucumber-gherkin = {
|
||||
dependencies = [ "cucumber-messages" ];
|
||||
@@ -95,10 +95,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0wznhl3b8b47zff0yx69828bx33n0vc60kh6110ml0xni7lx8xw1";
|
||||
sha256 = "18bfg6gpijjbka0pp7604src1ajjkmsr79nyvr6zjgw4j0nvdsfn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "21.3.0";
|
||||
version = "21.9.0";
|
||||
};
|
||||
cucumber-messages = {
|
||||
groups = [ "default" ];
|
||||
@@ -115,30 +115,30 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1g0fl6v1677q71nkaib2g3p03jdzrwgfanpi96srb1743qd54bk1";
|
||||
sha256 = "0vcifp1fiha6yqi36m26n1vr8sz3dpnn5966hcz4a3dq43lf947p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.0";
|
||||
version = "6.1.2";
|
||||
};
|
||||
diff-lcs = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
|
||||
sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.1";
|
||||
version = "1.6.2";
|
||||
};
|
||||
ffi = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
|
||||
sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.16.3";
|
||||
version = "1.17.2";
|
||||
};
|
||||
mini_mime = {
|
||||
groups = [ "default" ];
|
||||
@@ -166,9 +166,9 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "03j9qpqip89a0vk6s0gvhxzhbvafjcj5rss7i3jwha0831aivib3";
|
||||
sha256 = "177l8rrqnb4rxf657mw28sgvgc8a2m7nlqcbdbra5m4xga0ypcxp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.3";
|
||||
version = "1.3.1";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscrypt-proxy";
|
||||
version = "2.1.9";
|
||||
version = "2.1.12";
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
owner = "DNSCrypt";
|
||||
repo = "dnscrypt-proxy";
|
||||
rev = version;
|
||||
sha256 = "sha256-8KnanJw9eBFm/zdy6f4OFCMStzic/n4Alnm5Y/pbDCA=";
|
||||
hash = "sha256-HgpcZccx3gaR3dTJJRKPICvNxZj9KdeC0+2ll8TWgeM=";
|
||||
};
|
||||
|
||||
passthru.tests = { inherit (nixosTests) dnscrypt-proxy2; };
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "irpf";
|
||||
version = "2025-1.2";
|
||||
version = "2025-1.3";
|
||||
|
||||
# https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
|
||||
# Para outros sistemas operacionais -> Multi
|
||||
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
in
|
||||
fetchzip {
|
||||
url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
|
||||
hash = "sha256-RlkDioXLcD3wHm9DDLw42QCRT4z0rEwlM0sGMORxk/A=";
|
||||
hash = "sha256-BWCxnKPvkijVkXfbA1iVbdcgLZqY5SAzASqnzdjXwiw=";
|
||||
};
|
||||
|
||||
passthru.updateScript = writeScript "update-irpf" ''
|
||||
|
||||
@@ -58,10 +58,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
lib.makeLibraryPath [
|
||||
vulkan-loader
|
||||
libdrm
|
||||
ocl-icd
|
||||
]
|
||||
}"
|
||||
"-C link-arg=-Wl,--add-needed,${vulkan-loader}/lib/libvulkan.so"
|
||||
"-C link-arg=-Wl,--add-needed,${libdrm}/lib/libdrm.so"
|
||||
"-C link-arg=-Wl,--add-needed,${ocl-icd}/lib/libOpenCL.so"
|
||||
]
|
||||
);
|
||||
|
||||
@@ -104,10 +106,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
patchelf $out/bin/.lact-wrapped \
|
||||
--add-needed libvulkan.so \
|
||||
--add-needed libdrm.so \
|
||||
--add-needed libOpenCL.so \
|
||||
--add-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
vulkan-loader
|
||||
libdrm
|
||||
ocl-icd
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
swig,
|
||||
# If we build the python packages, these two are not null
|
||||
buildPythonPackage ? null,
|
||||
lgpioWithoutPython ? null,
|
||||
# When building a python Packages, this specifies the python subproject
|
||||
pyProject ? "",
|
||||
}:
|
||||
|
||||
let
|
||||
mkDerivation = if pyProject == "" then stdenv.mkDerivation else buildPythonPackage;
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "lgpio";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joan2937";
|
||||
repo = "lg";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-92lLV+EMuJj4Ul89KIFHkpPxVMr/VvKGEocYSW2tFiE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals (pyProject == "PY_LGPIO") [
|
||||
swig
|
||||
];
|
||||
|
||||
preConfigure =
|
||||
if pyProject != "" then
|
||||
''
|
||||
cd ${pyProject}
|
||||
''
|
||||
else
|
||||
"";
|
||||
# Emulate ldconfig when building the C API
|
||||
postConfigure =
|
||||
if pyProject == "" then
|
||||
''
|
||||
substituteInPlace Makefile \
|
||||
--replace ldconfig 'echo ldconfig'
|
||||
''
|
||||
else
|
||||
"";
|
||||
|
||||
preBuild =
|
||||
if pyProject == "PY_LGPIO" then
|
||||
''
|
||||
swig -python lgpio.i
|
||||
''
|
||||
else
|
||||
"";
|
||||
|
||||
buildInputs = [
|
||||
lgpioWithoutPython
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Linux C libraries and Python modules for manipulating GPIO";
|
||||
homepage = "https://github.com/joan2937/lg";
|
||||
license = with lib.licenses; [ unlicense ];
|
||||
maintainers = with lib.maintainers; [ doronbehar ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -28,8 +28,7 @@ Identifiers must not be identical to any historical location's anchor of the sam
|
||||
The following identifiers violate this rule:
|
||||
- {"\n - ".join(self.conflicting_anchors)}
|
||||
|
||||
This can break links or redirects. If you added new content, choose a different identifier.
|
||||
""")
|
||||
This can break links or redirects. If you added new content, choose a different identifier.""")
|
||||
if self.divergent_redirects:
|
||||
error_messages.append(f"""
|
||||
All historical content locations must correspond to exactly one identifier.
|
||||
@@ -37,8 +36,7 @@ All historical content locations must correspond to exactly one identifier.
|
||||
- {"\n - ".join(self.divergent_redirects)}
|
||||
|
||||
It leads to inconsistent behavior depending on which redirect is applied.
|
||||
Please update doc/redirects.json or nixos/doc/manual/redirects.json!
|
||||
""")
|
||||
Please update doc/redirects.json or nixos/doc/manual/redirects.json!""")
|
||||
if self.identifiers_missing_current_outpath:
|
||||
error_messages.append(f"""
|
||||
The first element of an identifier's redirects list must denote its current location.
|
||||
@@ -46,52 +44,34 @@ The first element of an identifier's redirects list must denote its current loca
|
||||
- {"\n - ".join(self.identifiers_missing_current_outpath)}
|
||||
|
||||
If you moved content, add its new location as the first element of the redirects mapping.
|
||||
Please update doc/redirects.json or nixos/doc/manual/redirects.json!
|
||||
""")
|
||||
Please update doc/redirects.json or nixos/doc/manual/redirects.json!""")
|
||||
if self.identifiers_without_redirects:
|
||||
error_messages.append(f"""
|
||||
Identifiers present in the source must have a mapping in the redirects file.
|
||||
- {"\n - ".join(self.identifiers_without_redirects)}
|
||||
|
||||
This can happen when an identifier was added or renamed.
|
||||
|
||||
Added new content?
|
||||
redirects add-content ❬identifier❭ ❬path❭
|
||||
|
||||
Moved existing content to a different output path?
|
||||
redirects move-content ❬identifier❭ ❬path❭
|
||||
|
||||
Renamed existing identifiers?
|
||||
redirects rename-identifier ❬old-identifier❭ ❬new-identifier❭
|
||||
|
||||
Removed content? Redirect to alternatives or relevant release notes.
|
||||
redirects remove-and-redirect ❬identifier❭ ❬target-identifier❭
|
||||
|
||||
Note that you need to run `nix-shell doc` or `nix-shell nixos/doc/manual` to be able to run this command.
|
||||
""")
|
||||
- {"\n - ".join(self.identifiers_without_redirects)}""")
|
||||
if self.orphan_identifiers:
|
||||
error_messages.append(f"""
|
||||
Keys of the redirects mapping must correspond to some identifier in the source.
|
||||
- {"\n - ".join(self.orphan_identifiers)}
|
||||
|
||||
This can happen when an identifier was removed or renamed.
|
||||
- {"\n - ".join(self.orphan_identifiers)}""")
|
||||
if self.identifiers_without_redirects or self.orphan_identifiers or self.identifiers_missing_current_outpath:
|
||||
error_messages.append(f"""
|
||||
This can happen when an identifier was added, renamed, or removed.
|
||||
|
||||
Added new content?
|
||||
redirects add-content ❬identifier❭ ❬path❭
|
||||
$ redirects add-content ❬identifier❭ ❬path❭
|
||||
|
||||
Moved existing content to a different output path?
|
||||
redirects move-content ❬identifier❭ ❬path❭
|
||||
$ redirects move-content ❬identifier❭ ❬path❭
|
||||
|
||||
Renamed existing identifiers?
|
||||
redirects rename-identifier ❬old-identifier❭ ❬new-identifier❭
|
||||
$ redirects rename-identifier ❬old-identifier❭ ❬new-identifier❭
|
||||
|
||||
Removed content? (good for redirecting deprecations to new content or release notes)
|
||||
redirects remove-and-redirect ❬identifier❭ ❬target-identifier❭
|
||||
Removed content? Redirect to alternatives or relevant release notes.
|
||||
$ redirects remove-and-redirect ❬identifier❭ ❬target-identifier❭
|
||||
|
||||
Note that you need to run `nix-shell doc` or `nix-shell nixos/doc/manual` to be able to run this command.
|
||||
NOTE: Run `nix-shell doc` or `nix-shell nixos/doc/manual` to make this command available.
|
||||
""")
|
||||
|
||||
error_messages.append("NOTE: If your Manual build passes locally and you see this message in CI, you probably need a rebase.")
|
||||
error_messages.append("NOTE: If your build passes locally and you see this message in CI, you probably need a rebase.")
|
||||
return "\n".join(error_messages)
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nodezator";
|
||||
version = "1.5.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IndieSmiths";
|
||||
repo = "nodezator";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kdkOAJB7cVaayJOzof7dV9EBczEoEKXzCM7TcY8Ex5g=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
pygame-ce
|
||||
numpy
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Generalist Python node editor";
|
||||
homepage = "https://nodezator.com";
|
||||
downloadPage = "https://github.com/IndiePython/nodezator";
|
||||
changelog = "https://github.com/IndiePython/nodezator/releases/tag/v${version}";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ theobori ];
|
||||
mainProgram = "nodezator";
|
||||
};
|
||||
}
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pdfcpu";
|
||||
version = "0.10.2";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdfcpu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vfU0mFfOW9K3rgVNdfN2RBiKJLbijoVMtuywsoclEgE=";
|
||||
hash = "sha256-HTqaFl/ug/4sdchZBD4VQiXbD1L0/DVf2efZ3BV/vx4=";
|
||||
# Apparently upstream requires that the compiled executable will know the
|
||||
# commit hash and the date of the commit. This information is also presented
|
||||
# in the output of `pdfcpu version` which we use as a sanity check in the
|
||||
@@ -37,7 +37,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-27YTR/vYuNggjUIbpKs3/yEJheUXMaLZk8quGPwgNNk=";
|
||||
vendorHash = "sha256-5qB3zXiee4yMFpV8Ia8jICZaw+8Zpxd2Fs7DZ/DW/Jg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
buildPythonPackage ? null,
|
||||
}:
|
||||
|
||||
let
|
||||
mkDerivation =
|
||||
if builtins.isNull buildPythonPackage then stdenv.mkDerivation else buildPythonPackage;
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "pigpio";
|
||||
version = "79";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joan2937";
|
||||
repo = "pigpio";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Z+SwUlBbtWtnbjTe0IghR3gIKS43ZziN0amYtmXy7HE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "C library for the Raspberry which allows control of the General Purpose Input Outputs (GPIO)";
|
||||
homepage = "https://github.com/joan2937/pigpio";
|
||||
license = with lib.licenses; [ unlicense ];
|
||||
maintainers = with lib.maintainers; [ doronbehar ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
# nativeBuildInputs
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
installShellFiles,
|
||||
|
||||
# buildInputs
|
||||
gtk3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "piscope";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joan2937";
|
||||
repo = "piscope";
|
||||
tag = "V${finalAttrs.version}";
|
||||
hash = "sha256-VDrx/RLSpMhyD64PmdeWVacb9LleHakcy7D6zFxeyhw=";
|
||||
};
|
||||
# Fix FHS paths
|
||||
postConfigure = ''
|
||||
substituteInPlace piscope.c \
|
||||
--replace /usr/share/piscope $out/share/piscope
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
installShellFiles
|
||||
];
|
||||
buildInputs = [
|
||||
gtk3
|
||||
];
|
||||
# Upstream's Makefile assumes FHS
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
installBin piscope
|
||||
install -D -m 0644 piscope.glade $out/share/piscope/piscope.glade
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://abyz.me.uk/rpi/pigpio/piscope.html";
|
||||
description = "A logic analyser (digital waveform viewer) for the Raspberry";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ doronbehar ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -1,8 +1,8 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
json (2.2.0)
|
||||
procodile (1.0.23)
|
||||
json (2.12.2)
|
||||
procodile (1.0.26)
|
||||
json
|
||||
|
||||
PLATFORMS
|
||||
@@ -12,4 +12,4 @@ DEPENDENCIES
|
||||
procodile
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
2.6.6
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
|
||||
sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.0";
|
||||
version = "2.12.2";
|
||||
};
|
||||
procodile = {
|
||||
dependencies = [ "json" ];
|
||||
@@ -15,9 +15,9 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "025pbr1kah7cgs527n5q56m5agaa2smzac4rpmpk619xg4r1rdhs";
|
||||
sha256 = "1f2xf460p0dd8871dfjm3mx669hiy4fz2n53za0pfrd6mvwx5qkq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.23";
|
||||
version = "1.0.26";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,25 +7,31 @@
|
||||
libxkbcommon,
|
||||
installShellFiles,
|
||||
scdoc,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "swww";
|
||||
version = "0.9.5";
|
||||
version = "0.10.0-unstable-2025-05-27";
|
||||
|
||||
# Fixes build for locating wayland.xml, go back to regular tagged releases at next version bump
|
||||
# https://codeberg.org/LGFae/waybackend/issues/2
|
||||
src = fetchFromGitHub {
|
||||
owner = "LGFae";
|
||||
repo = "swww";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ldy9HhIsWdtTdvtRLV3qDT80oX646BI4Q+YX5wJXbsc=";
|
||||
rev = "800619eb70c0f4293a5b449103f55a0a3cfe2963";
|
||||
hash = "sha256-zkw1r2mmICkplgXTyN6GckTy0XEBAEoz4H1VQuP8eMU=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-K1ww0bOD747EDtqYkA0Dlu7cwbjYcPwSXPSqQDbTwZo=";
|
||||
cargoHash = "sha256-L2mbQJ0dAiB8+NOATnrPhVrjHvE5zjA1frhPbLUJ3sI=";
|
||||
|
||||
buildInputs = [
|
||||
lz4
|
||||
libxkbcommon
|
||||
wayland-protocols
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
doCheck = false; # Integration tests do not work in sandbox environment
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
makeWrapper,
|
||||
}:
|
||||
let
|
||||
version = "4.1.7";
|
||||
version = "4.1.8";
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
|
||||
|
||||
@@ -22,10 +22,10 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
aarch64-darwin = "sha256-CjzOBmhnEW0c+V6utNKPROhAOx1ql2vG8S4G1hT6Wdo=";
|
||||
aarch64-linux = "sha256-jEGaZiGW8FcmVRrQBr2DQfR7i+344MtlFofZrjwK4GY=";
|
||||
x86_64-darwin = "sha256-TN7TKW561j9qvgadL/P/cQhhum1lCrsjNglhxgz9GSw=";
|
||||
x86_64-linux = "sha256-BwYpKTWpdzxsh54X0jYlMi5EkOfo96CtDmiPquTe+YE=";
|
||||
aarch64-darwin = "sha256-GeUnkdNW3VnbaCdK42pYebqwzp2sI8x7Dxn8e3wdN6I=";
|
||||
aarch64-linux = "sha256-KKd9Hlmw5FtBaDweOUdiH9/nP2iVsF23w09j8/SJjo0=";
|
||||
x86_64-darwin = "sha256-SmyyYNdcS9ygck+8w7I6WttScVrW14WVRjyGEoyhwyk=";
|
||||
x86_64-linux = "sha256-j4TOgQvf8iXlmXgdHi2qgrQoIikCHIZ6cbQZ9Z+aqDY=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
in
|
||||
|
||||
@@ -15,17 +15,18 @@ GEM
|
||||
tzinfo (~> 2.0, >= 2.0.5)
|
||||
uri (>= 0.13.1)
|
||||
aws-eventstream (1.3.2)
|
||||
aws-partitions (1.1071.0)
|
||||
aws-sdk-core (3.220.2)
|
||||
aws-partitions (1.1107.0)
|
||||
aws-sdk-core (3.224.0)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.992.0)
|
||||
aws-sigv4 (~> 1.9)
|
||||
base64
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-kms (1.99.0)
|
||||
logger
|
||||
aws-sdk-kms (1.101.0)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-s3 (1.182.0)
|
||||
aws-sdk-s3 (1.186.1)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
@@ -39,11 +40,11 @@ GEM
|
||||
text-table
|
||||
zeitwerk
|
||||
concurrent-ruby (1.3.5)
|
||||
connection_pool (2.5.0)
|
||||
connection_pool (2.5.3)
|
||||
deep_merge (1.2.2)
|
||||
diff-lcs (1.6.0)
|
||||
dotenv (3.1.7)
|
||||
drb (2.2.1)
|
||||
diff-lcs (1.6.2)
|
||||
dotenv (3.1.8)
|
||||
drb (2.2.3)
|
||||
dsl_evaluator (0.3.2)
|
||||
activesupport
|
||||
memoist
|
||||
@@ -58,11 +59,11 @@ GEM
|
||||
i18n (1.14.7)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jmespath (1.6.2)
|
||||
logger (1.6.6)
|
||||
logger (1.7.0)
|
||||
memoist (0.16.2)
|
||||
mini_portile2 (2.8.8)
|
||||
mini_portile2 (2.8.9)
|
||||
minitest (5.25.5)
|
||||
nokogiri (1.18.5)
|
||||
nokogiri (1.18.8)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
racc (1.8.1)
|
||||
@@ -80,13 +81,13 @@ GEM
|
||||
rspec-mocks (~> 3.13.0)
|
||||
rspec-core (3.13.3)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-expectations (3.13.3)
|
||||
rspec-expectations (3.13.4)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-mocks (3.13.2)
|
||||
rspec-mocks (3.13.4)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-support (3.13.2)
|
||||
rspec-support (3.13.3)
|
||||
rspec-terraspace (0.3.3)
|
||||
activesupport
|
||||
memoist
|
||||
@@ -132,7 +133,7 @@ GEM
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
uri (1.0.3)
|
||||
zeitwerk (2.7.2)
|
||||
zeitwerk (2.7.3)
|
||||
zip_folder (0.1.0)
|
||||
rubyzip
|
||||
|
||||
@@ -143,4 +144,4 @@ DEPENDENCIES
|
||||
terraspace
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.2
|
||||
2.6.6
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1qlygf2bg086hr5cpyg8hh0jwvx4xvkh8v09maxdj7xqplzplhg7";
|
||||
sha256 = "0h25l48fy06yba48ymsflda93yclk0335kdcnf74f5axsah84qfn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1071.0";
|
||||
version = "1.1107.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
dependencies = [
|
||||
@@ -50,15 +50,16 @@
|
||||
"aws-sigv4"
|
||||
"base64"
|
||||
"jmespath"
|
||||
"logger"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0qydjik09i110rxpkz4g8kfq5n10x0fwp2cwpb9zw44kprzwvcmn";
|
||||
sha256 = "1b0pi1iibp644dn78g53s7hs7gcxghfa7h8rz3lvz8ivykisl5y6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.220.2";
|
||||
version = "3.224.0";
|
||||
};
|
||||
aws-sdk-kms = {
|
||||
dependencies = [
|
||||
@@ -69,10 +70,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads";
|
||||
sha256 = "1mv8jc8sbvim2m3y3zxm8z4i5sh4x9ds7y9h5z04qfg7kjvbbn24";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.99.0";
|
||||
version = "1.101.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
dependencies = [
|
||||
@@ -84,10 +85,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h";
|
||||
sha256 = "00sq22mfibxq3rjy9c4vj1s8yjszv8988di7z7rs8v62my53nw2v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.182.0";
|
||||
version = "1.186.1";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
dependencies = [ "aws-eventstream" ];
|
||||
@@ -160,10 +161,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
|
||||
sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.0";
|
||||
version = "2.5.3";
|
||||
};
|
||||
deep_merge = {
|
||||
groups = [ "default" ];
|
||||
@@ -180,30 +181,30 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0bnss89lcm3b1k3xcjd35grxqz5q040d12imd73qybwnfarggrx1";
|
||||
sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
version = "1.6.2";
|
||||
};
|
||||
dotenv = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1wrw6fm0s38cd6h55w79bkvjhcj2zfkargjpws4kilkmhr3xyw66";
|
||||
sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.7";
|
||||
version = "3.1.8";
|
||||
};
|
||||
drb = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
|
||||
sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.1";
|
||||
version = "2.2.3";
|
||||
};
|
||||
dsl_evaluator = {
|
||||
dependencies = [
|
||||
@@ -289,10 +290,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
|
||||
sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.6";
|
||||
version = "1.7.0";
|
||||
};
|
||||
memoist = {
|
||||
groups = [ "default" ];
|
||||
@@ -309,10 +310,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
|
||||
sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.8";
|
||||
version = "2.8.9";
|
||||
};
|
||||
minitest = {
|
||||
groups = [ "default" ];
|
||||
@@ -333,10 +334,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1p1nl5gqs56wlv2gwzdj0px3dw018ywpkg14a4s23b0qjkdgi9n8";
|
||||
sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.18.5";
|
||||
version = "1.18.8";
|
||||
};
|
||||
racc = {
|
||||
groups = [ "default" ];
|
||||
@@ -429,10 +430,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf";
|
||||
sha256 = "1n7cb6szws90hxbzqrfybs4rj1xb0vhn24xa4l5r1vnzcnblahsf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.13.3";
|
||||
version = "3.13.4";
|
||||
};
|
||||
rspec-mocks = {
|
||||
dependencies = [
|
||||
@@ -443,20 +444,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3";
|
||||
sha256 = "14xr5bq7s80hm97fcp3pvk4v515qfw3lrlsf20idalwwf6h5icbb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.13.2";
|
||||
version = "3.13.4";
|
||||
};
|
||||
rspec-support = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf";
|
||||
sha256 = "0hrzdcklbl8pv721cq906yfl38fmqmlnh33ff8l752z1ys9y6q9a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.13.2";
|
||||
version = "3.13.3";
|
||||
};
|
||||
rspec-terraspace = {
|
||||
dependencies = [
|
||||
@@ -612,10 +613,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0ws6rpyj0y9iadjg1890dwnnbjfdbzxsv6r48zbj7f8yn5y0cbl4";
|
||||
sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.2";
|
||||
version = "2.7.3";
|
||||
};
|
||||
zip_folder = {
|
||||
dependencies = [ "rubyzip" ];
|
||||
|
||||
@@ -29,6 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./startupwmclass.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.wrapPython
|
||||
makeWrapper
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
diff --git a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
|
||||
index b0472a18d..0e0be14f3 100644
|
||||
--- a/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
|
||||
+++ b/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop
|
||||
@@ -7,3 +7,4 @@ Terminal=false
|
||||
Type=Application
|
||||
Categories=Application;Network;P2P
|
||||
MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet;application/x-bittorrent
|
||||
+StartupWMClass=Tribler
|
||||
@@ -11,18 +11,18 @@ GEM
|
||||
artifactory (3.0.17)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.3.2)
|
||||
aws-partitions (1.1075.0)
|
||||
aws-sdk-core (3.221.0)
|
||||
aws-partitions (1.1107.0)
|
||||
aws-sdk-core (3.224.0)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.992.0)
|
||||
aws-sigv4 (~> 1.9)
|
||||
base64
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
logger
|
||||
aws-sdk-kms (1.99.0)
|
||||
aws-sdk-kms (1.101.0)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-s3 (1.182.0)
|
||||
aws-sdk-s3 (1.186.1)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
@@ -71,7 +71,7 @@ GEM
|
||||
faraday_middleware (1.2.1)
|
||||
faraday (~> 1.0)
|
||||
fastimage (2.4.0)
|
||||
fastlane (2.227.0)
|
||||
fastlane (2.227.2)
|
||||
CFPropertyList (>= 2.3, < 4.0.0)
|
||||
addressable (>= 2.8, < 3.0.0)
|
||||
artifactory (~> 3.0)
|
||||
@@ -111,7 +111,7 @@ GEM
|
||||
tty-spinner (>= 0.8.0, < 1.0.0)
|
||||
word_wrap (~> 1.0.0)
|
||||
xcodeproj (>= 1.13.0, < 2.0.0)
|
||||
xcpretty (~> 0.4.0)
|
||||
xcpretty (~> 0.4.1)
|
||||
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
|
||||
fastlane-sirp (1.0.0)
|
||||
sysrandom (~> 1.0)
|
||||
@@ -158,7 +158,7 @@ GEM
|
||||
httpclient (2.9.0)
|
||||
mutex_m
|
||||
jmespath (1.6.2)
|
||||
json (2.10.2)
|
||||
json (2.12.2)
|
||||
jwt (2.10.1)
|
||||
base64
|
||||
logger (1.7.0)
|
||||
@@ -173,7 +173,7 @@ GEM
|
||||
optparse (0.6.0)
|
||||
os (1.1.4)
|
||||
plist (3.7.2)
|
||||
public_suffix (6.0.1)
|
||||
public_suffix (6.0.2)
|
||||
rake (13.2.1)
|
||||
representable (3.2.0)
|
||||
declarative (< 0.1.0)
|
||||
@@ -185,7 +185,7 @@ GEM
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyzip (2.4.1)
|
||||
security (0.1.5)
|
||||
signet (0.19.0)
|
||||
signet (0.20.0)
|
||||
addressable (~> 2.8)
|
||||
faraday (>= 0.17.5, < 3.a)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
@@ -228,4 +228,4 @@ DEPENDENCIES
|
||||
xcode-install
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.2
|
||||
2.6.6
|
||||
|
||||
@@ -55,10 +55,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1jb72jj18a9l98ghmi8ny9nys4w3hcny0xyi0dzl3ms0knsrrn3i";
|
||||
sha256 = "0h25l48fy06yba48ymsflda93yclk0335kdcnf74f5axsah84qfn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1075.0";
|
||||
version = "1.1107.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
dependencies = [
|
||||
@@ -73,10 +73,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0jmd8rf68jf99ksklwaflym07issvr1il1qpzmpaf59avhcxgjjy";
|
||||
sha256 = "1b0pi1iibp644dn78g53s7hs7gcxghfa7h8rz3lvz8ivykisl5y6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.221.0";
|
||||
version = "3.224.0";
|
||||
};
|
||||
aws-sdk-kms = {
|
||||
dependencies = [
|
||||
@@ -87,10 +87,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads";
|
||||
sha256 = "1mv8jc8sbvim2m3y3zxm8z4i5sh4x9ds7y9h5z04qfg7kjvbbn24";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.99.0";
|
||||
version = "1.101.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
dependencies = [
|
||||
@@ -102,10 +102,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h";
|
||||
sha256 = "00sq22mfibxq3rjy9c4vj1s8yjszv8988di7z7rs8v62my53nw2v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.182.0";
|
||||
version = "1.186.1";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
dependencies = [ "aws-eventstream" ];
|
||||
@@ -461,10 +461,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "12lqn70c3v5h2z2svn1gickyhkhny6rwnm2xfrs3gmjc6pvfrqhb";
|
||||
sha256 = "1dw9smmpzhlca2zzp2pgmr2slhwnz8926s5rnjfjrclilz33p22z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.227.0";
|
||||
version = "2.227.2";
|
||||
};
|
||||
fastlane-sirp = {
|
||||
dependencies = [ "sysrandom" ];
|
||||
@@ -668,10 +668,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
|
||||
sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.10.2";
|
||||
version = "2.12.2";
|
||||
};
|
||||
jwt = {
|
||||
dependencies = [ "base64" ];
|
||||
@@ -809,10 +809,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
|
||||
sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
};
|
||||
rake = {
|
||||
groups = [ "default" ];
|
||||
@@ -910,10 +910,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0cfxa11wy1nv9slmnzjczkdgld0gqizajsb03rliy53zylwkjzsk";
|
||||
sha256 = "18s7xiclzajp9w9cmq8k28iy5ig1zpx1zv1mrm416cb2c0m0wrmw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
};
|
||||
simctl = {
|
||||
dependencies = [
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
# generated by zon2nix (https://github.com/nix-community/zon2nix)
|
||||
|
||||
{
|
||||
linkFarm,
|
||||
fetchzip,
|
||||
fetchgit,
|
||||
}:
|
||||
|
||||
linkFarm "zig-packages" [
|
||||
{
|
||||
name = "chameleon-3.0.0-bqfnCfhtAAAAxXGw5t9odkb4ayCTTqOcPvL-TgSMUacF";
|
||||
path = fetchzip {
|
||||
url = "https://github.com/DonIsaac/chameleon/archive/7c7477fa76da53c2791f9e1f860481f64140ccbc.zip";
|
||||
hash = "sha256-fbKhLQLE/6aHmpYr8+daxyUSWNpDq5zApHP4brRYvlo=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "recover-1.1.0-Zd97oqomAADqISI8KEhW_UUjiPSExhw9hzeoNpg1Nveo";
|
||||
path = fetchzip {
|
||||
url = "https://github.com/dimdin/zig-recover/archive/36133afaa1b085db7063ffc97c08ae0bddc2de4e.zip";
|
||||
hash = "sha256-0oPP6BLVEIR79Q8KcvOlSeDfNLT+8inmIU6ZkuJWrfU=";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "smart_pointers-0.0.3-NPos2MOwAABoujUzLcVLofXqRAgYWLc5pG-TKDhyK0cq";
|
||||
path = fetchzip {
|
||||
url = "https://github.com/DonIsaac/smart-pointers/archive/refs/tags/v0.0.3.tar.gz";
|
||||
hash = "sha256-oSI76wyiAX7YDvKGhzRbZdEvl7+DPLtMb56w0QsYrkg=";
|
||||
};
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,56 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
callPackage,
|
||||
zig_0_14,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zig-zlint";
|
||||
version = "0.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "zlint"; # tests expect this
|
||||
owner = "DonIsaac";
|
||||
repo = "zlint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-S0FhugmrNHCEpIWX7oL1vZ8heikpo/mok7ciTgSdOpg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
zig_0_14.hook
|
||||
];
|
||||
|
||||
zigBuildFlags = [
|
||||
"-Dversion=v${finalAttrs.version}"
|
||||
"--system"
|
||||
(callPackage ./build.zig.zon.nix { })
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
zigCheckFlags = finalAttrs.zigBuildFlags;
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/zlint";
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
# `zig build` produces a lot more artifacts, just copy over the ones we want
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -vDm755 zig-out/bin/zlint $out/bin/zlint
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Linter for the Zig programming language";
|
||||
homepage = "https://github.com/DonIsaac/zlint";
|
||||
changelog = "https://github.com/DonIsaac/zlint/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ christoph-heiss ];
|
||||
mainProgram = "zlint";
|
||||
inherit (zig_0_14.meta) platforms;
|
||||
};
|
||||
})
|
||||
@@ -14,7 +14,6 @@
|
||||
assert lib.elem variant [
|
||||
null
|
||||
"cpp"
|
||||
"pcre16"
|
||||
"pcre32"
|
||||
];
|
||||
|
||||
|
||||
@@ -1,15 +1,13 @@
|
||||
# How to update
|
||||
|
||||
1. `./fetchrepo.sh`
|
||||
2. `./mkrepo.sh`
|
||||
3. Check the `repo.json` diff for new stable versions of `tools`, `platform-tools`, `build-tools`, `emulator` and/or `ndk`
|
||||
4. Update the relevant argument defaults in `compose-android-packages.nix`
|
||||
`nix-shell maintainers/scripts/update.nix --argstr package androidenv.test-suite --argstr commit true`
|
||||
|
||||
# How to run tests
|
||||
|
||||
You may need to make yourself familiar with [package tests](../../../README.md#package-tests), and [Writing larger package tests](../../../README.md#writing-larger-package-tests), then run tests locally with:
|
||||
|
||||
```shell
|
||||
$ export NIXPKGS_ALLOW_UNFREE=1
|
||||
$ cd path/to/nixpkgs
|
||||
$ nix-build -A androidenv.test-suite.tests
|
||||
$ nix-build -A androidenv.test-suite
|
||||
```
|
||||
|
||||
@@ -31,7 +31,7 @@ in
|
||||
# Reads the repo JSON. If repoXmls is provided, will build a repo JSON into the Nix store.
|
||||
if repoXmls != null then
|
||||
let
|
||||
# Uses mkrepo.rb to create a repo spec.
|
||||
# Uses update.rb to create a repo spec.
|
||||
mkRepoJson =
|
||||
{
|
||||
packages ? [ ],
|
||||
@@ -43,6 +43,7 @@ in
|
||||
ruby.withPackages (
|
||||
pkgs: with pkgs; [
|
||||
slop
|
||||
curb
|
||||
nokogiri
|
||||
]
|
||||
)
|
||||
@@ -68,7 +69,7 @@ in
|
||||
preferLocalBuild = true;
|
||||
unpackPhase = "true";
|
||||
buildPhase = ''
|
||||
ruby ${./mkrepo.rb} ${lib.escapeShellArgs mkRepoRubyArguments} > repo.json
|
||||
env ruby -e 'load "${./update.rb}"' -- ${lib.escapeShellArgs mkRepoRubyArguments} --input /dev/null --output repo.json
|
||||
'';
|
||||
installPhase = ''
|
||||
mv repo.json $out
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
{
|
||||
# If you want to use the in-tree version of nixpkgs:
|
||||
pkgs ? import ../../../../.. {
|
||||
config.allowUnfree = true;
|
||||
},
|
||||
|
||||
licenseAccepted ? pkgs.callPackage ../license.nix { },
|
||||
}:
|
||||
|
||||
# Tests IFD with androidenv. Needs a folder of `../xml` in your local tree;
|
||||
# use ../fetchrepo.sh to produce it.
|
||||
let
|
||||
androidEnv = pkgs.callPackage ./.. {
|
||||
inherit pkgs licenseAccepted;
|
||||
};
|
||||
|
||||
sdkArgs = {
|
||||
repoXmls = {
|
||||
packages = [ ../xml/repository2-3.xml ];
|
||||
images = [
|
||||
../xml/android-sys-img2-3.xml
|
||||
../xml/android-tv-sys-img2-3.xml
|
||||
../xml/google_apis-sys-img2-3.xml
|
||||
../xml/google_apis_playstore-sys-img2-3.xml
|
||||
../xml/android-wear-sys-img2-3.xml
|
||||
../xml/android-wear-cn-sys-img2-3.xml
|
||||
../xml/android-automotive-sys-img2-3.xml
|
||||
];
|
||||
addons = [ ../xml/addon2-3.xml ];
|
||||
};
|
||||
};
|
||||
|
||||
androidComposition = androidEnv.composeAndroidPackages sdkArgs;
|
||||
androidSdk = androidComposition.androidsdk;
|
||||
platformTools = androidComposition.platform-tools;
|
||||
jdk = pkgs.jdk;
|
||||
in
|
||||
pkgs.mkShell {
|
||||
name = "androidenv-example-ifd-demo";
|
||||
packages = [
|
||||
androidSdk
|
||||
platformTools
|
||||
jdk
|
||||
];
|
||||
|
||||
LANG = "C.UTF-8";
|
||||
LC_ALL = "C.UTF-8";
|
||||
JAVA_HOME = jdk.home;
|
||||
|
||||
# Note: ANDROID_HOME is deprecated. Use ANDROID_SDK_ROOT.
|
||||
ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
|
||||
|
||||
shellHook = ''
|
||||
# Write out local.properties for Android Studio.
|
||||
cat <<EOF > local.properties
|
||||
# This file was automatically generated by nix-shell.
|
||||
sdk.dir=$ANDROID_SDK_ROOT
|
||||
EOF
|
||||
'';
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p "ruby.withPackages (pkgs: with pkgs; [ slop nokogiri moreutils ])"
|
||||
|
||||
set -e
|
||||
|
||||
pushd "$(dirname "$0")" &>/dev/null || exit 1
|
||||
|
||||
echo "Writing repo.json" >&2
|
||||
ruby mkrepo.rb \
|
||||
--packages ./xml/repository2-3.xml \
|
||||
--images ./xml/android-sys-img2-3.xml \
|
||||
--images ./xml/android-tv-sys-img2-3.xml \
|
||||
--images ./xml/android-wear-cn-sys-img2-3.xml \
|
||||
--images ./xml/android-wear-sys-img2-3.xml \
|
||||
--images ./xml/android-automotive-sys-img2-3.xml \
|
||||
--images ./xml/google_apis-sys-img2-3.xml \
|
||||
--images ./xml/google_apis_playstore-sys-img2-3.xml \
|
||||
--addons ./xml/addon2-3.xml <./repo.json
|
||||
popd &>/dev/null
|
||||
File diff suppressed because it is too large
Load Diff
@@ -18,6 +18,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "androidenv-test-suite";
|
||||
version = "1";
|
||||
buildInputs = lib.mapAttrsToList (name: value: value) all-tests;
|
||||
|
||||
buildCommand = ''
|
||||
@@ -26,9 +27,8 @@ stdenv.mkDerivation {
|
||||
|
||||
passthru.tests = all-tests;
|
||||
|
||||
# This is the toplevel package, so inherit the update script
|
||||
passthru.updateScript = {
|
||||
command = [ ./update.sh ];
|
||||
command = [ ./update.rb ];
|
||||
attrPath = "androidenv.test-suite";
|
||||
supportedFeatures = [ "commit" ];
|
||||
};
|
||||
|
||||
Regular → Executable
+100
-53
@@ -1,11 +1,15 @@
|
||||
#!/usr/bin/env ruby
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i ruby -p "ruby.withPackages (ps: with ps; [ slop curb nokogiri ])"
|
||||
|
||||
require 'json'
|
||||
require 'rubygems'
|
||||
require 'nokogiri'
|
||||
require 'slop'
|
||||
require 'shellwords'
|
||||
require 'erb'
|
||||
require 'uri'
|
||||
require 'stringio'
|
||||
require 'slop'
|
||||
require 'curb'
|
||||
require 'nokogiri'
|
||||
|
||||
# Returns a repo URL for a given package name.
|
||||
def repo_url value
|
||||
@@ -32,6 +36,36 @@ def image_url value, dir
|
||||
end
|
||||
end
|
||||
|
||||
# Runs a GET with curl.
|
||||
def _curl_get url
|
||||
curl = Curl::Easy.new(url) do |http|
|
||||
http.headers['User-Agent'] = 'nixpkgs androidenv update bot'
|
||||
yield http if block_given?
|
||||
end
|
||||
STDERR.print "GET #{url}"
|
||||
curl.perform
|
||||
STDERR.puts "... #{curl.response_code}"
|
||||
|
||||
StringIO.new(curl.body_str)
|
||||
end
|
||||
|
||||
# Retrieves a repo from the filesystem or a URL.
|
||||
def get location
|
||||
uri = URI.parse(location)
|
||||
case uri.scheme
|
||||
when 'repo'
|
||||
_curl_get repo_url("#{uri.host}#{uri.fragment}.xml")
|
||||
when 'image'
|
||||
_curl_get image_url("sys-img#{uri.fragment}.xml", uri.host)
|
||||
else
|
||||
if File.exist?(uri.path)
|
||||
File.open(uri.path, 'rt')
|
||||
else
|
||||
raise "Repository #{uri} was neither a file nor a repo URL"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# Returns a JSON with the data and structure of the input XML
|
||||
def to_json_collector doc
|
||||
json = {}
|
||||
@@ -438,9 +472,19 @@ def merge dest, src
|
||||
end
|
||||
|
||||
opts = Slop.parse do |o|
|
||||
o.array '-p', '--packages', 'packages repo XMLs to parse'
|
||||
o.array '-i', '--images', 'system image repo XMLs to parse'
|
||||
o.array '-a', '--addons', 'addon repo XMLs to parse'
|
||||
o.array '-p', '--packages', 'packages repo XMLs to parse', default: %w[repo://repository#2-3]
|
||||
o.array '-i', '--images', 'system image repo XMLs to parse', default: %w[
|
||||
image://android#2-3
|
||||
image://android-tv#2-3
|
||||
image://android-wear#2-3
|
||||
image://android-wear-cn#2-3
|
||||
image://android-automotive#2-3
|
||||
image://google_apis#2-3
|
||||
image://google_apis_playstore#2-3
|
||||
]
|
||||
o.array '-a', '--addons', 'addon repo XMLs to parse', default: %w[repo://addon#2-3]
|
||||
o.string '-I', '--input', 'input JSON file for repo', default: File.join(__dir__, 'repo.json')
|
||||
o.string '-O', '--output', 'output JSON file for repo', default: File.join(__dir__, 'repo.json')
|
||||
end
|
||||
|
||||
result = {}
|
||||
@@ -451,20 +495,20 @@ result['addons'] = {}
|
||||
result['extras'] = {}
|
||||
|
||||
opts[:packages].each do |filename|
|
||||
licenses, packages, extras = parse_package_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks })
|
||||
licenses, packages, extras = parse_package_xml(Nokogiri::XML(get(filename)) { |conf| conf.noblanks })
|
||||
merge result['licenses'], licenses
|
||||
merge result['packages'], packages
|
||||
merge result['extras'], extras
|
||||
end
|
||||
|
||||
opts[:images].each do |filename|
|
||||
licenses, images = parse_image_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks })
|
||||
licenses, images = parse_image_xml(Nokogiri::XML(get(filename)) { |conf| conf.noblanks })
|
||||
merge result['licenses'], licenses
|
||||
merge result['images'], images
|
||||
end
|
||||
|
||||
opts[:addons].each do |filename|
|
||||
licenses, addons, extras = parse_addon_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks })
|
||||
licenses, addons, extras = parse_addon_xml(Nokogiri::XML(get(filename)) { |conf| conf.noblanks })
|
||||
merge result['licenses'], licenses
|
||||
merge result['addons'], addons
|
||||
merge result['extras'], extras
|
||||
@@ -491,7 +535,14 @@ two_years_ago = today - 2 * 365
|
||||
input = {}
|
||||
prev_latest = {}
|
||||
begin
|
||||
input_json = (STDIN.tty?) ? "{}" : STDIN.read
|
||||
input_json = if File.exist?(opts[:input])
|
||||
STDERR.puts "Reading #{opts[:input]}"
|
||||
File.read(opts[:input])
|
||||
else
|
||||
STDERR.puts "Creating new repo"
|
||||
"{}"
|
||||
end
|
||||
|
||||
if input_json != nil && !input_json.empty?
|
||||
input = expire_records(JSON.parse(input_json), two_years_ago)
|
||||
|
||||
@@ -511,40 +562,37 @@ fixup_result = fixup(result)
|
||||
# therefore the old packages will work as long as the links are working on the Google servers.
|
||||
output = merge input, fixup_result
|
||||
|
||||
# See if there are any changes in the latest versions.
|
||||
cur_latest = output['latest'] || {}
|
||||
|
||||
old_versions = []
|
||||
new_versions = []
|
||||
changes = []
|
||||
changed = false
|
||||
|
||||
cur_latest.each do |k, v|
|
||||
prev = prev_latest[k]
|
||||
if prev && prev != v
|
||||
old_versions << "#{k}:#{prev}"
|
||||
new_versions << "#{k}:#{v}"
|
||||
changes << "#{k}: #{prev} -> #{v}"
|
||||
changed = true
|
||||
end
|
||||
end
|
||||
|
||||
# Write the repository. Append a \n to keep nixpkgs Github Actions happy.
|
||||
File.write 'repo.json', (JSON.pretty_generate(sort_recursively(output)) + "\n")
|
||||
STDERR.puts "Writing #{opts[:output]}"
|
||||
File.write opts[:output], (JSON.pretty_generate(sort_recursively(output)) + "\n")
|
||||
|
||||
# Output metadata for the nixpkgs update script.
|
||||
changed_paths = []
|
||||
if changed
|
||||
if ENV['UPDATE_NIX_ATTR_PATH']
|
||||
# Instantiate it.
|
||||
test_result = `NIXPKGS_ALLOW_UNFREE=1 NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 nix-build ../../../../default.nix -A #{Shellwords.join [ENV['UPDATE_NIX_ATTR_PATH']]} 2>&1`
|
||||
test_status = $?.exitstatus
|
||||
tests_ran = true
|
||||
else
|
||||
tests_ran = false
|
||||
if ENV['UPDATE_NIX_ATTR_PATH']
|
||||
# See if there are any changes in the latest versions.
|
||||
cur_latest = output['latest'] || {}
|
||||
|
||||
old_versions = []
|
||||
new_versions = []
|
||||
changes = []
|
||||
changed = false
|
||||
|
||||
cur_latest.each do |k, v|
|
||||
prev = prev_latest[k]
|
||||
if prev && prev != v
|
||||
old_versions << "#{k}:#{prev}"
|
||||
new_versions << "#{k}:#{v}"
|
||||
changes << "#{k}: #{prev} -> #{v}"
|
||||
changed = true
|
||||
end
|
||||
end
|
||||
|
||||
template = ERB.new(<<-EOF, trim_mode: '<>-')
|
||||
changed_paths = []
|
||||
if changed
|
||||
# Instantiate it.
|
||||
test_result = `NIXPKGS_ALLOW_UNFREE=1 NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 nix-build #{Shellwords.escape(File.realpath(File.join(__dir__, '..', '..', '..', '..', 'default.nix')))} -A #{Shellwords.join [ENV['UPDATE_NIX_ATTR_PATH']]} 2>&1`
|
||||
test_status = $?.exitstatus
|
||||
|
||||
template = ERB.new(<<-EOF, trim_mode: '<>-')
|
||||
androidenv: <%= changes.join('; ') %>
|
||||
|
||||
Performed the following automatic androidenv updates:
|
||||
@@ -553,7 +601,6 @@ Performed the following automatic androidenv updates:
|
||||
- <%= change -%>
|
||||
<% end %>
|
||||
|
||||
<% if tests_ran %>
|
||||
Tests exited with status: <%= test_status -%>
|
||||
|
||||
<% if !test_result.empty? %>
|
||||
@@ -562,19 +609,19 @@ Last 100 lines of output:
|
||||
<%= test_result.lines.last(100).join -%>
|
||||
```
|
||||
<% end %>
|
||||
<% end %>
|
||||
EOF
|
||||
|
||||
changed_paths << {
|
||||
attrPath: 'androidenv.androidPkgs.androidsdk',
|
||||
oldVersion: old_versions.join('; '),
|
||||
newVersion: new_versions.join('; '),
|
||||
files: [
|
||||
File.realpath('repo.json')
|
||||
],
|
||||
commitMessage: template.result(binding)
|
||||
}
|
||||
end
|
||||
changed_paths << {
|
||||
attrPath: 'androidenv.androidPkgs.androidsdk',
|
||||
oldVersion: old_versions.join('; '),
|
||||
newVersion: new_versions.join('; '),
|
||||
files: [
|
||||
opts[:output]
|
||||
],
|
||||
commitMessage: template.result(binding)
|
||||
}
|
||||
end
|
||||
|
||||
# nix-update info is on stderr
|
||||
STDOUT.puts JSON.pretty_generate(changed_paths)
|
||||
# nix-update info is on stdout
|
||||
STDOUT.puts JSON.pretty_generate(changed_paths)
|
||||
end
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
pushd "$(dirname "$0")" &>/dev/null || exit 1
|
||||
./fetchrepo.sh && ./mkrepo.sh
|
||||
popd &>/dev/null
|
||||
@@ -6,18 +6,19 @@
|
||||
azure-common,
|
||||
azure-core,
|
||||
isodate,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-search-documents";
|
||||
version = "14.0.0";
|
||||
version = "11.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-sdk-for-python";
|
||||
tag = "azure-mgmt-containerregistry_${version}";
|
||||
hash = "sha256-FRdXdk3+G/xPraB2laTV6Xs/yNY65gebvMCKPOgby1g=";
|
||||
tag = "azure_search_documents_${version}";
|
||||
hash = "sha256-RcVdqI50lsYed9L6Kz7faNLec1Y9zq685SGnwaEw6Qc=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/sdk/search/azure-search-documents";
|
||||
@@ -35,8 +36,11 @@ buildPythonPackage rec {
|
||||
# require devtools_testutils which is a internal package for azure-sdk
|
||||
doCheck = false;
|
||||
|
||||
# multiple packages in the repo and the updater picks the wrong tag
|
||||
passthru.skipBulkUpdate = true;
|
||||
passthru = {
|
||||
# multiple packages in the repo and the updater picks the wrong tag
|
||||
skipBulkUpdate = true;
|
||||
updateScript = gitUpdater { rev-prefix = "azure.search.documents_"; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Microsoft Azure Cognitive Search Client Library for Python";
|
||||
|
||||
@@ -52,7 +52,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Official Python library for the Cloudflare API";
|
||||
homepage = "https://github.com/cloudflare/cloudflare-python";
|
||||
changelog = "https://github.com/cloudflare/cloudflare-python/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/cloudflare/cloudflare-python/blob/v${version}/CHANGELOG.md";
|
||||
maintainers = with lib.maintainers; [
|
||||
marie
|
||||
jemand771
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
colcon,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
scspell,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "colcon-output";
|
||||
version = "0.2.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "colcon";
|
||||
repo = "colcon-output";
|
||||
tag = version;
|
||||
hash = "sha256-6HFpqGJMjQswKaGSUXVdzoKW677mdmy/PeEZFBCzaMU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
colcon
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
scspell
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"colcon_output"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"test/test_flake8.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Extension for colcon-core to customize the output in various ways";
|
||||
downloadPage = "https://github.com/colcon/colcon-output";
|
||||
homepage = "http://colcon.readthedocs.io/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ guelakais ];
|
||||
};
|
||||
}
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-genai";
|
||||
version = "1.16.1";
|
||||
version = "1.17.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "python-genai";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-P37dGIfpr02aO7N6Y3jGWXTjwz8IZPuZQYG0uJqeek4=";
|
||||
hash = "sha256-ks8MU+Sg6TM57QiNmZD6rTGF8Di32mKtHFTF1pCTouQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "unstructured-client";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Unstructured-IO";
|
||||
repo = "unstructured-python-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-f1sJei3OnLxVahsirZFUzdIpkEEMc8rZR3+8JfihCuM=";
|
||||
hash = "sha256-WEltF3puitytIFN/CxG6TCpWGxs8dubCqvU7byba1Yg=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
qtsvg,
|
||||
qtwebengine,
|
||||
kconfigwidgets,
|
||||
kitemmodels,
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "klevernotes";
|
||||
@@ -19,6 +20,7 @@ mkKdeDerivation rec {
|
||||
qtsvg
|
||||
qtwebengine
|
||||
kconfigwidgets
|
||||
kitemmodels
|
||||
];
|
||||
|
||||
meta.license = with lib.licenses; [
|
||||
|
||||
@@ -1476,6 +1476,7 @@ mapAliases {
|
||||
partition-manager = makePlasma5Throw "partitionmanager"; # Added 2024-01-08
|
||||
patchelfStable = patchelf; # Added 2024-01-25
|
||||
paup = paup-cli; # Added 2024-09-11
|
||||
pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29
|
||||
pcsctools = pcsc-tools; # Added 2023-12-07
|
||||
pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20
|
||||
pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02
|
||||
|
||||
@@ -9312,7 +9312,6 @@ with pkgs;
|
||||
};
|
||||
|
||||
pcre = callPackage ../development/libraries/pcre { };
|
||||
pcre16 = res.pcre.override { variant = "pcre16"; };
|
||||
# pcre32 seems unused
|
||||
pcre-cpp = res.pcre.override { variant = "cpp"; };
|
||||
|
||||
|
||||
@@ -2695,6 +2695,8 @@ self: super: with self; {
|
||||
|
||||
colcon-notification = callPackage ../development/python-modules/colcon-notification { };
|
||||
|
||||
colcon-output = callPackage ../development/python-modules/colcon-output { };
|
||||
|
||||
colcon-parallel-executor = callPackage ../development/python-modules/colcon-parallel-executor { };
|
||||
|
||||
colcon-ros-domain-id-coordinator =
|
||||
@@ -7793,6 +7795,14 @@ self: super: with self; {
|
||||
|
||||
lexilang = callPackage ../development/python-modules/lexilang { };
|
||||
|
||||
lgpio = toPythonModule (
|
||||
pkgs.lgpio.override {
|
||||
inherit buildPythonPackage;
|
||||
pyProject = "PY_LGPIO";
|
||||
lgpioWithoutPython = pkgs.lgpio;
|
||||
}
|
||||
);
|
||||
|
||||
lhapdf = toPythonModule (pkgs.lhapdf.override { python3 = python; });
|
||||
|
||||
lib4package = callPackage ../development/python-modules/lib4package { };
|
||||
@@ -11176,6 +11186,12 @@ self: super: with self; {
|
||||
|
||||
piexif = callPackage ../development/python-modules/piexif { };
|
||||
|
||||
pigpio = toPythonModule (
|
||||
pkgs.pigpio.override {
|
||||
inherit buildPythonPackage;
|
||||
}
|
||||
);
|
||||
|
||||
pijuice = callPackage ../development/python-modules/pijuice { };
|
||||
|
||||
pika = callPackage ../development/python-modules/pika { };
|
||||
@@ -15199,6 +15215,13 @@ self: super: with self; {
|
||||
|
||||
rflink = callPackage ../development/python-modules/rflink { };
|
||||
|
||||
rgpio = toPythonModule (
|
||||
pkgs.lgpio.override {
|
||||
inherit buildPythonPackage;
|
||||
pyProject = "PY_RGPIO";
|
||||
}
|
||||
);
|
||||
|
||||
rich = callPackage ../development/python-modules/rich { };
|
||||
|
||||
rich-argparse = callPackage ../development/python-modules/rich-argparse { };
|
||||
|
||||
@@ -119,7 +119,6 @@ self: super: {
|
||||
# causes shadowstack disablement
|
||||
pcre = super'.pcre.override { enableJit = false; };
|
||||
pcre-cpp = super'.pcre-cpp.override { enableJit = false; };
|
||||
pcre16 = super'.pcre16.override { enableJit = false; };
|
||||
}
|
||||
)
|
||||
] ++ overlays;
|
||||
|
||||
Reference in New Issue
Block a user