forked from mirrors/nixpkgs
Merge master into haskell-updates
This commit is contained in:
commit
64ebcd8051
|
@ -4859,7 +4859,7 @@
|
|||
name = "Eric Evenchick";
|
||||
};
|
||||
evenbrenden = {
|
||||
email = "evenbrenden@gmail.com";
|
||||
email = "packages@anythingexternal.com";
|
||||
github = "evenbrenden";
|
||||
githubId = 2512008;
|
||||
name = "Even Brenden";
|
||||
|
|
|
@ -256,6 +256,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- The `pnpm` package has be updated to from version 7.29.1 to version 8.1.1 and Node.js 14 support has been discontinued (though, there are workarounds if Node.js 14 is still required)
|
||||
- Migration instructions: ["Before updating pnpm to v8 in your CI, regenerate your pnpm-lock.yaml. To upgrade your lockfile, run pnpm install and commit the changes. Existing dependencies will not be updated; however, due to configuration changes in pnpm v8, some missing peer dependencies may be added to the lockfile and some packages may get deduplicated. You can commit the new lockfile even before upgrading Node.js in the CI, as pnpm v7 already supports the new lockfile format."](https://github.com/pnpm/pnpm/releases/tag/v8.0.0)
|
||||
|
||||
- The `zplug` package changes its output path from `$out` to `$out/share/zplug`. Users should update their dependency on `${pkgs.zplug}/init.zsh` to `${pkgs.zplug}/share/zplug/init.zsh`.
|
||||
|
||||
## Other Notable Changes {#sec-release-23.05-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
@ -171,6 +171,7 @@
|
|||
./programs/fuse.nix
|
||||
./programs/fzf.nix
|
||||
./programs/gamemode.nix
|
||||
./programs/gamescope.nix
|
||||
./programs/geary.nix
|
||||
./programs/git.nix
|
||||
./programs/gnome-disks.nix
|
||||
|
|
85
nixos/modules/programs/gamescope.nix
Normal file
85
nixos/modules/programs/gamescope.nix
Normal file
|
@ -0,0 +1,85 @@
|
|||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.programs.gamescope;
|
||||
|
||||
gamescope =
|
||||
let
|
||||
wrapperArgs =
|
||||
optional (cfg.args != [ ])
|
||||
''--add-flags "${toString cfg.args}"''
|
||||
++ builtins.attrValues (mapAttrs (var: val: "--set-default ${var} ${val}") cfg.env);
|
||||
in
|
||||
pkgs.runCommand "gamescope" { nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; } ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${cfg.package}/bin/gamescope $out/bin/gamescope --inherit-argv0 \
|
||||
${toString wrapperArgs}
|
||||
'';
|
||||
in
|
||||
{
|
||||
options.programs.gamescope = {
|
||||
enable = mkEnableOption (mdDoc "gamescope");
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.gamescope;
|
||||
defaultText = literalExpression "pkgs.gamescope";
|
||||
description = mdDoc ''
|
||||
The GameScope package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
capSysNice = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = mdDoc ''
|
||||
Add cap_sys_nice capability to the GameScope
|
||||
binary so that it may renice itself.
|
||||
'';
|
||||
};
|
||||
|
||||
args = mkOption {
|
||||
type = types.listOf types.string;
|
||||
default = [ ];
|
||||
example = [ "--rt" "--prefer-vk-device 8086:9bc4" ];
|
||||
description = mdDoc ''
|
||||
Arguments passed to GameScope on startup.
|
||||
'';
|
||||
};
|
||||
|
||||
env = mkOption {
|
||||
type = types.attrsOf types.string;
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
# for Prime render offload on Nvidia laptops.
|
||||
# Also requires `hardware.nvidia.prime.offload.enable`.
|
||||
{
|
||||
__NV_PRIME_RENDER_OFFLOAD = "1";
|
||||
__VK_LAYER_NV_optimus = "NVIDIA_only";
|
||||
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
|
||||
}
|
||||
'';
|
||||
description = mdDoc ''
|
||||
Default environment variables available to the GameScope process, overridable at runtime.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
security.wrappers = mkIf cfg.capSysNice {
|
||||
gamescope = {
|
||||
owner = "root";
|
||||
group = "root";
|
||||
source = "${gamescope}/bin/gamescope";
|
||||
capabilities = "cap_sys_nice+pie";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = mkIf (!cfg.capSysNice) [ gamescope ];
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ nrdxp ];
|
||||
}
|
|
@ -4,6 +4,24 @@ with lib;
|
|||
|
||||
let
|
||||
cfg = config.programs.steam;
|
||||
gamescopeCfg = config.programs.gamescope;
|
||||
|
||||
steam-gamescope = let
|
||||
exports = builtins.attrValues (builtins.mapAttrs (n: v: "export ${n}=${v}") cfg.gamescopeSession.env);
|
||||
in
|
||||
pkgs.writeShellScriptBin "steam-gamescope" ''
|
||||
${builtins.concatStringsSep "\n" exports}
|
||||
gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
|
||||
'';
|
||||
|
||||
gamescopeSessionFile =
|
||||
(pkgs.writeTextDir "share/wayland-sessions/steam.desktop" ''
|
||||
[Desktop Entry]
|
||||
Name=Steam
|
||||
Comment=A digital distribution platform
|
||||
Exec=${steam-gamescope}/bin/steam-gamescope
|
||||
Type=Application
|
||||
'').overrideAttrs (_: { passthru.providedSessions = [ "steam" ]; });
|
||||
in {
|
||||
options.programs.steam = {
|
||||
enable = mkEnableOption (lib.mdDoc "steam");
|
||||
|
@ -32,6 +50,12 @@ in {
|
|||
then [ package ] ++ extraPackages
|
||||
else [ package32 ] ++ extraPackages32;
|
||||
in prevLibs ++ additionalLibs;
|
||||
} // optionalAttrs (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice)
|
||||
{
|
||||
buildFHSEnv = pkgs.buildFHSEnv.override {
|
||||
# use the setuid wrapped bubblewrap
|
||||
bubblewrap = "${config.security.wrapperDir}/..";
|
||||
};
|
||||
});
|
||||
description = lib.mdDoc ''
|
||||
The Steam package to use. Additional libraries are added from the system
|
||||
|
@ -57,6 +81,31 @@ in {
|
|||
Open ports in the firewall for Source Dedicated Server.
|
||||
'';
|
||||
};
|
||||
|
||||
gamescopeSession = mkOption {
|
||||
description = mdDoc "Run a GameScope driven Steam session from your display-manager";
|
||||
default = {};
|
||||
type = types.submodule {
|
||||
options = {
|
||||
enable = mkEnableOption (mdDoc "GameScope Session");
|
||||
args = mkOption {
|
||||
type = types.listOf types.string;
|
||||
default = [ ];
|
||||
description = mdDoc ''
|
||||
Arguments to be passed to GameScope for the session.
|
||||
'';
|
||||
};
|
||||
|
||||
env = mkOption {
|
||||
type = types.attrsOf types.string;
|
||||
default = { };
|
||||
description = mdDoc ''
|
||||
Environmental variables to be passed to GameScope for the session.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
@ -66,6 +115,19 @@ in {
|
|||
driSupport32Bit = true;
|
||||
};
|
||||
|
||||
security.wrappers = mkIf (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) {
|
||||
# needed or steam fails
|
||||
bwrap = {
|
||||
owner = "root";
|
||||
group = "root";
|
||||
source = "${pkgs.bubblewrap}/bin/bwrap";
|
||||
setuid = true;
|
||||
};
|
||||
};
|
||||
|
||||
programs.gamescope.enable = mkDefault cfg.gamescopeSession.enable;
|
||||
services.xserver.displayManager.sessionPackages = mkIf cfg.gamescopeSession.enable [ gamescopeSessionFile ];
|
||||
|
||||
# optionally enable 32bit pulseaudio support if pulseaudio is enabled
|
||||
hardware.pulseaudio.support32Bit = config.hardware.pulseaudio.enable;
|
||||
|
||||
|
@ -74,7 +136,7 @@ in {
|
|||
environment.systemPackages = [
|
||||
cfg.package
|
||||
cfg.package.run
|
||||
];
|
||||
] ++ lib.optional cfg.gamescopeSession.enable steam-gamescope;
|
||||
|
||||
networking.firewall = lib.mkMerge [
|
||||
(mkIf cfg.remotePlay.openFirewall {
|
||||
|
|
|
@ -119,6 +119,9 @@ in {
|
|||
# Required by Budgie Menu.
|
||||
gnome-menus
|
||||
|
||||
# Required by Budgie Control Center.
|
||||
gnome.zenity
|
||||
|
||||
# Provides `gsettings`.
|
||||
glib
|
||||
|
||||
|
|
|
@ -19,20 +19,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amberol";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-G1B+kDH1eWYA/j1t2xJPoGQasIJ77y+BKnnu/6VEWts=";
|
||||
hash = "sha256-pvvpiZHp3Gj3rtjvlnfmC2E0mcmh0/poxidhJC8j4Cg=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-5hy2u1flUKZCM4OPFhoT5b3R8v3zBGtwN+e6kwY3LQ4=";
|
||||
hash = "sha256-eb4vVgSAvR2LYVmZmdOIoXxJqFz6q78PIoQPVrOIffc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "open-stage-control";
|
||||
version = "1.23.0";
|
||||
version = "1.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jean-emmanuel";
|
||||
repo = "open-stage-control";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5QMBJw6H9TmyoSMkG5rniq1BdVYuEtQsQF1GGBkxqMI=";
|
||||
hash = "sha256-mM81u1irVfFFJUddOXKcs46tcGwVAcir+daKdkxFLsE=";
|
||||
};
|
||||
|
||||
# Remove some Electron stuff from package.json
|
||||
|
|
|
@ -25,13 +25,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.77";
|
||||
version = "6.79";
|
||||
|
||||
src = fetchurl {
|
||||
url = url_for_platform version stdenv.hostPlatform.qemuArch;
|
||||
hash = {
|
||||
x86_64-linux = "sha256-1HQtmhcLV/yhrANy1wLM1ju3t9o/lnU1OaYxqe20UFc=";
|
||||
aarch64-linux = "sha256-17lBwadEDINoXd0yF/hCVFRGoWq6AuFUf4o+uPR6q60=";
|
||||
x86_64-linux = "sha256-Bpsc09y5R/zyVXiDAqRF6n09qKOrBTLjk84z+noeko0=";
|
||||
aarch64-linux = "sha256-jbyXXeVtFmt7xoIWd4YKFu4AUM6W9LzeIiGoGyaO2lU=";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SonyHeadphonesClient";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Plutoberth";
|
||||
repo = "SonyHeadphonesClient";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0DQanrglJiGsN8qQ5KxkL8I+Fpt1abeeuKiM8v9GclM=";
|
||||
hash = "sha256-vhI97KheKzr87exCh4xNN7NDefcagdMu1tWSt67vLiU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, imagemagick
|
||||
, libappindicator-gtk3
|
||||
, libdbusmenu
|
||||
, libdrm
|
||||
|
@ -37,11 +36,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tidal-hifi";
|
||||
version = "5.0.0";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
|
||||
sha256 = "sha256-6NyHDH16bLs+bgSbjZYm2LEzp1WkJ1nO3sdkO78/VqE=";
|
||||
sha256 = "sha256-IaSgul2L0L343TVT3ujgBoMt6tITwjJaBNOVJPCBDtI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
|
@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
|
|||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
imagemagick
|
||||
pango
|
||||
systemd
|
||||
mesa # for libgbm
|
||||
|
@ -110,12 +108,6 @@ stdenv.mkDerivation rec {
|
|||
"''${gappsWrapperArgs[@]}"
|
||||
substituteInPlace $out/share/applications/tidal-hifi.desktop \
|
||||
--replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi"
|
||||
|
||||
for size in 48 64 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/
|
||||
convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \
|
||||
-resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/icon.png
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.191.5";
|
||||
version = "1.192.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-jGIdDgSDgKXI9DHEmu2FRXjoFsvmxUbK5xoajLjX7zQ=";
|
||||
hash = "sha256-uRw4IeTJz5K3EPgEAtvtG938LT0doHh49/y02XlMhzE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
12
pkgs/applications/editors/cudatext/deps.json
generated
12
pkgs/applications/editors/cudatext/deps.json
generated
|
@ -11,18 +11,18 @@
|
|||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.03.22",
|
||||
"hash": "sha256-cUuoB9hPA04MmurtCbzkMuozc79Dj0rRnqE0ms2jJGs="
|
||||
"rev": "2023.04.26",
|
||||
"hash": "sha256-OQOIDK3DSWQeKMjHPbJzfB35v+FQXFaoOES0luKSMc0="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.04.22",
|
||||
"hash": "sha256-12W0p18s15KFFIopgit8l/Bf1KjMZkP2kCAaeaoqfyQ="
|
||||
"rev": "2023.04.26",
|
||||
"hash": "sha256-RD8ZmRy6jf6pUGPDI3Ft2LBYHXklxXlJXaLHjLv3usE="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.04.08",
|
||||
"hash": "sha256-xm2fMAm0DF0hILxBQ2m+OSodQQgl5a4rkW0pgTDjuoo="
|
||||
"rev": "2023.04.26",
|
||||
"hash": "sha256-y5+NaTTSS6GI2gLOOewQnWzfAUB1reximvqnWjavORk="
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ldtk";
|
||||
version = "1.2.5";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip";
|
||||
sha256 = "sha256-kx4GOENYYbS09HxAiCCvqm/ztc32sdB39W8uv6D+R+A=";
|
||||
hash = "sha256-2gGxl6l7J/L0CfMJk6PVmc1ABQISzAnjKDJgnMyx2PM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];
|
||||
|
@ -48,8 +48,9 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ldtk.io/";
|
||||
description = "Modern, lightweight and efficient 2D level editor";
|
||||
homepage = "https://ldtk.io/";
|
||||
changelog = "https://github.com/deepnight/ldtk/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ felschr ];
|
||||
|
|
|
@ -13209,6 +13209,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/honza/vim-snippets/";
|
||||
};
|
||||
|
||||
vim-solarized8 = buildVimPluginFrom2Nix {
|
||||
pname = "vim-solarized8";
|
||||
version = "2023-02-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lifepillar";
|
||||
repo = "vim-solarized8";
|
||||
rev = "bcd4e74e9850fd59ee0294a5c3ae958ed535cc52";
|
||||
sha256 = "00qhqy511wdcmlsglwhqsd6gffagjmdz0wl5627a3nwmxs8p45sa";
|
||||
};
|
||||
meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
|
||||
};
|
||||
|
||||
vim-solidity = buildVimPluginFrom2Nix {
|
||||
pname = "vim-solidity";
|
||||
version = "2018-04-17";
|
||||
|
|
|
@ -1110,6 +1110,7 @@ https://github.com/justinmk/vim-sneak/,,
|
|||
https://github.com/garbas/vim-snipmate/,,
|
||||
https://github.com/honza/vim-snippets/,,
|
||||
https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
|
||||
https://github.com/lifepillar/vim-solarized8/,HEAD,
|
||||
https://github.com/tomlion/vim-solidity/,,
|
||||
https://github.com/christoomey/vim-sort-motion/,,
|
||||
https://github.com/tpope/vim-speeddating/,,
|
||||
|
|
|
@ -31,11 +31,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "saga";
|
||||
version = "9.0.0";
|
||||
version = "9.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
|
||||
sha256 = "sha256-Yi0zYV6RnUy9mx7/jVBXa0POyTqisPqFEFH+BATn2YY=";
|
||||
sha256 = "sha256-8S8Au+aLwl8X0GbqPPv2Q6EL98KSoT665aILc5vcbpA=";
|
||||
};
|
||||
|
||||
sourceRoot = "saga-${version}/saga-gis";
|
||||
|
|
|
@ -56,11 +56,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "digikam";
|
||||
version = "7.9.0";
|
||||
version = "7.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
|
||||
sha256 = "sha256-w7gKvAkNo8u8QuZ6QDCA1/X+CnyYaYc1vaVWxgMUurQ=";
|
||||
sha256 = "sha256-o/MPAbfRttWFgivNXr+N9p4P8CRWOnJGLr+AadvaIuE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
|
|
|
@ -1,16 +1,17 @@
|
|||
{ stdenv, lib, fetchFromGitHub
|
||||
, imagemagick, pkg-config, wayland, wayland-protocols
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "hello-wayland";
|
||||
version = "unstable-2023-03-16";
|
||||
version = "unstable-2023-04-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = "hello-wayland";
|
||||
rev = "f6a8203309977af03cda94765dd61367c189bea6";
|
||||
sha256 = "FNtc6OApW/epAFortvujNVWJJVI44IY+Pa0qU0QdecA=";
|
||||
rev = "77e270c19672f3ad863e466093f429cde8eb1f16";
|
||||
sha256 = "NMQE2zU858b6OZhdS2oZnGvLK+eb7yU0nFaMAcpNw04=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ imagemagick pkg-config ];
|
||||
|
@ -23,6 +24,8 @@ stdenv.mkDerivation {
|
|||
runHook postBuild
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Hello world Wayland client";
|
||||
homepage = "https://github.com/emersion/hello-wayland";
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "chatblade";
|
||||
version = "0.2.1";
|
||||
version = "0.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-1syZyqdv+0iyAOWDychv3bGnkHs9SCxsEotxQ+G1UPo=";
|
||||
sha256 = "sha256-YXZeqIX8cxNDvM4Pn0or6Lqj2ffX9aQb3b/xMIeBHRk=";
|
||||
};
|
||||
|
||||
doCheck = false; # there are no tests
|
||||
|
|
|
@ -5,10 +5,10 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jotta-cli";
|
||||
version = "0.15.75988";
|
||||
version = "0.15.80533";
|
||||
src = fetchzip {
|
||||
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
|
||||
sha256 = "sha256-8ldr5FPbnNBlQb4YEbieIu3ZAjCzk5+MKdekq4dsNhc=";
|
||||
sha256 = "sha256-4Knenhuezc+hKqVVY/l5d7SNfiAHyxspwGEgJj++GQM=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lscolors";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-rs/qv6zmSHy2FFiPSgGzxAV/r0SqK9vnfwnLj45WY4I=";
|
||||
sha256 = "sha256-YVKs/1R//oKYBSSGnj6UMFo5zDp5O3QDDdkDKF4ICBk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-WDvflAb56l+UkrxeQQZrloxlaK/mZavT9sA+VOWDW5Q=";
|
||||
cargoHash = "sha256-EJdjSFgvvwH5beW+aD1KT5G9bpW/8mdi+7c27KSkZjo=";
|
||||
|
||||
# setid is not allowed in the sandbox
|
||||
checkFlags = [ "--skip=tests::style_for_setid" ];
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "22.12";
|
||||
version = "23.03";
|
||||
pname = "mediainfo";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w=";
|
||||
sha256 = "sha256-8GGkJXVlZ2ojS2O91tSX4xcMjkojQaQgu6OcTqi6pJg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minder";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phase1geo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5k6a7/49iqtPt7il1/LlCHlQsilXRcGAJSAkJ3BBowU=";
|
||||
sha256 = "sha256-JKbz7UUl5iQxquBH705WBN9T4q7OondTypnEUGfqBWY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
{ lib, stdenv, fetchFromSourcehut, nixos, wayland, pixman, pkg-config }:
|
||||
{ lib, stdenv, fetchFromSourcehut, fetchpatch
|
||||
, wayland, pixman, pkg-config, wayland-scanner
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "river-tag-overlay";
|
||||
|
@ -11,8 +13,16 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-hLyXdLi/ldvwPJ1oQQsH5wgflQJuXu6vhYw/qdKAV9E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backport cross fix.
|
||||
(fetchpatch {
|
||||
url = "https://git.sr.ht/~leon_plickat/river-tag-overlay/commit/791eaadf46482121a4c811ffba13d03168d74d8f.patch";
|
||||
sha256 = "CxSDcweHGup1EF3oD/2vhP6RFoeYorj0BwmlgA3tbPE=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ pixman wayland ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config wayland-scanner ];
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=${placeholder "out"}"
|
||||
|
@ -25,6 +35,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ edrex ];
|
||||
platforms = platforms.linux;
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, lib
|
||||
, fetchFromGitHub
|
||||
, rofi-unwrapped
|
||||
, wayland-scanner
|
||||
, wayland-protocols
|
||||
, wayland
|
||||
}:
|
||||
|
@ -18,8 +19,8 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec {
|
|||
sha256 = "sha256-ddKLV7NvqgTQl5YlAEyBK0oalcJsLASK4z3qArQPUDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ];
|
||||
buildInputs = oldAttrs.buildInputs ++ [ wayland ];
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ];
|
||||
buildInputs = oldAttrs.buildInputs ++ [ wayland wayland-protocols ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Window switcher, run dialog and dmenu replacement for Wayland";
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
source 'http://rubygems.org'
|
||||
gem 'taskjuggler'
|
|
@ -1,21 +0,0 @@
|
|||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
mime-types (2.6.1)
|
||||
taskjuggler (3.5.0)
|
||||
mail (>= 2.4.3)
|
||||
term-ansicolor (>= 1.0.7)
|
||||
term-ansicolor (1.3.2)
|
||||
tins (~> 1.0)
|
||||
tins (1.6.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
taskjuggler
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
|
@ -1,15 +0,0 @@
|
|||
{ lib, bundlerEnv, ruby }:
|
||||
|
||||
bundlerEnv {
|
||||
name = "taskjuggler-3.5.0";
|
||||
|
||||
inherit ruby;
|
||||
gemdir = ./.;
|
||||
|
||||
meta = {
|
||||
description = "A modern and powerful project management tool";
|
||||
homepage = "https://taskjuggler.org/";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
|
@ -1,47 +0,0 @@
|
|||
{
|
||||
mail = {
|
||||
version = "2.6.3";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
|
||||
};
|
||||
dependencies = [
|
||||
"mime-types"
|
||||
];
|
||||
};
|
||||
mime-types = {
|
||||
version = "2.6.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
|
||||
};
|
||||
};
|
||||
taskjuggler = {
|
||||
version = "3.5.0";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2";
|
||||
};
|
||||
dependencies = [
|
||||
"mail"
|
||||
"term-ansicolor"
|
||||
];
|
||||
};
|
||||
term-ansicolor = {
|
||||
version = "1.3.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
|
||||
};
|
||||
dependencies = [
|
||||
"tins"
|
||||
];
|
||||
};
|
||||
tins = {
|
||||
version = "1.6.0";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
|
||||
};
|
||||
};
|
||||
}
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thedesk";
|
||||
version = "24.0.10";
|
||||
version = "24.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
|
||||
sha256 = "sha256-0ZXI3KyRgRHUcRiSNn5a4eSy5Kgcl9HAsP79J2L/vW0=";
|
||||
sha256 = "sha256-0EvJ60yTRi3R0glgI8l3r7mxR76McDA1x5aF6WQDbdU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
, meson
|
||||
, scdoc
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, freetype
|
||||
, harfbuzz
|
||||
, cairo
|
||||
|
@ -25,7 +26,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-lokp6Zmdt7WuAyuRnHBkKD4ydbNiQY7pEVY97Z62U90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ];
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config scdoc wayland-protocols wayland-scanner
|
||||
];
|
||||
buildInputs = [ freetype harfbuzz cairo pango wayland libxkbcommon ];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -34,6 +38,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fbergroth ];
|
||||
platforms = platforms.linux;
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -51,11 +51,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opera";
|
||||
version = "97.0.4719.43";
|
||||
version = "98.0.4759.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
hash = "sha256-VZVR7oE2GJwVo1M2oHFWuzzyTphJARpeJX/tbAPvwEg=";
|
||||
hash = "sha256-bX0Z+p6DvfsBbglONuGSdVnbIOGZrM1xFtfvbY0U7SQ=";
|
||||
};
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
|
24
pkgs/applications/networking/cluster/aiac/default.nix
Normal file
24
pkgs/applications/networking/cluster/aiac/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aiac";
|
||||
version = "2.2.0";
|
||||
excludedPackages = [".ci"];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gofireflyio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ju2LoCDY4lQaiJ3OSkt01SaOqVLrDGiTAwxxRnbnz/0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UaC3Ez/i+kPQGOJYtCRtaD2pn3kVZPTaoCcNG7LiFbY=";
|
||||
ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v3/libaiac.Version=v${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''Artificial Intelligence Infrastructure-as-Code Generator.'';
|
||||
homepage = "https://github.com/gofireflyio/aiac/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ qjoly ];
|
||||
};
|
||||
}
|
25
pkgs/applications/networking/cluster/kubecm/default.nix
Normal file
25
pkgs/applications/networking/cluster/kubecm/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubecm";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunny0826";
|
||||
repo = "kubecm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0oQOuBYCDNnOODM2ZSqTgOI+jHWuHTtsk2NfGIPMy5A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fVPiEDB6WFu2x5EY7NjmJEEq297QxP10593cXxxv8iI=";
|
||||
ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manage your kubeconfig more easily";
|
||||
homepage = "https://github.com/sunny0826/kubecm/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ qjoly ];
|
||||
};
|
||||
}
|
|
@ -155,11 +155,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"bigip": {
|
||||
"hash": "sha256-XnCwJxMuLysle4+UioJ/1e+FFZ39PkaEkdGGOePMo5s=",
|
||||
"hash": "sha256-SGwCEcPNxWw7Bsa4SQ1uWJ1rH/PZlkAMwvDy/fnXU3w=",
|
||||
"homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
|
||||
"owner": "F5Networks",
|
||||
"repo": "terraform-provider-bigip",
|
||||
"rev": "v1.17.0",
|
||||
"rev": "v1.17.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
@ -282,13 +282,13 @@
|
|||
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
|
||||
},
|
||||
"datadog": {
|
||||
"hash": "sha256-rbBLyCxGB1W7VCPs1f/7PQnyvdWo+uhze6p4cucdEG0=",
|
||||
"hash": "sha256-3C+jh9rGw2v2ME3PHLc+TIAY4UWcZVFdmNy4N4WyRM8=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.23.0",
|
||||
"rev": "v3.24.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-hy4GQKhY+6bYdVAZensLU0EswZXfxZWY2YNyiTA2UaE="
|
||||
"vendorHash": "sha256-MMPE1Urnlt7QCoiEnHqWnFZzmeSs/i4UtiotyrXZF2U="
|
||||
},
|
||||
"dhall": {
|
||||
"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
|
||||
|
@ -437,22 +437,22 @@
|
|||
"vendorHash": "sha256-SLFpH7isx4OM2X9bzWYYD4VlejlgckBovOxthg47OOQ="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-92abTfGWNFQMf8YjOxgKEncdqEdbfAt+3BU0fQaSnGk=",
|
||||
"hash": "sha256-8uRIvFZsuPyisJMRmqL5zNxea6h1VwxZS+lmmvZslfo=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.63.0",
|
||||
"rev": "v4.63.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-OyaMoySQ7qd8fsxMcetZCUVvxi6nWwVJusNV61DASck=",
|
||||
"hash": "sha256-avE1EnjCItz1NcF0KzsSgUnQABr2D0IC7kLGgIj+j6g=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.63.0",
|
||||
"rev": "v4.63.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
|
||||
},
|
||||
|
@ -810,11 +810,11 @@
|
|||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-9Qcwxi8TojsDIWeyqwQcagTeTwKS/hkPukjeHANHGfU=",
|
||||
"hash": "sha256-WtdB5aI5YS5Kc33g3RXh/gneOVXhhhKXq+pW+fm44/I=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.117.0",
|
||||
"rev": "v4.118.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
@ -837,11 +837,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"opennebula": {
|
||||
"hash": "sha256-Y1rNhXnHgwpKPgN5iZxH0ChHUBOj36K3XnSOkObj10g=",
|
||||
"hash": "sha256-r5evkpYnT2foc9ucHVkalm0qVO8UCoLhoc9ro/TerRI=",
|
||||
"homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula",
|
||||
"owner": "OpenNebula",
|
||||
"repo": "terraform-provider-opennebula",
|
||||
"rev": "v1.2.0",
|
||||
"rev": "v1.2.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A="
|
||||
},
|
||||
|
@ -1098,11 +1098,11 @@
|
|||
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-kIsH+kp+fnYsZatEJOH51lUdQs9cq/8FtpXHZIRzSM0=",
|
||||
"hash": "sha256-ZwThN4kqScXumJXrw2s3NoWY/ZgCOrb0JAwiZWX3GIQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.80.5",
|
||||
"rev": "v1.80.6",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
|
@ -166,9 +166,9 @@ rec {
|
|||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.4.5";
|
||||
hash = "sha256-mnJ9d3UHAZxmz0i7PH0JF5gA3m3nJxM2NyAn0J0L6u8=";
|
||||
vendorHash = "sha256-3ZQcWatJlQ6NVoPL/7cKQO6+YCSM3Ld77iLEQK3jBDE=";
|
||||
version = "1.4.6";
|
||||
hash = "sha256-V5sI8xmGASBZrPFtsnnfMEHapjz4BH3hvl0+DGjUSxQ=";
|
||||
vendorHash = "sha256-OW/aS6aBoHABxfdjDxMJEdHwLuHHtPR2YVW4l0sHPjE=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
|
|
|
@ -5,15 +5,15 @@ buildGoModule rec {
|
|||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.31.2";
|
||||
version = "0.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8=";
|
||||
sha256 = "sha256-YB/stG+7gxIaB+vMx8PwmUm4W32fCNeRnVrOvOXba5k=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "cmd/tilt" ];
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||
signal-desktop = {
|
||||
dir = "Signal";
|
||||
version = "6.15.0";
|
||||
hash = "sha256-uZXFnbDe49GrjKm4A0lsOTGV8Xqg0+oC0+AwRMKykfY=";
|
||||
version = "6.16.0";
|
||||
hash = "sha256-q7z7TS16RORPbEMJBEmF3m2q4IdD3dM1xqv1DfgM9Zs=";
|
||||
};
|
||||
signal-desktop-beta = {
|
||||
dir = "Signal Beta";
|
||||
version = "6.16.0-beta.1";
|
||||
hash = "sha256-J7YPuQetfob8Ybab+c5W0Z4Urzi4AtEJAnIVRIGtv0Q=";
|
||||
version = "6.17.0-beta.1";
|
||||
hash = "sha256-8Ae+IrwDRxcF5JhrDqEhimQqyCtDYWm/pOrcpKgAo2w=";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -181,10 +181,7 @@ stdenv.mkDerivation rec {
|
|||
"''${gappsWrapperArgs[@]}" \
|
||||
"''${qtWrapperArgs[@]}" \
|
||||
--prefix LD_LIBRARY_PATH : "${xorg.libXcursor}/lib" \
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||
--set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
|
||||
sed -i $out/bin/telegram-desktop \
|
||||
-e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, gradle, bash, coreutils
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils
|
||||
, substituteAll, nixosTests, perl, fetchpatch, writeText }:
|
||||
|
||||
let
|
||||
|
@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
wrapper = substituteAll {
|
||||
src = ./freenetWrapper;
|
||||
inherit bash coreutils jdk seednodes;
|
||||
inherit bash coreutils jre seednodes;
|
||||
};
|
||||
|
||||
# https://github.com/freenet/fred/blob/next/build-offline.sh
|
||||
|
|
|
@ -15,4 +15,4 @@ cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref
|
|||
chmod u+rw -- $FREENET_HOME/seednodes.fref
|
||||
|
||||
cd -- $FREENET_HOME
|
||||
exec @jdk@/bin/java -Xmx1024M freenet.node.NodeStarter "$@"
|
||||
exec @jre@/bin/java -Xmx1024M freenet.node.NodeStarter "$@"
|
||||
|
|
64
pkgs/applications/networking/sniffers/savvycan/default.nix
Normal file
64
pkgs/applications/networking/sniffers/savvycan/default.nix
Normal file
|
@ -0,0 +1,64 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qtbase
|
||||
, qttools
|
||||
, qmake
|
||||
, qtserialbus
|
||||
, qtserialport
|
||||
, qtdeclarative
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "savvycan";
|
||||
version = "208";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "collin80";
|
||||
repo = "SavvyCAN";
|
||||
rev = "V${version}";
|
||||
hash = "sha256-agvCl8c7LqGyIKe0K3PdzuBUqTJZtUr434134olbUMw=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qttools qtserialbus qtserialport qtdeclarative ];
|
||||
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "QT based cross platform canbus tool";
|
||||
homepage = "https://savvycan.com/";
|
||||
changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}";
|
||||
maintainers = with maintainers; [ simoneruffini ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.mit;
|
||||
mainProgram = "SavvyCAN";
|
||||
longDescription = ''
|
||||
SavvyCAN is a cross platform QT based C++ program. It is a CAN bus reverse
|
||||
engineering and capture tool. It was originally written to utilize EVTV
|
||||
hardware such as the EVTVDue and CANDue hardware. It has since expanded to be
|
||||
able to use any socketCAN compatible device as well as the Macchina M2 and
|
||||
Teensy 3.x boards. SavvyCAN can use any CAN interface supported by QT's
|
||||
SerialBus system (PeakCAN, Vector, SocketCAN, J2534, etc) It can capture and
|
||||
send to multiple buses and CAN capture devices at once. It has many functions
|
||||
specifically meant for reverse engineering data found on the CAN bus:
|
||||
- Ability to capture even very highly loaded buses
|
||||
- Ability to connect to many dongles simultaneously
|
||||
- Scan captured traffic for data that looks coherent
|
||||
- Show ASCII of captured data to find things like VIN numbers and traffic to
|
||||
and from the radio
|
||||
- Graph data found on the bus
|
||||
- Load and Save many different file formats common to CAN capture tools (Vector
|
||||
captures, Microchip, CANDo, PCAN, and many more)
|
||||
- Load and Save DBC files. DBC files are used to store definitions for how data
|
||||
are formatted on the bus. You can turn the raw data into things like a RPM,
|
||||
odometer readings, and more.
|
||||
- UDS scanning and decoding
|
||||
- Scripting interface to be able to expand the scope of the software
|
||||
- Best of all, it's free and open source. Don't like something about it? Change
|
||||
it!
|
||||
'';
|
||||
};
|
||||
|
||||
}
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "warp";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VtmLWbZXKTv+sjICnaBt2EPbtDwIVZym/PZdL2N7UQo=";
|
||||
hash = "sha256-RwsrE4ZIG0i0B7Xu7fDKyDQt4+W2Ntd+epTST8s/YDc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-NT6reZUsieqMTX7HW9QmrjcgBpqxZOUfzht9b7suNeY=";
|
||||
hash = "sha256-0L7Wz/vOudZ4Bd3umn+auejYGDnSoU6o07+u/MfrgqE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -36,6 +36,8 @@
|
|||
|
||||
obs-source-record = callPackage ./obs-source-record.nix { };
|
||||
|
||||
obs-teleport = callPackage ./obs-teleport { };
|
||||
|
||||
obs-vaapi = callPackage ./obs-vaapi { };
|
||||
|
||||
obs-vkcapture = callPackage ./obs-vkcapture.nix {
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "droidcam-obs";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dev47apps";
|
||||
repo = "droidcam-obs-plugin";
|
||||
rev = version;
|
||||
sha256 = "sha256-oaw/mq4WCQMlf3sv9WtNlv9J9rm79xnqDwKzHtyFW50=";
|
||||
sha256 = "sha256-YtfWwgBhyQYx6QfrKld7p6qUf8BEV/kkQX4QcdHuaYU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -0,0 +1,54 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, libjpeg
|
||||
, nix-update-script
|
||||
, obs-studio
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "obs-teleport";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fzwoch";
|
||||
repo = "obs-teleport";
|
||||
rev = version;
|
||||
sha256 = "sha256-J3Q0AQV21jh+Pth5wXbGbryrx7Mg65rAQVapyGBls7Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2rlEMkdcD+46EpQhUpLIGMzqvlyMFYK/XQYV9DJZxao=";
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
obs-studio
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
CGO_CFLAGS = "-I${obs-studio}/include/obs";
|
||||
CGO_LDFLAGS = "-L${obs-studio}/lib -lobs -lobs-frontend-api";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
go build -buildmode=c-shared -o obs-teleport.so .
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/obs-plugins
|
||||
mv obs-teleport.so $out/lib/obs-plugins
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "An OBS Studio plugin for an open NDI-like replacement";
|
||||
homepage = "https://github.com/fzwoch/obs-teleport";
|
||||
maintainers = [ lib.maintainers.paveloom ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = obs-studio.meta.platforms;
|
||||
};
|
||||
}
|
|
@ -1,139 +0,0 @@
|
|||
From c04ce502d29f7769efbff730d1f9060b8c24629a Mon Sep 17 00:00:00 2001
|
||||
From: ckie <git-525ff67@ckie.dev>
|
||||
Date: Tue, 8 Feb 2022 19:18:49 +0200
|
||||
Subject: [PATCH] remove printer support
|
||||
|
||||
---
|
||||
app/src/CMakeLists.txt | 4 ++--
|
||||
guilib/src/CMakeLists.txt | 4 ++--
|
||||
guilib/src/GraphViewer.cpp | 12 +-----------
|
||||
guilib/src/ImageView.cpp | 16 ----------------
|
||||
guilib/src/utilite/UPlot.cpp | 9 ---------
|
||||
5 files changed, 5 insertions(+), 40 deletions(-)
|
||||
|
||||
diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt
|
||||
index b20a07d4..2cad8c1e 100644
|
||||
--- a/app/src/CMakeLists.txt
|
||||
+++ b/app/src/CMakeLists.txt
|
||||
@@ -63,9 +63,9 @@ ENDIF()
|
||||
TARGET_LINK_LIBRARIES(rtabmap rtabmap_core rtabmap_gui rtabmap_utilite ${LIBRARIES})
|
||||
IF(Qt5_FOUND)
|
||||
IF(Qt5Svg_FOUND)
|
||||
- QT5_USE_MODULES(rtabmap Widgets Core Gui Svg PrintSupport)
|
||||
+ QT5_USE_MODULES(rtabmap Widgets Core Gui Svg)
|
||||
ELSE()
|
||||
- QT5_USE_MODULES(rtabmap Widgets Core Gui PrintSupport)
|
||||
+ QT5_USE_MODULES(rtabmap Widgets Core Gui)
|
||||
ENDIF()
|
||||
ENDIF(Qt5_FOUND)
|
||||
|
||||
diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt
|
||||
index 3711205b..a393aa25 100644
|
||||
--- a/guilib/src/CMakeLists.txt
|
||||
+++ b/guilib/src/CMakeLists.txt
|
||||
@@ -208,9 +208,9 @@ ADD_LIBRARY(rtabmap_gui ${SRC_FILES})
|
||||
TARGET_LINK_LIBRARIES(rtabmap_gui rtabmap_core rtabmap_utilite ${LIBRARIES})
|
||||
IF(Qt5_FOUND)
|
||||
IF(Qt5Svg_FOUND)
|
||||
- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg PrintSupport)
|
||||
+ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg)
|
||||
ELSE()
|
||||
- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui PrintSupport)
|
||||
+ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui)
|
||||
ENDIF()
|
||||
ENDIF(Qt5_FOUND)
|
||||
|
||||
diff --git a/guilib/src/GraphViewer.cpp b/guilib/src/GraphViewer.cpp
|
||||
index 58907c34..7b41061f 100644
|
||||
--- a/guilib/src/GraphViewer.cpp
|
||||
+++ b/guilib/src/GraphViewer.cpp
|
||||
@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#include <QtGui/QDesktopServices>
|
||||
#include <QtGui/QContextMenuEvent>
|
||||
#include <QColorDialog>
|
||||
-#include <QPrinter>
|
||||
#include <QFileDialog>
|
||||
#ifdef QT_SVG_LIB
|
||||
#include <QtSvg/QSvgGenerator>
|
||||
@@ -2011,16 +2010,7 @@ void GraphViewer::contextMenuEvent(QContextMenuEvent * event)
|
||||
this->scene()->setSceneRect(this->scene()->itemsBoundingRect()); // Re-shrink the scene to it's bounding contents
|
||||
QSize sceneSize = this->scene()->sceneRect().size().toSize();
|
||||
|
||||
- if(QFileInfo(filePath).suffix().compare("pdf") == 0)
|
||||
- {
|
||||
- QPrinter printer(QPrinter::HighResolution);
|
||||
- printer.setOrientation(QPrinter::Portrait);
|
||||
- printer.setOutputFileName( filePath );
|
||||
- QPainter p(&printer);
|
||||
- scene()->render(&p);
|
||||
- p.end();
|
||||
- }
|
||||
- else if(QFileInfo(filePath).suffix().compare("svg") == 0)
|
||||
+ if(QFileInfo(filePath).suffix().compare("svg") == 0)
|
||||
{
|
||||
#ifdef QT_SVG_LIB
|
||||
QSvgGenerator svgGen;
|
||||
diff --git a/guilib/src/ImageView.cpp b/guilib/src/ImageView.cpp
|
||||
index 714f2d36..887e7bdc 100644
|
||||
--- a/guilib/src/ImageView.cpp
|
||||
+++ b/guilib/src/ImageView.cpp
|
||||
@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#include <QInputDialog>
|
||||
#include <QVBoxLayout>
|
||||
#include <QColorDialog>
|
||||
-#include <QPrinter>
|
||||
#include <QGraphicsRectItem>
|
||||
#include "rtabmap/utilite/ULogger.h"
|
||||
#include "rtabmap/gui/KeypointItem.h"
|
||||
@@ -843,21 +842,6 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e)
|
||||
}
|
||||
|
||||
_savedFileName = text;
|
||||
- if(QFileInfo(text).suffix().compare("pdf") == 0)
|
||||
- {
|
||||
- QPrinter printer(QPrinter::HighResolution);
|
||||
- printer.setOrientation(QPrinter::Portrait);
|
||||
- printer.setOutputFileName( text );
|
||||
- QPainter p(&printer);
|
||||
- p.begin(&printer);
|
||||
- double xscale = printer.pageRect().width()/double(_graphicsView->sceneRect().width());
|
||||
- double yscale = printer.pageRect().height()/double(_graphicsView->sceneRect().height());
|
||||
- double scale = qMin(xscale, yscale);
|
||||
- p.scale(scale, scale);
|
||||
- _graphicsView->scene()->render(&p, _graphicsView->sceneRect(), _graphicsView->sceneRect());
|
||||
- p.end();
|
||||
- }
|
||||
- else
|
||||
{
|
||||
QImage img(_graphicsView->sceneRect().width(), _graphicsView->sceneRect().height(), QImage::Format_ARGB32_Premultiplied);
|
||||
QPainter p(&img);
|
||||
diff --git a/guilib/src/utilite/UPlot.cpp b/guilib/src/utilite/UPlot.cpp
|
||||
index 1b11c65e..8bf94841 100644
|
||||
--- a/guilib/src/utilite/UPlot.cpp
|
||||
+++ b/guilib/src/utilite/UPlot.cpp
|
||||
@@ -42,7 +42,6 @@
|
||||
#include <QFileDialog>
|
||||
#include <QtGui/QClipboard>
|
||||
#include <QApplication>
|
||||
-#include <QPrinter>
|
||||
#include <QColorDialog>
|
||||
#include <QToolTip>
|
||||
#ifdef QT_SVG_LIB
|
||||
@@ -2849,14 +2848,6 @@ void UPlot::contextMenuEvent(QContextMenuEvent * event)
|
||||
else
|
||||
{
|
||||
#endif
|
||||
- if(QFileInfo(text).suffix().compare("pdf") == 0)
|
||||
- {
|
||||
- QPrinter printer;
|
||||
- printer.setOutputFormat(QPrinter::PdfFormat);
|
||||
- printer.setOutputFileName(text);
|
||||
- this->render(&printer);
|
||||
- }
|
||||
- else
|
||||
{
|
||||
QPixmap figure = QPixmap::grabWidget(this);
|
||||
figure.save(text);
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -1,24 +1,40 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen
|
||||
, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect
|
||||
, libdc1394, librealsense, libGL, libGLU, vtk_8_withQt5, wrapGAppsHook, liblapack
|
||||
, xorg }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, opencv
|
||||
, pcl
|
||||
, libusb1
|
||||
, eigen
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, g2o
|
||||
, ceres-solver
|
||||
, libpointmatcher
|
||||
, octomap
|
||||
, freenect
|
||||
, libdc1394
|
||||
, librealsense
|
||||
, libGL
|
||||
, libGLU
|
||||
, vtkWithQt5
|
||||
, wrapGAppsHook
|
||||
, liblapack
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rtabmap";
|
||||
version = "unstable-2022-09-24";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "introlab";
|
||||
repo = "rtabmap";
|
||||
rev = "fa31affea0f0bd54edf1097b8289209c7ac0548e";
|
||||
sha256 = "sha256-kcY+o31fSmwxBcvF/e+Wu6OIqiQzLKgEJJxcj+g3qDM=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Our Qt5 seems to be missing PrintSupport.. I think?
|
||||
./0001-remove-printer-support.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
## Required
|
||||
|
@ -41,25 +57,17 @@ stdenv.mkDerivation rec {
|
|||
qtbase
|
||||
libGL
|
||||
libGLU
|
||||
vtk_8_withQt5
|
||||
vtkWithQt5
|
||||
];
|
||||
|
||||
# Disable warnings that are irrelevant to us as packagers
|
||||
cmakeFlags = [ "-Wno-dev" ];
|
||||
|
||||
# We run one of the executables we build while the build is
|
||||
# still running (and patchelf hasn't been invoked) which means
|
||||
# the RPATH is not set correctly. This hacks around that error:
|
||||
#
|
||||
# build/bin/rtabmap-res_tool: error while loading shared libraries: librtabmap_utilite.so.0.20: cannot open shared object file: No such file or directory
|
||||
LD_LIBRARY_PATH = "/build/source/build/bin";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Real-Time Appearance-Based 3D Mapping";
|
||||
homepage = "https://introlab.github.io/rtabmap/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
platforms = with platforms; linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ecs-agent";
|
||||
version = "1.70.1";
|
||||
version = "1.70.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
hash = "sha256-CAoMXWxtsGJOEOxZ8ZLwLYAWW0kY/4jryrIAFDbOeXA=";
|
||||
hash = "sha256-52Ty7g8SnhYAgYsE9mpmRmg4T6QifjWDIwNnJZBSPMk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "runc";
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vcOOkpUywDqHW+ZZO0tSsMmJp3gSvyRy/nVrn1deLY0=";
|
||||
hash = "sha256-reSC9j9ESjRigItBRytef78XBjmMGsqu0o9qcN2AstU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "14.0.0";
|
||||
version = "14.1.2";
|
||||
|
||||
twemojiSrc = fetchFromGitHub {
|
||||
name = "twemoji";
|
||||
owner = "twitter";
|
||||
owner = "jdecked";
|
||||
repo = "twemoji";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ar6rBYudMIMngMVe/IowDV3X8wA77JBA6g0x/M7YLMg=";
|
||||
sha256 = "sha256-UQ4PwO4D1kw7JOMf6xSaRBfT822KwrvWBPDmaQjkRVQ=";
|
||||
};
|
||||
|
||||
pythonEnv =
|
||||
|
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
This font uses Google’s CBDT format making it work on Android and Linux graphical stack.
|
||||
'';
|
||||
homepage = "https://twemoji.twitter.com/";
|
||||
homepage = "https://github.com/jdecked/twemoji";
|
||||
# In noto-emoji-fonts source
|
||||
## noto-emoji code is in ASL 2.0 license
|
||||
## Emoji fonts are under OFL license
|
||||
|
|
|
@ -36,14 +36,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "budgie-desktop";
|
||||
version = "10.7.1";
|
||||
version = "10.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BuddiesOfBudgie";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-ww65J9plixbxFza6xCfaz1WYtT9giKkLVH1XYxH41+0=";
|
||||
hash = "sha256-fd3B2DMZxCI4Gb9mwdACjIPydKghXx8IkhFpMS/Clps=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
|
|||
gnome.gnome-bluetooth_1_0
|
||||
gnome.gnome-settings-daemon
|
||||
gnome.mutter
|
||||
gnome.zenity
|
||||
graphene
|
||||
gtk3
|
||||
ibus
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ fetchFromGitHub
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, gobject-introspection
|
||||
, meson
|
||||
|
@ -6,24 +7,39 @@
|
|||
, python3
|
||||
, gtk3
|
||||
, gdk-pixbuf
|
||||
, xapp
|
||||
, wrapGAppsHook
|
||||
, gettext
|
||||
, polkit
|
||||
, glib
|
||||
, gitUpdater
|
||||
, bubblewrap
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
let
|
||||
pythonEnv = python3.withPackages (pp: with pp; [
|
||||
grpcio-tools
|
||||
protobuf
|
||||
pygobject3
|
||||
setproctitle
|
||||
pp.xapp
|
||||
zeroconf
|
||||
grpcio
|
||||
setuptools
|
||||
cryptography
|
||||
pynacl
|
||||
netifaces
|
||||
]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "warpinator";
|
||||
version = "1.4.5";
|
||||
|
||||
format = "other";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-5mMV4WinpFR9ihgoQsgIXre0VpBdg9S8GjSkx+7ocLg=";
|
||||
hash = "sha256-H8bFSgx3IysHCoKrMZ9gbwRl9forEjY90a/PIC68E6k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -39,20 +55,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
glib
|
||||
gtk3
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
grpcio-tools
|
||||
protobuf
|
||||
pygobject3
|
||||
setproctitle
|
||||
pythonEnv
|
||||
xapp
|
||||
zeroconf
|
||||
grpcio
|
||||
setuptools
|
||||
cryptography
|
||||
pynacl
|
||||
netifaces
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -66,15 +70,18 @@ python3.pkgs.buildPythonApplication rec {
|
|||
find . -type f -exec sed -i \
|
||||
-e s,/usr/libexec/warpinator,$out/libexec/warpinator,g \
|
||||
{} +
|
||||
'';
|
||||
|
||||
dontWrapGApps = true; # Prevent double wrapping
|
||||
# We make bubblewrap mode always available since
|
||||
# landlock mode is not supported in old kernels.
|
||||
substituteInPlace src/warpinator-launch.py \
|
||||
--replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \
|
||||
--replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \
|
||||
--replace 'GLib.find_program_in_path("bwrap")' "True"
|
||||
|
||||
preFixup = ''
|
||||
# these get loaded via import from bin, so don't need wrapping
|
||||
chmod -x+X $out/libexec/warpinator/*.py
|
||||
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
# Typo fix that can be removed on next update
|
||||
# https://github.com/linuxmint/warpinator/pull/174
|
||||
substituteInPlace src/remote.py \
|
||||
--replace "receiver.remaining_count" "op.remaining_count"
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-camera";
|
||||
version = "1.4.8";
|
||||
version = "1.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-p2RCetx1lgLonXZaC3umE+nDgZnp64o3iR2MgQhbisM=";
|
||||
sha256 = "sha256-GQQFwlJNfdsi0GvDRMIorUnlbXrgbYl9H9aBedOm+ZQ=";
|
||||
};
|
||||
|
||||
# QLibrary and dlopen work with LD_LIBRARY_PATH
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ghex";
|
||||
version = "44.0";
|
||||
version = "44.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "WKpHz9vtEoCjwTGVHBokWWEpQEoLDTR6Pb//tv9oOXY=";
|
||||
sha256 = "QEvfZJ6qE5IqgK4y8Z/kDnHw7g9GHEXtrHKIigDq1sI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -50,13 +50,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "43.4";
|
||||
version = "43.5";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "FiU2cxEaLsyW/I0tFfrdobVU0B3CioMEE11J1rqHsUA=";
|
||||
sha256 = "/JAP4ahA2aeTyOLSDUTJCqCH1fv9x5Su5wluHYoJZxo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -66,14 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch";
|
||||
sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
|
||||
})
|
||||
|
||||
# GLib 2.76 switches from using its own slice allocator to using the system malloc instead.
|
||||
# This makes dragging window between workspace in multitasking view crashes Pantheon's Gala.
|
||||
# Inspiration https://github.com/mate-desktop/mate-desktop/pull/538
|
||||
# Backtrace https://github.com/elementary/gala/issues/1580
|
||||
# Upstream report https://gitlab.gnome.org/GNOME/mutter/-/issues/2495
|
||||
# The patch will not apply on 44.0+, make sure this is fixed when trying to clean this up.
|
||||
./glib-2-76-gala-crash.patch
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
|
||||
index d34c8f59f..8835a6a33 100644
|
||||
--- a/clutter/clutter/clutter-actor.c
|
||||
+++ b/clutter/clutter/clutter-actor.c
|
||||
@@ -12304,7 +12304,7 @@ clutter_actor_run_actions (ClutterActor *self,
|
||||
ClutterEventPhase phase)
|
||||
{
|
||||
ClutterActorPrivate *priv;
|
||||
- const GList *actions, *l;
|
||||
+ const GList *actions, *l, *next;
|
||||
gboolean retval = CLUTTER_EVENT_PROPAGATE;
|
||||
|
||||
priv = self->priv;
|
||||
@@ -12313,9 +12313,10 @@ clutter_actor_run_actions (ClutterActor *self,
|
||||
|
||||
actions = _clutter_meta_group_peek_metas (priv->actions);
|
||||
|
||||
- for (l = actions; l; l = l->next)
|
||||
+ for (l = actions; l; l = next)
|
||||
{
|
||||
ClutterAction *action = l->data;
|
||||
+ next = l->next;
|
||||
ClutterEventPhase action_phase;
|
||||
|
||||
action_phase = clutter_action_get_phase (action);
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, gettext
|
||||
, meson
|
||||
|
@ -11,15 +12,24 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "elementary-gtk-theme";
|
||||
version = "7.1.0";
|
||||
version = "7.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "stylesheet";
|
||||
rev = version;
|
||||
sha256 = "sha256-AFiREZ4pDIwQ4OeZDIHEJUNSeUsMjAlDd5h0pB0ilNw=";
|
||||
sha256 = "sha256-ZR0FJ8DkPlO1Zatvxv3NghAVBPo2j+1m0k4C+gvYPVA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Headerbars: fix missing default-decoration
|
||||
# https://github.com/elementary/stylesheet/pull/1258
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/stylesheet/commit/9cea2383bec8f90d25f1e9b854b5221737487521.patch";
|
||||
sha256 = "sha256-6komROS4+nxwoGoKoiDmnrTfLNZAvnTU6hIEOQQfmxc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }:
|
||||
let
|
||||
version = "2201.4.0";
|
||||
version = "2201.5.0";
|
||||
codeName = "swan-lake";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "ballerina";
|
||||
|
@ -8,7 +8,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";
|
||||
sha256 = "sha256-720QKGOerRzXsnbUghk+HGOMl4lQxHDYya3+FHtU/Ys=";
|
||||
sha256 = "sha256-6UpUKoUHkYW9aPo2AbpP5uC1rCv578ultG9II1jZPRE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -45,7 +45,7 @@ let
|
|||
buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903
|
||||
disableBootstrap' = disableBootstrap && !langFortran;
|
||||
disableBootstrap' = disableBootstrap && !langFortran && !langGo;
|
||||
|
||||
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
|
||||
crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
|
||||
|
@ -217,8 +217,7 @@ let
|
|||
++ lib.optional javaAwtGtk "--enable-java-awt=gtk"
|
||||
++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}"
|
||||
|
||||
# TODO: aarch64-darwin has clang stdenv and its arch and cpu flag values are incompatible with gcc
|
||||
++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; })
|
||||
++ import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }
|
||||
++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags
|
||||
++ lib.optional disableBootstrap' "--disable-bootstrap"
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ in
|
|||
outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
|
||||
# This is a separate phase because gcc assembles its phase scripts
|
||||
# in bash instead of nix (we should fix that).
|
||||
preFixupPhases = (previousAttrs.preFixupPhases or []) ++ [ "preFixupLibGccPhase" ];
|
||||
preFixupPhases = (previousAttrs.preFixupPhases or []) ++ lib.optionals ((!langC) || enableLibGccOutput) [ "preFixupLibGccPhase" ];
|
||||
preFixupLibGccPhase =
|
||||
# delete extra/unused builds of libgcc_s in non-langC builds
|
||||
# (i.e. libgccjit, gnat, etc) to avoid potential confusion
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
{ lib, targetPlatform }:
|
||||
|
||||
let
|
||||
isAarch64Darwin = targetPlatform.isDarwin && targetPlatform.isAarch64;
|
||||
gcc = targetPlatform.gcc or {};
|
||||
p = gcc
|
||||
// targetPlatform.parsed.abi;
|
||||
in lib.concatLists [
|
||||
(lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64
|
||||
(lib.optional (p ? cpu) "--with-cpu=${p.cpu}")
|
||||
# --with-arch= is unknown flag on x86_64 and aarch64-darwin.
|
||||
(lib.optional (!targetPlatform.isx86_64 && !isAarch64Darwin && p ? arch) "--with-arch=${p.arch}")
|
||||
# --with-cpu on aarch64-darwin fails with "Unknown cpu used in --with-cpu=apple-a13".
|
||||
(lib.optional (!isAarch64Darwin && p ? cpu) "--with-cpu=${p.cpu}")
|
||||
(lib.optional (p ? abi) "--with-abi=${p.abi}")
|
||||
(lib.optional (p ? fpu) "--with-fpu=${p.fpu}")
|
||||
(lib.optional (p ? float) "--with-float=${p.float}")
|
||||
|
|
|
@ -27,13 +27,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p4c";
|
||||
version = "1.2.3.7";
|
||||
version = "1.2.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p4lang";
|
||||
repo = "p4c";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s9uUq86xbqU21jfAF42blbbIvHlkv7W75rotjSbMxHc=";
|
||||
sha256 = "sha256-EvMoooB6kAV0fJ3XBFJKpams87ImybTXw0C5P9YAa9Q=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "babashka";
|
||||
version = "1.3.178";
|
||||
version = "1.3.179";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-ihARaZ8GJsoFmlOd0qtbOAQkbs6a9zohJ9PREJoxdZg=";
|
||||
sha256 = "sha256-tF+SqKY7tcJvmOATVwKIZemR2A3eqrbhvSBvr7tcq5U=";
|
||||
};
|
||||
|
||||
graalvmDrv = graalvmCEPackages.graalvm19-ce;
|
||||
|
|
|
@ -83,11 +83,10 @@ let
|
|||
__structuredAttrs = true;
|
||||
env = {
|
||||
LUAROCKS_CONFIG="$PWD/${luarocks_config}";
|
||||
};
|
||||
} // attrs.env or {};
|
||||
|
||||
generatedRockspecFilename = "${rockspecDir}/${pname}-${rockspecVersion}.rockspec";
|
||||
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapLua
|
||||
lua.pkgs.luarocks
|
||||
|
@ -99,6 +98,7 @@ let
|
|||
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
|
||||
externalDeps' = lib.filter (dep: !lib.isDerivation dep) self.externalDeps;
|
||||
in [ lua.pkgs.luarocks ]
|
||||
++ buildInputs
|
||||
++ lib.optionals self.doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs)
|
||||
++ (map (d: d.dep) externalDeps')
|
||||
;
|
||||
|
@ -200,15 +200,15 @@ let
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
inherit lua; # The lua interpreter
|
||||
};
|
||||
inherit lua;
|
||||
} // attrs.passthru or { };
|
||||
|
||||
meta = {
|
||||
platforms = lua.meta.platforms;
|
||||
# add extra maintainer(s) to every package
|
||||
maintainers = (attrs.meta.maintainers or []) ++ [ ];
|
||||
broken = disabled;
|
||||
} // attrs.meta;
|
||||
} // attrs.meta or {};
|
||||
}));
|
||||
in
|
||||
luarocksDrv
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
, cups
|
||||
, AppKit
|
||||
, Cocoa
|
||||
, libexecinfo
|
||||
, broadwaySupport ? true
|
||||
}:
|
||||
|
||||
|
@ -138,6 +139,8 @@ stdenv.mkDerivation rec {
|
|||
cups
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
libexecinfo
|
||||
];
|
||||
#TODO: colord?
|
||||
|
||||
|
@ -180,7 +183,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# These are the defines that'd you'd get with --enable-debug=minimum (default).
|
||||
# See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
|
||||
env.NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
|
||||
} // lib.optionalAttrs stdenv.hostPlatform.isMusl {
|
||||
NIX_LDFLAGS = "-lexecinfo";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
files=(
|
||||
|
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hamlib";
|
||||
version = "4.5.2";
|
||||
version = "4.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-Wg+eky/+LTlx4HtUSqYr7D5JTnP/HOPKM/oNiOGZsGE=";
|
||||
sha256 = "sha256-YByJ8y7SJelSet49ZNDQXSMgLAWuIf+nflnXDuRZf80=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,12 +2,14 @@
|
|||
, autoconf
|
||||
, automake
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gettext
|
||||
, lib
|
||||
, libiconv
|
||||
, libtool
|
||||
, libusb1
|
||||
, pkg-config
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -21,6 +23,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-/tyCoEW/rCLfZH2HhA3Nxuij9d/ZJgsfyP4fLlfyNRA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backport cross fix.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libmtp/libmtp/commit/467fa26e6b14c0884b15cf6d191de97e5513fe05.patch";
|
||||
sha256 = "2DrRrdcguJ9su4LxtT6YOjer8gUTxIoHVpk+6M9P4cg=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -41,6 +51,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configurePlatforms = [ "build" "host" ];
|
||||
|
||||
makeFlags = lib.optionals (stdenv.isLinux && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
"MTP_HOTPLUG=${buildPackages.libmtp}/bin/mtp-hotplug"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -42,13 +42,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvgm";
|
||||
version = "unstable-2023-01-18";
|
||||
version = "unstable-2023-04-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValleyBell";
|
||||
repo = "libvgm";
|
||||
rev = "c250212538dd48d3965826ad7fe669bb0f348cbd";
|
||||
sha256 = "5XHdPtadfsfzkeeOpa5NPrWarHBHeKvmr7p0m31URDc=";
|
||||
rev = "669a7566a356393d4e5b1030a9f9cdd3486bb41b";
|
||||
sha256 = "U/PO/YtS8bOb2yKk57UQKH4eRNysYC/hrmUR5YZyYlw=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwmf";
|
||||
version = "0.2.12";
|
||||
version = "0.2.13";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "caolanm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0i2w5hg8mbgmgabxyd48qp1gx2mhk33hgr3jqvg72k0nhkd2jhf6";
|
||||
sha256 = "sha256-vffohx57OvQKu8DfNXNBm9bPsA8KgkQWs/3mmFn7L6M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen,
|
||||
libX11, libXinerama, libXrandr, libGLU, libGL,
|
||||
glib, ilmbase, libxml2, pcre, zlib,
|
||||
AGL, Carbon, Cocoa, Foundation,
|
||||
AGL, Accelerate, Carbon, Cocoa, Foundation,
|
||||
boost,
|
||||
jpegSupport ? true, libjpeg,
|
||||
exrSupport ? false, openexr,
|
||||
|
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional sdlSupport SDL2
|
||||
++ lib.optional restSupport asio
|
||||
++ lib.optionals withExamples [ fltk ]
|
||||
++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ]
|
||||
++ lib.optionals stdenv.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ]
|
||||
++ lib.optional (restSupport || colladaSupport) boost
|
||||
;
|
||||
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qxmpp";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qxmpp-project";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h2MBs46E2dvwOhs1cnSvrMll3nZSE9o4oEZV2Bd1Yh0=";
|
||||
sha256 = "sha256-4MDP2OQK1fjlG74y396CSLt7s+QScWBqlms4aqLIC3s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.8.3";
|
||||
version = "2.8.7";
|
||||
pname = "tinygltf";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syoyo";
|
||||
repo = "tinygltf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6rfC5nXGseXtqh2IonZto+DM8ZV/t5U1ulZ3GFHwoeg=";
|
||||
hash = "sha256-uQlv+mUWnqUJIXnPf2pVuRg1akcXAfqyBIzPPmm4Np4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
{stdenv}:
|
||||
{version ? "11.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
|
||||
{ stdenv, lib }:
|
||||
{ version ? "11.1"
|
||||
, allowHigher ? false
|
||||
, xcodeBaseDir ? "/Applications/Xcode.app" }:
|
||||
|
||||
assert stdenv.isDarwin;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xcode-wrapper-"+version;
|
||||
pname = "xcode-wrapper${lib.optionalString allowHigher "-plus"}";
|
||||
inherit version;
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
cd $out/bin
|
||||
|
@ -24,9 +27,15 @@ stdenv.mkDerivation {
|
|||
ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
|
||||
|
||||
# Check if we have the xcodebuild version that we want
|
||||
if [ -z "$($out/bin/xcodebuild -version | grep -x 'Xcode ${version}')" ]
|
||||
currVer=$($out/bin/xcodebuild -version | head -n1)
|
||||
${if allowHigher then ''
|
||||
if [ -z "$(printf '%s\n' "${version}" "$currVer" | sort -V | head -n1)""" != "${version}" ]
|
||||
'' else ''
|
||||
if [ -z "$(echo $currVer | grep -x 'Xcode ${version}')" ]
|
||||
''}
|
||||
then
|
||||
echo "We require xcodebuild version: ${version}"
|
||||
echo "We require xcodebuild version${if allowHigher then " or higher" else ""}: ${version}"
|
||||
echo "Instead what was found: $currVer"
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
|
|
@ -1,15 +1,9 @@
|
|||
{ stdenv, lib }:
|
||||
{ callPackage }:
|
||||
|
||||
rec {
|
||||
composeXcodeWrapper = import ./compose-xcodewrapper.nix {
|
||||
inherit stdenv;
|
||||
};
|
||||
composeXcodeWrapper = callPackage ./compose-xcodewrapper.nix { };
|
||||
|
||||
buildApp = import ./build-app.nix {
|
||||
inherit stdenv lib composeXcodeWrapper;
|
||||
};
|
||||
buildApp = callPackage ./build-app.nix { inherit composeXcodeWrapper; };
|
||||
|
||||
simulateApp = import ./simulate-app.nix {
|
||||
inherit stdenv lib composeXcodeWrapper;
|
||||
};
|
||||
simulateApp = callPackage ./simulate-app.nix { inherit composeXcodeWrapper; };
|
||||
}
|
||||
|
|
|
@ -347,6 +347,12 @@ final: prev: {
|
|||
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
||||
postInstall = let
|
||||
patches = [
|
||||
# Needed to fix packages with DOS line-endings after above patch - PR svanderburg/node2nix#314
|
||||
(fetchpatch {
|
||||
name = "convert-crlf-for-script-bin-files.patch";
|
||||
url = "https://github.com/svanderburg/node2nix/commit/91aa511fe7107938b0409a02ab8c457a6de2d8ca.patch";
|
||||
hash = "sha256-ISiKYkur/o8enKDzJ8mQndkkSC4yrTNlheqyH+LiXlU=";
|
||||
})
|
||||
# fix nodejs attr names
|
||||
(fetchpatch {
|
||||
url = "https://github.com/svanderburg/node2nix/commit/3b63e735458947ef39aca247923f8775633363e5.patch";
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adlfs";
|
||||
version = "2023.1.0";
|
||||
version = "2023.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "fsspec";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-eSfdRiIr8xJEoLMs2114NX0CsBMlku9qjUXA23D5qgY=";
|
||||
hash = "sha256-olXOMmUBfamOrwtS0SEFGW3Z7g+ExWHxON9SKKSxnbc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aliyun-python-sdk-config";
|
||||
version = "2.2.7";
|
||||
version = "2.2.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IJMU16RySVo6nw5PwreZBLETzF8mH5PdZyE+YgoUVYo=";
|
||||
hash = "sha256-0rGI2YMT78gstfHmQD63hdvICQ3WlKgkx8unsDegaXw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
pname = "azure-mgmt-imagebuilder";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2EWfTsl5y3Sw4P8d5X7TKxYmO4PagUTNv/SFKdjY2Ss=";
|
||||
hash = "sha256-XmGIzw+yGYgdaNGZJClFRl531BGsQUH+HESUXGVK6TI=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
33
pkgs/development/python-modules/binary/default.nix
Normal file
33
pkgs/development/python-modules/binary/default.nix
Normal file
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "binary";
|
||||
version = "1.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bsAQ5Y9zMevIvJY42+bGbWNd5g1YGLByO+9N6tDsKKY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "binary" "binary.core" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easily convert between binary and SI units (kibibyte, kilobyte, etc.)";
|
||||
homepage = "https://github.com/ofek/binary";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
|
@ -18,6 +18,7 @@
|
|||
, pythonOlder
|
||||
, pretend
|
||||
, libiconv
|
||||
, libxcrypt
|
||||
, iso8601
|
||||
, py
|
||||
, pytz
|
||||
|
@ -56,7 +57,8 @@ buildPythonPackage rec {
|
|||
] ++ (with rustPlatform; [ rust.cargo rust.rustc ]);
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
++ lib.optionals stdenv.isDarwin [ Security libiconv ]
|
||||
++ lib.optionals (pythonOlder "3.9") [ libxcrypt ];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (!isPyPy) [
|
||||
cffi
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fakeredis";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "dsoftwareinc";
|
||||
repo = "fakeredis-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-R9fB8Y22HPFxMtFQJmmbxZWh6qUtbXrWFUetaOKRFlg=";
|
||||
hash = "sha256-nV/YZFgy4IagdJRLeg1rLTe7f2NsVnvizyMQrJhlrik=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -11,15 +11,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "latex2mathml";
|
||||
version = "3.75.2";
|
||||
version = "3.75.3";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roniemartinez";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-i/F1B/Rndg66tiKok1PDMK/rT5c2e8upnQrMSCTUzpU=";
|
||||
hash = "sha256-i1OJ6hmF04cdDOG1gfyseCJu+e0LEr1I3UwLXbdQJqQ=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
|
|
@ -1,30 +1,37 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, drawio-headless
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, lib
|
||||
, pythonOlder
|
||||
, mkdocs
|
||||
, beautifulsoup4
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-swagger-ui-tag";
|
||||
version = "0.5.2";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = !isPy3k;
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qurnqgpsppO4LPg8fN6HobUoNHQTDI6OmEDjVtObA78=";
|
||||
hash = "sha256-FBrAZ9MhPGPwJhVXslu5mvVIJ7gPDiCK/3EuPAq6RNw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mkdocs beautifulsoup4 ];
|
||||
propagatedBuildInputs = [
|
||||
mkdocs
|
||||
beautifulsoup4
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mkdocs_swagger_ui_tag" ];
|
||||
pythonImportsCheck = [
|
||||
"mkdocs_swagger_ui_tag"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A MkDocs plugin supports for add Swagger UI in page.";
|
||||
description = "A MkDocs plugin supports for add Swagger UI in page";
|
||||
homepage = "https://github.com/Blueswen/mkdocs-swagger-ui-tag";
|
||||
changelog = "https://github.com/blueswen/mkdocs-swagger-ui-tag/blob/v${version}/CHANGELOG";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ snpschaaf ];
|
||||
};
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeps";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "thebjorn";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lwQaU7MwFuk+VBCKl4zBNWRFo88/uW2DxXjiZNyuHAg=";
|
||||
hash = "sha256-c5A9iUq2M2PL76pi5v4AMqOsYLYYKN7ugYd8w7VfrYk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylsqpack";
|
||||
version = "0.3.16";
|
||||
version = "0.3.17";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tnps4/aTfYUGgYJ3FL5zCqNhwEnjd1Lj7Z3xHn8jL/s=";
|
||||
hash = "sha256-LyB3jblW3H5LGop5ci1XpGUMRZl/tlwTUsv4XreqPOI=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gvm";
|
||||
version = "23.4.1";
|
||||
version = "23.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RuyOhFerWSJ/JEQTruv1gh/ieO2X99E33VW28assflY=";
|
||||
hash = "sha256-ONCPC05NYyymTKiJZaDTdcShLLy4+K+JwROVVXBkz+o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.27.1";
|
||||
version = "0.27.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-KmUzXlINRbtyzZCoG4d2Xc57g07d+x7bdoq/DtMmtqM=";
|
||||
hash = "sha256-8JeQvvCxKAmFy8kiXVD+l1EBv5mO1rWYoAg+iLjapRw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "returns";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dry-python";
|
||||
repo = "returns";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yKlW5M7LlK9xF4GiCKtUVrZwwSmFVjCnDhnzaNFcAsU=";
|
||||
hash = "sha256-28WYjrjmu3hQ8+Snuvl3ykTd86eWYI97AE60p6SVwDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,18 +2,24 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, mock
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schedule";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e6ca13585e62c810e13a08682e0a6a8ad245372e376ba2b8679294f377dfc8e4";
|
||||
hash = "sha256-tK1peq+6cYTJ62oeLrxB94FUckKs3ozq6aCiWwTAki0=";
|
||||
};
|
||||
|
||||
buildInputs = [ mock ];
|
||||
buildInputs = [
|
||||
mock
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# https://github.com/dbader/schedule/issues/488
|
||||
|
@ -22,10 +28,15 @@ buildPythonPackage rec {
|
|||
"# self.assertRaises(ScheduleValueError, every().day.until, datetime.time(hour=5))"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"schedule"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python job scheduling for humans";
|
||||
homepage = "https://github.com/dbader/schedule";
|
||||
changelog = "https://github.com/dbader/schedule/blob/${version}/HISTORY.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "syrupy";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8.1";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tophat";
|
||||
repo = "syrupy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BL1Z1hPMwU1duAZb3ZTWWKS/XGv8RJ6/4YoBhktd5NE=";
|
||||
hash = "sha256-luYYh6L7UxW8wkp1zxR0EOmyTj0mIZ6Miy6HcVHebo4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -40,6 +40,9 @@ buildPythonPackage rec {
|
|||
sed -i \
|
||||
-e '/#define EVP_PKEY_id/d' \
|
||||
src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c
|
||||
sed -z -i \
|
||||
-e 's/OpenSSL 3\nif(LINUX)/OpenSSL 3\nif(1)/' \
|
||||
src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, appdirs
|
||||
, azure-core
|
||||
, bokeh
|
||||
, boto3
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, docker_pycreds
|
||||
|
@ -10,12 +11,19 @@
|
|||
, flask
|
||||
, git
|
||||
, gitpython
|
||||
, google-cloud-compute
|
||||
, google-cloud-storage
|
||||
, hypothesis
|
||||
, jsonref
|
||||
, jsonschema
|
||||
, keras
|
||||
, kubernetes
|
||||
, matplotlib
|
||||
, mlflow
|
||||
, nbclient
|
||||
, nbformat
|
||||
, pandas
|
||||
, parameterized
|
||||
, pathtools
|
||||
, promise
|
||||
, protobuf
|
||||
|
@ -26,21 +34,23 @@
|
|||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, torch
|
||||
, pyyaml
|
||||
, requests
|
||||
, responses
|
||||
, scikit-learn
|
||||
, sentry-sdk
|
||||
, setproctitle
|
||||
, setuptools
|
||||
, shortuuid
|
||||
, substituteAll
|
||||
, tensorflow
|
||||
, torch
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wandb";
|
||||
version = "0.13.9";
|
||||
version = "0.15.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -49,7 +59,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BpFLN4WLT+fm5+50NDOU4bM73WjeGEhD6P8XKE9n9cI=";
|
||||
hash = "sha256-UULsvvk9BsWUrJ8eD7uD2UnUJqmPrmjrJvCA7WRC/Cw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -85,19 +95,29 @@ buildPythonPackage rec {
|
|||
nativeCheckInputs = [
|
||||
azure-core
|
||||
bokeh
|
||||
boto3
|
||||
flask
|
||||
google-cloud-compute
|
||||
google-cloud-storage
|
||||
hypothesis
|
||||
jsonref
|
||||
jsonschema
|
||||
keras
|
||||
kubernetes
|
||||
matplotlib
|
||||
mlflow
|
||||
nbclient
|
||||
nbformat
|
||||
pandas
|
||||
parameterized
|
||||
pydantic
|
||||
pytest-mock
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
torch
|
||||
responses
|
||||
scikit-learn
|
||||
tensorflow
|
||||
torch
|
||||
tqdm
|
||||
];
|
||||
|
||||
|
@ -111,49 +131,118 @@ buildPythonPackage rec {
|
|||
|
||||
disabledTestPaths = [
|
||||
# Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.
|
||||
"tests/unit_tests_old/test_cli.py"
|
||||
"tests/unit_tests_old/test_data_types.py"
|
||||
"tests/unit_tests_old/test_file_stream.py"
|
||||
"tests/unit_tests_old/test_file_upload.py"
|
||||
"tests/unit_tests_old/test_footer.py"
|
||||
"tests/unit_tests_old/test_internal_api.py"
|
||||
"tests/unit_tests_old/test_keras.py"
|
||||
"tests/unit_tests_old/test_logging.py"
|
||||
"tests/unit_tests_old/test_metric_internal.py"
|
||||
"tests/unit_tests_old/test_public_api.py"
|
||||
"tests/unit_tests_old/test_runtime.py"
|
||||
"tests/unit_tests_old/test_sender.py"
|
||||
"tests/unit_tests_old/test_summary.py"
|
||||
"tests/unit_tests_old/test_tb_watcher.py"
|
||||
"tests/unit_tests_old/test_time_resolution.py"
|
||||
"tests/unit_tests_old/test_wandb.py"
|
||||
"tests/unit_tests_old/test_wandb_agent.py"
|
||||
"tests/unit_tests_old/test_wandb_artifacts.py"
|
||||
"tests/unit_tests_old/test_wandb_integration.py"
|
||||
"tests/unit_tests_old/test_wandb_run.py"
|
||||
"tests/unit_tests/test_cli.py"
|
||||
"tests/unit_tests/test_data_types.py"
|
||||
"tests/unit_tests/test_file_upload.py"
|
||||
"tests/unit_tests/test_footer.py"
|
||||
"tests/unit_tests/test_internal_api.py"
|
||||
"tests/unit_tests/test_label_full.py"
|
||||
"tests/unit_tests/test_login.py"
|
||||
"tests/unit_tests/test_metric_full.py"
|
||||
"tests/unit_tests/test_metric_internal.py"
|
||||
"tests/unit_tests/test_mode_disabled.py"
|
||||
"tests/unit_tests/test_model_workflows.py"
|
||||
"tests/unit_tests/test_mp_full.py"
|
||||
"tests/unit_tests/test_plots.py"
|
||||
"tests/unit_tests/test_public_api.py"
|
||||
"tests/unit_tests/test_runtime.py"
|
||||
"tests/unit_tests/test_sender.py"
|
||||
"tests/unit_tests/test_start_method.py"
|
||||
"tests/unit_tests/test_tb_watcher.py"
|
||||
"tests/unit_tests/test_telemetry_full.py"
|
||||
"tests/unit_tests/test_util.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_cli.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_data_types.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_file_stream.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_file_upload.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_footer.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_internal_api.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_keras.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_logging.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_metric_internal.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_public_api.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_runtime.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_sender.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_summary.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_tb_watcher.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_time_resolution.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_wandb_agent.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_wandb_artifacts.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_wandb_integration.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_wandb_run.py"
|
||||
"tests/pytest_tests/unit_tests_old/test_wandb.py"
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_aws.py"
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_cli.py"
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_docker.py"
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_kubernetes.py"
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch.py"
|
||||
"tests/pytest_tests/unit_tests_old/tests_s_nb/test_notebooks.py"
|
||||
"tests/pytest_tests/unit_tests/test_cli.py"
|
||||
"tests/pytest_tests/unit_tests/test_data_types.py"
|
||||
"tests/pytest_tests/unit_tests/test_internal_api.py"
|
||||
"tests/pytest_tests/unit_tests/test_mode_disabled.py"
|
||||
"tests/pytest_tests/unit_tests/test_model_workflows.py"
|
||||
"tests/pytest_tests/unit_tests/test_plots.py"
|
||||
"tests/pytest_tests/unit_tests/test_public_api.py"
|
||||
"tests/pytest_tests/unit_tests/test_sender.py"
|
||||
"tests/pytest_tests/unit_tests/test_util.py"
|
||||
"tests/pytest_tests/unit_tests/test_wandb_verify.py"
|
||||
|
||||
# Requires docker access
|
||||
"tests/pytest_tests/system_tests/test_artifacts/test_artifact_saver.py"
|
||||
"tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts_full.py"
|
||||
"tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_cli_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_data_types_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_file_stream_internal.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_file_upload.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_footer.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_keras_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_label_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_metric_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_metric_internal.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_mode_disabled_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_model_workflow.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_mp_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_public_api.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_redir_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_report_api.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_runtime.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_save_policies.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_sender.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_start_method.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_system_info.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_tb_watcher.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_telemetry_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_time_resolution.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_torch_full.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_validation_data_logger.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb_integration.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb_run.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb_settings.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb_tensorflow.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb_verify.py"
|
||||
"tests/pytest_tests/system_tests/test_core/test_wandb.py"
|
||||
"tests/pytest_tests/system_tests/test_importers/test_import_mlflow.py"
|
||||
"tests/pytest_tests/system_tests/test_sweep/test_public_api.py"
|
||||
"tests/pytest_tests/system_tests/test_sweep/test_sweep_scheduler.py"
|
||||
"tests/pytest_tests/system_tests/test_sweep/test_wandb_agent_full.py"
|
||||
"tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py"
|
||||
"tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py"
|
||||
"tests/pytest_tests/system_tests/tests_launch/test_github_reference.py"
|
||||
"tests/pytest_tests/system_tests/tests_launch/test_job.py"
|
||||
"tests/pytest_tests/system_tests/tests_launch/test_launch_add.py"
|
||||
"tests/pytest_tests/system_tests/tests_launch/test_launch_cli.py"
|
||||
"tests/pytest_tests/system_tests/tests_launch/test_launch_kubernetes.py"
|
||||
"tests/pytest_tests/system_tests/tests_launch/test_launch_local_container.py"
|
||||
"tests/pytest_tests/system_tests/tests_launch/test_launch_run.py"
|
||||
"tests/pytest_tests/system_tests/tests_launch/test_launch_sweep.py"
|
||||
"tests/pytest_tests/system_tests/tests_launch/test_launch.py"
|
||||
"tests/pytest_tests/system_tests/tests_launch/test_wandb_reference.py"
|
||||
|
||||
# Tries to access /homeless-shelter
|
||||
"tests/unit_tests/test_tables.py"
|
||||
"tests/pytest_tests/unit_tests/test_tables.py"
|
||||
|
||||
# E AssertionError: assert 'Cannot use both --async and --queue with wandb launch' in 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n'
|
||||
# E + where 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n' = <Result SystemExit(1)>.output
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_jobs.py"
|
||||
|
||||
# Requires google-cloud-aiplatform which is not packaged as of 2023-04-25.
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_launch_gcp.py"
|
||||
|
||||
# Requires google-cloud-artifact-registry which is not packaged as of 2023-04-25.
|
||||
"tests/pytest_tests/unit_tests_old/tests_launch/test_kaniko_build.py"
|
||||
"tests/pytest_tests/unit_tests/test_launch/test_registry/test_gcp_artifact_registry.py"
|
||||
|
||||
# Requires kfp which is not packaged as of 2023-04-25.
|
||||
"tests/pytest_tests/system_tests/test_core/test_kfp.py"
|
||||
|
||||
# Requires metaflow which is not packaged as of 2023-04-25.
|
||||
"tests/pytest_tests/unit_tests/test_metaflow.py"
|
||||
|
||||
# See https://github.com/wandb/wandb/issues/5423
|
||||
"tests/pytest_tests/unit_tests/test_docker.py"
|
||||
"tests/pytest_tests/unit_tests/test_library_public.py"
|
||||
];
|
||||
|
||||
# Disable test that fails on darwin due to issue with python3Packages.psutil:
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-zigate";
|
||||
version = "0.10.3";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -22,8 +22,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy-zigate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zO20ySRO9XFcDB8TkUJW2MxkhDIBpHp9Z24gupssOaY=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-eGN2QvPHZ8gfPPFdUbAP9cs43jzUHDBS/w1tni1shB0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -52,6 +52,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Library which communicates with ZiGate radios for zigpy";
|
||||
homepage = "https://github.com/zigpy/zigpy-zigate";
|
||||
changelog = "https://github.com/zigpy/zigpy-zigate/releases/tag/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ mvnetbiz ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -1336,6 +1336,10 @@ let
|
|||
rhdf5= old.rhdf5.overrideAttrs (attrs: {
|
||||
patches = [ ./patches/rhdf5.patch ];
|
||||
});
|
||||
|
||||
textshaping = old.textshaping.overrideAttrs (attrs: {
|
||||
env.NIX_LDFLAGS = "-lfribidi -lharfbuzz";
|
||||
});
|
||||
};
|
||||
in
|
||||
self
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
let
|
||||
pname = "altair";
|
||||
version = "5.0.22";
|
||||
version = "5.0.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
|
||||
sha256 = "sha256-zbsKj70ESotf4rW3zf60gaZWoXRgPRi4sPv7eIXC/Zg=";
|
||||
sha256 = "sha256-sjM5KztkFqsZT153b181OLrus5YS09Dp/w4LD6Q6Ros=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
|
|
|
@ -22,14 +22,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.3.199";
|
||||
version = "2.3.202";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-JwEI+i6xvO8wsCCAliljXxddL3T6MWzHvzMmewNlbsk=";
|
||||
hash = "sha256-cJGHby6g4ndz031vxLFmQ9yUAB6lsyGff3eM8vjxUbc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -116,7 +116,7 @@ buildPythonApplication rec {
|
|||
# Tests are comparing console output
|
||||
"cli"
|
||||
"console"
|
||||
# Starting to fail after 2.3.199
|
||||
# Starting to fail after 2.3.202
|
||||
"test_non_multiline_pair"
|
||||
];
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-buildtools";
|
||||
version = "6.1.0";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "buildtools";
|
||||
rev = version;
|
||||
hash = "sha256-yqRvmVy5KRVURsRanLXT1tQvbIaib8UZrO4cLEQNlc0=";
|
||||
hash = "sha256-CqQ8rj45RES3BV7RBfGr/JX9GzjyRuA1sxgKzQx+oE8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A=";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloud-nuke";
|
||||
version = "0.29.4";
|
||||
version = "0.29.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qQrgeUmsCOLlmeU4kwtovo/3cK9Vqzeng7W9M+j+hdk=";
|
||||
hash = "sha256-JIMEmXZVPXDR8t+ECaV5OqThHiW2CUn2BrIvM+uxSMI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6+uQAEp+fRlRrwfJR0eDMXs0mEQwzWadLxCrXrDREhs=";
|
||||
vendorHash = "sha256-i+AzDEydK+mUvOb6LivuyaCqHaqIdPkE46nxvf7mLTw=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue