mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
Merge staging-next into staging
This commit is contained in:
commit
5c9c7359c3
@ -34,13 +34,24 @@ in
|
||||
description = "Database user.";
|
||||
};
|
||||
|
||||
url = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "postgres://${config.services.windmill.database.name}?host=/var/run/postgresql";
|
||||
defaultText = lib.literalExpression ''
|
||||
"postgres://\$\{config.services.windmill.database.name}?host=/var/run/postgresql";
|
||||
'';
|
||||
description = "Database url. Note that any secret here would be world-readable. Use `services.windmill.database.urlPath` unstead to include secrets in the url.";
|
||||
};
|
||||
|
||||
urlPath = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
description = ''
|
||||
Path to the file containing the database url windmill should connect to. This is not deducted from database user and name as it might contain a secret
|
||||
'';
|
||||
default = null;
|
||||
example = "config.age.secrets.DATABASE_URL_FILE.path";
|
||||
};
|
||||
|
||||
createLocally = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
@ -50,6 +61,10 @@ in
|
||||
|
||||
baseUrl = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "https://localhost:${toString config.services.windmill.serverPort}";
|
||||
defaultText = lib.literalExpression ''
|
||||
"https://localhost:\$\{toString config.services.windmill.serverPort}";
|
||||
'';
|
||||
description = ''
|
||||
The base url that windmill will be served on.
|
||||
'';
|
||||
@ -79,6 +94,7 @@ in
|
||||
|
||||
systemd.services =
|
||||
let
|
||||
useUrlPath = (cfg.database.urlPath != null);
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
# using the same user to simplify db connection
|
||||
@ -86,10 +102,16 @@ in
|
||||
ExecStart = "${pkgs.windmill}/bin/windmill";
|
||||
|
||||
Restart = "always";
|
||||
} // lib.optionalAttrs useUrlPath {
|
||||
LoadCredential = [
|
||||
"DATABASE_URL_FILE:${cfg.database.urlPath}"
|
||||
];
|
||||
};
|
||||
db_url_envs = lib.optionalAttrs useUrlPath {
|
||||
DATABASE_URL_FILE = "%d/DATABASE_URL_FILE";
|
||||
} // lib.optionalAttrs (!useUrlPath) {
|
||||
DATABASE_URL = cfg.database.url;
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
@ -132,12 +154,11 @@ EOF
|
||||
serviceConfig = serviceConfig // { StateDirectory = "windmill";};
|
||||
|
||||
environment = {
|
||||
DATABASE_URL_FILE = "%d/DATABASE_URL_FILE";
|
||||
PORT = builtins.toString cfg.serverPort;
|
||||
WM_BASE_URL = cfg.baseUrl;
|
||||
RUST_LOG = cfg.logLevel;
|
||||
MODE = "server";
|
||||
};
|
||||
} // db_url_envs;
|
||||
};
|
||||
|
||||
windmill-worker = {
|
||||
@ -148,13 +169,12 @@ EOF
|
||||
serviceConfig = serviceConfig // { StateDirectory = "windmill-worker";};
|
||||
|
||||
environment = {
|
||||
DATABASE_URL_FILE = "%d/DATABASE_URL_FILE";
|
||||
WM_BASE_URL = cfg.baseUrl;
|
||||
RUST_LOG = cfg.logLevel;
|
||||
MODE = "worker";
|
||||
WORKER_GROUP = "default";
|
||||
KEEP_JOB_DIR = "false";
|
||||
};
|
||||
} // db_url_envs;
|
||||
};
|
||||
|
||||
windmill-worker-native = {
|
||||
@ -165,12 +185,11 @@ EOF
|
||||
serviceConfig = serviceConfig // { StateDirectory = "windmill-worker-native";};
|
||||
|
||||
environment = {
|
||||
DATABASE_URL_FILE = "%d/DATABASE_URL_FILE";
|
||||
WM_BASE_URL = cfg.baseUrl;
|
||||
RUST_LOG = cfg.logLevel;
|
||||
MODE = "worker";
|
||||
WORKER_GROUP = "native";
|
||||
};
|
||||
} // db_url_envs;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -1,7 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.desktopManager.phosh;
|
||||
|
||||
@ -21,29 +18,29 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
phocConfigType = types.submodule {
|
||||
phocConfigType = lib.types.submodule {
|
||||
options = {
|
||||
xwayland = mkOption {
|
||||
xwayland = lib.mkOption {
|
||||
description = ''
|
||||
Whether to enable XWayland support.
|
||||
|
||||
To start XWayland immediately, use `immediate`.
|
||||
'';
|
||||
type = types.enum [ "true" "false" "immediate" ];
|
||||
type = lib.types.enum [ "true" "false" "immediate" ];
|
||||
default = "false";
|
||||
};
|
||||
cursorTheme = mkOption {
|
||||
cursorTheme = lib.mkOption {
|
||||
description = ''
|
||||
Cursor theme to use in Phosh.
|
||||
'';
|
||||
type = types.str;
|
||||
type = lib.types.str;
|
||||
default = "default";
|
||||
};
|
||||
outputs = mkOption {
|
||||
outputs = lib.mkOption {
|
||||
description = ''
|
||||
Output configurations.
|
||||
'';
|
||||
type = types.attrsOf phocOutputType;
|
||||
type = lib.types.attrsOf phocOutputType;
|
||||
default = {
|
||||
DSI-1 = {
|
||||
scale = 2;
|
||||
@ -53,34 +50,34 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
phocOutputType = types.submodule {
|
||||
phocOutputType = lib.types.submodule {
|
||||
options = {
|
||||
modeline = mkOption {
|
||||
modeline = lib.mkOption {
|
||||
description = ''
|
||||
One or more modelines.
|
||||
'';
|
||||
type = types.either types.str (types.listOf types.str);
|
||||
type = lib.types.either lib.types.str (lib.types.listOf lib.types.str);
|
||||
default = [];
|
||||
example = [
|
||||
"87.25 720 776 848 976 1440 1443 1453 1493 -hsync +vsync"
|
||||
"65.13 768 816 896 1024 1024 1025 1028 1060 -HSync +VSync"
|
||||
];
|
||||
};
|
||||
mode = mkOption {
|
||||
mode = lib.mkOption {
|
||||
description = ''
|
||||
Default video mode.
|
||||
'';
|
||||
type = types.nullOr types.str;
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
example = "768x1024";
|
||||
};
|
||||
scale = mkOption {
|
||||
scale = lib.mkOption {
|
||||
description = ''
|
||||
Display scaling factor.
|
||||
'';
|
||||
type = types.nullOr (
|
||||
types.addCheck
|
||||
(types.either types.int types.float)
|
||||
type = lib.types.nullOr (
|
||||
lib.types.addCheck
|
||||
(lib.types.either lib.types.int lib.types.float)
|
||||
(x : x > 0)
|
||||
) // {
|
||||
description = "null or positive integer or float";
|
||||
@ -88,11 +85,11 @@ let
|
||||
default = null;
|
||||
example = 2;
|
||||
};
|
||||
rotate = mkOption {
|
||||
rotate = lib.mkOption {
|
||||
description = ''
|
||||
Screen transformation.
|
||||
'';
|
||||
type = types.enum [
|
||||
type = lib.types.enum [
|
||||
"90" "180" "270" "flipped" "flipped-90" "flipped-180" "flipped-270" null
|
||||
];
|
||||
default = null;
|
||||
@ -100,7 +97,7 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
optionalKV = k: v: optionalString (v != null) "${k} = ${builtins.toString v}";
|
||||
optionalKV = k: v: lib.optionalString (v != null) "${k} = ${builtins.toString v}";
|
||||
|
||||
renderPhocOutput = name: output: let
|
||||
modelines = if builtins.isList output.modeline
|
||||
@ -109,18 +106,18 @@ let
|
||||
renderModeline = l: "modeline = ${l}";
|
||||
in ''
|
||||
[output:${name}]
|
||||
${concatStringsSep "\n" (map renderModeline modelines)}
|
||||
${lib.concatStringsSep "\n" (map renderModeline modelines)}
|
||||
${optionalKV "mode" output.mode}
|
||||
${optionalKV "scale" output.scale}
|
||||
${optionalKV "rotate" output.rotate}
|
||||
'';
|
||||
|
||||
renderPhocConfig = phoc: let
|
||||
outputs = mapAttrsToList renderPhocOutput phoc.outputs;
|
||||
outputs = lib.mapAttrsToList renderPhocOutput phoc.outputs;
|
||||
in ''
|
||||
[core]
|
||||
xwayland = ${phoc.xwayland}
|
||||
${concatStringsSep "\n" outputs}
|
||||
${lib.concatStringsSep "\n" outputs}
|
||||
[cursor]
|
||||
theme = ${phoc.cursorTheme}
|
||||
'';
|
||||
@ -129,37 +126,37 @@ in
|
||||
{
|
||||
options = {
|
||||
services.xserver.desktopManager.phosh = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable the Phone Shell.";
|
||||
};
|
||||
|
||||
package = mkPackageOption pkgs "phosh" { };
|
||||
package = lib.mkPackageOption pkgs "phosh" { };
|
||||
|
||||
user = mkOption {
|
||||
user = lib.mkOption {
|
||||
description = "The user to run the Phosh service.";
|
||||
type = types.str;
|
||||
type = lib.types.str;
|
||||
example = "alice";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
group = lib.mkOption {
|
||||
description = "The group to run the Phosh service.";
|
||||
type = types.str;
|
||||
type = lib.types.str;
|
||||
example = "users";
|
||||
};
|
||||
|
||||
phocConfig = mkOption {
|
||||
phocConfig = lib.mkOption {
|
||||
description = ''
|
||||
Configurations for the Phoc compositor.
|
||||
'';
|
||||
type = types.oneOf [ types.lines types.path phocConfigType ];
|
||||
type = lib.types.oneOf [ lib.types.lines lib.types.path phocConfigType ];
|
||||
default = {};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.defaultUnit = "graphical.target";
|
||||
# Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service
|
||||
systemd.services.phosh = {
|
||||
@ -216,7 +213,7 @@ in
|
||||
|
||||
security.pam.services.phosh = {};
|
||||
|
||||
hardware.graphics.enable = mkDefault true;
|
||||
hardware.graphics.enable = lib.mkDefault true;
|
||||
|
||||
services.gnome.core-shell.enable = true;
|
||||
services.gnome.core-os-services.enable = true;
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fulcrum";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VY6yUdmU8MLwSH3VeAWCGbdouOxGrhDc1usYj70jrd8=";
|
||||
sha256 = "sha256-+hBc7jW1MVLVjYXNOV7QvFJJpZ5RzW5/c9NdqOXrsj0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
@ -84,6 +84,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
embreeSupport = (!stdenv.isAarch64 && stdenv.isLinux) || stdenv.isDarwin;
|
||||
openImageDenoiseSupport = (!stdenv.isAarch64 && stdenv.isLinux) || stdenv.isDarwin;
|
||||
openUsdSupport = !stdenv.isDarwin;
|
||||
|
||||
python3 = python3Packages.python;
|
||||
pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; };
|
||||
|
||||
@ -163,8 +167,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DWITH_CODEC_SNDFILE=ON"
|
||||
"-DWITH_CPU_CHECK=OFF"
|
||||
"-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}"
|
||||
"-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}"
|
||||
"-DWITH_CYCLES_OSL=OFF"
|
||||
"-DWITH_FFTW3=ON"
|
||||
"-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}"
|
||||
"-DWITH_IMAGE_OPENJPEG=ON"
|
||||
"-DWITH_INSTALL_PORTABLE=OFF"
|
||||
"-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}"
|
||||
@ -172,6 +178,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DWITH_MOD_OCEANSIM=ON"
|
||||
"-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}"
|
||||
"-DWITH_OPENCOLORIO=ON"
|
||||
"-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}"
|
||||
"-DWITH_OPENSUBDIV=ON"
|
||||
"-DWITH_OPENVDB=ON"
|
||||
"-DWITH_PULSEAUDIO=OFF"
|
||||
@ -181,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DWITH_SDL=OFF"
|
||||
"-DWITH_STRICT_BUILD_OPTIONS=ON"
|
||||
"-DWITH_TBB=ON"
|
||||
"-DWITH_USD=ON"
|
||||
"-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}"
|
||||
|
||||
# Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file)
|
||||
"-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include"
|
||||
@ -193,13 +200,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DWITH_GHOST_WAYLAND_DYNLOAD=OFF"
|
||||
"-DWITH_GHOST_WAYLAND_LIBDECOR=ON"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
|
||||
"-DWITH_CYCLES_EMBREE=OFF"
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"-DLIBDIR=/does-not-exist"
|
||||
"-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib"
|
||||
"-DWITH_USD=OFF" # currently fails on darwin
|
||||
]
|
||||
++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic"
|
||||
++ lib.optionals cudaSupport [
|
||||
@ -269,10 +272,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zlib
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals (!stdenv.isAarch64 && stdenv.isLinux) [
|
||||
embree
|
||||
(openimagedenoise.override { inherit cudaSupport; })
|
||||
]
|
||||
++ lib.optional embreeSupport embree
|
||||
++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; })
|
||||
++ (
|
||||
if (!stdenv.isDarwin) then
|
||||
[
|
||||
@ -285,7 +286,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libXxf86vm
|
||||
openal
|
||||
openxr-loader
|
||||
pyPkgsOpenusd
|
||||
]
|
||||
else
|
||||
[
|
||||
@ -296,13 +296,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
OpenGL
|
||||
SDL
|
||||
brotli
|
||||
embree
|
||||
llvmPackages.openmp
|
||||
(openimagedenoise.override { inherit cudaSupport; })
|
||||
sse2neon
|
||||
]
|
||||
)
|
||||
++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]
|
||||
++ lib.optionals openUsdSupport [ pyPkgsOpenusd ]
|
||||
++ lib.optionals waylandSupport [
|
||||
dbus
|
||||
libdecor'
|
||||
@ -325,7 +324,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ps.requests
|
||||
ps.zstandard
|
||||
]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ pyPkgsOpenusd ];
|
||||
++ lib.optional openUsdSupport [ pyPkgsOpenusd ];
|
||||
|
||||
blenderExecutable =
|
||||
placeholder "out"
|
||||
@ -434,8 +433,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"x86_64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
# the current apple sdk is too old (currently 11_0) and fails to build "metal" on x86_64-darwin
|
||||
broken = stdenv.hostPlatform.system == "x86_64-darwin";
|
||||
broken = stdenv.isDarwin; # fails due to too-old SDK, using newer SDK fails to compile
|
||||
maintainers = with lib.maintainers; [
|
||||
amarshall
|
||||
veprbl
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "uni";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arp242";
|
||||
repo = "uni";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ociPkuRtpBS+x1zSVNYk8oqAsJZGv31/TUUUlBOYhJA=";
|
||||
hash = "sha256-LSmQtndWBc7wCYBnyaeDb4Le4PQPcSO8lTp+CSC2jbc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/PvBn2RRYuVpjnrIL1xAcVqAKZuIV2KTSyVtBW1kqj4=";
|
||||
vendorHash = "sha256-4w5L5Zg0LJX2v4mqLLjAvEdh3Ad69MLa97SR6RY3fT4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "yewtube";
|
||||
version = "2.10.5";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mps-youtube";
|
||||
repo = "yewtube";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-a7ySRHSRHmQePaVV7HnCk8QsiAQfN4nCVRdamPMUHGo=";
|
||||
hash = "sha256-66cGnEEISC+lZAYhFXuVdDtwh1TgwvCP6nBD84z2z0I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatekeeper";
|
||||
version = "3.17.0";
|
||||
version = "3.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "gatekeeper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-33imFUFIonE5DTNwAKgJQd4jQ/lLap3LmVTqn9nxj98=";
|
||||
hash = "sha256-Tu4p0kY0UdU0++zLpj+6A5ky5OXEEN5iivHbiyvghw4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k0sctl";
|
||||
version = "0.18.1";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0sproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lZCD8hBe6SKKjTvEKNg/lr7NXrAPqFQoh9iQg0O6jhc=";
|
||||
hash = "sha256-86MLQdXc10bvDFeq3ImD19ytjVPVD19eJzicIo6oJZc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FobBn7rbRVfnW8Zd982vkSuKpPj4gGK4b41o9OK/CCY=";
|
||||
vendorHash = "sha256-eKim5F8bKC1UOY+lOo0NSHOzXuMOcnBjkjm3/vDkGEM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "roxctl";
|
||||
version = "4.5.1";
|
||||
version = "4.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackrox";
|
||||
repo = "stackrox";
|
||||
rev = version;
|
||||
sha256 = "sha256-EYhp07G4a3dhnNrWzz6BtFpcgoYHosGdY2sDUYcS9QA=";
|
||||
sha256 = "sha256-dJtqUYH6TUEb3IMSzVg3NBi1UYGvUPDQUaQ9h19a3NY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Z7EkKVrwTzoD1BwaPhLr6XVtq/dctPJwH+KgyN3ZbUU=";
|
||||
vendorHash = "sha256-qDSi1Jk6erSCwPiLubdVlqOT6PQygMQghS8leieJ78s=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -33,7 +33,8 @@ mkDerivation rec {
|
||||
|
||||
# fixup and install desktop file
|
||||
desktop-file-install --dir $out/share/applications \
|
||||
--set-key Exec --set-value $binary \
|
||||
--set-key Exec --set-value SoulseekQt \
|
||||
--set-key Terminal --set-value false \
|
||||
--set-key Comment --set-value "${meta.description}" \
|
||||
--set-key Categories --set-value Network ${appextracted}/default.desktop
|
||||
mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop
|
||||
|
@ -7,10 +7,10 @@
|
||||
# subset of files responsible for the vast majority of packaging tests, we can
|
||||
# think about moving this upstream.
|
||||
[
|
||||
"src/sage/env.py" # [1]
|
||||
"src/sage/misc/persist.pyx" # [1]
|
||||
"src/sage/misc/inline_fortran.py" # [1]
|
||||
"src/sage/repl/ipython_extension.py" # [1]
|
||||
"src/sage/env.py" # [1]
|
||||
"src/sage/misc/persist.pyx" # [1]
|
||||
"src/sage/misc/inline_fortran.py" # [1]
|
||||
"src/sage/repl/ipython_extension.py" # [1]
|
||||
]
|
||||
|
||||
# Numbered list of past failures to annotate files with
|
||||
|
@ -55,16 +55,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rio";
|
||||
version = "0.1.10";
|
||||
version = "0.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphamorim";
|
||||
repo = "rio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-S42is3wqjBvYgysQ6yDUAn7ZEy9xJBmQD/emYAQfCkw=";
|
||||
hash = "sha256-JrmjQjKpL9di66z4IYTcWhNBL0CgalqOhQgVDpkh6b0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ILX3xrcz3tMnl7mUrwUAXv9ffaZKjSoSf8cZVQB10zk=";
|
||||
cargoHash = "sha256-KWdkpQY1F0RU3JViFrXEp+JW6xdaofEmp2SlAkzPMPU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
ncurses
|
||||
@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tornax otavio oluceps ];
|
||||
platforms = lib.platforms.unix;
|
||||
changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/raphamorim/rio/blob/v${version}/docs/docs/releases.md";
|
||||
mainProgram = "rio";
|
||||
# ---- corcovado/src/sys/unix/eventedfd.rs - sys::unix::eventedfd::EventedFd (line 31) stdout ----
|
||||
# Test executable failed (exit status: 101).
|
||||
|
@ -31,41 +31,37 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
addDeps()
|
||||
{
|
||||
if [ -f $1/nix-support/dotnet-assemblies ]
|
||||
then
|
||||
for i in $(cat $1/nix-support/dotnet-assemblies)
|
||||
do
|
||||
windowsPath=$(cygpath --windows $i)
|
||||
assemblySearchPaths="$assemblySearchPaths;$windowsPath"
|
||||
runHook preInstall
|
||||
|
||||
addDeps $i
|
||||
done
|
||||
fi
|
||||
addDeps() {
|
||||
if [ -f $1/nix-support/dotnet-assemblies ]; then
|
||||
for i in $(cat $1/nix-support/dotnet-assemblies); do
|
||||
windowsPath=$(cygpath --windows $i)
|
||||
assemblySearchPaths="$assemblySearchPaths;$windowsPath"
|
||||
|
||||
addDeps $i
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
for i in ${toString assemblyInputs}
|
||||
do
|
||||
windowsPath=$(cygpath --windows $i)
|
||||
echo "Using assembly path: $windowsPath"
|
||||
for i in ${toString assemblyInputs}; do
|
||||
windowsPath=$(cygpath --windows $i)
|
||||
echo "Using assembly path: $windowsPath"
|
||||
|
||||
if [ "$assemblySearchPaths" = "" ]
|
||||
then
|
||||
assemblySearchPaths="$windowsPath"
|
||||
else
|
||||
assemblySearchPaths="$assemblySearchPaths;$windowsPath"
|
||||
fi
|
||||
if [ "$assemblySearchPaths" = "" ]; then
|
||||
assemblySearchPaths="$windowsPath"
|
||||
else
|
||||
assemblySearchPaths="$assemblySearchPaths;$windowsPath"
|
||||
fi
|
||||
|
||||
addDeps $i
|
||||
addDeps $i
|
||||
done
|
||||
|
||||
echo "Assembly search paths are: $assemblySearchPaths"
|
||||
|
||||
if [ "$assemblySearchPaths" != "" ]
|
||||
then
|
||||
echo "Using assembly search paths args: $assemblySearchPathsArg"
|
||||
export AssemblySearchPaths=$assemblySearchPaths
|
||||
if [ "$assemblySearchPaths" != "" ]; then
|
||||
echo "Using assembly search paths args: $assemblySearchPathsArg"
|
||||
export AssemblySearchPaths=$assemblySearchPaths
|
||||
fi
|
||||
|
||||
mkdir -p $out
|
||||
@ -77,9 +73,10 @@ stdenv.mkDerivation {
|
||||
|
||||
mkdir -p $out/nix-support
|
||||
|
||||
for i in ${toString assemblyInputs}
|
||||
do
|
||||
echo $i >> $out/nix-support/dotnet-assemblies
|
||||
for i in ${toString assemblyInputs}; do
|
||||
echo $i >> $out/nix-support/dotnet-assemblies
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
|
@ -28,27 +28,23 @@ dotnetenv.buildSolution {
|
||||
slnFile = "Wrapper.sln";
|
||||
assemblyInputs = [ application ];
|
||||
preBuild = ''
|
||||
addRuntimeDeps()
|
||||
{
|
||||
if [ -f $1/nix-support/dotnet-assemblies ]
|
||||
then
|
||||
for i in $(cat $1/nix-support/dotnet-assemblies)
|
||||
do
|
||||
windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g')
|
||||
assemblySearchArray="$assemblySearchArray @\"$windowsPath\""
|
||||
addRuntimeDeps() {
|
||||
if [ -f $1/nix-support/dotnet-assemblies ]; then
|
||||
for i in $(cat $1/nix-support/dotnet-assemblies); do
|
||||
windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g')
|
||||
assemblySearchArray="$assemblySearchArray @\"$windowsPath\""
|
||||
|
||||
addRuntimeDeps $i
|
||||
done
|
||||
fi
|
||||
addRuntimeDeps $i
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g')
|
||||
|
||||
# Generate assemblySearchPaths string array contents
|
||||
for path in ${toString assemblyInputs}
|
||||
do
|
||||
assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", "
|
||||
addRuntimeDeps $path
|
||||
for path in ${toString assemblyInputs}; do
|
||||
assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", "
|
||||
addRuntimeDeps $path
|
||||
done
|
||||
|
||||
sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \
|
||||
@ -57,8 +53,8 @@ dotnetenv.buildSolution {
|
||||
|
||||
sed -e "s|@NAMESPACE@|${namespace}|g" \
|
||||
-e "s|@MAINCLASSNAME@|${mainClassName}|g" \
|
||||
-e "s|@EXEPATH@|$exePath|g" \
|
||||
-e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \
|
||||
-e "s|@EXEPATH@|$exePath|g" \
|
||||
-e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \
|
||||
Wrapper/Wrapper.cs.in > Wrapper/Wrapper.cs
|
||||
'';
|
||||
}
|
||||
|
@ -49,11 +49,11 @@ in {
|
||||
|
||||
noisily = colors: verbose: ''
|
||||
noisily() {
|
||||
${lib.optionalString verbose ''
|
||||
${lib.optionalString verbose ''
|
||||
echo_colored -n "Running "
|
||||
echo $@
|
||||
''}
|
||||
$@
|
||||
''}
|
||||
$@
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "aldente";
|
||||
version = "1.27.3";
|
||||
version = "1.28.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg";
|
||||
hash = "sha256-G6Kpfy1LE1VG/nTks4KU6doTKZeJT6gk6JtKmUEy6FI=";
|
||||
hash = "sha256-CgBH5PRlq6USfdE8ubHKAYNq1YzUmfIN7wAS4HfJvZU=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
homepage = "https://apphousekitchen.com";
|
||||
changelog = "https://github.com/davidwernhart/aldente-charge-limiter/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ stepbrobd ];
|
||||
platforms = [
|
||||
"aarch64-darwin"
|
||||
|
@ -1,46 +1,50 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libgit2
|
||||
, rust-jemalloc-sys
|
||||
, zlib
|
||||
, stdenv
|
||||
, darwin
|
||||
, git
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libgit2,
|
||||
rust-jemalloc-sys,
|
||||
zlib,
|
||||
stdenv,
|
||||
darwin,
|
||||
git,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "biome";
|
||||
version = "1.8.3";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biomejs";
|
||||
repo = "biome";
|
||||
rev = "cli/v${version}";
|
||||
hash = "sha256-6/RYuaR4HBXLI7eKysyRcSOxONFlChpQuhzWHAlx2CM=";
|
||||
hash = "sha256-AVw7yhC/f5JkFw2sQZ5YgzeXXjoJ8BfGgsS5sRVV/wE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ytGbiDamxkTCPjNTBMsW1YjK+qMZfktGG5mVUVdKV5I=";
|
||||
cargoHash = "sha256-Vz6GCDGdC2IUtBK5X/t/Q5LODFUSlUxPBTCIjgdw3XU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgit2
|
||||
rust-jemalloc-sys
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
libgit2
|
||||
rust-jemalloc-sys
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "-p=biome_cli" ];
|
||||
cargoTestFlags = cargoBuildFlags ++
|
||||
cargoTestFlags =
|
||||
cargoBuildFlags
|
||||
++
|
||||
# skip a broken test from v1.7.3 release
|
||||
# this will be removed on the next version
|
||||
[ "-- --skip=diagnostics::test::termination_diagnostic_size" ];
|
||||
@ -58,12 +62,15 @@ rustPlatform.buildRustPackage rec {
|
||||
unset BIOME_VERSION
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Toolchain of the web";
|
||||
homepage = "https://biomejs.dev/";
|
||||
changelog = "https://github.com/biomejs/biome/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
figsoda
|
||||
isabelroses
|
||||
];
|
||||
mainProgram = "biome";
|
||||
};
|
||||
}
|
@ -10,7 +10,7 @@
|
||||
buildNpmPackage rec {
|
||||
pname = "clever-tools";
|
||||
|
||||
version = "3.8.2";
|
||||
version = "3.8.3";
|
||||
|
||||
nodejs = nodejs_18;
|
||||
|
||||
@ -18,10 +18,10 @@ buildNpmPackage rec {
|
||||
owner = "CleverCloud";
|
||||
repo = "clever-tools";
|
||||
rev = version;
|
||||
hash = "sha256-cBFdxJrH/1l6YpvdJTeLQf1zl6pm3IbPryimtewh9fc=";
|
||||
hash = "sha256-70wyu8+Jb9kR5lIucBZG9UWIufMhsgMBMkT2ohGvE50=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-cY7wB0IQPLHOOuOLunjeJASp1Ba7ri8cj05/2HveJ7A=";
|
||||
npmDepsHash = "sha256-LljwS6Rd/8WnGpxSHwCr87KWLaRR2i7sMdUuuprYiOE=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
@ -1,95 +1,112 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, atk
|
||||
, cairo
|
||||
, czkawka
|
||||
, darwin
|
||||
, fetchFromGitHub
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk4
|
||||
, pango
|
||||
, overrideSDK
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, testers
|
||||
, wrapGAppsHook4
|
||||
, xvfb-run
|
||||
{
|
||||
lib,
|
||||
atk,
|
||||
cairo,
|
||||
callPackage,
|
||||
darwin,
|
||||
fetchFromGitHub,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
gobject-introspection,
|
||||
gtk4,
|
||||
overrideSDK,
|
||||
pango,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
testers,
|
||||
wrapGAppsHook4,
|
||||
xvfb-run,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "czkawka";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qarmin";
|
||||
repo = "czkawka";
|
||||
rev = version;
|
||||
hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94=";
|
||||
};
|
||||
cargoPatches = [ ./time.patch ];
|
||||
cargoHash = "sha256-cQv8C0P3xizsvnJODkTMJQA98P4nYSCHFT75isJE6es=";
|
||||
|
||||
buildRustPackage' = rustPlatform.buildRustPackage.override {
|
||||
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
|
||||
};
|
||||
|
||||
self = buildRustPackage' {
|
||||
pname = "czkawka";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qarmin";
|
||||
repo = "czkawka";
|
||||
rev = self.version;
|
||||
hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# Updates time and time-macros from Cargo.lock
|
||||
./0000-time.diff
|
||||
];
|
||||
|
||||
cargoHash = "sha256-cQv8C0P3xizsvnJODkTMJQA98P4nYSCHFT75isJE6es=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
atk
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk4
|
||||
pango
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
AppKit
|
||||
Foundation
|
||||
]
|
||||
);
|
||||
|
||||
nativeCheckInputs = [ xvfb-run ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
doCheck = stdenv.hostPlatform.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform);
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
xvfb-run cargo test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
# Desktop items, icons and metainfo are not installed automatically
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop
|
||||
install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg
|
||||
install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg
|
||||
install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = self;
|
||||
command = "czkawka_cli --version";
|
||||
};
|
||||
wrapper = callPackage ./wrapper.nix {
|
||||
czkawka = self;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/qarmin/czkawka";
|
||||
description = "Simple, fast and easy to use app to remove unnecessary files from your computer";
|
||||
changelog = "https://github.com/qarmin/czkawka/raw/${self.version}/Changelog.md";
|
||||
license = with lib.licenses; [ mit ];
|
||||
mainProgram = "czkawka_gui";
|
||||
maintainers = with lib.maintainers; [
|
||||
AndersonTorres
|
||||
yanganto
|
||||
_0x4A6F
|
||||
];
|
||||
};
|
||||
};
|
||||
in
|
||||
buildRustPackage' {
|
||||
inherit pname version src cargoPatches cargoHash;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
atk
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk4
|
||||
pango
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
Foundation
|
||||
AppKit
|
||||
]);
|
||||
|
||||
nativeCheckInputs = [
|
||||
xvfb-run
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
xvfb-run cargo test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
doCheck = stdenv.hostPlatform.isLinux
|
||||
&& (stdenv.hostPlatform == stdenv.buildPlatform);
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = czkawka;
|
||||
command = "czkawka_cli --version";
|
||||
};
|
||||
|
||||
# Desktop items, icons and metainfo are not installed automatically
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop
|
||||
install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg
|
||||
install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg
|
||||
install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/qarmin/czkawka/raw/${version}/Changelog.md";
|
||||
description = "Simple, fast and easy to use app to remove unnecessary files from your computer";
|
||||
homepage = "https://github.com/qarmin/czkawka";
|
||||
license = with lib.licenses; [ mit ];
|
||||
mainProgram = "czkawka_gui";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres yanganto _0x4A6F ];
|
||||
};
|
||||
}
|
||||
self
|
||||
|
33
pkgs/by-name/cz/czkawka/wrapper.nix
Normal file
33
pkgs/by-name/cz/czkawka/wrapper.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
czkawka,
|
||||
makeWrapper,
|
||||
symlinkJoin,
|
||||
# configurable options
|
||||
extraPackages ? [ ],
|
||||
}:
|
||||
|
||||
symlinkJoin {
|
||||
name = "czkawka-wrapped-${czkawka.version}";
|
||||
inherit (czkawka) pname version outputs;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
paths = [ czkawka ];
|
||||
|
||||
postBuild = ''
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
output: "ln --symbolic --no-target-directory ${czkawka.${output}} \$${output}"
|
||||
) (lib.remove "out" czkawka.outputs)}
|
||||
|
||||
pushd $out/bin
|
||||
for f in *; do
|
||||
rm -v $f
|
||||
makeWrapper ${lib.getBin czkawka}/bin/$f $out/bin/$f \
|
||||
--prefix PATH ":" "${lib.makeBinPath extraPackages}"
|
||||
done
|
||||
popd
|
||||
'';
|
||||
|
||||
meta = czkawka.meta;
|
||||
}
|
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dezoomify-rs";
|
||||
version = "2.12.4";
|
||||
version = "2.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lovasoa";
|
||||
repo = "dezoomify-rs";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7CRwlnIItJ89qqemkJbx5QjcLrwYrvpcjVYX5ZWP0W4=";
|
||||
hash = "sha256-PbtsrvNHo/SvToQJTTAPLoNDFotDPmSjr6C3IJZUjqU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-v48eM43+/dt2M1J9yfjfTpBetv6AA2Hhzu8rrL3gojg=";
|
||||
cargoHash = "sha256-K9LNommagWjVxOXq6YUE4eg/3zpj3+MR5BugGCcVUlA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "doppler";
|
||||
version = "3.69.0";
|
||||
version = "3.69.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dopplerhq";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-lijVKNmqTcmjgIzlcMdm/DUrBA+0xV6Wge9dt5xdWFY=";
|
||||
sha256 = "sha256-KiSRMF4S+gz8cnRxkO2SVwO3Rl6ImflK/4MEgkQh2UE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NUHWKPszQH/pvnA+j65+bJ6t+C0FDRRbTviqkYztpE4=";
|
||||
|
@ -1,10 +0,0 @@
|
||||
{ wrapCC, gcc49 }:
|
||||
wrapCC (
|
||||
gcc49.cc.override {
|
||||
name = "gfortran";
|
||||
langFortran = true;
|
||||
langCC = false;
|
||||
langC = false;
|
||||
profiledCompiler = false;
|
||||
}
|
||||
)
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gowall";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Achno";
|
||||
repo = "gowall";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-R7dOONfyzj6V3101Rp/WhUcFpqrSKWEkVm4a2riXZAI=";
|
||||
hash = "sha256-r2IvwpvtWMlIKG0TNM4cLUPKFRgUV8E06VzkPSVCorI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-H2Io1K2LEFmEPJYVcEaVAK2ieBrkV6u+uX82XOvNXj4=";
|
||||
|
@ -30,4 +30,4 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
})
|
||||
})
|
||||
|
56
pkgs/by-name/mu/musicpod/package.nix
Normal file
56
pkgs/by-name/mu/musicpod/package.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{
|
||||
lib,
|
||||
flutter324,
|
||||
fetchFromGitHub,
|
||||
mpv-unwrapped,
|
||||
libass,
|
||||
pulseaudio,
|
||||
}:
|
||||
|
||||
flutter324.buildFlutterApplication rec {
|
||||
pname = "musicpod";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu-flutter-community";
|
||||
repo = "musicpod";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Xs6qDSqd10mYjLNFiPV9Irthd/hK2kE4fC6i03QvOn0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace snap/gui/musicpod.desktop \
|
||||
--replace-fail 'Icon=''${SNAP}/meta/gui/musicpod.png' 'Icon=musicpod'
|
||||
'';
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
gitHashes = {
|
||||
audio_service_mpris = "sha256-QRZ4a3w4MZP8/A4yXzP4P9FPwEVNXlntmBwE8I+s2Kk=";
|
||||
media_kit_native_event_loop = "sha256-JBtFTYlztDQvN/qQcDxkK27mka2fSG+iiIIxk2mqEpY=";
|
||||
media_kit_video = "sha256-JBtFTYlztDQvN/qQcDxkK27mka2fSG+iiIIxk2mqEpY=";
|
||||
phoenix_theme = "sha256-5kgPAnK61vFi/sJ1jr3c5D2UZbxItW8YOk/IJEtHkZo=";
|
||||
yaru = "sha256-3GexoQpwr7pazajAMyPl9rcYhmSgQeialZTvJsadP4k=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
mpv-unwrapped
|
||||
libass
|
||||
];
|
||||
|
||||
runtimeDependencies = [ pulseaudio ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 snap/gui/musicpod.desktop -t $out/share/applications
|
||||
install -Dm644 snap/gui/musicpod.png -t $out/share/pixmaps
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Music, radio, television and podcast player";
|
||||
homepage = "https://github.com/ubuntu-flutter-community/musicpod";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "musicpod";
|
||||
maintainers = with lib.maintainers; [ aleksana ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
2259
pkgs/by-name/mu/musicpod/pubspec.lock.json
Normal file
2259
pkgs/by-name/mu/musicpod/pubspec.lock.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "myks";
|
||||
version = "4.2.2";
|
||||
version = "4.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mykso";
|
||||
repo = "myks";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jI5u/xaAt7BOug/okrrRoZXZVJOr+ahGtFJE3PbPQ7k=";
|
||||
hash = "sha256-sf+X+qafR0kpJTNIYoLr8q6stm+DgiD/yhVRyBRPA/s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ka+zVKQBAd6ChOYOw4FYzqJCfdzpN2OppDJsoT/5I0c=";
|
||||
vendorHash = "sha256-aWXU2UG4/U8g4dgspjyIfTT2J++WoJlLHAo6K3CSLxc=";
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
|
@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pulumi-esc";
|
||||
version = "0.9.1";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulumi";
|
||||
repo = "esc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9K7pP4MOShHPTxTuKaUMY87Z4rDkGHrV9Ds1guUpFqM=";
|
||||
hash = "sha256-SeHO8N8NwAF4f6Eo46V2mBElVgJc5ijVrjsBHWtUMc0=";
|
||||
};
|
||||
|
||||
subPackages = "cmd/esc";
|
||||
|
||||
vendorHash = "sha256-uVw8jc7dZOHdJt9uVDJGaJWkD7dz0rQ3W1pJXSrcW5w=";
|
||||
vendorHash = "sha256-xJtlTyhGyoxefE2pFcLGHMapn9L2F/PKuNt49J41viE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -30,11 +30,10 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [ autoconf automake itstool intltool gettext
|
||||
mono
|
||||
stfl
|
||||
makeWrapper ] ++ lib.optionals (guiSupport) [
|
||||
stfl ] ++ lib.optionals (guiSupport) [
|
||||
gtk-sharp-2_0
|
||||
# loaded at runtime by GTK#
|
||||
gdk-pixbuf pango
|
||||
|
@ -4,7 +4,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "wait4x";
|
||||
version = "2.14.1";
|
||||
version = "2.14.2";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@ -13,10 +13,10 @@ buildGoModule {
|
||||
owner = "atkrad";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7dm1KERBYkASuRWlCbpbLuHVc4uCMPWbSwegjZ8LwVU=";
|
||||
hash = "sha256-fNPZ/qgAn4odd5iWnDK1RWPxeBhS/l4ffHLFB27SAoM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CYE5wvBgNLYzCiibd9SWubIQ+22nffr4jpwgwSxhtGo=";
|
||||
vendorHash = "sha256-Eio6CoYaChG59rHL4tfl7dNWliD7ksRyhoCPxMvMmrQ=";
|
||||
|
||||
# Tests make network access
|
||||
doCheck = false;
|
||||
|
@ -31,7 +31,6 @@ in stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/ful1e5/apple_cursor";
|
||||
license = [
|
||||
licenses.gpl3Only
|
||||
|
||||
# Potentially a derivative work of copyrighted Apple designs
|
||||
licenses.unfree
|
||||
];
|
||||
|
@ -9,4 +9,5 @@
|
||||
sqlcipher_flutter_libs = callPackage ./sqlcipher_flutter_libs { };
|
||||
sqlite3 = callPackage ./sqlite3 { };
|
||||
system_tray = callPackage ./system-tray { };
|
||||
super_native_extensions = callPackage ./super_native_extensions { };
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,77 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
at-spi2-atk,
|
||||
gdk-pixbuf,
|
||||
cairo,
|
||||
gtk3,
|
||||
writeText,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
{ version, src, ... }:
|
||||
|
||||
let
|
||||
rustDep = rustPlatform.buildRustPackage {
|
||||
pname = "super_native_extensions-rs";
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/rust";
|
||||
|
||||
cargoLock =
|
||||
rec {
|
||||
_0_8_22 = {
|
||||
lockFile = ./Cargo-0.8.22.lock;
|
||||
outputHashes = {
|
||||
"mime_guess-2.0.4" = "sha256-KSw0YUTGqNEWY9pMvQplUGajJgoP2BRwVX6qZPpB2rI=";
|
||||
};
|
||||
};
|
||||
_0_8_21 = _0_8_22;
|
||||
_0_8_20 = _0_8_22;
|
||||
_0_8_19 = _0_8_22;
|
||||
_0_8_18 = _0_8_22;
|
||||
_0_8_17 = _0_8_22;
|
||||
}
|
||||
.${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw ''
|
||||
Unsupported version of pub 'super_native_extensions': '${version}'
|
||||
Please add ${src}/rust/Cargo.lock
|
||||
to this path, and add corresponding entry here. If the lock
|
||||
is the same with existing versions, add an alias here.
|
||||
'');
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
at-spi2-atk
|
||||
gdk-pixbuf
|
||||
cairo
|
||||
gtk3
|
||||
];
|
||||
|
||||
passthru.libraryPath = "lib/libsuper_native_extensions.so";
|
||||
};
|
||||
|
||||
fakeCargokitCmake = writeText "FakeCargokit.cmake" ''
|
||||
function(apply_cargokit target manifest_dir lib_name any_symbol_name)
|
||||
target_link_libraries("''${target}" PRIVATE ${rustDep}/${rustDep.passthru.libraryPath})
|
||||
set("''${target}_cargokit_lib" ${rustDep}/${rustDep.passthru.libraryPath} PARENT_SCOPE)
|
||||
endfunction()
|
||||
'';
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "super_native_extensions";
|
||||
inherit version src;
|
||||
inherit (src) passthru;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r "$src" "$out"
|
||||
chmod +rwx $out/cargokit/cmake/cargokit.cmake
|
||||
cp ${fakeCargokitCmake} $out/cargokit/cmake/cargokit.cmake
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
@ -29,11 +29,11 @@ let
|
||||
else if atLeast "9" then isl_0_20
|
||||
else if atLeast "7" then isl_0_17
|
||||
else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14)
|
||||
else /* "4.9" */ isl_0_11;
|
||||
else /* "5" */ isl_0_11;
|
||||
} // lib.optionalAttrs (!(atLeast "6")) {
|
||||
cloog = if stdenv.isDarwin
|
||||
then null
|
||||
else /* 4.9 */ cloog_0_18_0;
|
||||
else /* 5 */ cloog_0_18_0;
|
||||
} // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) {
|
||||
# gcc 10 is too strict to cross compile gcc <= 8
|
||||
stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv;
|
||||
|
@ -82,7 +82,6 @@ let
|
||||
atLeast8 = versionAtLeast version "8";
|
||||
atLeast7 = versionAtLeast version "7";
|
||||
atLeast6 = versionAtLeast version "6";
|
||||
atLeast49 = versionAtLeast version "4.9";
|
||||
is14 = majorVersion == "14";
|
||||
is13 = majorVersion == "13";
|
||||
is12 = majorVersion == "12";
|
||||
@ -92,7 +91,6 @@ let
|
||||
is8 = majorVersion == "8";
|
||||
is7 = majorVersion == "7";
|
||||
is6 = majorVersion == "6";
|
||||
is49 = majorVersion == "4" && versions.minor version == "9";
|
||||
|
||||
disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler);
|
||||
|
||||
@ -277,7 +275,7 @@ pipe ((callFile ./common/builder.nix {}) ({
|
||||
outputs =
|
||||
if atLeast7
|
||||
then [ "out" "man" "info" ] ++ optional (!langJit) "lib"
|
||||
else if atLeast49 && (langJava || langGo || (if atLeast6 then langJit else targetPlatform.isDarwin)) then ["out" "man" "info"]
|
||||
else if (langJava || langGo || (if atLeast6 then langJit else targetPlatform.isDarwin)) then ["out" "man" "info"]
|
||||
else [ "out" "lib" "man" "info" ];
|
||||
|
||||
setOutputFlags = false;
|
||||
@ -460,7 +458,7 @@ pipe ((callFile ./common/builder.nix {}) ({
|
||||
badPlatforms =
|
||||
# avr-gcc8 is maintained for the `qmk` package
|
||||
if (is8 && targetPlatform.isAvr) then []
|
||||
else if !(is49 || is6) then [ "aarch64-darwin" ]
|
||||
else if !(is6) then [ "aarch64-darwin" ]
|
||||
else platforms.darwin;
|
||||
} // optionalAttrs is10 {
|
||||
badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ];
|
||||
@ -474,7 +472,7 @@ pipe ((callFile ./common/builder.nix {}) ({
|
||||
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
|
||||
} // optionalAttrs enableMultilib {
|
||||
dontMoveLib64 = true;
|
||||
} // optionalAttrs (((is49 && !stdenv.hostPlatform.isDarwin) || is6) && langJava) {
|
||||
} // optionalAttrs (is6 && langJava) {
|
||||
postFixup = ''
|
||||
target="$(echo "$out/libexec/gcc"/*/*/ecj*)"
|
||||
patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
|
||||
|
@ -1,24 +0,0 @@
|
||||
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
|
||||
index aec950454..5bda9b3a3 100644
|
||||
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
|
||||
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
|
||||
@@ -156,18 +156,13 @@ namespace __sanitizer {
|
||||
#elif defined(__sparc__)
|
||||
# if defined(__arch64__)
|
||||
unsigned mode;
|
||||
- unsigned short __pad1;
|
||||
-# else
|
||||
- unsigned short __pad1;
|
||||
- unsigned short mode;
|
||||
unsigned short __pad2;
|
||||
# endif
|
||||
unsigned short __seq;
|
||||
unsigned long long __unused1;
|
||||
unsigned long long __unused2;
|
||||
#else
|
||||
- unsigned short mode;
|
||||
- unsigned short __pad1;
|
||||
+ unsigned int mode;
|
||||
unsigned short __seq;
|
||||
unsigned short __pad2;
|
||||
#if defined(__x86_64__) && !defined(_LP64)
|
@ -1,61 +0,0 @@
|
||||
gcc/Makefile.in: fix parallel building failure
|
||||
|
||||
The gcc-ar.o, gcc-nm.o, gcc-ranlib.o and errors.o included
|
||||
config.h which was a generated file. But no explicity rule
|
||||
to clarify the dependency. There was potential building
|
||||
failure while parallel make.
|
||||
|
||||
For gcc-ar.o, gcc-nm.o and gcc-ranlib.o, they were compiled from one C
|
||||
source file gcc-ar.c, we add them to ALL_HOST_BACKEND_OBJS, so the
|
||||
'$(ALL_HOST_OBJS) : | $(generated_files)' rule could work for these
|
||||
objects.
|
||||
|
||||
For errors.o, it is part of gengtype, and the gengtype generator program
|
||||
is special: Two versions are built. One is for the build machine, and one
|
||||
is for the host. We refered what gengtype-parse.o did (which also is part
|
||||
of gengtype).
|
||||
|
||||
[GCC #61899]
|
||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61899
|
||||
|
||||
Upstream-Status: Send to gcc-patches@gcc.gnu.org mailing list
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
gcc/Makefile.in | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
|
||||
index 6475cba..56e50bb 100644
|
||||
--- a/gcc/Makefile.in
|
||||
+++ b/gcc/Makefile.in
|
||||
@@ -1481,13 +1481,16 @@ OBJS-libcommon-target = $(common_out_object_file) prefix.o params.o \
|
||||
opts.o opts-common.o options.o vec.o hooks.o common/common-targhooks.o \
|
||||
hash-table.o file-find.o
|
||||
|
||||
+# Objects compiled from one C source file gcc-ar.c
|
||||
+OBJS-gcc-ar = gcc-ar.o gcc-nm.o gcc-ranlib.o
|
||||
+
|
||||
# This lists all host objects for the front ends.
|
||||
ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS))
|
||||
|
||||
ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \
|
||||
$(OBJS-libcommon-target) @TREEBROWSER@ main.o c-family/cppspec.o \
|
||||
$(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) \
|
||||
- lto-wrapper.o
|
||||
+ lto-wrapper.o $(OBJS-gcc-ar)
|
||||
|
||||
# This lists all host object files, whether they are included in this
|
||||
# compilation or not.
|
||||
@@ -2437,6 +2440,8 @@ gengtype-parse.o: $(CONFIG_H)
|
||||
CFLAGS-build/gengtype-parse.o += -DGENERATOR_FILE
|
||||
build/gengtype-parse.o: $(BCONFIG_H)
|
||||
|
||||
+errors.o : $(CONFIG_H)
|
||||
+
|
||||
gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \
|
||||
gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \
|
||||
$(XREGEX_H)
|
||||
--
|
||||
1.8.1.2
|
||||
|
@ -34,7 +34,6 @@ let
|
||||
atLeast8 = lib.versionAtLeast version "8";
|
||||
atLeast7 = lib.versionAtLeast version "7";
|
||||
atLeast6 = lib.versionAtLeast version "6";
|
||||
atLeast49 = lib.versionAtLeast version "4.9";
|
||||
is14 = majorVersion == "14";
|
||||
is13 = majorVersion == "13";
|
||||
is12 = majorVersion == "12";
|
||||
@ -44,7 +43,6 @@ let
|
||||
is8 = majorVersion == "8";
|
||||
is7 = majorVersion == "7";
|
||||
is6 = majorVersion == "6";
|
||||
is49 = majorVersion == "4" && lib.versions.minor version == "9";
|
||||
inherit (lib) optionals optional;
|
||||
in
|
||||
|
||||
@ -239,8 +237,7 @@ in
|
||||
|
||||
## gcc 8.0 and older ##############################################################################
|
||||
|
||||
# for 49 this is applied later
|
||||
++ optional (atLeast49 && !is49 && !atLeast9) ./libsanitizer-no-cyclades-9.patch
|
||||
++ optional (!atLeast9) ./libsanitizer-no-cyclades-9.patch
|
||||
++ optional (is7 || is8) ./9/fix-struct-redefinition-on-glibc-2.36.patch
|
||||
|
||||
# Make Darwin bootstrap respect whether the assembler supports `--gstabs`,
|
||||
@ -280,8 +277,8 @@ in
|
||||
## gcc 6.0 and older ##############################################################################
|
||||
|
||||
++ optional (is6 && langGo) ./gogcc-workaround-glibc-2.36.patch
|
||||
++ optional (is49 || is6) ./9/fix-struct-redefinition-on-glibc-2.36.patch
|
||||
++ optional (is49 || (is6 && !stdenv.targetPlatform.isRedox)) ./use-source-date-epoch.patch
|
||||
++ optional is6 ./9/fix-struct-redefinition-on-glibc-2.36.patch
|
||||
++ optional (is6 && !stdenv.targetPlatform.isRedox) ./use-source-date-epoch.patch
|
||||
++ optional (is6 && !stdenv.targetPlatform.isRedox) ./6/0001-Fix-build-for-glibc-2.31.patch
|
||||
++ optionals (is6 && langAda) [
|
||||
./gnat-cflags.patch
|
||||
@ -297,51 +294,7 @@ in
|
||||
# defaults to the impure, system location and causes the build to fail.
|
||||
++ optional (is6 && hostPlatform.isDarwin) ./6/libstdc++-disable-flat_namespace.patch
|
||||
|
||||
## gcc 4.9 and older ##############################################################################
|
||||
## gcc 5.0 and older ##############################################################################
|
||||
|
||||
++ optional (!atLeast6) ./parallel-bconfig.patch
|
||||
++ optionals (is49) [
|
||||
(./. + "/${lib.versions.major version}.${lib.versions.minor version}/parallel-strsignal.patch")
|
||||
(./. + "/${lib.versions.major version}.${lib.versions.minor version}/libsanitizer.patch")
|
||||
(fetchpatch {
|
||||
name = "avoid-ustat-glibc-2.28.patch";
|
||||
url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96";
|
||||
sha256 = "0b32sb4psv5lq0ij9fwhi1b4pjbwdjnv24nqprsk14dsc6xmi1g0";
|
||||
})
|
||||
# has to be applied after "avoid-ustat-glibc-2.28.patch"
|
||||
./libsanitizer-no-cyclades-9.patch
|
||||
# glibc-2.26
|
||||
./struct-ucontext.patch
|
||||
./struct-sigaltstack-4.9.patch
|
||||
]
|
||||
# Retpoline patches pulled from the branch hjl/indirect/gcc-4_9-branch (by H.J. Lu, the author of GCC upstream retpoline commits)
|
||||
++ optionals is49
|
||||
(builtins.map ({commit, sha256}: fetchpatch {url = "https://github.com/hjl-tools/gcc/commit/${commit}.patch"; inherit sha256;})
|
||||
[{ commit = "e623d21608e96ecd6b65f0d06312117d20488a38"; sha256 = "1ix8i4d2r3ygbv7npmsdj790rhxqrnfwcqzv48b090r9c3ij8ay3"; }
|
||||
{ commit = "2015a09e332309f12de1dadfe179afa6a29368b8"; sha256 = "0xcfs0cbb63llj2gbcdrvxim79ax4k4aswn0a3yjavxsj71s1n91"; }
|
||||
{ commit = "6b11591f4494f705e8746e7d58b7f423191f4e92"; sha256 = "0aydyhsm2ig0khgbp27am7vq7liyqrq6kfhfi2ki0ij0ab1hfbga"; }
|
||||
{ commit = "203c7d9c3e9cb0f88816b481ef8e7e87b3ecc373"; sha256 = "0wqn16y7wy5kg8ngfcni5qdwfphl01axczibbk49bxclwnzvldqa"; }
|
||||
{ commit = "f039c6f284b2c9ce97c8353d6034978795c4872e"; sha256 = "13fkgdb17lpyxfksz1zanxhgpsm0jrss9w61nbl7an4im22hz7ci"; }
|
||||
{ commit = "ed42606bdab1c5d9e5ad828cd6fe1a0557f193b7"; sha256 = "0gdnn8v3p03imj3qga2mzdhpgbmjcklkxdl97jvz5xia2ikzknxm"; }
|
||||
{ commit = "5278e062ef292fd2fbf987d25389785f4c5c0f99"; sha256 = "0j81x758wf8v7j4rx5wc1cy7yhkvhlhv3wmnarwakxiwsspq0vrs"; }
|
||||
{ commit = "76f1ffbbb6cd9f6ecde6c82cd16e20a27242e890"; sha256 = "1py56y6gp7fjf4f8bbsfwh5bs1gnmlqda1ycsmnwlzfm0cshdp0c"; }
|
||||
{ commit = "4ca48b2b688b135c0390f54ea9077ef10aedd52c"; sha256 = "15r019pzr3k0lpgyvdc92c8fayw8b5lrzncna4bqmamcsdz7vsaw"; }
|
||||
{ commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; }
|
||||
{ commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; }
|
||||
{ commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; }
|
||||
{ commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }])
|
||||
|
||||
++ optional (is49 && !atLeast6) [
|
||||
# gcc-11 compatibility
|
||||
(fetchpatch {
|
||||
name = "gcc4-char-reload.patch";
|
||||
url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d57c99458933a21fdf94f508191f145ad8d5ec58";
|
||||
includes = [ "gcc/reload.h" ];
|
||||
sha256 = "sha256-66AMP7/ajunGKAN5WJz/yPn42URZ2KN51yPrFdsxEuM=";
|
||||
})
|
||||
]
|
||||
|
||||
|
||||
## gcc 4.8 only ##############################################################################
|
||||
|
||||
++ optional (!atLeast49 && hostPlatform.isDarwin) ./gfortran-darwin-NXConstStr.patch
|
||||
|
@ -1,27 +0,0 @@
|
||||
From 82f81877458ea372176eabb5de36329431dce99b Mon Sep 17 00:00:00 2001
|
||||
From: Iain Sandoe <iain@codesourcery.com>
|
||||
Date: Sat, 21 Dec 2013 00:30:18 +0000
|
||||
Subject: [PATCH] don't try to mark local symbols as no-dead-strip
|
||||
|
||||
---
|
||||
gcc/config/darwin.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
|
||||
index 40804b8..0080299 100644
|
||||
--- a/gcc/config/darwin.c
|
||||
+++ b/gcc/config/darwin.c
|
||||
@@ -1259,6 +1259,11 @@ darwin_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED)
|
||||
void
|
||||
darwin_mark_decl_preserved (const char *name)
|
||||
{
|
||||
+ /* Actually we shouldn't mark any local symbol this way, but for now
|
||||
+ this only happens with ObjC meta-data. */
|
||||
+ if (darwin_label_is_anonymous_local_objc_name (name))
|
||||
+ return;
|
||||
+
|
||||
fprintf (asm_out_file, "\t.no_dead_strip ");
|
||||
assemble_name (asm_out_file, name);
|
||||
fputc ('\n', asm_out_file);
|
||||
--
|
||||
2.2.1
|
@ -1,78 +0,0 @@
|
||||
hand-resolved trivial conflicts for 4.9 from the upstream patch
|
||||
72edc2c02f8b4768ad660f46a1c7e2400c0a8e06
|
||||
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc
|
||||
index 69c9c10..8e53673 100644
|
||||
--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc
|
||||
+++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc
|
||||
@@ -599,8 +599,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {
|
||||
return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5);
|
||||
}
|
||||
|
||||
-uptr internal_sigaltstack(const struct sigaltstack *ss,
|
||||
- struct sigaltstack *oss) {
|
||||
+uptr internal_sigaltstack(const void *ss, void *oss) {
|
||||
return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss);
|
||||
}
|
||||
|
||||
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h
|
||||
index 6422df1..8e111d1 100644
|
||||
--- a/libsanitizer/sanitizer_common/sanitizer_linux.h
|
||||
+++ b/libsanitizer/sanitizer_common/sanitizer_linux.h
|
||||
@@ -18,7 +18,6 @@
|
||||
#include "sanitizer_platform_limits_posix.h"
|
||||
|
||||
struct link_map; // Opaque type returned by dlopen().
|
||||
-struct sigaltstack;
|
||||
|
||||
namespace __sanitizer {
|
||||
// Dirent structure for getdents(). Note that this structure is different from
|
||||
@@ -28,8 +27,7 @@ struct linux_dirent;
|
||||
// Syscall wrappers.
|
||||
uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
|
||||
uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5);
|
||||
-uptr internal_sigaltstack(const struct sigaltstack* ss,
|
||||
- struct sigaltstack* oss);
|
||||
+uptr internal_sigaltstack(const void* ss, void* oss);
|
||||
uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act,
|
||||
__sanitizer_kernel_sigaction_t *oldact);
|
||||
uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set,
|
||||
diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
|
||||
index 891386dc..234e8c6 100644
|
||||
--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
|
||||
+++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
|
||||
@@ -273,7 +273,7 @@ static int TracerThread(void* argument) {
|
||||
|
||||
// Alternate stack for signal handling.
|
||||
InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
|
||||
- struct sigaltstack handler_stack;
|
||||
+ stack_t handler_stack;
|
||||
internal_memset(&handler_stack, 0, sizeof(handler_stack));
|
||||
handler_stack.ss_sp = handler_stack_memory.data();
|
||||
handler_stack.ss_size = kHandlerStackSize;
|
||||
diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc
|
||||
index 2ed5718..6f972ab 100644
|
||||
--- a/libsanitizer/tsan/tsan_platform_linux.cc
|
||||
+++ b/libsanitizer/tsan/tsan_platform_linux.cc
|
||||
@@ -287,7 +287,7 @@ void InitializePlatform() {
|
||||
int ExtractResolvFDs(void *state, int *fds, int nfd) {
|
||||
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||||
int cnt = 0;
|
||||
- __res_state *statp = (__res_state*)state;
|
||||
+ struct __res_state *statp = (struct __res_state*)state;
|
||||
for (int i = 0; i < MAXNS && cnt < nfd; i++) {
|
||||
if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
|
||||
fds[cnt++] = statp->_u._ext.nssocks[i];
|
||||
|
||||
error: 'SIGSEGV' was not declared in this scope
|
||||
diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc
|
||||
index 0692eb1..472f734 100644
|
||||
--- a/libsanitizer/asan/asan_linux.cc
|
||||
+++ b/libsanitizer/asan/asan_linux.cc
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <pthread.h>
|
||||
+#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <unwind.h>
|
@ -1,190 +0,0 @@
|
||||
From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001
|
||||
From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Tue, 4 Jul 2017 10:23:57 +0000
|
||||
Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files.
|
||||
|
||||
Current glibc no longer gives the ucontext_t type the tag struct
|
||||
ucontext, to conform with POSIX namespace rules. This requires
|
||||
various linux-unwind.h files in libgcc, that were previously using
|
||||
struct ucontext, to be fixed to use ucontext_t instead. This is
|
||||
similar to the removal of the struct siginfo tag from siginfo_t some
|
||||
years ago.
|
||||
|
||||
This patch changes those files to use ucontext_t instead. As the
|
||||
standard name that should be unconditionally safe, so this is not
|
||||
restricted to architectures supported by glibc, or conditioned on the
|
||||
glibc version.
|
||||
|
||||
Tested compilation together with current glibc with glibc's
|
||||
build-many-glibcs.py.
|
||||
|
||||
* config/aarch64/linux-unwind.h (aarch64_fallback_frame_state),
|
||||
config/alpha/linux-unwind.h (alpha_fallback_frame_state),
|
||||
config/bfin/linux-unwind.h (bfin_fallback_frame_state),
|
||||
config/i386/linux-unwind.h (x86_64_fallback_frame_state,
|
||||
x86_fallback_frame_state), config/m68k/linux-unwind.h (struct
|
||||
uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext),
|
||||
config/pa/linux-unwind.h (pa32_fallback_frame_state),
|
||||
config/sh/linux-unwind.h (sh_fallback_frame_state),
|
||||
config/tilepro/linux-unwind.h (tile_fallback_frame_state),
|
||||
config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use
|
||||
ucontext_t instead of struct ucontext.
|
||||
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
---
|
||||
libgcc/ChangeLog (REMOVED) | 14 ++++++++++++++
|
||||
libgcc/config/aarch64/linux-unwind.h | 2 +-
|
||||
libgcc/config/alpha/linux-unwind.h | 2 +-
|
||||
libgcc/config/bfin/linux-unwind.h | 2 +-
|
||||
libgcc/config/i386/linux-unwind.h | 4 ++--
|
||||
libgcc/config/m68k/linux-unwind.h | 2 +-
|
||||
libgcc/config/nios2/linux-unwind.h | 2 +-
|
||||
libgcc/config/pa/linux-unwind.h | 2 +-
|
||||
libgcc/config/sh/linux-unwind.h | 2 +-
|
||||
libgcc/config/tilepro/linux-unwind.h | 2 +-
|
||||
libgcc/config/xtensa/linux-unwind.h | 2 +-
|
||||
11 files changed, 25 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
|
||||
index 4512efb..06de45a 100644
|
||||
--- a/libgcc/config/aarch64/linux-unwind.h
|
||||
+++ b/libgcc/config/aarch64/linux-unwind.h
|
||||
@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
|
||||
struct rt_sigframe
|
||||
{
|
||||
siginfo_t info;
|
||||
- struct ucontext uc;
|
||||
+ ucontext_t uc;
|
||||
};
|
||||
|
||||
struct rt_sigframe *rt_;
|
||||
diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
|
||||
index bdbba4a..e84812e 100644
|
||||
--- a/libgcc/config/alpha/linux-unwind.h
|
||||
+++ b/libgcc/config/alpha/linux-unwind.h
|
||||
@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
|
||||
{
|
||||
struct rt_sigframe {
|
||||
siginfo_t info;
|
||||
- struct ucontext uc;
|
||||
+ ucontext_t uc;
|
||||
} *rt_ = context->cfa;
|
||||
sc = &rt_->uc.uc_mcontext;
|
||||
}
|
||||
diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
|
||||
index 77b7c23..8bf5e82 100644
|
||||
--- a/libgcc/config/bfin/linux-unwind.h
|
||||
+++ b/libgcc/config/bfin/linux-unwind.h
|
||||
@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
|
||||
void *puc;
|
||||
char retcode[8];
|
||||
siginfo_t info;
|
||||
- struct ucontext uc;
|
||||
+ ucontext_t uc;
|
||||
} *rt_ = context->cfa;
|
||||
|
||||
/* The void * cast is necessary to avoid an aliasing warning.
|
||||
diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
|
||||
index 540a0a2..29efbe3 100644
|
||||
--- a/libgcc/config/i386/linux-unwind.h
|
||||
+++ b/libgcc/config/i386/linux-unwind.h
|
||||
@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
|
||||
if (*(unsigned char *)(pc+0) == 0x48
|
||||
&& *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
|
||||
{
|
||||
- struct ucontext *uc_ = context->cfa;
|
||||
+ ucontext_t *uc_ = context->cfa;
|
||||
/* The void * cast is necessary to avoid an aliasing warning.
|
||||
The aliasing warning is correct, but should not be a problem
|
||||
because it does not alias anything. */
|
||||
@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
|
||||
siginfo_t *pinfo;
|
||||
void *puc;
|
||||
siginfo_t info;
|
||||
- struct ucontext uc;
|
||||
+ ucontext_t uc;
|
||||
} *rt_ = context->cfa;
|
||||
/* The void * cast is necessary to avoid an aliasing warning.
|
||||
The aliasing warning is correct, but should not be a problem
|
||||
diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
|
||||
index 75b7cf7..f964e24 100644
|
||||
--- a/libgcc/config/m68k/linux-unwind.h
|
||||
+++ b/libgcc/config/m68k/linux-unwind.h
|
||||
@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
/* <sys/ucontext.h> is unfortunately broken right now. */
|
||||
struct uw_ucontext {
|
||||
unsigned long uc_flags;
|
||||
- struct ucontext *uc_link;
|
||||
+ ucontext_t *uc_link;
|
||||
stack_t uc_stack;
|
||||
mcontext_t uc_mcontext;
|
||||
unsigned long uc_filler[80];
|
||||
diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
|
||||
index 2304142..30f25ea 100644
|
||||
--- a/libgcc/config/nios2/linux-unwind.h
|
||||
+++ b/libgcc/config/nios2/linux-unwind.h
|
||||
@@ -38,7 +38,7 @@ struct nios2_mcontext {
|
||||
|
||||
struct nios2_ucontext {
|
||||
unsigned long uc_flags;
|
||||
- struct ucontext *uc_link;
|
||||
+ ucontext_t *uc_link;
|
||||
stack_t uc_stack;
|
||||
struct nios2_mcontext uc_mcontext;
|
||||
sigset_t uc_sigmask; /* mask last for extensibility */
|
||||
diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
|
||||
index 9a2657f..e47493d 100644
|
||||
--- a/libgcc/config/pa/linux-unwind.h
|
||||
+++ b/libgcc/config/pa/linux-unwind.h
|
||||
@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
|
||||
struct sigcontext *sc;
|
||||
struct rt_sigframe {
|
||||
siginfo_t info;
|
||||
- struct ucontext uc;
|
||||
+ ucontext_t uc;
|
||||
} *frame;
|
||||
|
||||
/* rt_sigreturn trampoline:
|
||||
diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
|
||||
index e389cac..0bf43ba 100644
|
||||
--- a/libgcc/config/sh/linux-unwind.h
|
||||
+++ b/libgcc/config/sh/linux-unwind.h
|
||||
@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
|
||||
{
|
||||
struct rt_sigframe {
|
||||
siginfo_t info;
|
||||
- struct ucontext uc;
|
||||
+ ucontext_t uc;
|
||||
} *rt_ = context->cfa;
|
||||
/* The void * cast is necessary to avoid an aliasing warning.
|
||||
The aliasing warning is correct, but should not be a problem
|
||||
diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
|
||||
index 796e976..75f8890 100644
|
||||
--- a/libgcc/config/tilepro/linux-unwind.h
|
||||
+++ b/libgcc/config/tilepro/linux-unwind.h
|
||||
@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
|
||||
struct rt_sigframe {
|
||||
unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
|
||||
siginfo_t info;
|
||||
- struct ucontext uc;
|
||||
+ ucontext_t uc;
|
||||
} *rt_;
|
||||
|
||||
/* Return if this is not a signal handler. */
|
||||
diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
|
||||
index 9872492..586a9d4 100644
|
||||
--- a/libgcc/config/xtensa/linux-unwind.h
|
||||
+++ b/libgcc/config/xtensa/linux-unwind.h
|
||||
@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
|
||||
|
||||
struct rt_sigframe {
|
||||
siginfo_t info;
|
||||
- struct ucontext uc;
|
||||
+ ucontext_t uc;
|
||||
} *rt_;
|
||||
|
||||
/* movi a2, __NR_rt_sigreturn; syscall */
|
||||
--
|
||||
2.9.3
|
||||
|
@ -9,7 +9,6 @@ let
|
||||
"8" = "8.5.0";
|
||||
"7" = "7.5.0";
|
||||
"6" = "6.5.0";
|
||||
"4.9"= "4.9.4";
|
||||
};
|
||||
|
||||
fromMajorMinor = majorMinorVersion:
|
||||
@ -26,7 +25,6 @@ let
|
||||
"8.5.0" = "0l7d4m9jx124xsk6xardchgy2k5j5l2b15q322k31f0va4d8826k";
|
||||
"7.5.0" = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq";
|
||||
"6.5.0" = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby";
|
||||
"4.9.4" = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc";
|
||||
}."${version}";
|
||||
|
||||
in {
|
||||
|
@ -1,4 +1,8 @@
|
||||
{ stdenv, lib, idris2, makeWrapper
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
idris2,
|
||||
makeBinaryWrapper,
|
||||
}:
|
||||
# Usage: let
|
||||
# pkg = idris2Packages.buildIdris {
|
||||
@ -11,49 +15,57 @@
|
||||
# bin = pkg.executable;
|
||||
# }
|
||||
#
|
||||
{ src
|
||||
, ipkgName
|
||||
, version ? "unversioned"
|
||||
, idrisLibraries # Other libraries built with buildIdris
|
||||
, ... }@attrs:
|
||||
{
|
||||
src,
|
||||
ipkgName,
|
||||
version ? "unversioned",
|
||||
idrisLibraries, # Other libraries built with buildIdris
|
||||
...
|
||||
}@attrs:
|
||||
|
||||
let
|
||||
# loop over idrisLibraries and normalize them by turning any that are
|
||||
# direct outputs of the buildIdris function into the `.library {}`
|
||||
# property.
|
||||
idrisLibraryLibs = map (idrisLib:
|
||||
if lib.isDerivation idrisLib
|
||||
then idrisLib
|
||||
else if builtins.isFunction idrisLib
|
||||
then idrisLib {}
|
||||
else if (builtins.isAttrs idrisLib && idrisLib ? "library")
|
||||
then idrisLib.library {}
|
||||
else throw "Found an Idris2 library dependency that was not the result of the buildIdris function"
|
||||
idrisLibraryLibs = map (
|
||||
idrisLib:
|
||||
if lib.isDerivation idrisLib then
|
||||
idrisLib
|
||||
else if builtins.isFunction idrisLib then
|
||||
idrisLib { }
|
||||
else if (builtins.isAttrs idrisLib && idrisLib ? "library") then
|
||||
idrisLib.library { }
|
||||
else
|
||||
throw "Found an Idris2 library dependency that was not the result of the buildIdris function"
|
||||
) idrisLibraries;
|
||||
|
||||
propagate = libs: lib.unique (lib.concatMap (nextLib: [nextLib] ++ nextLib.propagatedIdrisLibraries) libs);
|
||||
propagate =
|
||||
libs: lib.unique (lib.concatMap (nextLib: [ nextLib ] ++ nextLib.propagatedIdrisLibraries) libs);
|
||||
ipkgFileName = ipkgName + ".ipkg";
|
||||
idrName = "idris2-${idris2.version}";
|
||||
libSuffix = "lib/${idrName}";
|
||||
propagatedIdrisLibraries = propagate idrisLibraryLibs;
|
||||
libDirs =
|
||||
(lib.makeSearchPath libSuffix propagatedIdrisLibraries) +
|
||||
":${idris2}/${idrName}";
|
||||
libDirs = (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + ":${idris2}/${idrName}";
|
||||
supportDir = "${idris2}/${idrName}/lib";
|
||||
drvAttrs = builtins.removeAttrs attrs [
|
||||
"ipkgName"
|
||||
"idrisLibraries"
|
||||
];
|
||||
|
||||
derivation = stdenv.mkDerivation (finalAttrs:
|
||||
drvAttrs // {
|
||||
derivation = stdenv.mkDerivation (
|
||||
finalAttrs:
|
||||
drvAttrs
|
||||
// {
|
||||
pname = ipkgName;
|
||||
inherit version;
|
||||
src = src;
|
||||
nativeBuildInputs = [ idris2 makeWrapper ] ++ attrs.nativeBuildInputs or [];
|
||||
buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [];
|
||||
nativeBuildInputs = [
|
||||
idris2
|
||||
makeBinaryWrapper
|
||||
] ++ attrs.nativeBuildInputs or [ ];
|
||||
buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [ ];
|
||||
|
||||
IDRIS2_PACKAGE_PATH = libDirs;
|
||||
env.IDRIS2_PACKAGE_PATH = libDirs;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
@ -63,15 +75,16 @@ let
|
||||
|
||||
passthru = {
|
||||
inherit propagatedIdrisLibraries;
|
||||
};
|
||||
} // (attrs.passthru or { });
|
||||
|
||||
shellHook = ''
|
||||
export IDRIS2_PACKAGE_PATH="${finalAttrs.IDRIS2_PACKAGE_PATH}"
|
||||
export IDRIS2_PACKAGE_PATH="${finalAttrs.env.IDRIS2_PACKAGE_PATH}"
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
executable = derivation.overrideAttrs {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -97,9 +110,14 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
library = { withSource ? false }:
|
||||
let installCmd = if withSource then "--install-with-src" else "--install";
|
||||
in derivation.overrideAttrs {
|
||||
library =
|
||||
{
|
||||
withSource ? false,
|
||||
}:
|
||||
let
|
||||
installCmd = if withSource then "--install-with-src" else "--install";
|
||||
in
|
||||
derivation.overrideAttrs {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/${libSuffix}
|
||||
|
@ -1,21 +1,8 @@
|
||||
{ callPackage
|
||||
, idris2Packages
|
||||
}:
|
||||
|
||||
let
|
||||
in {
|
||||
{ callPackage }:
|
||||
{
|
||||
idris2 = callPackage ./idris2.nix { };
|
||||
idris2Api = callPackage ./idris2-api.nix { };
|
||||
idris2Lsp = callPackage ./idris2-lsp.nix { };
|
||||
|
||||
buildIdris = callPackage ./build-idris.nix { };
|
||||
|
||||
idris2Api = (idris2Packages.buildIdris {
|
||||
inherit (idris2Packages.idris2) src version;
|
||||
ipkgName = "idris2api";
|
||||
idrisLibraries = [ ];
|
||||
preBuild = ''
|
||||
export IDRIS2_PREFIX=$out/lib
|
||||
make src/IdrisPaths.idr
|
||||
'';
|
||||
}).library;
|
||||
}
|
||||
|
22
pkgs/development/compilers/idris2/idris2-api.nix
Normal file
22
pkgs/development/compilers/idris2/idris2-api.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, idris2Packages }:
|
||||
let
|
||||
inherit (idris2Packages) idris2 buildIdris;
|
||||
apiPkg = buildIdris {
|
||||
inherit (idris2) src version;
|
||||
ipkgName = "idris2api";
|
||||
idrisLibraries = [ ];
|
||||
preBuild = ''
|
||||
export IDRIS2_PREFIX=$out/lib
|
||||
make src/IdrisPaths.idr
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Idris2 Compiler API Library";
|
||||
homepage = "https://github.com/idris-lang/Idris2";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ mattpolzin ];
|
||||
inherit (idris2.meta) platforms;
|
||||
};
|
||||
};
|
||||
in
|
||||
apiPkg.library { }
|
@ -1,14 +1,21 @@
|
||||
{ lib, fetchFromGitHub, idris2Packages, makeWrapper }:
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
idris2Packages,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
let
|
||||
globalLibraries = let
|
||||
idrName = "idris2-${idris2Packages.idris2.version}";
|
||||
libSuffix = "lib/${idrName}";
|
||||
in [
|
||||
"\\$HOME/.nix-profile/lib/${idrName}"
|
||||
"/run/current-system/sw/lib/${idrName}"
|
||||
"${idris2Packages.idris2}/${idrName}"
|
||||
];
|
||||
globalLibraries =
|
||||
let
|
||||
idrName = "idris2-${idris2Packages.idris2.version}";
|
||||
libSuffix = "lib/${idrName}";
|
||||
in
|
||||
[
|
||||
"\\$HOME/.nix-profile/lib/${idrName}"
|
||||
"/run/current-system/sw/lib/${idrName}"
|
||||
"${idris2Packages.idris2}/${idrName}"
|
||||
];
|
||||
globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries;
|
||||
|
||||
inherit (idris2Packages) idris2Api;
|
||||
@ -16,10 +23,10 @@ let
|
||||
ipkgName = "lsp-lib";
|
||||
version = "2024-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "idris-community";
|
||||
repo = "LSP-lib";
|
||||
rev = "03851daae0c0274a02d94663d8f53143a94640da";
|
||||
hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM=";
|
||||
owner = "idris-community";
|
||||
repo = "LSP-lib";
|
||||
rev = "03851daae0c0274a02d94663d8f53143a94640da";
|
||||
hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM=";
|
||||
};
|
||||
idrisLibraries = [ ];
|
||||
};
|
||||
@ -28,12 +35,15 @@ let
|
||||
ipkgName = "idris2-lsp";
|
||||
version = "2024-01-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "idris-community";
|
||||
repo = "idris2-lsp";
|
||||
rev = "a77ef2d563418925aa274fa29f06880dde43f4ec";
|
||||
hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o=";
|
||||
owner = "idris-community";
|
||||
repo = "idris2-lsp";
|
||||
rev = "a77ef2d563418925aa274fa29f06880dde43f4ec";
|
||||
hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o=";
|
||||
};
|
||||
idrisLibraries = [idris2Api lspLib];
|
||||
idrisLibraries = [
|
||||
idris2Api
|
||||
lspLib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postInstall = ''
|
||||
@ -49,4 +59,5 @@ let
|
||||
maintainers = with maintainers; [ mattpolzin ];
|
||||
};
|
||||
};
|
||||
in lspPkg.executable
|
||||
in
|
||||
lspPkg.executable
|
||||
|
@ -1,29 +1,30 @@
|
||||
# Almost 1:1 copy of idris2's nix/package.nix. Some work done in their flake.nix
|
||||
# we do here instead.
|
||||
{ stdenv
|
||||
, lib
|
||||
, chez
|
||||
, chez-racket
|
||||
, clang
|
||||
, gmp
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, gambit
|
||||
, nodejs
|
||||
, zsh
|
||||
, callPackage
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
chez,
|
||||
chez-racket,
|
||||
clang,
|
||||
gmp,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
gambit,
|
||||
nodejs,
|
||||
zsh,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
# NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs
|
||||
|
||||
let
|
||||
platformChez =
|
||||
if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0")
|
||||
then
|
||||
chez
|
||||
else
|
||||
chez-racket;
|
||||
in stdenv.mkDerivation rec {
|
||||
if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") then
|
||||
chez
|
||||
else
|
||||
chez-racket;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "idris2";
|
||||
version = "0.7.0";
|
||||
|
||||
@ -35,56 +36,69 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ makeWrapper clang platformChez ]
|
||||
++ lib.optionals stdenv.isDarwin [ zsh ];
|
||||
buildInputs = [ platformChez gmp ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
clang
|
||||
platformChez
|
||||
] ++ lib.optionals stdenv.isDarwin [ zsh ];
|
||||
buildInputs = [
|
||||
platformChez
|
||||
gmp
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs --build tests
|
||||
'';
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ]
|
||||
++ lib.optional stdenv.isDarwin "OS=";
|
||||
makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.isDarwin "OS=";
|
||||
|
||||
# The name of the main executable of pkgs.chez is `scheme`
|
||||
buildFlags = [ "bootstrap" "SCHEME=scheme" ];
|
||||
buildFlags = [
|
||||
"bootstrap"
|
||||
"SCHEME=scheme"
|
||||
];
|
||||
|
||||
checkTarget = "test";
|
||||
nativeCheckInputs = [ gambit nodejs ]; # racket ];
|
||||
nativeCheckInputs = [
|
||||
gambit
|
||||
nodejs
|
||||
]; # racket ];
|
||||
checkFlags = [ "INTERACTIVE=" ];
|
||||
|
||||
# TODO: Move this into its own derivation, such that this can be changed
|
||||
# without having to recompile idris2 every time.
|
||||
postInstall = let
|
||||
name = "${pname}-${version}";
|
||||
globalLibraries = [
|
||||
"\\$HOME/.nix-profile/lib/${name}"
|
||||
"/run/current-system/sw/lib/${name}"
|
||||
"$out/${name}"
|
||||
];
|
||||
globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries;
|
||||
in ''
|
||||
# Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH
|
||||
rm $out/bin/idris2
|
||||
# The only thing we need from idris2_app is the actual binary
|
||||
mv $out/bin/idris2_app/idris2.so $out/bin/idris2
|
||||
rm $out/bin/idris2_app/*
|
||||
rmdir $out/bin/idris2_app
|
||||
# idris2 needs to find scheme at runtime to compile
|
||||
# idris2 installs packages with --install into the path given by
|
||||
# IDRIS2_PREFIX. We set that to a default of ~/.idris2, to mirror the
|
||||
# behaviour of the standard Makefile install.
|
||||
# TODO: Make support libraries their own derivation such that
|
||||
# overriding LD_LIBRARY_PATH is unnecessary
|
||||
wrapProgram "$out/bin/idris2" \
|
||||
--set-default CHEZ "${platformChez}/bin/scheme" \
|
||||
--run 'export IDRIS2_PREFIX=''${IDRIS2_PREFIX-"$HOME/.idris2"}' \
|
||||
--suffix IDRIS2_LIBS ':' "$out/${name}/lib" \
|
||||
--suffix IDRIS2_DATA ':' "$out/${name}/support" \
|
||||
--suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \
|
||||
--suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \
|
||||
--suffix LD_LIBRARY_PATH ':' "$out/${name}/lib"
|
||||
'';
|
||||
postInstall =
|
||||
let
|
||||
name = "${pname}-${version}";
|
||||
globalLibraries = [
|
||||
"\\$HOME/.nix-profile/lib/${name}"
|
||||
"/run/current-system/sw/lib/${name}"
|
||||
"$out/${name}"
|
||||
];
|
||||
globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries;
|
||||
in
|
||||
''
|
||||
# Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH
|
||||
rm $out/bin/idris2
|
||||
# The only thing we need from idris2_app is the actual binary
|
||||
mv $out/bin/idris2_app/idris2.so $out/bin/idris2
|
||||
rm $out/bin/idris2_app/*
|
||||
rmdir $out/bin/idris2_app
|
||||
# idris2 needs to find scheme at runtime to compile
|
||||
# idris2 installs packages with --install into the path given by
|
||||
# IDRIS2_PREFIX. We set that to a default of ~/.idris2, to mirror the
|
||||
# behaviour of the standard Makefile install.
|
||||
# TODO: Make support libraries their own derivation such that
|
||||
# overriding LD_LIBRARY_PATH is unnecessary
|
||||
wrapProgram "$out/bin/idris2" \
|
||||
--set-default CHEZ "${platformChez}/bin/scheme" \
|
||||
--run 'export IDRIS2_PREFIX=''${IDRIS2_PREFIX-"$HOME/.idris2"}' \
|
||||
--suffix IDRIS2_LIBS ':' "$out/${name}/lib" \
|
||||
--suffix IDRIS2_DATA ':' "$out/${name}/support" \
|
||||
--suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \
|
||||
--suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \
|
||||
--suffix LD_LIBRARY_PATH ':' "$out/${name}/lib"
|
||||
'';
|
||||
|
||||
# Run package tests
|
||||
passthru.tests = callPackage ./tests.nix { inherit pname; };
|
||||
@ -94,7 +108,11 @@ in stdenv.mkDerivation rec {
|
||||
mainProgram = "idris2";
|
||||
homepage = "https://github.com/idris-lang/Idris2";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fabianhjr wchresta mattpolzin ];
|
||||
maintainers = with lib.maintainers; [
|
||||
fabianhjr
|
||||
wchresta
|
||||
mattpolzin
|
||||
];
|
||||
inherit (chez.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
@ -1,19 +1,36 @@
|
||||
{ stdenv, lib, pname, idris2, zsh }:
|
||||
{
|
||||
stdenv,
|
||||
runCommand,
|
||||
lib,
|
||||
pname,
|
||||
idris2,
|
||||
idris2Packages,
|
||||
zsh,
|
||||
tree,
|
||||
}:
|
||||
|
||||
let
|
||||
testCompileAndRun = {testName, code, want, packages ? []}: let
|
||||
testCompileAndRun =
|
||||
{
|
||||
testName,
|
||||
code,
|
||||
want,
|
||||
packages ? [ ],
|
||||
}:
|
||||
let
|
||||
packageString = builtins.concatStringsSep " " (map (p: "--package " + p) packages);
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}-${testName}";
|
||||
meta.timeout = 60;
|
||||
in
|
||||
runCommand "${pname}-${testName}"
|
||||
{
|
||||
meta.timeout = 60;
|
||||
|
||||
# with idris2 compiled binaries assume zsh is available on darwin, but that
|
||||
# is not the case with pure nix environments. Thus, we need to include zsh
|
||||
# when we build for darwin in tests. While this is impure, this is also what
|
||||
# we find in real darwin hosts.
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [ zsh ];
|
||||
|
||||
buildCommand = ''
|
||||
# with idris2 compiled binaries assume zsh is available on darwin, but that
|
||||
# is not the case with pure nix environments. Thus, we need to include zsh
|
||||
# when we build for darwin in tests. While this is impure, this is also what
|
||||
# we find in real darwin hosts.
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [ zsh ];
|
||||
}
|
||||
''
|
||||
set -eo pipefail
|
||||
|
||||
cat > packageTest.idr <<HERE
|
||||
@ -33,10 +50,43 @@ let
|
||||
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
in {
|
||||
|
||||
testBuildIdris =
|
||||
{
|
||||
testName,
|
||||
buildIdrisArgs,
|
||||
makeExecutable,
|
||||
expectedTree,
|
||||
}:
|
||||
let
|
||||
final = pkg: if makeExecutable then pkg.executable else pkg.library { };
|
||||
idrisPkg = final (idris2Packages.buildIdris buildIdrisArgs);
|
||||
in
|
||||
runCommand "${pname}-${testName}"
|
||||
{
|
||||
meta.timeout = 60;
|
||||
|
||||
nativeBuildInputs = [ tree ];
|
||||
}
|
||||
''
|
||||
GOT="$(tree ${idrisPkg} | tail -n +2)"
|
||||
|
||||
if [ "$GOT" = '${expectedTree}' ]; then
|
||||
echo "${testName} SUCCESS"
|
||||
else
|
||||
>&2 echo "Got:
|
||||
$GOT"
|
||||
>&2 echo 'want:
|
||||
${expectedTree}'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
touch $out
|
||||
'';
|
||||
in
|
||||
{
|
||||
# Simple hello world compiles, runs and outputs as expected
|
||||
hello-world = testCompileAndRun {
|
||||
helloWorld = testCompileAndRun {
|
||||
testName = "hello-world";
|
||||
code = ''
|
||||
module Main
|
||||
@ -48,7 +98,7 @@ in {
|
||||
};
|
||||
|
||||
# Data.Vect.Sort is available via --package contrib
|
||||
use-contrib = testCompileAndRun {
|
||||
useContrib = testCompileAndRun {
|
||||
testName = "use-contrib";
|
||||
packages = [ "contrib" ];
|
||||
code = ''
|
||||
@ -65,4 +115,72 @@ in {
|
||||
'';
|
||||
want = "[1, 3, 5]";
|
||||
};
|
||||
|
||||
buildLibrary = testBuildIdris {
|
||||
testName = "library-package";
|
||||
buildIdrisArgs = {
|
||||
ipkgName = "pkg";
|
||||
idrisLibraries = [ idris2Packages.idris2Api ];
|
||||
src = runCommand "library-package-src" { } ''
|
||||
mkdir $out
|
||||
|
||||
cat > $out/Main.idr <<EOF
|
||||
module Main
|
||||
|
||||
import Compiler.ANF -- from Idris2Api
|
||||
|
||||
hello : String
|
||||
hello = "world"
|
||||
EOF
|
||||
|
||||
cat > $out/pkg.ipkg <<EOF
|
||||
package pkg
|
||||
modules = Main
|
||||
depends = idris2
|
||||
EOF
|
||||
'';
|
||||
};
|
||||
makeExecutable = false;
|
||||
expectedTree = ''
|
||||
`-- lib
|
||||
`-- idris2-0.7.0
|
||||
`-- pkg-0
|
||||
|-- 2023090800
|
||||
| |-- Main.ttc
|
||||
| `-- Main.ttm
|
||||
`-- pkg.ipkg
|
||||
|
||||
5 directories, 3 files'';
|
||||
};
|
||||
|
||||
buildExecutable = testBuildIdris {
|
||||
testName = "executable-package";
|
||||
buildIdrisArgs = {
|
||||
ipkgName = "pkg";
|
||||
idrisLibraries = [ ];
|
||||
src = runCommand "executable-package-src" { } ''
|
||||
mkdir $out
|
||||
|
||||
cat > $out/Main.idr <<EOF
|
||||
module Main
|
||||
|
||||
main : IO ()
|
||||
main = putStrLn "hi"
|
||||
EOF
|
||||
|
||||
cat > $out/pkg.ipkg <<EOF
|
||||
package pkg
|
||||
modules = Main
|
||||
main = Main
|
||||
executable = mypkg
|
||||
EOF
|
||||
'';
|
||||
};
|
||||
makeExecutable = true;
|
||||
expectedTree = ''
|
||||
`-- bin
|
||||
`-- mypkg
|
||||
|
||||
2 directories, 1 file'';
|
||||
};
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||
postgresql
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
|
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
||||
"--enable-system-sqlite=${if stdenv.isDarwin then "no" else "yes"}"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libuninameslist";
|
||||
version = "20240524";
|
||||
version = "20240910";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fontforge";
|
||||
repo = pname;
|
||||
repo = "libuninameslist";
|
||||
rev = version;
|
||||
sha256 = "sha256-LANwM0fhCsscXAdI/qGOmUWDzAhe3g9w3J68g4szDZQ=";
|
||||
hash = "sha256-Pi30c3To57AzY59i39JVG2IUkGnq7CEAQkqJ1f5AZhw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/fontforge/libuninameslist/";
|
||||
changelog = "https://github.com/fontforge/libuninameslist/blob/${version}/ChangeLog";
|
||||
description = "Library of Unicode names and annotation data";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ erictapen ];
|
||||
|
@ -1348,16 +1348,16 @@ buildLuarocksPackage {
|
||||
lua-resty-openidc = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-resty-http, lua-resty-jwt, lua-resty-session, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "lua-resty-openidc";
|
||||
version = "1.7.6-3";
|
||||
version = "1.8.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lua-resty-openidc-1.7.6-3.rockspec";
|
||||
sha256 = "08nq24kxw51xiyyp5jailyqjfsgz4m4fzy4hb7g3fv76vcsf8msp";
|
||||
url = "mirror://luarocks/lua-resty-openidc-1.8.0-1.rockspec";
|
||||
sha256 = "0jgajhn45nybhi7z15bg957kznzqcjzxc8nrzmgyignkwp4yi1qk";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "zmartzone";
|
||||
repo = "lua-resty-openidc";
|
||||
rev = "v1.7.6";
|
||||
hash = "sha256-1yBmYuFlF/RdOz9csteaqsEEUxVWdwE6IMgS5M9PsJU=";
|
||||
rev = "v1.8.0";
|
||||
hash = "sha256-LSkNWebMF1L1a66QszugAxcHsW5o9uxQZHWituFFgJs=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
@ -323,7 +323,13 @@ in
|
||||
});
|
||||
|
||||
lua-resty-jwt = prev.lua-resty-jwt.overrideAttrs(oa: {
|
||||
meta = oa.meta // { broken = true; };
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdbattags";
|
||||
repo = "lua-resty-jwt";
|
||||
rev = "v0.2.3";
|
||||
hash = "sha256-5lnr0ka6ijfujiRjqwCPb6jzItXx45FIN8CvhR/KiB8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
});
|
||||
|
||||
lua-zlib = prev.lua-zlib.overrideAttrs (oa: {
|
||||
@ -470,13 +476,6 @@ in
|
||||
# meta.broken = true;
|
||||
# });
|
||||
|
||||
lua-resty-openidc = prev.lua-resty-openidc.overrideAttrs (_: {
|
||||
postConfigure = ''
|
||||
substituteInPlace ''${rockspecFilename} \
|
||||
--replace '"lua-resty-session >= 2.8, <= 3.10",' '"lua-resty-session >= 2.8",'
|
||||
'';
|
||||
});
|
||||
|
||||
lua-yajl = prev.lua-yajl.overrideAttrs (oa: {
|
||||
buildInputs = oa.buildInputs ++ [
|
||||
yajl
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "checkdmarc";
|
||||
version = "4.8.4";
|
||||
version = "5.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "domainaware";
|
||||
repo = "checkdmarc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NNB5dYQzzdNapjP4mtpCW08BzfZ+FFRESUtpxCOzrdk=";
|
||||
hash = "sha256-skQqLWBEmfyiW2DsRRbj3Lfj52QZca0zKenFC7LltjM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "djangorestframework-stubs";
|
||||
version = "3.15.0";
|
||||
version = "3.15.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "typeddjango";
|
||||
repo = "djangorestframework-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5fZzSRn59ii41QKOqkZUXTDnm70Um9SY445Vfoo8sgg=";
|
||||
hash = "sha256-m9KxC3dGe+uRB3YIykV/SCOHeItRYNKopF9fqCd10Vk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "influxdb-client";
|
||||
version = "1.45.0";
|
||||
version = "1.46.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "influxdata";
|
||||
repo = "influxdb-client-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Mhbje/wRltU04jrDQBZVG4OuGdBn20gmBRnnPqyzjcU=";
|
||||
hash = "sha256-oq6VXsCizqs7ZGocFWvD6SK1HRgQerlAEDW6+SBoM+A=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -13,16 +13,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "influxdb3-python";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "InfluxCommunity";
|
||||
repo = "influxdb3-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Knub5rZ27OXsiJanA+sI85DaUIskiGcuedKk1wF5zss=";
|
||||
hash = "sha256-4P+bQEldyBNh4qsIkoZLXnUOrQ5wVGbr55xbS0oQMMM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipycanvas";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Ujh9nYf2WVXzlVL7eSfEReXl5JN9hTgU2RDL6O+g+3k=";
|
||||
hash = "sha256-ToZ8UJsB9cTPwAn32SHjLloSoCmshW54wE/xW2VpLEo=";
|
||||
};
|
||||
|
||||
# We relax dependencies here instead of pulling in a patch because upstream
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab-execute-time";
|
||||
version = "3.1.2";
|
||||
version = "3.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "jupyterlab_execute_time";
|
||||
inherit version;
|
||||
hash = "sha256-DiyGsoNXXh+ieMfpSrA6A/5c0ftNV9Ygs9Tl2/VEdbk=";
|
||||
hash = "sha256-mxO2XCwTm/q7P2/xcGxNM+1aViA6idApdggzThW8nAs=";
|
||||
};
|
||||
|
||||
# jupyterlab is required to build from source but we use the pre-build package
|
||||
|
@ -25,7 +25,7 @@
|
||||
let
|
||||
llm = buildPythonPackage rec {
|
||||
pname = "llm";
|
||||
version = "0.15";
|
||||
version = "0.16";
|
||||
pyproject = true;
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@ -36,7 +36,7 @@ let
|
||||
owner = "simonw";
|
||||
repo = "llm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PPmbqY9+OYGs4U3z3LHs7a3BjQ0AlRY6J+SKmCY3bXk=";
|
||||
hash = "sha256-ew8080Lv1ObjUaGicaGrj8IXXA7rtdgcWhp41O8gfVE=";
|
||||
};
|
||||
|
||||
patches = [ ./001-disable-install-uninstall-commands.patch ];
|
||||
|
@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marimo";
|
||||
version = "0.8.13";
|
||||
version = "0.8.15";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-x1f71IaFO/LVNmgCS/eKa/Ia/KETToGexLK1FD3gWZM=";
|
||||
hash = "sha256-S+lhoyM8s6wLFq1oGJMdzq+s+Uhn76qMgbkMUwpVr44=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -6,28 +6,32 @@
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
typeguard,
|
||||
typing-extensions,
|
||||
typing-inspect,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marshmallow-dataclass";
|
||||
version = "8.7.0";
|
||||
format = "setuptools";
|
||||
version = "8.7.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lovasoa";
|
||||
repo = "marshmallow_dataclass";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O96Xv732euS0X+1ilhLVMoazpC4kUSJvyVYwdj10e2E=";
|
||||
hash = "sha256-0OXP78oyNe/UcI05NHskPyXAuX3dwAW4Uz4dI4b8KV0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
marshmallow
|
||||
typing-inspect
|
||||
];
|
||||
] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
@ -51,7 +55,7 @@ buildPythonPackage rec {
|
||||
description = "Automatic generation of marshmallow schemas from dataclasses";
|
||||
homepage = "https://github.com/lovasoa/marshmallow_dataclass";
|
||||
changelog = "https://github.com/lovasoa/marshmallow_dataclass/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meraki";
|
||||
version = "1.49.0";
|
||||
version = "1.50.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4/FiF8eEziaD3ka/XVdAxDI8WWuWlYoMoLupQXVCBA8=";
|
||||
hash = "sha256-tKtfshAsKtXPkkDY13+QWRaWduQCBhor4+ReLjarwLA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -16,15 +16,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-jupyter";
|
||||
version = "0.24.8";
|
||||
version = "0.25.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "mkdocs_jupyter";
|
||||
inherit version;
|
||||
hash = "sha256-Cadi9ITVQNnA6UTTSyjLU2oyhp4iS0YOL8eRsUP3aUA=";
|
||||
hash = "sha256-4mwdNBkWvFf5bqP5PY0KiPx3yH1M7iIvZtIAd5jZJPU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "nbconvert" ];
|
||||
|
@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "molecule";
|
||||
version = "24.8.0";
|
||||
version = "24.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FAc4kE6fF4FXgFaKxAjJ9zu54qxyHjRoWjWebTUH5nc=";
|
||||
hash = "sha256-hUjtoTwxoepBugeGsp3eRmz7gSYXwleSFRM1sXpBD2M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,10 +0,0 @@
|
||||
--- a/nbdime/webapp/nbdimeserver.py
|
||||
+++ b/nbdime/webapp/nbdimeserver.py
|
||||
@@ -388,6 +388,7 @@
|
||||
'jinja2_env': env,
|
||||
'local_hostnames': ['localhost', '127.0.0.1'],
|
||||
'cookie_secret': base64.encodebytes(os.urandom(32)), # Needed even for an unsecured server.
|
||||
+ 'allow_unauthenticated_access': True,
|
||||
}
|
||||
|
||||
try:
|
@ -22,29 +22,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbdime";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8adgwLAMG6m0lFwWzpJXfzk/tR0YTzUbdoW6boUCCY4=";
|
||||
hash = "sha256-2Cefj0sjbAslOyDWDEgxu2eEPtjb1uCfI06wEdNvG/I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# this fixes the webserver (nbdiff-web) when jupyter-server >=2.13 is used
|
||||
# see https://github.com/jupyter/nbdime/issues/749
|
||||
./749.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatch-jupyter-builder
|
||||
hatchling
|
||||
jupyterlab
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
nbformat
|
||||
colorama
|
||||
pygments
|
||||
|
@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oauthenticator";
|
||||
version = "16.3.1";
|
||||
version = "17.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gFhhOCcmorkrLxrup9fICh5ueCrc64fxfuZXTQG1tMk=";
|
||||
hash = "sha256-0eRfcuI+GuhgF0myZPy8ZcL4kBCLv6PcGEk+92J+GZ0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pbs-installer";
|
||||
version = "2024.08.14";
|
||||
version = "2024.09.09";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "frostming";
|
||||
repo = "pbs-installer";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Hitd7Ze8pujkRBoTapP5SekpdiDwJz/0UNe0wW7eaRA=";
|
||||
hash = "sha256-c9jd85CLQPrwA1HmsedGhbBoQIuEWiPsZN0Srq+DyVE=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plantuml-markdown";
|
||||
version = "3.10.3";
|
||||
version = "3.10.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "mikitex70";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9G+llIojgNyxupvKLfJC4igjtNK1YjbEMxcape9xqmk=";
|
||||
hash = "sha256-5K8NSxMCdAsOtV0egY8gMbHnHifvYNRHzafR0LAcm+Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyblu";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LouisChrist";
|
||||
repo = "pyblu";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Qe6GNzF8ffNSwqRL5QlN9x3dqwaX/YCfY/keEDwWW/8=";
|
||||
hash = "sha256-olQZ7e4RmjL1KVtJvPsXICgL2VCOIFnZCW8WjKO3X+Q=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyngo";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "yezz123";
|
||||
repo = "pyngo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vzqm+g/jYkxue5DiUe+iYA5x0zMKLKQtAatOSKCUWzs=";
|
||||
hash = "sha256-E3UNgn/L1bbfYljufPp+bGAvSsADpPAvv/eJimD8v50=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -33,7 +33,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-arango";
|
||||
version = "8.1.0";
|
||||
version = "8.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
owner = "arangodb";
|
||||
repo = "python-arango";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bMCzuqKLOQYmBGhdfHaff+0ZIVmZ4iy5jFtmV7X0pIM=";
|
||||
hash = "sha256-C2qFC0KOPO8I2CIDgFl0L7LyPgvqfqEeYdPAvwIJ+PY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-linkplay";
|
||||
version = "0.0.9";
|
||||
version = "0.0.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Velleman";
|
||||
repo = "python-linkplay";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SA+FKssA9ucbEWCAYfjFgZUt0RIIWBSAWQGZ7SCIyYE=";
|
||||
hash = "sha256-uenFr86WXSFzo3PlDz/KyMgG06QDzm69z0TM59UP6pg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
# dependencies
|
||||
@ -29,19 +28,17 @@
|
||||
|
||||
let
|
||||
pname = "torchmetrics";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lightning-AI";
|
||||
repo = "torchmetrics";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NOxj1vVY9ynCS/Pf6V+ONNx50jjKqfkhzYbc60Sf4Qw=";
|
||||
hash = "sha256-YieIz99QFnuW3hTtNFgxhkNnSXGsTG2qqYhRCyvZo7Q=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect";
|
||||
version = "0.60.4";
|
||||
version = "0.60.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ht+TSjI1FZ+y/lt5IlepxpT5uOBYeJaNmF7aBw2YUPA=";
|
||||
hash = "sha256-vWnqitYGh68PM9IM2qKJG3g0JrVfIA+s9Ngh8jpNJKg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xmlschema";
|
||||
version = "3.3.2";
|
||||
version = "3.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "sissaschool";
|
||||
repo = "xmlschema";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cZVNgY0Y9tE+ud8596Ujidc7aq+Gon9x6q/XDCuJ9oI=";
|
||||
hash = "sha256-ypyBBo00ZjYRvljn/eGaTxMViHzgoxq5IoNclWb7ghA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gqlgenc";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamashou";
|
||||
repo = "gqlgenc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tKEHqo7drOwHIRCgKEXbELi0u9uRpXSwB9R1fPhv/PE=";
|
||||
sha256 = "sha256-4d2IFJIoIX0IlS/v/EJkn1cK8hJl9808PE8ZnwqYzu8=";
|
||||
};
|
||||
|
||||
excludedPackages = [ "example" ];
|
||||
|
||||
vendorHash = "sha256-lQ2KQF+55qvscnYfm1jLK/4DdwFBaRZmv9oa/BUSoXI=";
|
||||
vendorHash = "sha256-GcqLW/Ooy2h5spYA94/HmaG0yYiqA4g5DyKlg9EORCQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Go tool for building GraphQL client with gqlgen";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kubie";
|
||||
version = "0.23.1";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "sbstp";
|
||||
repo = "kubie";
|
||||
sha256 = "sha256-TjZ8n88uldCNfpdReE/SYPkj0m6bBA2lI4SyNAhPFFM=";
|
||||
sha256 = "sha256-9tBPV0VR1bZUgYDD6T+hthPIzN9aGAyi1sUyeaynOQA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AkeKAPzgKDvnS+eyAh8MJfPOPFF+v6Rje3eXu7LM6Pk=";
|
||||
cargoHash = "sha256-Igq4vjIyixpAhFd1wZqrVXCUmJdetUn6uM1eIX/0CiM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -5,15 +5,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "opcr-policy";
|
||||
version = "0.2.17";
|
||||
version = "0.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opcr-io";
|
||||
repo = "policy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pZOCxOoGl/qq6nfklnwPtCy6pPXjIaY6qhH4TuL5kGg=";
|
||||
sha256 = "sha256-Q/2r8mqz820mEQD7o9qzC1TPMrRH0f6nr1jgRQAEj/Y=";
|
||||
};
|
||||
vendorHash = "sha256-LTlBj+F+QdLpndLhtH/vW6oNrvh+yUqtYngWpFMfahA=";
|
||||
vendorHash = "sha256-C6Y+R2q1ZRbeFN1qY109fikkzvcUsBfDn4CYCrKrLKI=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ];
|
||||
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pyenv";
|
||||
version = "2.4.11";
|
||||
version = "2.4.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyenv";
|
||||
repo = "pyenv";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Si7fjcUsj5Q+SezBGzQtzvu6OK2ZFk6YruYabYpuyK4=";
|
||||
hash = "sha256-ZvXtDD9HKwOJiUpR8ThqyCHWyMFs46dIrOgPMNpuHrY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
callPackage ./generic.nix rec {
|
||||
pname = "shattered-pixel-dungeon";
|
||||
version = "2.4.2";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "00-Evan";
|
||||
repo = "shattered-pixel-dungeon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1msmjKDEd/pFMqLB4vJgR6GPC9z4CnNew2hlemLw2d0=";
|
||||
hash = "sha256-G/g84Jl+jkmvxmQtCIPHsW9vHi3FPKt7A087SkVxNVE=";
|
||||
};
|
||||
|
||||
depsPath = ./deps.json;
|
||||
|
@ -11,12 +11,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "raycast";
|
||||
version = "1.82.0";
|
||||
version = "1.82.5";
|
||||
|
||||
src = fetchurl {
|
||||
name = "Raycast.dmg";
|
||||
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
|
||||
hash = "sha256-+USKcwmjapDH+zet7lHSWS6vT1GZ0ch+yPBRD2BrLS0=";
|
||||
hash = "sha256-wqX61h6iF3yhZePLvtGL+gsGOrRIwZ1w2i1F7M52bsw=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
@ -54,8 +54,8 @@ in rec {
|
||||
};
|
||||
|
||||
unifi8 = generic {
|
||||
version = "8.4.59";
|
||||
suffix = "-y2b2oj1o96";
|
||||
sha256 = "sha256-VwRvU+IHJs6uThdWF0uOqxz4cegBykYzB/fD0/AGPaM=";
|
||||
version = "8.4.62";
|
||||
suffix = "-i3q2j125cz";
|
||||
sha256 = "sha256-7qEk6zpihJfgxCoVa8fVSMZN87sHG5XhWpuZoBvB5QU=";
|
||||
};
|
||||
}
|
||||
|
@ -48,7 +48,6 @@ with pkgs;
|
||||
sets = lib.pipe gccTests ([
|
||||
(filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.stdenv.cc))
|
||||
# Broken
|
||||
(filterAttrs (n: _: n != "gcc49Stdenv"))
|
||||
(filterAttrs (n: _: n != "gccMultiStdenv"))
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
# fails with things like
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "credhub-cli";
|
||||
version = "2.9.36";
|
||||
version = "2.9.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry-incubator";
|
||||
repo = "credhub-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-5jrVN0mFRLieKg92pWrBK89SiPr9A2Z8Rtzou4dRdOQ=";
|
||||
sha256 = "sha256-BW6QMxBuiBmCE7ujpPc2sGEz0jkhEo0cPoa184Yx6/Q=";
|
||||
};
|
||||
|
||||
# these tests require network access that we're not going to give them
|
||||
|
@ -1,12 +1,12 @@
|
||||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "3.131.0";
|
||||
version = "3.132.0";
|
||||
pulumiPkgs = {
|
||||
x86_64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-linux-x64.tar.gz";
|
||||
sha256 = "06gzn2vbjmv4gljm7ar90hxm47ap2izhlr6whff7jrsrkvf71n54";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-linux-x64.tar.gz";
|
||||
sha256 = "1ylraqx71fc28aij6hpmqgq83ccs1615222ccav3q2r3k72jjw8h";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-amd64.tar.gz";
|
||||
@ -17,20 +17,20 @@
|
||||
sha256 = "1ckk20g77lwgg5v4baai0w6cvw9zapf31jy42lm9l3qnzx61fm6r";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.2-linux-amd64.tar.gz";
|
||||
sha256 = "0f8xh0hqvfpqj9rzyj46kzk2ilna6r0s577bq03vd50p97slqs18";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-linux-amd64.tar.gz";
|
||||
sha256 = "17mhp43q3igid15qavhib3ffcgz5ll64nxs9iv1gasmlm6v4gand";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.8.0-linux-amd64.tar.gz";
|
||||
sha256 = "1j87gqk46kdpbbzfjd7vfgq7f0yma1w66ygmh42f259hplaj0c33";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-linux-amd64.tar.gz";
|
||||
sha256 = "0k520iz4rf26x09nhy3xzxky6ni6c6q26l4pks8zylm508g8kkaz";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.6.0-linux-amd64.tar.gz";
|
||||
sha256 = "0ypabr7slayhy1kpiikx6pwfx89ibcvwz21kagf4zm3idrrv47kl";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-amd64.tar.gz";
|
||||
sha256 = "0qfkbwbkgh828hxgr64z8mkf6hbpqzwdfc2q6b1r718g647cm7nb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.0-linux-amd64.tar.gz";
|
||||
sha256 = "0grarc3ri7k9kvr8hb96id9r5sryyp0hymr2qv4ldm53wyzw3zxd";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-linux-amd64.tar.gz";
|
||||
sha256 = "1qvyh1d70lrgxbdkmcjcgl5pldc9a4bnzii9p3nnhgs37ks95w31";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-amd64.tar.gz";
|
||||
@ -45,16 +45,16 @@
|
||||
sha256 = "1l7qibcbak0zmrzfrldqrhkfdvmankb8yflv6ak17y8434dfcrfa";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-linux-amd64.tar.gz";
|
||||
sha256 = "1lc2p0x5ar0vhp0klmp6ilfl1aa8zilg4jgkiqsycsqqaj4f0hk7";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-linux-amd64.tar.gz";
|
||||
sha256 = "1gn7m1wyx7qlvv8q2i64cybpzms92dbydnv4dw3gvdxq4l217w94";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-amd64.tar.gz";
|
||||
sha256 = "1b5iyp0rld41mpin4w297p6q17kb3ya9sv5rsfg9iqwpbsz5c0vf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.2-linux-amd64.tar.gz";
|
||||
sha256 = "1r9flwh8sbnls78xsl64kfh7i29i2y3nm19jbhwjr8lmgnq5p2f4";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.1-linux-amd64.tar.gz";
|
||||
sha256 = "06smn9a3lrmqz9k2akzg984345h22mnlv75x6y3yzgs7cihyq26m";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-linux-amd64.tar.gz";
|
||||
@ -89,12 +89,12 @@
|
||||
sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-linux-amd64.tar.gz";
|
||||
sha256 = "0biyj03nhbmq0fnlkx3v4w43cwk095sa80di1mhbszgz13zj4409";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-linux-amd64.tar.gz";
|
||||
sha256 = "1cr2rwv1k4myd4gdyb88v4vyqrlxkl2br4jrvnari7sklpb4kjz9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-linux-amd64.tar.gz";
|
||||
sha256 = "1zvspswy3lmjpwpw35xxpkssv28sapwcv52lxiam57vcr9rbyi5g";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-linux-amd64.tar.gz";
|
||||
sha256 = "0h0dmb5q2flkjgkv7ps9maildc9cfcd921n38wyccql9nscrdy94";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-linux-amd64.tar.gz";
|
||||
@ -113,20 +113,20 @@
|
||||
sha256 = "192m4j80xqhyn8ramp3sdczcagia6xvfv99wq5ffz6yh7vyv0l2g";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-amd64.tar.gz";
|
||||
sha256 = "13s88q8ibd2sb0ly4z4mbj785jv0hclvh0prccsvkq8zbyg91vv1";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-linux-amd64.tar.gz";
|
||||
sha256 = "1qrf7v0v2qzn3df1dh2v99kvszjj38c4ms8msv57pd0ksbkyy03x";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.4-linux-amd64.tar.gz";
|
||||
sha256 = "0q2ajdbywq2s3ss7iqhv3iwjf0vqiw6ydyw059k606h0jr3x6dgr";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.5-linux-amd64.tar.gz";
|
||||
sha256 = "1qp5ix0ybdjg9gzdlrlrkvvnqyc7sz9hwjkfmr944h6nc1smkghw";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-linux-amd64.tar.gz";
|
||||
sha256 = "1h2kql44fjq6vv2a3pvvnx78sil6jgwm792qmrvh7gqrad0dd050";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-linux-amd64.tar.gz";
|
||||
sha256 = "0i9668mimdhm0aw0hjmg2ca2qycwilngz30mp2hjjlb2rv4mfgbk";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.90.0-linux-amd64.tar.gz";
|
||||
sha256 = "1jp70a089k3kgyqqvywyy3x7iwwsnng4qb17m4p624y4xhfgy512";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-linux-amd64.tar.gz";
|
||||
sha256 = "1974ysq788i3g4xzgx16azwn71flypbpb378j0dpaz7z2phwa021";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-linux-amd64.tar.gz";
|
||||
@ -137,8 +137,8 @@
|
||||
sha256 = "03y02rcy2xarvb4v33wxqf2qcy71amc9f6j6h406c8w8dnlaa9c3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.5-linux-amd64.tar.gz";
|
||||
sha256 = "1931a27h7jbsiy5addq93j8rnsk9gys9jq76w04mwx1fmlzm78j9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-linux-amd64.tar.gz";
|
||||
sha256 = "0ypnrzgfm5v3a4j28ydx9kbfliisvn5lc2i5kyzma86bvaizf8l8";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-linux-amd64.tar.gz";
|
||||
@ -149,8 +149,8 @@
|
||||
sha256 = "11g44ngbz4yar22flz6l1qxsjrjh1ks0fihln0g2b2da9n24v251";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.0-linux-amd64.tar.gz";
|
||||
sha256 = "1i2r83yfzh7ivvd15198czr6g9ry28pvz49a0rz9fy29rkggxhqs";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-linux-amd64.tar.gz";
|
||||
sha256 = "05xc1bm0bzqfwpakw9yrlh6dwm0zy3sq0vdhp4bnwrl2cmkwxp26";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-linux-amd64.tar.gz";
|
||||
@ -163,8 +163,8 @@
|
||||
];
|
||||
x86_64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-darwin-x64.tar.gz";
|
||||
sha256 = "0pl3wd2y7mkap7jq29bmbw1ipc2qf149xixriad2wk87sr6swgak";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-darwin-x64.tar.gz";
|
||||
sha256 = "0xcrv8536h043s0sk3h5ja75xjvcpx4adqhdn799sjlbx449mv1i";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-amd64.tar.gz";
|
||||
@ -175,20 +175,20 @@
|
||||
sha256 = "0l34kaa1x2sbalx0dannmmysr1ai8bh2z6x0lzg1iwxhr6fdvl3a";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.2-darwin-amd64.tar.gz";
|
||||
sha256 = "1lhp3wsa47a9r1zh6p4173gzhs0z5yzbzlr8wiqgkpn5ifsnl44a";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0mzygnyznqjj7niz7dv4c936riqbqrw4291ws76f777awksyri2c";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.8.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1nmarzx8s506g9559wa1l8bmhaxhplh515r74jkibnfhgj79fckp";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-darwin-amd64.tar.gz";
|
||||
sha256 = "06qg7jm9gr5s2nh1c44h94s17ai165c24j1lig01m27gwvdddl0z";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.6.0-darwin-amd64.tar.gz";
|
||||
sha256 = "16v1mr4h5cd0yj1nbm56pajp7nh386y79jpi1j0vvclhv4g11gli";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1hqcr1yhlc8m99w8z0i3mr3wnvnldkbwni4v5s1r11blpzqrwa0p";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1x333757814q95ixbmkzk49lhkfvsw9xnjpgnnx8f6325x331hy1";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1cvf7y3xgplyd7j586fa10j9s9wm7h6nqdvhydkbqzlrbqs6ys6p";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-amd64.tar.gz";
|
||||
@ -203,16 +203,16 @@
|
||||
sha256 = "02czk2wwf03sswlqj4hrj83i2i53h4nclqrb3nlgzjgaal82ijv9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0iw3gf7kwpi5lckngns2ra1vyd4n05r756s18b01zbcppw8fq2mw";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0rnj0nvqazsmvb3wwkgiwnpcimzv86df6bw8ln5h7rjiqpb23mvk";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1bgq98jiaqhvgbywvydpkif154k6rlzk0sqn55bj0ng9f04vz2ka";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.2-darwin-amd64.tar.gz";
|
||||
sha256 = "0h0nng26467yq12w3jhkbbs0629d6a6mxigxmhfca9w3dzrmkw8h";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0hdnyy6fjnrz0shqf0jsyl80w5r3pmkbpgyv41s37n6yk04kmcgy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-darwin-amd64.tar.gz";
|
||||
@ -247,12 +247,12 @@
|
||||
sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0pw9qawf3wrndzrz0i93al09rygr23b6gg53njq3az74gw4vjaw3";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0lkbzgp8kycnd2285zb90w6l0q5iigmjamxh4zrak86vrk4lnyz7";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-darwin-amd64.tar.gz";
|
||||
sha256 = "170fh5nyjxc3ayk0yfpv0ypck65rmdgy8p4p90v2i7mq7b6fs53z";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-darwin-amd64.tar.gz";
|
||||
sha256 = "047y788pxxlls03j9anp9a7mngq9rkr1x5cyq0gjch11605p0fay";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-darwin-amd64.tar.gz";
|
||||
@ -271,20 +271,20 @@
|
||||
sha256 = "1x5msm5ssslfpss1gvi56hmjc17hfnkvzmk5c1lhzzk1w94l30vj";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-amd64.tar.gz";
|
||||
sha256 = "09bdp7khxcmary0jiis921hdrakdz1ywzmz9byn4hfx0r6iajbpl";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0kv59rg37bvffgpc2mabi0p3rj6w7ihgzsxlplls1hx9x955kip8";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.4-darwin-amd64.tar.gz";
|
||||
sha256 = "1gcl5pahm54rkfxny11wqc36kn848cgqzji6kn8iz82wwg2sq68v";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.5-darwin-amd64.tar.gz";
|
||||
sha256 = "0qc451qq772vfa5cfi06r2vpcmi69hahj8m2040sbx363wpz8rm5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-darwin-amd64.tar.gz";
|
||||
sha256 = "01g19rm8272n6yzm7a1dyj2xr6f6xvgi0d962aw66sjhq4jc0s1h";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0jnbcq4649mn52qmq52h1sndad9jch07rh9b3ahjm8b6lakviq87";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.90.0-darwin-amd64.tar.gz";
|
||||
sha256 = "10x5j64dwvjvzmhv0991jsp8737v770hnyq9k99k3v0wi8fpsjfi";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0jbl5avzhqs4phnfrwp8n0lq1m4lmvlzvyhjpcsrx4nb33740rhz";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-darwin-amd64.tar.gz";
|
||||
@ -295,8 +295,8 @@
|
||||
sha256 = "0sr9a8zgfvhyr9993pmfddiw92c2m6v5wiafpd0p5hfzf99n5l8c";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.5-darwin-amd64.tar.gz";
|
||||
sha256 = "09454zh11wd9fra7x2dcyhy7ihs5chw5fy0ii376y4flj1gbx0j7";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-darwin-amd64.tar.gz";
|
||||
sha256 = "1jbsh2ni7qrl2q4lm63pgb3rf00xg3j4070nw9v82xbl9fcfmrjg";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-darwin-amd64.tar.gz";
|
||||
@ -307,8 +307,8 @@
|
||||
sha256 = "1g164xrj9nkdjw9pw08y24vzhg25f8h5702rfjsk0s2z011g86p7";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.0-darwin-amd64.tar.gz";
|
||||
sha256 = "12jsdnn5az8qhmak0i57k28w57nm0a0pmlpz81as47mffdkadjkr";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1wj5zz7gc9c8f1yk1aycb55v6pdpdkm97x4yq7ig3gy1j0zx90pg";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-darwin-amd64.tar.gz";
|
||||
@ -321,8 +321,8 @@
|
||||
];
|
||||
aarch64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-linux-arm64.tar.gz";
|
||||
sha256 = "1mvi1z851yzhdmxaxq03vg309x1hkniky3fkiz4k1qfwxrnqjpji";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-linux-arm64.tar.gz";
|
||||
sha256 = "1ny1wsjw6zickc1lc8cm223zngdlag5zdrxm7q5vpqxmw6lxkvhy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-arm64.tar.gz";
|
||||
@ -333,20 +333,20 @@
|
||||
sha256 = "1ldlxsnpjkdqh2xdfl56wgq9y94vaigc5i3q6cz682094fwhmw42";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.2-linux-arm64.tar.gz";
|
||||
sha256 = "140rl0kxlk81xdn3k6alyyy5skkbdidfyr6522dl2yqj0bxgmkl0";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-linux-arm64.tar.gz";
|
||||
sha256 = "1l5947vz9k5p6n9ij072igb1ck52fm0rxim82aa0bhvbg794l08a";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.8.0-linux-arm64.tar.gz";
|
||||
sha256 = "0w8c2vxfmwpcy1f6lbi8d7hahq3sbzpw1ivsb9n8864lin5iycry";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-linux-arm64.tar.gz";
|
||||
sha256 = "0bcxkk2rl9bls4h7nn0s1hm4lnypz30w4vgkc5wphw6a8jr55pr5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.6.0-linux-arm64.tar.gz";
|
||||
sha256 = "157vh8jgkqyydpic63qpwsqp469rjxakld4sd671lr6lqz234pwm";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-arm64.tar.gz";
|
||||
sha256 = "0h7ngd0zblvgf22m563p7f2y3kpqlvn5kqvb6psz3ixa8k4klmz7";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.0-linux-arm64.tar.gz";
|
||||
sha256 = "1jmqgajpi4771qp282p3rjaawnl5kcm4k63j41771nh69siyj0ib";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-linux-arm64.tar.gz";
|
||||
sha256 = "0k5n9kcbs2h86d89lrcmcliihb0avxya765z8gzxj97mgyfz0x8j";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-arm64.tar.gz";
|
||||
@ -361,16 +361,16 @@
|
||||
sha256 = "0ciadynvqc0pkmy9w7zj65zbc7w6rbsnz5b6iaszlyqp9rzwahg2";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-linux-arm64.tar.gz";
|
||||
sha256 = "1wmi0zwrsvphk82h7wqn0jvlsk685nl3xf48crara716xkhlr6cp";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-linux-arm64.tar.gz";
|
||||
sha256 = "0pv5av9471mlgv18k9pz977awnrc86zfm86bb1hkgbsgnpzxnxjd";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-arm64.tar.gz";
|
||||
sha256 = "0j53qafafq8s4rxds8anrsyylyjx6gd3jhrz16zqs4hcxwiimcfp";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.2-linux-arm64.tar.gz";
|
||||
sha256 = "0kzsxb0kifxl8yvkssryic9jaqmyhxkxhvxna5d3zivawmy1hbil";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.1-linux-arm64.tar.gz";
|
||||
sha256 = "070jixfr3qqzk4ni24fzankqmvmvn27cixipa8xfmxg4wwci8kb3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-linux-arm64.tar.gz";
|
||||
@ -405,12 +405,12 @@
|
||||
sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-linux-arm64.tar.gz";
|
||||
sha256 = "1m18aypypjsyr18igj2kmzh1dw86hxph32agk7k0zjfj921anqmx";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-linux-arm64.tar.gz";
|
||||
sha256 = "00ip2mi0hizfcvrmhq609ppghxpw50nihq0gaxl6lw9a7983ai97";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-linux-arm64.tar.gz";
|
||||
sha256 = "07kv3nqbfdah4i82pb8q83swr726q0bkx8wr6wwy168nff6zs98l";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-linux-arm64.tar.gz";
|
||||
sha256 = "04xvc3f94hybbdsln067qjw32876vak6msifqmh9vw3jkrzz60nx";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-linux-arm64.tar.gz";
|
||||
@ -429,20 +429,20 @@
|
||||
sha256 = "0xyypg6rf1q9mb4brsplhaj4aj3fsrwsqli45662syhd7skmzwrm";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-arm64.tar.gz";
|
||||
sha256 = "1gmcqk0ddfa5zfmhqv32vl1x5shmr80pik8da2g96y3mvfjbicpp";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-linux-arm64.tar.gz";
|
||||
sha256 = "1k8qylpilv579gdzv6m463v7i419npn2jca1w6lrjk234vlvz0c1";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.4-linux-arm64.tar.gz";
|
||||
sha256 = "1d8qb9n96c536s3qbf82k9jjpvgi5lryywli7jlfjqz98bwwr8dm";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.5-linux-arm64.tar.gz";
|
||||
sha256 = "0a1r87a9vp1sm4q7bxhgisrypyfi1p7hvh3c15yx22ylrmgwd83n";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-linux-arm64.tar.gz";
|
||||
sha256 = "0ainz86d5bcslk4yyyw6qsqnjhw2myirlkb22l0ldfpg85j4gbnm";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-linux-arm64.tar.gz";
|
||||
sha256 = "11racnb583bfsi3id7mqf8bjnwxl83a252y1lxbz3wy4bpqdzz4b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.90.0-linux-arm64.tar.gz";
|
||||
sha256 = "0frpkch4nmkjcmkdp9iv35d6nj6n7188wqcnq4wi9hjchvz03ngx";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-linux-arm64.tar.gz";
|
||||
sha256 = "11sf43q4djd1yk0cf7ypv5ypcjc62dibhb8g1p5dg2qcbdlkc551";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-linux-arm64.tar.gz";
|
||||
@ -453,8 +453,8 @@
|
||||
sha256 = "08f5yqxf0vgidcmwrzq8scdbd2h4wdz226l87h8rxpzssj56lpls";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.5-linux-arm64.tar.gz";
|
||||
sha256 = "0d1hnhfk3mxsw57y8k4pbrsimdkd7pibc77gspmhz16r1mvwavmz";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-linux-arm64.tar.gz";
|
||||
sha256 = "01ihcjgg9cbvxf3f26p1jjpjdq3x9l4bklabhlhixp51jr4h7wyn";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-linux-arm64.tar.gz";
|
||||
@ -465,8 +465,8 @@
|
||||
sha256 = "0jkjbsdmsc50jwv9rr40s0hlhwyhljwz95s5ll28xmmk413jkpfr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.0-linux-arm64.tar.gz";
|
||||
sha256 = "0b42ym6ypaz1qrjgh1bpgadm1b2vjcj6wxqs1af81hjcwdmqnmn0";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-linux-arm64.tar.gz";
|
||||
sha256 = "11yb5bv4ra9a28g4ns4pmzmf0ax280j6hxwh2p2nrkxxd3p8a6ai";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-linux-arm64.tar.gz";
|
||||
@ -479,8 +479,8 @@
|
||||
];
|
||||
aarch64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-darwin-arm64.tar.gz";
|
||||
sha256 = "01ysc776ng4gdi9vaa7am0a9n49wakkbwq6r2bj5avn0v95njrqa";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0wkmc2kajcd35js6ircf5an7h3hq7ra8z154v47dyid39m7c5bc5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-arm64.tar.gz";
|
||||
@ -491,20 +491,20 @@
|
||||
sha256 = "0nwb4w5y5nyz8a9marqln338mhxgj49iw2br5p7rksfw0xcv3a4x";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.2-darwin-arm64.tar.gz";
|
||||
sha256 = "0yhy5ci5qxx4xnv16jav68b258ancjc8iqybk1xifhixf8vyxcr7";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-darwin-arm64.tar.gz";
|
||||
sha256 = "125ck3a48ailqb7qwvfk7mx321k71xg3wby4fcvb2wjqgyl0x1kl";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.8.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1vz4qrf5nn17h9qlrnq1gb9q2km7zcl2bwa36bhfbm0h9rh2b52k";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-darwin-arm64.tar.gz";
|
||||
sha256 = "174dzisax2mqjm6gwmq20va0yivz3jqkczq03ys8b4m7q4s9yl7w";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.6.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0rcxkkjxc7prywjj7hpsr4dvvxd70hvp2widqwfa1s4lg7gcbfi7";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-arm64.tar.gz";
|
||||
sha256 = "1d6gpymsa5qjn03510pz61g774qh53v914hg2dm5kqrjzgb1mnvh";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1qlhjwv6b1vad4i77i7xq6pp92v292i5aj4wjc1k0hsb2xsizs5v";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-darwin-arm64.tar.gz";
|
||||
sha256 = "0321gnpljbzwyn1cdw5y3rhwi6kipavqnyamq6pa2s3725pplbys";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-arm64.tar.gz";
|
||||
@ -519,16 +519,16 @@
|
||||
sha256 = "1vs8xhy7iqfadfi2397jwfnz099pqyz5js4g4mx7kw1v47bsbvdq";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-darwin-arm64.tar.gz";
|
||||
sha256 = "08hhsjw93g5fyivlykmrzg4sghrranprzl17p1wn8rfiwfvk3d1x";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1b833d49z3h4cnf35qgill4rnixh6mfswk0g70qzv83jm9gvw9gz";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-arm64.tar.gz";
|
||||
sha256 = "17f53cknsyqm5r9glxmwc396y8bbl1khvg9px5ixr43gfgq4vm91";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.2-darwin-arm64.tar.gz";
|
||||
sha256 = "11afh8r6l0xjkfmqa8976h9i6xchn9fapsrfbpa8lvz3l4ch30md";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.1-darwin-arm64.tar.gz";
|
||||
sha256 = "0p2vciicmq7103cg205pqsxpjz0p0k1a1dbiakr2qjx56crraj4b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-darwin-arm64.tar.gz";
|
||||
@ -563,12 +563,12 @@
|
||||
sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-darwin-arm64.tar.gz";
|
||||
sha256 = "19nr55glr64lvxf233c2z8j5g13b7r2zxqwsri9vgj3kg52rjsbi";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-darwin-arm64.tar.gz";
|
||||
sha256 = "19shjz66ybjkcij72bhknsnxgpg8acnv6vp1lkmxd39s5g87ajv0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-darwin-arm64.tar.gz";
|
||||
sha256 = "1rh428pj6yzqy40l9gcjaacfcxy5snsy642gavwr9raw3yxdh4br";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1vqyd9g11k64wqmp5c0si7xycl1wlfl694fg6l8jv6dhkmr44q5b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-darwin-arm64.tar.gz";
|
||||
@ -587,20 +587,20 @@
|
||||
sha256 = "0l48njd1dw2fmr0sgpws5c6178wcv8h1rzvyj6x6djin3va8nwsg";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-arm64.tar.gz";
|
||||
sha256 = "1p1r5mn75mgshs9k9yjnzxism4b4nlyp84vz2l48bdgcbqzn1jin";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1jmfrlilb4par17awwr4aklkr9dnckpr2c88p8x1i641zbfrniw7";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.4-darwin-arm64.tar.gz";
|
||||
sha256 = "0w3y5phh1i6h2w77gg7p9rkrb9my11mx0bmsk29nlqpzrmfgwqbc";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.5-darwin-arm64.tar.gz";
|
||||
sha256 = "0nsgv18wdkyjrr9wq6qdd07bcjy9jr5206ncz84xhar47iaw1m16";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-darwin-arm64.tar.gz";
|
||||
sha256 = "09z5hdwn282xcxi4a2xsigcscnxykidm3a57r1s92jyxcvp9y2k8";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0p9lcg7wjjsgj8slg5vxd6jdjdwk36pdfdk87w450zm7k0ymfzq1";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.90.0-darwin-arm64.tar.gz";
|
||||
sha256 = "19n9pzm2nv8pwzvi9hvr7026zbywa2ravsplbbl35j1q15g46dcm";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-darwin-arm64.tar.gz";
|
||||
sha256 = "02fqsg8vvfl1xcb7s5waa9ysfl57i6307wzgwsw2y156jdbl2xkn";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-darwin-arm64.tar.gz";
|
||||
@ -611,8 +611,8 @@
|
||||
sha256 = "0d7jyzf66hxg13zkg9c4g63328vazlp9g7z9djqx44zmpxm6yh2b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.5-darwin-arm64.tar.gz";
|
||||
sha256 = "1dddpyrixmsgw2w8d30s18b49lc35xkkq8vjlhmwbpmcsp8kmfl7";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-darwin-arm64.tar.gz";
|
||||
sha256 = "0kcycvq3yaary4197cdwj2ziryffwmry295ds2am91gbgd3wyzd1";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-darwin-arm64.tar.gz";
|
||||
@ -623,8 +623,8 @@
|
||||
sha256 = "114cbaxhr067nf6rhxqnxhqzfwbq6sak6wmxjq5d25xxx0k0392j";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1bgzdndiqkz45a8k3c82fr6br6sp02q06lv1bw5kybz9xn194jp8";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-darwin-arm64.tar.gz";
|
||||
sha256 = "1329dc2jqwqdxlfrx214jmxji01kzny3rj5hh137yipkvfkrfzkf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-darwin-arm64.tar.gz";
|
||||
|
@ -2,27 +2,34 @@
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, libusb1
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-ios";
|
||||
version = "1.0.121";
|
||||
version = "1.0.143";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielpaulus";
|
||||
repo = "go-ios";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zWaEtfxrJYaROQ05nBQvM5fiIRSG+hCecU+BVnpIuck=";
|
||||
sha256 = "sha256-6RiKyhV5y6lOrhfZezSB2m/l17T3bHYaYRhsMf04wT8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0Wi9FCTaOD+kzO5cRjpqbXHqx5UAKSGu+hc9bpj+PWo=";
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-GfVHAOlN2tL21ILQYPw/IaYQZccxitjHGQ09unfHcKg=";
|
||||
|
||||
excludedPackages = [
|
||||
"restapi"
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
"-tags=fast"
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libusb1
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@ -30,6 +37,16 @@ buildGoModule rec {
|
||||
mv $out/bin/go-ios $out/bin/ios
|
||||
'';
|
||||
|
||||
# skips all the integration tests (requires iOS device) (`-tags=fast`)
|
||||
# as well as tests that requires networking
|
||||
checkFlags = let
|
||||
skippedTests = [
|
||||
"TestWorksWithoutProxy"
|
||||
"TestUsesProxy"
|
||||
];
|
||||
in [ "-tags=fast" ]
|
||||
++ [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "moar";
|
||||
version = "1.26.0";
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gc2JhahxiaIpDRPpuUEjd+lOE6zk1RevhD4NechxXxA=";
|
||||
hash = "sha256-nuBLO+7AUa2e9WC95kami77si+LrhigGu1ngAoFwjqY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE=";
|
||||
|
@ -5,17 +5,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pokeget-rs";
|
||||
version = "1.5.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "talwat";
|
||||
repo = "pokeget-rs";
|
||||
rev = version;
|
||||
hash = "sha256-pP6iIgpY3wI2Yhtu9NXAyB5tQgKqC9yzbC0IwalzhiI=";
|
||||
hash = "sha256-Epet0CG4p7ruKHYVx0rX7KeOAe9kCer6Y8bguOY9SUs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DBbcfq2ON05BXGRgtZ4Sze8rAz4Eu23pOk1AEYScVbg=";
|
||||
cargoHash = "sha256-gakrHutB6KBYcSZce/MDDnHK6VRPHU2B2xwtmUi4ZWY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Better rust version of pokeget";
|
||||
|
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tgt";
|
||||
version = "1.0.92";
|
||||
version = "1.0.93";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fujita";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Axx9D4BIg68R9bDDNyIGw8n91Jg1YJ/zN1rE6aeMZcs=";
|
||||
hash = "sha256-0Yfah8VxmbBe1J1OMhG6kyHlGBBAed8F9uStjMs6S2E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ];
|
||||
|
@ -511,11 +511,14 @@ mapAliases ({
|
||||
garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12
|
||||
garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17
|
||||
gcc48 = throw "'gcc48' has been removed from nixpkgs"; # Added 2024-09-10
|
||||
gcc49 = throw "'gcc49' has been removed from nixpkgs"; # Added 2024-09-11
|
||||
gcc49Stdenv = throw "'gcc49Stdenv' has been removed from nixpkgs"; # Added 2024-09-11
|
||||
gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21
|
||||
gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11
|
||||
geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10
|
||||
geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10
|
||||
gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
|
||||
gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
|
||||
ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18
|
||||
go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04
|
||||
gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06
|
||||
|
@ -4463,6 +4463,10 @@ with pkgs;
|
||||
|
||||
cz-cli = callPackage ../applications/version-management/cz-cli { };
|
||||
|
||||
czkawka-full = czkawka.wrapper.override {
|
||||
extraPackages = [ ffmpeg ];
|
||||
};
|
||||
|
||||
comma = callPackage ../tools/package-management/comma { };
|
||||
|
||||
commitizen = with python3Packages; toPythonApplication commitizen;
|
||||
@ -6690,8 +6694,6 @@ with pkgs;
|
||||
|
||||
biodiff = callPackage ../development/tools/biodiff { };
|
||||
|
||||
biome = callPackage ../development/tools/biome { };
|
||||
|
||||
biosdevname = callPackage ../tools/networking/biosdevname { };
|
||||
|
||||
bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { };
|
||||
@ -14910,7 +14912,6 @@ with pkgs;
|
||||
extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
|
||||
};
|
||||
|
||||
gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49;
|
||||
gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6;
|
||||
gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7;
|
||||
gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8;
|
||||
@ -15005,7 +15006,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; })
|
||||
gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14;
|
||||
gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14;
|
||||
|
||||
gcc_latest = gcc14;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user