Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -3818,6 +3818,12 @@
|
||||
name = "ChaosAttractor";
|
||||
keys = [ { fingerprint = "A137 4415 DB7C 6439 10EA 5BF1 0FEE 4E47 5940 E125"; } ];
|
||||
};
|
||||
charB66 = {
|
||||
email = "nix.disparate221@passinbox.com";
|
||||
github = "charB66";
|
||||
githubId = 59340663;
|
||||
name = "Bryan F.";
|
||||
};
|
||||
charlesbaynham = {
|
||||
email = "charlesbaynham@gmail.com";
|
||||
github = "charlesbaynham";
|
||||
|
||||
@@ -236,8 +236,7 @@ let
|
||||
image = (
|
||||
pkgs.vmTools.override {
|
||||
rootModules =
|
||||
[ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++
|
||||
(pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos");
|
||||
[ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ];
|
||||
kernel = modulesTree;
|
||||
}
|
||||
).runInLinuxVM (
|
||||
|
||||
@@ -226,8 +226,7 @@ let
|
||||
image = (
|
||||
pkgs.vmTools.override {
|
||||
rootModules =
|
||||
[ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++
|
||||
(pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos");
|
||||
[ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ];
|
||||
kernel = modulesTree;
|
||||
}
|
||||
).runInLinuxVM (
|
||||
|
||||
@@ -335,12 +335,14 @@ let
|
||||
set textmode=true
|
||||
terminal_output console
|
||||
}
|
||||
|
||||
${lib.optionalString (config.isoImage.grubTheme != null) ''
|
||||
hiddenentry 'GUI mode' --hotkey 'g' {
|
||||
$(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/BOOT/grub-theme/%P\n")
|
||||
set textmode=false
|
||||
terminal_output gfxterm
|
||||
}
|
||||
|
||||
''}
|
||||
|
||||
# If the parameter iso_path is set, append the findiso parameter to the kernel
|
||||
# line. We need this to allow the nixos iso to be booted from grub directly.
|
||||
|
||||
@@ -77,6 +77,7 @@ in {
|
||||
description = "mopidy music player daemon";
|
||||
serviceConfig = {
|
||||
ExecStart = "${mopidyEnv}/bin/mopidy --config ${lib.concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}";
|
||||
Restart = "on-failure";
|
||||
User = "mopidy";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -460,6 +460,16 @@ in {
|
||||
ignoreCollisions = true;
|
||||
postBuild = ''
|
||||
find $out/bin/ -mindepth 1 -not -name "mailman*" -delete
|
||||
'' + lib.optionalString config.security.sudo.enable ''
|
||||
mv $out/bin/mailman $out/bin/.mailman-wrapped
|
||||
echo '#!${pkgs.runtimeShell}
|
||||
sudo=exec
|
||||
if [[ "$USER" != mailman ]]; then
|
||||
sudo="exec /run/wrappers/bin/sudo -u mailman"
|
||||
fi
|
||||
$sudo ${placeholder "out"}/bin/.mailman-wrapped "$@"
|
||||
' > $out/bin/mailman
|
||||
chmod +x $out/bin/mailman
|
||||
'';
|
||||
}) ];
|
||||
|
||||
|
||||
@@ -306,9 +306,6 @@ in
|
||||
] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
|
||||
# Misc. x86 keyboard stuff.
|
||||
"pcips2" "atkbd" "i8042"
|
||||
|
||||
# x86 RTC needed by the stage 2 init script.
|
||||
"rtc_cmos"
|
||||
]);
|
||||
|
||||
boot.initrd.kernelModules =
|
||||
|
||||
@@ -7,6 +7,13 @@ in {
|
||||
options.services.lvm = {
|
||||
enable = mkEnableOption "lvm2" // {
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable lvm2.
|
||||
|
||||
:::{.note}
|
||||
The lvm2 package contains device-mapper udev rules and without those tools like cryptsetup do not fully function!
|
||||
:::
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
|
||||
@@ -15,11 +15,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
|
||||
|
||||
unpackCmd = ''
|
||||
mkdir -p root
|
||||
dpkg-deb -x $curSrc root
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
dontWrapGApps = true; # we only want $gappsWrapperArgs here
|
||||
|
||||
|
||||
@@ -33,11 +33,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
|
||||
|
||||
unpackCmd = ''
|
||||
mkdir -p root
|
||||
dpkg-deb -x $curSrc root
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
dontWrapGApps = true; # we only want $gappsWrapperArgs here
|
||||
|
||||
|
||||
@@ -32,17 +32,13 @@ stdenv.mkDerivation rec {
|
||||
version = "5.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
name = "bitwig-studio-${version}.deb";
|
||||
url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
|
||||
hash = "sha256-x6Uw6o+a3nArMm1Ev5ytGtLDGQ3r872WqlC022zT8Hk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
|
||||
|
||||
unpackCmd = ''
|
||||
mkdir -p root
|
||||
dpkg-deb -x $curSrc root
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
dontWrapGApps = true; # we only want $gappsWrapperArgs here
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, makeSetupHook
|
||||
, callPackage
|
||||
, config
|
||||
, vimUtils
|
||||
, vimPlugins
|
||||
, nodejs
|
||||
@@ -256,5 +257,6 @@ in
|
||||
inherit normalizePlugins normalizedPluginsToVimPackage;
|
||||
|
||||
inherit buildNeovimPlugin;
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin;
|
||||
}
|
||||
|
||||
@@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper dpkg desktop-file-utils asar ];
|
||||
|
||||
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
|
||||
|
||||
installPhase = let
|
||||
libPath = lib.makeLibraryPath [
|
||||
libsecret
|
||||
|
||||
@@ -45,6 +45,8 @@ mapAliases (with prev; {
|
||||
coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18
|
||||
Solarized = vim-colors-solarized;
|
||||
solarized = vim-colors-solarized;
|
||||
spacevim = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27
|
||||
SpaceVim = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27
|
||||
colors-solarized = vim-colors-solarized;
|
||||
caw = caw-vim;
|
||||
chad = chadtree;
|
||||
|
||||
@@ -411,18 +411,6 @@ final: prev:
|
||||
meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
|
||||
};
|
||||
|
||||
SpaceVim = buildVimPlugin {
|
||||
pname = "SpaceVim";
|
||||
version = "2024-11-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpaceVim";
|
||||
repo = "SpaceVim";
|
||||
rev = "08719ccab2073b4c12f2c6b318eba63b87e35180";
|
||||
sha256 = "0fr7vhs5gi054nn9z3hqcgf4y3w7nx00d94f7nd9g2jg7x2zzfyp";
|
||||
};
|
||||
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
|
||||
};
|
||||
|
||||
SudoEdit-vim = buildVimPlugin {
|
||||
pname = "SudoEdit.vim";
|
||||
version = "2023-04-25";
|
||||
@@ -11470,18 +11458,6 @@ final: prev:
|
||||
meta.homepage = "https://github.com/FireIsGood/spaceman.nvim/";
|
||||
};
|
||||
|
||||
spacevim = buildVimPlugin {
|
||||
pname = "spacevim";
|
||||
version = "2018-03-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ctjhoa";
|
||||
repo = "spacevim";
|
||||
rev = "30142a518ba77feb22791b5cb2387d88b70c58f2";
|
||||
sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg";
|
||||
};
|
||||
meta.homepage = "https://github.com/ctjhoa/spacevim/";
|
||||
};
|
||||
|
||||
sparkup = buildVimPlugin {
|
||||
pname = "sparkup";
|
||||
version = "2012-06-11";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -33,7 +33,6 @@ https://github.com/vim-scripts/ShowMultiBase/,,
|
||||
https://github.com/tmhedberg/SimpylFold/,,
|
||||
https://github.com/vim-scripts/SmartCase/,,
|
||||
https://github.com/jaredgorski/SpaceCamp/,,
|
||||
https://github.com/SpaceVim/SpaceVim/,,
|
||||
https://github.com/chrisbra/SudoEdit.vim/,,
|
||||
https://github.com/hsitz/VimOrganizer/,,
|
||||
https://github.com/VundleVim/Vundle.vim/,,
|
||||
@@ -953,7 +952,6 @@ https://github.com/sQVe/sort.nvim/,HEAD,
|
||||
https://github.com/chikatoike/sourcemap.vim/,,
|
||||
https://github.com/liuchengxu/space-vim/,,
|
||||
https://github.com/FireIsGood/spaceman.nvim/,HEAD,
|
||||
https://github.com/ctjhoa/spacevim/,,
|
||||
https://github.com/chrisgeo/sparkup/,,
|
||||
https://github.com/cxwx/specs.nvim/,HEAD,
|
||||
https://github.com/lewis6991/spellsitter.nvim/,HEAD,
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, python3
|
||||
, callPackage, makeSetupHook
|
||||
, linkFarm
|
||||
, config
|
||||
}:
|
||||
|
||||
/*
|
||||
@@ -358,8 +359,6 @@ rec {
|
||||
overrideAttrs = f: makeCustomizable (vim.overrideAttrs f);
|
||||
};
|
||||
|
||||
vimWithRC = throw "vimWithRC was removed, please use vim.customize instead";
|
||||
|
||||
vimGenDocHook = callPackage ({ vim }:
|
||||
makeSetupHook {
|
||||
name = "vim-gen-doc-hook";
|
||||
@@ -430,4 +429,6 @@ rec {
|
||||
vimPlugin = true;
|
||||
};
|
||||
});
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
vimWithRC = throw "vimWithRC was removed, please use vim.customize instead";
|
||||
}
|
||||
|
||||
@@ -88,6 +88,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
||||
changelog = "https://github.com/microsoft/vscode-python/releases";
|
||||
license = lib.licenses.mit;
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
"aarch64-darwin"
|
||||
"x86_64-darwin"
|
||||
|
||||
@@ -18,15 +18,10 @@ in mkDerivation {
|
||||
sha256 = "10027a3ab18efd04ca75aa699ff550eca3bdfe6f7084460d3c00001bffb50070";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg -x $src oda_unpacked
|
||||
sourceRoot=$PWD/oda_unpacked
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib
|
||||
cp -vr $sourceRoot/usr/bin/ODAFileConverter_${version} $out/libexec
|
||||
cp -vr $sourceRoot/usr/share $out/share
|
||||
cp -vr usr/bin/ODAFileConverter_${version} $out/libexec
|
||||
cp -vr usr/share $out/share
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@@ -33,14 +33,6 @@ stdenvNoCC.mkDerivation {
|
||||
sha256 = "sha256-9F56u+jYj2CClhbnGlLi65FxS1Vq00coxwu7mjVTY1w=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
dpkg-deb -x $src .
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -46,7 +46,6 @@ let
|
||||
})
|
||||
];
|
||||
|
||||
unpackCmd = "dpkg-deb -x $src ./${program}-${version}";
|
||||
dontBuild = true;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -20,11 +20,7 @@ in mkDerivation rec {
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
# avoid https://github.com/NixOS/patchelf/issues/99
|
||||
dontStrip = true;
|
||||
unpackPhase = ''
|
||||
mkdir pkg
|
||||
dpkg-deb -x $src pkg
|
||||
sourceRoot=pkg
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp usr/bin/rescuetime $out/bin
|
||||
|
||||
@@ -24,8 +24,6 @@ let
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv usr/share $out/share
|
||||
|
||||
@@ -813,13 +813,13 @@
|
||||
"vendorHash": "sha256-cFt/fbgJsLATi9aolKl9ra1xAz9zp3JjWk+a5aWs88o="
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-h2zGfU4Ud5sZ2zjcsWGnaVpGRPTpWVJYTIUvWMrF7AQ=",
|
||||
"hash": "sha256-aSEzsncqNLWfVnnGfz/fDpRw9w2muGnybX8WYd1tP/Y=",
|
||||
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
|
||||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v2.5.1",
|
||||
"rev": "v3.2.1",
|
||||
"spdx": "AGPL-3.0",
|
||||
"vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A="
|
||||
"vendorHash": "sha256-a9v1nVG3NiuyHwJGhIKKKXFDp4/Cb533EJxrfqK9h/A="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-ztdzVTCQDPOgXVv/39SDfaNM4wR/zh5ReikEGz4S8Jw=",
|
||||
@@ -1264,13 +1264,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"tfe": {
|
||||
"hash": "sha256-v5DHEp/O0y4TrOpqOfkBtv4IWTvXV2WPypsRUj3XgOw=",
|
||||
"hash": "sha256-gCgbov6Psb884CJjYBIQM0180gwEQIt3yjXlZpgODao=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-tfe",
|
||||
"rev": "v0.59.0",
|
||||
"rev": "v0.60.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-LgTSyu1TzGT+SV2y9Xoqxv2F828nSTIJp03yMV9OkjM="
|
||||
"vendorHash": "sha256-8k2t5oUBzA9qMtmkJiq4wNpKpUT+Y83vx/TiUDs+B68="
|
||||
},
|
||||
"thunder": {
|
||||
"hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=",
|
||||
|
||||
@@ -165,9 +165,9 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.9.8";
|
||||
hash = "sha256-0xBhOdaIbw1fLmbI4KDvQoHD4BmVZoiMT/zv9MnwuD4=";
|
||||
vendorHash = "sha256-tH9KQF4oHcQh34ikB9Bx6fij/iLZN+waxv5ZilqGGlU=";
|
||||
version = "1.10.0";
|
||||
hash = "sha256-GvFBefp1RWqgB79Sv+2vYZyTjeLEYNsXFJrJxEUJAlY=";
|
||||
vendorHash = "sha256-UmPnOfjR6kYI0TMH2J54LzDeDGJKMkAC0xZk6xstIuk=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
|
||||
@@ -29,7 +29,8 @@ let
|
||||
in
|
||||
|
||||
buildFHSEnv {
|
||||
name = "dropbox";
|
||||
inherit version;
|
||||
pname = "dropbox";
|
||||
|
||||
# The dropbox-cli command `dropbox start` starts the dropbox daemon in a
|
||||
# separate session, and wants the daemon to outlive the launcher. Enabling
|
||||
|
||||
@@ -71,8 +71,6 @@ in stdenv.mkDerivation (rec {
|
||||
];
|
||||
runtimeDependencies = [ libglvnd (lib.getLib stdenv.cc.cc) (lib.getLib udev) libnotify libappindicator-gtk3 ];
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -r opt $out
|
||||
|
||||
@@ -99,8 +99,6 @@ stdenv.mkDerivation {
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
runtimeDependencies = [ (lib.getLib systemd) libGL libnotify libappindicator wayland ];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -8,10 +8,13 @@
|
||||
, xdg-utils
|
||||
, gtk3
|
||||
, jdk
|
||||
, gradle
|
||||
, gradle_8
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.13";
|
||||
pname = "jabref";
|
||||
|
||||
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
|
||||
version = "3.5.9";
|
||||
|
||||
src = fetchurl {
|
||||
name = "morgen-${version}.deb";
|
||||
url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
|
||||
hash = "sha256-ZKlj/QuQnrqQepsJY6KCROC2fXK/4Py5tmI/FVnRi9w=";
|
||||
};
|
||||
@@ -19,10 +20,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ];
|
||||
|
||||
unpackCmd = ''
|
||||
dpkg-deb -x ${src} ./morgen-${pname}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
-3548
File diff suppressed because it is too large
Load Diff
@@ -1,20 +1,22 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, dbus
|
||||
, freetype
|
||||
, gtk3
|
||||
, libsoup_3
|
||||
, openssl
|
||||
, pkg-config
|
||||
, webkitgtk_4_1
|
||||
, libappindicator
|
||||
, makeWrapper
|
||||
, coolercontrol
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
dbus,
|
||||
freetype,
|
||||
gtk3,
|
||||
libsoup_3,
|
||||
openssl,
|
||||
pkg-config,
|
||||
webkitgtk_4_1,
|
||||
libappindicator,
|
||||
makeWrapper,
|
||||
coolercontrol,
|
||||
}:
|
||||
|
||||
{ version
|
||||
, src
|
||||
, meta
|
||||
{
|
||||
version,
|
||||
src,
|
||||
meta,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
@@ -22,7 +24,7 @@ rustPlatform.buildRustPackage {
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/coolercontrol-ui/src-tauri";
|
||||
|
||||
cargoHash = "sha256-0Ud5S4T5+5eBuvD5N64NAvbK0+tTozKsPhsNziCEu3I=";
|
||||
cargoHash = "sha256-nS67ABuI2/C08X+TWWoOx7bptIPF1fsvBC1Ucoky1/4=";
|
||||
|
||||
buildFeatures = [ "custom-protocol" ];
|
||||
|
||||
@@ -48,7 +50,7 @@ rustPlatform.buildRustPackage {
|
||||
postPatch = ''
|
||||
mkdir -p ui-build
|
||||
cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/
|
||||
substituteInPlace tauri.conf.json --replace '"frontendDist": "../dist"' '"frontendDist": "ui-build"'
|
||||
substituteInPlace tauri.conf.json --replace-fail '"frontendDist": "../dist"' '"frontendDist": "ui-build"'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ python3
|
||||
}:
|
||||
{ python3 }:
|
||||
|
||||
{ version
|
||||
, src
|
||||
, meta
|
||||
{
|
||||
version,
|
||||
src,
|
||||
meta,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
@@ -12,9 +12,7 @@ python3.pkgs.buildPythonApplication {
|
||||
sourceRoot = "${src.name}/coolercontrol-liqctld";
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
nativeBuildInputs = with python3.pkgs; [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
liquidctl
|
||||
@@ -26,7 +24,7 @@ python3.pkgs.buildPythonApplication {
|
||||
postInstall = ''
|
||||
install -Dm444 "${src}/packaging/systemd/coolercontrol-liqctld.service" -t "$out/lib/systemd/system"
|
||||
substituteInPlace "$out/lib/systemd/system/coolercontrol-liqctld.service" \
|
||||
--replace '/usr/bin' "$out/bin"
|
||||
--replace-fail '/usr/bin' "$out/bin"
|
||||
'';
|
||||
|
||||
meta = meta // {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ buildNpmPackage
|
||||
}:
|
||||
{ buildNpmPackage, autoPatchelfHook }:
|
||||
|
||||
{ version
|
||||
, src
|
||||
, meta
|
||||
{
|
||||
version,
|
||||
src,
|
||||
meta,
|
||||
}:
|
||||
|
||||
buildNpmPackage {
|
||||
@@ -11,7 +11,15 @@ buildNpmPackage {
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/coolercontrol-ui";
|
||||
|
||||
npmDepsHash = "sha256-PpX9lk+yEG1auvBv5JBdMh7rjWoM0oTYJx6Nme5ij8s=";
|
||||
npmDepsHash = "sha256-j+bGOGIG9H/1z0dN8BfvWSi6gPvYmCV7l0ZNH8h3yeU=";
|
||||
|
||||
preBuild = ''
|
||||
autoPatchelf node_modules/sass-embedded-linux-x64/dart-sass/src/dart
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
dontAutoPatchelf = true;
|
||||
|
||||
postBuild = ''
|
||||
cp -r dist $out
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
{ rustPlatform
|
||||
, testers
|
||||
, libdrm
|
||||
, coolercontrol
|
||||
, runtimeShell
|
||||
{
|
||||
rustPlatform,
|
||||
testers,
|
||||
libdrm,
|
||||
coolercontrol,
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
{ version
|
||||
, src
|
||||
, meta
|
||||
{
|
||||
version,
|
||||
src,
|
||||
meta,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
@@ -15,22 +17,16 @@ rustPlatform.buildRustPackage {
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/coolercontrold";
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"nvml-wrapper-0.10.0" = "sha256-pMiULWT+nJXcDfLDeACG/DaPF5+AbzpoIUWWWz8mQ+0=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ZAjaegUgNkKygXqskyeUkWpcqi1Jt7pE8GtqWlaP6/I=";
|
||||
|
||||
buildInputs = [
|
||||
libdrm
|
||||
];
|
||||
buildInputs = [ libdrm ];
|
||||
|
||||
postPatch = ''
|
||||
# copy the frontend static resources to a directory for embedding
|
||||
mkdir -p ui-build
|
||||
cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/
|
||||
substituteInPlace build.rs --replace '"./resources/app"' '"./ui-build"'
|
||||
substituteInPlace build.rs --replace-fail '"./resources/app"' '"./ui-build"'
|
||||
|
||||
# Hardcode a shell
|
||||
substituteInPlace src/repositories/utils.rs \
|
||||
@@ -40,7 +36,7 @@ rustPlatform.buildRustPackage {
|
||||
postInstall = ''
|
||||
install -Dm444 "${src}/packaging/systemd/coolercontrold.service" -t "$out/lib/systemd/system"
|
||||
substituteInPlace "$out/lib/systemd/system/coolercontrold.service" \
|
||||
--replace '/usr/bin' "$out/bin"
|
||||
--replace-fail '/usr/bin' "$out/bin"
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
|
||||
@@ -1,24 +1,28 @@
|
||||
{ lib
|
||||
, fetchFromGitLab
|
||||
, callPackage
|
||||
{
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.4.0";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "coolercontrol";
|
||||
repo = "coolercontrol";
|
||||
rev = version;
|
||||
hash = "sha256-jsgso9MHt5Szzp9YkuXz8qysdN0li/zD2R/vSZ2Lw5M=";
|
||||
hash = "sha256-9l10X4uDv3KJz582QQMhqh38bwDtQVHm9HdAVNC6Kfg=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Monitor and control your cooling devices";
|
||||
homepage = "https://gitlab.com/coolercontrol/coolercontrol";
|
||||
license = licenses.gpl3Plus;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ codifryed OPNA2608 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
codifryed
|
||||
OPNA2608
|
||||
];
|
||||
};
|
||||
|
||||
applySharedDetails = drv: drv { inherit version src meta; };
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include <fstream>
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <spawn.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
@@ -34,11 +35,15 @@ int main(int, const char *argv[]) {
|
||||
pid_t pid;
|
||||
const char *ldconfig_argv[] = {"/bin/ldconfig", NULL};
|
||||
char *ldconfig_envp[] = {NULL};
|
||||
if ((e = posix_spawn(&pid, ldconfig_argv[0], NULL, NULL,
|
||||
posix_spawn_file_actions_t action;
|
||||
posix_spawn_file_actions_init(&action);
|
||||
posix_spawn_file_actions_addopen (&action, STDERR_FILENO, "/dev/null", O_WRONLY|O_APPEND, 0);
|
||||
if ((e = posix_spawn(&pid, ldconfig_argv[0], &action, NULL,
|
||||
(char *const *)ldconfig_argv, ldconfig_envp))) {
|
||||
fprintf(stderr, "Failed to run ldconfig: %s\n", strerror(e));
|
||||
return 1;
|
||||
}
|
||||
posix_spawn_file_actions_destroy(&action);
|
||||
|
||||
int status;
|
||||
if (waitpid(pid, &status, 0) == -1) {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, buildPackages
|
||||
, config
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -9,9 +10,38 @@ let
|
||||
mktemp
|
||||
rsync
|
||||
;
|
||||
|
||||
/* Build a derivation based on the checkpoint output generated by
|
||||
* the `prepareCheckpointBuild` function.
|
||||
*
|
||||
* Usage:
|
||||
* let
|
||||
* checkpointArtifacts = prepareCheckpointBuild drv;
|
||||
* in mkCheckpointBuild drv checkpointArtifacts
|
||||
*/
|
||||
mkCheckpointBuild = drv: checkpointArtifacts: drv.overrideAttrs (old: {
|
||||
# The actual checkpoint build phase.
|
||||
# We compare the changed sources from a previous build with the current and create a patch.
|
||||
# Afterwards we clean the build directory and copy the previous output files (including the sources).
|
||||
# The source difference patch is then applied to get the latest changes again to allow short build times.
|
||||
preBuild = (old.preBuild or "") + ''
|
||||
set +e
|
||||
sourceDifferencePatchFile=$(${mktemp}/bin/mktemp)
|
||||
diff -ur ${checkpointArtifacts}/sources ./ > "$sourceDifferencePatchFile"
|
||||
set -e
|
||||
shopt -s dotglob
|
||||
rm -r *
|
||||
${rsync}/bin/rsync \
|
||||
--checksum --times --atimes --chown=$USER:$USER --chmod=+w \
|
||||
-r ${checkpointArtifacts}/outputs/ .
|
||||
patch -p 1 -i "$sourceDifferencePatchFile"
|
||||
rm "$sourceDifferencePatchFile"
|
||||
'';
|
||||
});
|
||||
in
|
||||
|
||||
rec {
|
||||
inherit mkCheckpointBuild;
|
||||
/* Prepare a derivation for local builds.
|
||||
*
|
||||
* This function prepares checkpoint builds by storing
|
||||
@@ -60,35 +90,7 @@ rec {
|
||||
doInstallCheck = false;
|
||||
doDist = false;
|
||||
});
|
||||
|
||||
/* Build a derivation based on the checkpoint output generated by
|
||||
* the `prepareCheckpointBuild` function.
|
||||
*
|
||||
* Usage:
|
||||
* let
|
||||
* checkpointArtifacts = prepareCheckpointBuild drv;
|
||||
* in mkCheckpointBuild drv checkpointArtifacts
|
||||
*/
|
||||
mkCheckpointBuild = drv: checkpointArtifacts: drv.overrideAttrs (old: {
|
||||
# The actual checkpoint build phase.
|
||||
# We compare the changed sources from a previous build with the current and create a patch.
|
||||
# Afterwards we clean the build directory and copy the previous output files (including the sources).
|
||||
# The source difference patch is then applied to get the latest changes again to allow short build times.
|
||||
preBuild = (old.preBuild or "") + ''
|
||||
set +e
|
||||
sourceDifferencePatchFile=$(${mktemp}/bin/mktemp)
|
||||
diff -ur ${checkpointArtifacts}/sources ./ > "$sourceDifferencePatchFile"
|
||||
set -e
|
||||
shopt -s dotglob
|
||||
rm -r *
|
||||
${rsync}/bin/rsync \
|
||||
--checksum --times --atimes --chown=$USER:$USER --chmod=+w \
|
||||
-r ${checkpointArtifacts}/outputs/ .
|
||||
patch -p 1 -i "$sourceDifferencePatchFile"
|
||||
rm "$sourceDifferencePatchFile"
|
||||
'';
|
||||
});
|
||||
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
mkCheckpointedBuild = lib.warn
|
||||
"`mkCheckpointedBuild` is deprecated, use `mkCheckpointBuild` instead!"
|
||||
mkCheckpointBuild;
|
||||
|
||||
@@ -92,6 +92,7 @@ convertIconTheme() {
|
||||
|
||||
echo "desktopToDarwinBundle: resizing icon $in to $out, size $dim" >&2
|
||||
magick convert -scale "${dim}x${dim}" -density "$density" -units PixelsPerInch "$in" "$out"
|
||||
convertIfUnsupportedIcon "$out" "$iconSize" "$scale"
|
||||
}
|
||||
|
||||
function synthesizeIcon() {
|
||||
@@ -107,11 +108,27 @@ convertIconTheme() {
|
||||
echo "desktopToDarwinBundle: rasterizing svg $in to $out, size $dim" >&2
|
||||
rsvg-convert --keep-aspect-ratio --width "$dim" --height "$dim" "$in" --output "$out"
|
||||
magick convert -density "$density" -units PixelsPerInch "$out" "$out"
|
||||
convertIfUnsupportedIcon "$out" "$iconSize" "$scale"
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# macOS does not correctly display 16x and 32x png icons on app bundles
|
||||
# they need to be converted to rgb+mask (argb is supported only from macOS 11)
|
||||
function convertIfUnsupportedIcon() {
|
||||
local -r in=$1
|
||||
local -r iconSize=$2
|
||||
local -r scale=$3
|
||||
local -r out=${in%.png}.rgb
|
||||
|
||||
if [[ ($scale -eq 1) && ($iconSize -eq 32 || $iconSize -eq 16) ]]; then
|
||||
echo "desktopToDarwinBundle: converting ${iconSize}x icon to rgb" >&2
|
||||
icnsutil convert "$out" "$in"
|
||||
rm "$in"
|
||||
fi
|
||||
}
|
||||
|
||||
function getIcons() {
|
||||
local -r sharePath=$1
|
||||
local -r iconname=$2
|
||||
@@ -151,6 +168,7 @@ convertIconTheme() {
|
||||
fixed)
|
||||
local density=$((72 * scale))x$((72 * scale))
|
||||
magick convert -density "$density" -units PixelsPerInch "$icon" "$result"
|
||||
convertIfUnsupportedIcon "$result" "$iconSize" "$scale"
|
||||
foundIcon=OTHER
|
||||
;;
|
||||
threshold)
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
, storeDir ? builtins.storeDir
|
||||
, rootModules ?
|
||||
[ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
|
||||
++ pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos"
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@@ -50,10 +50,6 @@ stdenv.mkDerivation rec {
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -2,10 +2,13 @@
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, jdk_headless
|
||||
, gradle
|
||||
, gradle_8
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apksigner";
|
||||
version = "34.0.5-unstable-2024-03-06";
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, jdk11
|
||||
, gradle
|
||||
, gradle_8
|
||||
, metasploit
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
@@ -47,6 +47,9 @@ let
|
||||
./gradle-8.patch
|
||||
];
|
||||
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname version src patches;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
gradle,
|
||||
gradle_8,
|
||||
jre,
|
||||
lib,
|
||||
makeWrapper,
|
||||
@@ -18,7 +18,10 @@
|
||||
udev,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
let
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "atlauncher";
|
||||
version = "3.4.38.0";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"owner": "advplyr",
|
||||
"repo": "audiobookshelf",
|
||||
"rev": "22f85d3af9815f4946eeeb2218d532cf5f543da8",
|
||||
"hash": "sha256-GAHl9QKs6O01wtt5ajSKwkIOc1VdM76cpw2MRdaC17M=",
|
||||
"version": "2.17.1",
|
||||
"depsHash": "sha256-ijFY/sp0P3Ya1076ZfIA8g+3tz0jvXBwKWGGr7Bw2+M=",
|
||||
"clientDepsHash": "sha256-by2LpKAfyyteBywTWiWZFufKerb39Jqzz+zsjl3f/bk="
|
||||
"rev": "f850db23fe37dfe5044c2f5f641931528b291bf2",
|
||||
"hash": "sha256-iboQnPmWIk/bYjEF+opjKU+XJVSD5DGCfqp6BJQRW3w=",
|
||||
"version": "2.17.2",
|
||||
"depsHash": "sha256-W56EG5SCiAcjHhR5WR1UBY9Xt0D0p8duEiUzx+luLfc=",
|
||||
"clientDepsHash": "sha256-gEgd2PCFWqNuRXhnFZylGS0GTMJUD0KeHbRgYxMUMPM="
|
||||
}
|
||||
|
||||
@@ -14,12 +14,6 @@ stdenv.mkDerivation rec {
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
dpkg-deb -x $src .
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl "${perl}/bin/perl"
|
||||
|
||||
@@ -64,8 +64,6 @@ stdenv.mkDerivation rec {
|
||||
udev
|
||||
];
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents";
|
||||
|
||||
dontBuild = true;
|
||||
dontStrip = true;
|
||||
dontWrapGApps = true;
|
||||
|
||||
@@ -189,12 +189,6 @@ stdenv.mkDerivation {
|
||||
adwaita-icon-theme
|
||||
];
|
||||
|
||||
unpackPhase =
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
"dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"
|
||||
else
|
||||
"unzip $src";
|
||||
|
||||
installPhase =
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -38,8 +38,6 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-N5VCBZLFrfw29QjjzlSvQ12urvyaf7ez/RJ08UwqHdk=";
|
||||
};
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
patches = [
|
||||
# The brother lpdwrapper uses a temporary file to convey the printer settings.
|
||||
# The original settings file will be copied with "400" permissions and the "brprintconflsr3"
|
||||
|
||||
@@ -2,27 +2,31 @@
|
||||
fetchPypi,
|
||||
lib,
|
||||
python3,
|
||||
xorg,
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "Exegol";
|
||||
version = "4.3.1";
|
||||
pname = "exegol";
|
||||
version = "4.3.8";
|
||||
format = "setuptools";
|
||||
|
||||
# Project has no unit tests
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pyyaml
|
||||
gitpython
|
||||
docker
|
||||
requests
|
||||
rich
|
||||
argcomplete
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
with python3.pkgs;
|
||||
[
|
||||
pyyaml
|
||||
gitpython
|
||||
docker
|
||||
requests
|
||||
rich
|
||||
argcomplete
|
||||
]
|
||||
++ [ xorg.xhost ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cMbMmkG52A104iHVwe+6k1Fazi7fISeU/doWJqw5Whw=";
|
||||
hash = "sha256-x2kIQOwbokJ0/uOafWZp0X67FmuEjF0WvI4D4jCLWnk=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@@ -39,6 +43,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
changelog = "https://github.com/ThePorgs/Exegol/releases/tag/${version}";
|
||||
license = licenses.gpl3Only;
|
||||
mainProgram = "exegol";
|
||||
maintainers = with maintainers; [ _0b11stan ];
|
||||
maintainers = with maintainers; [
|
||||
_0b11stan
|
||||
charB66
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,9 +16,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
curlOpts = "--user-agent Mozilla/5.0"; # HTTP 410 otherwise
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
unpackCmd = "dpkg-deb -x $curSrc .";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flashmq";
|
||||
version = "1.17.3";
|
||||
version = "1.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halfgaar";
|
||||
repo = "FlashMQ";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AL3jkmz+LLg8apyMkemQugFrZpn5f1sJEskjEiZ5/PQ=";
|
||||
hash = "sha256-sr3gKCovw5bhX9WsuiHQxwq/SaoLHOPCoNjtSop8ka8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake installShellFiles ];
|
||||
|
||||
@@ -11,11 +11,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ dpkg qt5.wrapQtAppsHook autoPatchelfHook ];
|
||||
|
||||
unpackCmd = ''
|
||||
mkdir -p root
|
||||
dpkg-deb -x $curSrc root
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.62.0";
|
||||
version = "2.63.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1nJCI+MLqZnEeXXHYI/GbZoPqIuIyQO5kFkPiLN+Y6I=";
|
||||
hash = "sha256-r60mqFMvgZ39hBjehHrjqDsCzznyQDcXJmqIrn62Jvw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-b8HO4mevQcfX/VpJv1ZefXWAeXyhsy6074fvVNoH/8Y=";
|
||||
vendorHash = "sha256-vdyArSBBF6ImYbwzAJCWbLihCtJuvxN6ooymwj32ywQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gk-cli";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = (
|
||||
finalAttrs.passthru.sources.${stdenv.system}
|
||||
@@ -50,47 +50,47 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
{
|
||||
armv6l-linux = fetchzip {
|
||||
url = "${base_url}Linux_arm6.zip";
|
||||
hash = "sha256-1e+TeZLSYZjlyHV+KzasysAiWREy6ayuvmllmfZ3f90=";
|
||||
hash = "sha256-pnEFTkx1JSmQlniVCXvIB6xGD8XyDh9OLDU0V9AZBTs=";
|
||||
stripRoot = false;
|
||||
};
|
||||
armv7l-linux = fetchzip {
|
||||
url = "${base_url}Linux_arm7.zip";
|
||||
hash = "sha256-phhfxDgfzHTVA5OexY6aTUNIuW/+3tn0Q2+el3Tu9Os=";
|
||||
hash = "sha256-qj0++i698s4ELKHU9B2sGIqf9hUJip4+2Car+brkRkM=";
|
||||
stripRoot = false;
|
||||
};
|
||||
aarch64-linux = fetchzip {
|
||||
url = "${base_url}Linux_arm64.zip";
|
||||
hash = "sha256-VvhbgvxCZBeJVYjjM/n6vr+xzQdolkZngzaU4Te3DbI=";
|
||||
hash = "sha256-vHGhlRHbk2/s3YmBdOPDbalEydpQVFkHiCkBVywa4N0=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_32-linux = fetchzip {
|
||||
url = "${base_url}Linux_i386.zip";
|
||||
hash = "sha256-pTUNXRqWKPyyKMzJl+pIStVKpepcSX1ZdAxN39q2eZc=";
|
||||
hash = "sha256-t+P9SpS9u/17kga74kbYjD6nkjiFusyIwCRGDnkP3tU=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-linux = fetchzip {
|
||||
url = "${base_url}Linux_x86_64.zip";
|
||||
hash = "sha256-bs/p15HaWV+XWuERmmih9n2lhI0OZivu97gnFiMCrzQ=";
|
||||
hash = "sha256-O6T27edHi20ZFHiNaZKdk/5dtCn2Tpxm0PR934SRwFk=";
|
||||
stripRoot = false;
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "${base_url}macOS_arm64.zip";
|
||||
hash = "sha256-BD9hefbkXbNzjdeoOqQ4RMgzIXdBt/3z1T0H55sTsP0=";
|
||||
hash = "sha256-LW2K+aveJiyYqfga2jpF3DvvFeHJuozqbc/afgtq2Oc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "${base_url}macOS_x86_64.zip";
|
||||
hash = "sha256-6L0eghJwCLZKDh2G/IKv9g1whSWLQbpj+AozumUkm2M=";
|
||||
hash = "sha256-1w8B4YWouVViTGoUh987pPQIoqdzB0S+M2bBiRI6Kfg=";
|
||||
stripRoot = false;
|
||||
};
|
||||
i686-windows = fetchzip {
|
||||
url = "${base_url}Windows_i386.zip";
|
||||
hash = "sha256-ZxTOhJbPUjIoDwWIHrEKBBAd3LedJRwoolSZi0h79k8=";
|
||||
hash = "sha256-t81/wK1weZ/uEZ5TzivylARTUqks9rLIG7WzeoWXb1k=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-windows = fetchzip {
|
||||
url = "${base_url}Windows_x86_64.zip";
|
||||
hash = "sha256-DWBzXQj1+/PKQzvI/R7gkLQz0rLz2h9x+nkPOXOtcyk=";
|
||||
hash = "sha256-9yydDMI9Gz/OswRhJHF+2c3Ia0zDmXMbf7byj6PJe24=";
|
||||
stripRoot = false;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "golangci-lint";
|
||||
version = "1.62.0";
|
||||
version = "1.62.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9CT9+8wBjXflIYPtqTTMKaPySpDYGa0yUAhApcLIQ1k=";
|
||||
hash = "sha256-8Itq4tWqJa9agGcPoQaJoQOgy/qhhegzPORDztS9T30=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-U79OfGm5EPuB8yTxLSLQKIBHuj/zzO4p5pXlvs+pVrU=";
|
||||
vendorHash = "sha256-SEoF+k7MYYq81v9m3eaDbIv1k9Hek5iAZ0TTJEgAsI4=";
|
||||
|
||||
subPackages = [ "cmd/golangci-lint" ];
|
||||
|
||||
|
||||
@@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper dpkg ];
|
||||
|
||||
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
|
||||
glib-networking
|
||||
];
|
||||
|
||||
unpackCmd = "dpkg-deb -x $curSrc source";
|
||||
|
||||
installPhase = ''
|
||||
mv usr $out
|
||||
mv $out/bin/holochain-launcher-${prerelease} $out/bin/holochain-launcher
|
||||
|
||||
@@ -1,21 +1,22 @@
|
||||
{ lib
|
||||
, cmake
|
||||
, cppzmq
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, glm
|
||||
, gtkmm3
|
||||
, libarchive
|
||||
, libepoxy
|
||||
, libgit2
|
||||
, librsvg
|
||||
, libuuid
|
||||
, meson
|
||||
, ninja
|
||||
, opencascade-occt_7_6
|
||||
, pkg-config
|
||||
, podofo
|
||||
, sqlite
|
||||
{
|
||||
lib,
|
||||
cmake,
|
||||
cppzmq,
|
||||
curl,
|
||||
fetchFromGitHub,
|
||||
glm,
|
||||
gtkmm3,
|
||||
libarchive,
|
||||
libepoxy,
|
||||
libgit2,
|
||||
librsvg,
|
||||
libuuid,
|
||||
meson,
|
||||
ninja,
|
||||
opencascade-occt_7_6,
|
||||
pkg-config,
|
||||
podofo,
|
||||
sqlite,
|
||||
}:
|
||||
let
|
||||
opencascade-occt = opencascade-occt_7_6;
|
||||
@@ -54,13 +55,22 @@ rec {
|
||||
sqlite
|
||||
];
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-fpermissive"
|
||||
];
|
||||
};
|
||||
|
||||
CASROOT = opencascade-occt;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Free EDA software to develop printed circuit boards";
|
||||
homepage = "https://horizon-eda.org";
|
||||
maintainers = with maintainers; [ guserav jue89 ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
guserav
|
||||
jue89
|
||||
];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,17 +1,25 @@
|
||||
{ stdenv
|
||||
, boost
|
||||
, callPackage
|
||||
, coreutils
|
||||
, libspnav
|
||||
, python3
|
||||
, wrapGAppsHook3
|
||||
{
|
||||
stdenv,
|
||||
boost,
|
||||
callPackage,
|
||||
coreutils,
|
||||
libspnav,
|
||||
python3,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
let
|
||||
base = callPackage ./base.nix { };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (base) pname version src meta CASROOT;
|
||||
inherit (base)
|
||||
pname
|
||||
version
|
||||
src
|
||||
meta
|
||||
CASROOT
|
||||
env
|
||||
;
|
||||
|
||||
# provide base for python module
|
||||
passthru = {
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
, nukeReferences
|
||||
, git
|
||||
, nlohmann_json
|
||||
, docbook_xsl
|
||||
, openssh
|
||||
, openldap
|
||||
, gnused
|
||||
@@ -35,13 +34,14 @@
|
||||
, cdrkit
|
||||
, pixz
|
||||
, boost
|
||||
, autoreconfHook
|
||||
, mdbook
|
||||
, foreman
|
||||
, python3
|
||||
, libressl
|
||||
, cacert
|
||||
, glibcLocales
|
||||
, meson
|
||||
, ninja
|
||||
, fetchFromGitHub
|
||||
, nixosTests
|
||||
, unstableGitUpdater
|
||||
@@ -81,6 +81,7 @@ let
|
||||
DigestSHA1
|
||||
EmailMIME
|
||||
EmailSender
|
||||
FileCopyRecursive
|
||||
FileLibMagic
|
||||
FileSlurper
|
||||
FileWhich
|
||||
@@ -124,15 +125,17 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hydra";
|
||||
version = "0-unstable-2024-10-24";
|
||||
version = "0-unstable-2024-11-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "hydra";
|
||||
rev = "f974891c76e295240017dd7f04d50ecb4b70284e";
|
||||
hash = "sha256-xVSu4ZNdlOEh2KcloDvhVeiFSYgk22W5fDvQlwn+kbE=";
|
||||
rev = "e75a4cbda86eed897ac853b256c8fd10829bc7e0";
|
||||
hash = "sha256-CCiBM7jV/zLegMizyfRETiYE8XYMEqzPXFAWPwjjMFc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
buildInputs = [
|
||||
unzip
|
||||
libpqxx
|
||||
@@ -177,7 +180,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
);
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
meson
|
||||
ninja
|
||||
makeWrapper
|
||||
pkg-config
|
||||
mdbook
|
||||
@@ -193,10 +197,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
openldap
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-pthread";
|
||||
OPENLDAP_ROOT = openldap;
|
||||
};
|
||||
|
||||
@@ -205,10 +206,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
mesonBuildType = "release";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs .
|
||||
export LOGNAME=''${LOGNAME:-foo}
|
||||
# set $HOME for bzr so it can create its trace file
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
@@ -24,12 +24,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir pkg
|
||||
dpkg-deb -x $src pkg
|
||||
sourceRoot=pkg
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
mv opt "$out/"
|
||||
|
||||
@@ -131,12 +131,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libsForQt5.quazip
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
dpkg-deb -x $src .
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -19,14 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-permissions --no-same-owner
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -46,14 +46,6 @@ let
|
||||
libthai
|
||||
] ++ (with libsForQt5; [ qt5.qtvirtualkeyboard ]);
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-permissions --no-same-owner
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-UPkUwZV3NIeVfL3yYvqOhm4X5xW+40GOlZGy8WGhYmk=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $src .";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ jdk ];
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gradle,
|
||||
gradle_8,
|
||||
jdk,
|
||||
quark-engine,
|
||||
makeBinaryWrapper,
|
||||
@@ -11,7 +11,10 @@
|
||||
copyDesktopItems,
|
||||
desktopToDarwinBundle,
|
||||
}:
|
||||
|
||||
let
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jadx";
|
||||
version = "1.5.0";
|
||||
|
||||
@@ -15,8 +15,6 @@ stdenv.mkDerivation {
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
unpackCmd = "dpkg-deb -x $src debcontents";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
substituteInPlace usr/share/${pname}/${pname}.sh \
|
||||
|
||||
@@ -112,14 +112,11 @@ else
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
wrapGAppsHook3
|
||||
dpkg
|
||||
];
|
||||
|
||||
buildInputs = libraries;
|
||||
|
||||
unpackPhase = ''
|
||||
${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
nativeBuildInputs = [ makeWrapper dpkg ];
|
||||
buildInputs = [
|
||||
glib
|
||||
@@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
|
||||
sdcv
|
||||
SDL2
|
||||
];
|
||||
unpackCmd = "dpkg-deb -x ${src} .";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
@@ -4,13 +4,15 @@
|
||||
fetchgit,
|
||||
python3,
|
||||
jdk17_headless,
|
||||
gradle,
|
||||
gradle_8,
|
||||
makeWrapper,
|
||||
postgresql,
|
||||
postgresqlTestHook,
|
||||
}:
|
||||
let
|
||||
customPython = python3.withPackages (p: [ p.setuptools ]);
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libeufin";
|
||||
|
||||
@@ -65,10 +65,10 @@ let
|
||||
else
|
||||
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ dpkg ];
|
||||
|
||||
unpackPhase = "dpkg-deb -x ${src} ./";
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
@@ -27,11 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-roD/bKv1N2sru/tZ6Zl1J2AyY1mgj2ssB2a42kwBNHM=";
|
||||
};
|
||||
|
||||
unpackCmd = ''
|
||||
mkdir -p root
|
||||
dpkg-deb -x $src root
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
libgcc
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
fetchFromGitHub,
|
||||
gradle,
|
||||
gradle_8,
|
||||
jdk17,
|
||||
zenity,
|
||||
|
||||
@@ -43,6 +43,8 @@ let
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
jdk = jdk17;
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
|
||||
Mindustry = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "mitimasu";
|
||||
version = "0-unstable-2023-10-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kemomimi-no-sato";
|
||||
repo = "mitimasu-webfont";
|
||||
rev = "6798f7a192d5c60adf75a3d32184057b8579e3c5";
|
||||
hash = "sha256-yiAnIVZY9DoIborO/s2KSlt6Zq1kAjKewLd30qBQqio=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m444 -Dt $out/share/fonts/truetype fonts/mitimasu.ttf
|
||||
install -m444 -Dt $out/share/fonts/eot fonts/mitimasu.eot
|
||||
install -m444 -Dt $out/share/fonts/woff fonts/mitimasu.woff
|
||||
install -m444 -Dt $out/share/fonts/woff2 fonts/mitimasu.woff2
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Mitimasu webfont";
|
||||
homepage = "https://github.com/kemomimi-no-sato/mitimasu-webfont";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ istudyatuni ];
|
||||
};
|
||||
}
|
||||
@@ -9,11 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1k6b1hn8lc4rj9n036imsl7s9lqj6ny3acdhnbnamsdkkndmxrw7";
|
||||
};
|
||||
|
||||
buildInputs = [ dpkg ];
|
||||
|
||||
unpackCmd = ''
|
||||
dpkg-deb -x "$src" source
|
||||
'';
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
installPhase = ''
|
||||
sed -i "s|/lib/molly-guard|${systemd}/sbin|g" lib/molly-guard/molly-guard
|
||||
|
||||
@@ -2,12 +2,15 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gradle,
|
||||
gradle_8,
|
||||
makeWrapper,
|
||||
jdk,
|
||||
gsettings-desktop-schemas,
|
||||
}:
|
||||
|
||||
let
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mucommander";
|
||||
version = "1.5.2-1";
|
||||
|
||||
@@ -91,7 +91,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "14.0";
|
||||
version = "14.0.3";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -103,7 +103,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-D5r1VsbjaswGm5ncgdSIOJFfDMXBZX2JDGcTTRVkoVs=";
|
||||
hash = "sha256-Kv69Q6o/Ww64yA8y5J3JXIV48A2B08YhNE9ib/UuA0o=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
openjdk,
|
||||
gradle,
|
||||
gradle_8,
|
||||
wget,
|
||||
which,
|
||||
gnused,
|
||||
@@ -14,6 +14,10 @@
|
||||
testers,
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nextflow";
|
||||
# 24.08.0-edge is compatible with Java 21. The current (as of 2024-09-19)
|
||||
|
||||
@@ -9,12 +9,13 @@
|
||||
meson,
|
||||
ninja,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
}: let
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluskript";
|
||||
repo = "nix-inspect";
|
||||
rev = "86f636b1e01579b3a63b2c778c21a818b00c3d1e";
|
||||
hash = "sha256-G5Md4ghux4LBRkPE8vzLTUWxzlQ7s1xKxZ8i3ICWZU8=";
|
||||
rev = "c55921e1d1cf980ff6351273fde6cedd5d8fa320";
|
||||
hash = "sha256-Upz+fnWJjzt5WokjO/iaiPbqiwSrqpWjrpcFOqQ4p0E=";
|
||||
};
|
||||
|
||||
workerPackage = stdenv.mkDerivation {
|
||||
@@ -22,14 +23,24 @@
|
||||
|
||||
pname = "nix-inspect-worker";
|
||||
version = "0.1.2";
|
||||
sourceRoot = "${src.name}/worker";
|
||||
postPatch = ''
|
||||
cd worker
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [meson ninja pkg-config];
|
||||
|
||||
# TODO: Remove this patch when this pull request is merged and released: https://github.com/bluskript/nix-inspect/pull/18
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/bluskript/nix-inspect/commit/e1e05883d42ce0c7029a3d69dce14ae9d057aae6.patch";
|
||||
sha256 = "sha256-bHo+sRc9pICK0ccdiWLRNNvr8QjNCrlcwMvmUHznAtg=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
nlohmann_json
|
||||
nixVersions.nix_2_19.dev
|
||||
nixVersions.nix_2_24.dev
|
||||
];
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
@@ -74,7 +74,6 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
latest = localRepoCheck nixVersions.latest;
|
||||
git = localRepoCheck nixVersions.git;
|
||||
nix_2_18 = localRepoCheck nixVersions.nix_2_18;
|
||||
nix_2_19 = localRepoCheck nixVersions.nix_2_19;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -120,10 +120,6 @@ let
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
fetchpatch2,
|
||||
|
||||
gradle,
|
||||
gradle_8,
|
||||
gradle_7,
|
||||
perl,
|
||||
pkg-config,
|
||||
@@ -57,7 +57,7 @@ let
|
||||
atLeast21 = lib.versionAtLeast featureVersion "21";
|
||||
atLeast23 = lib.versionAtLeast featureVersion "23";
|
||||
|
||||
gradle_openjfx = if atLeast23 then gradle else gradle_7;
|
||||
gradle_openjfx = if atLeast23 then gradle_8 else gradle_7;
|
||||
in
|
||||
|
||||
assert lib.assertMsg (lib.pathExists sourceFile)
|
||||
|
||||
@@ -58,8 +58,6 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-PBbozIdA+cfEzGIyL1P+25FZtrnd7ldctOtZYomKd/8=";
|
||||
};
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
fetchurl
|
||||
{
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/Future-Scholars/peperlib/releases/download/release-electron-${version}/Paperlib_${version}.dmg";
|
||||
url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.dmg";
|
||||
hash = "sha256-d9vEFx59K15PO7DJYJQ2fjiagqa8oJLtoawILDF9IKc=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
@@ -49,6 +49,8 @@ if stdenv.hostPlatform.isDarwin then
|
||||
passthru
|
||||
;
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitLab, gradle, jre, runtimeShell }:
|
||||
|
||||
{ lib, stdenv, fetchFromGitLab, gradle_8, jre, runtimeShell }:
|
||||
let
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdftk";
|
||||
version = "3.3.3";
|
||||
|
||||
@@ -29,8 +29,7 @@ let
|
||||
src = fetchurl { inherit (sources.libpicoipp) url sha256; };
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook ];
|
||||
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
|
||||
sourceRoot = ".";
|
||||
unpackCmd = "dpkg-deb -x $src .";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/lib
|
||||
@@ -57,8 +56,6 @@ let
|
||||
src = fetchurl { inherit url sha256; };
|
||||
# picoscope does a signature check, so we can't patchelf these
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
sourceRoot = ".";
|
||||
unpackCmd = "dpkg-deb -x $src .";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/lib
|
||||
@@ -82,8 +79,6 @@ in stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
buildInputs = [ gtk-sharp-3_0 mono glib libusb1 zlib ];
|
||||
|
||||
unpackCmd = "dpkg-deb -x $src .";
|
||||
sourceRoot = ".";
|
||||
scopeLibs = lib.attrVals (map (x: "lib${x}") scopes) scopePkgs;
|
||||
MONO_PATH = "${gtk-sharp-3_0}/lib/mono/gtk-sharp-3.0:" + (lib.makeLibraryPath
|
||||
([
|
||||
|
||||
@@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -93,8 +93,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl libnghttp2 ];
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -87,10 +87,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl libnghttp2 ];
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x $src .
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/polar-bookshelf $out/bin $out/lib
|
||||
mv opt/Polar\ Bookshelf/* $out/share/polar-bookshelf
|
||||
|
||||
@@ -41,7 +41,6 @@ stdenv.mkDerivation {
|
||||
[ makeShellWrapper ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
dpkg
|
||||
gtk3
|
||||
libglvnd
|
||||
libxkbcommon
|
||||
@@ -62,6 +61,7 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
_7zz
|
||||
@@ -72,8 +72,6 @@ stdenv.mkDerivation {
|
||||
(lib.getLib systemd)
|
||||
];
|
||||
|
||||
postUnpack = lib.optionalString stdenv.hostPlatform.isLinux ''dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-owner'';
|
||||
|
||||
installPhase =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
''
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "rectangle";
|
||||
version = "0.84";
|
||||
version = "0.85";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
|
||||
hash = "sha256-W09un/7gkKvYUQZtkZMJLeuZHpbQLfvfYm20NSK4oBg=";
|
||||
hash = "sha256-TBUC5z2BZMt0eb9NAD3/y9y23iRzs7YRJSfyb3QN1Mc=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
python3.pkgs.toPythonModule (
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "0-unstable-2024-11-17";
|
||||
version = "0-unstable-2024-11-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "searxng";
|
||||
repo = "searxng";
|
||||
rev = "10d3af84b833ab2f2d1095efa3a7ba240ffb32fc";
|
||||
hash = "sha256-dXALuiPCzK0Az64Fj9ygsNFoPKf0oJ2LyZDeg00Bfyo=";
|
||||
rev = "bad070b4bc2c5afa73edea546c68d3e142a476fc";
|
||||
hash = "sha256-pJl0pD+lx1L7CMKEZaK15ahd96gwWKsR53EVF7RRNtY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/==.*$//' requirements.txt
|
||||
sed -i 's/==/>=/' requirements.txt
|
||||
'';
|
||||
|
||||
preBuild =
|
||||
@@ -44,16 +44,17 @@ python3.pkgs.toPythonModule (
|
||||
with python3.pkgs;
|
||||
[
|
||||
babel
|
||||
brotli
|
||||
certifi
|
||||
python-dateutil
|
||||
fasttext-predict
|
||||
flask
|
||||
flask-babel
|
||||
brotli
|
||||
isodate
|
||||
jinja2
|
||||
lxml
|
||||
msgspec
|
||||
pygments
|
||||
python-dateutil
|
||||
pyyaml
|
||||
redis
|
||||
typer
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused,
|
||||
gradle, git, makeWrapper, jre_minimal
|
||||
gradle_8, git, makeWrapper, jre_minimal
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -32,6 +32,9 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||
gradle = gradle_8;
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname src version;
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ buildEnv {
|
||||
done
|
||||
'';
|
||||
|
||||
meta = snis-unwrapped // {
|
||||
meta = snis-unwrapped.meta // {
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -115,14 +115,6 @@ else
|
||||
gst_all_1.gstreamer
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
dpkg-deb -x $src .
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim
|
||||
index 16688680..fcafd6f7 100644
|
||||
--- a/autoload/SpaceVim.vim
|
||||
+++ b/autoload/SpaceVim.vim
|
||||
@@ -1355,13 +1355,6 @@ function! SpaceVim#end() abort
|
||||
let &helplang = 'jp'
|
||||
endif
|
||||
""
|
||||
- " generate tags for SpaceVim
|
||||
- let help = fnamemodify(g:_spacevim_root_dir, ':p:h') . '/doc'
|
||||
- try
|
||||
- exe 'helptags ' . help
|
||||
- catch
|
||||
- call SpaceVim#logger#warn('Failed to generate helptags for SpaceVim')
|
||||
- endtry
|
||||
|
||||
""
|
||||
" set language
|
||||
@@ -1,26 +1,21 @@
|
||||
{ ripgrep
|
||||
, git
|
||||
, fzf
|
||||
, makeWrapper
|
||||
, vim-full
|
||||
, vimPlugins
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, stdenv
|
||||
, formats
|
||||
, runCommand
|
||||
, spacevim_config ? import ./init.nix
|
||||
{
|
||||
fetchFromGitHub,
|
||||
formats,
|
||||
fzf,
|
||||
git,
|
||||
lib,
|
||||
makeWrapper,
|
||||
neovim,
|
||||
nix-update-script,
|
||||
ripgrep,
|
||||
runCommand,
|
||||
stdenv,
|
||||
vim-full,
|
||||
spacevim_config ? import ./init.nix,
|
||||
}:
|
||||
|
||||
let
|
||||
format = formats.toml { };
|
||||
vim-customized = vim-full.customize {
|
||||
name = "vim";
|
||||
# Not clear at the moment how to import plugins such that
|
||||
# SpaceVim finds them and does not auto download them to
|
||||
# ~/.cache/vimfiles/repos
|
||||
vimrcConfig.packages.myVimPackage = with vimPlugins; { start = [ ]; };
|
||||
};
|
||||
spacevimdir = runCommand "SpaceVim.d" { } ''
|
||||
mkdir -p $out
|
||||
cp ${format.generate "init.toml" spacevim_config} $out/init.toml
|
||||
@@ -28,28 +23,16 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spacevim";
|
||||
version = "1.8.0";
|
||||
version = "2.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpaceVim";
|
||||
repo = "SpaceVim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:11snnh5q47nqhzjb9qya6hpnmlzc060958whqvqrh4hc7gnlnqp8";
|
||||
hash = "sha256-MHsAA0x/rfwRupe8aW1JVKGiYkySAX0AhOkBuScpn7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper vim-customized ];
|
||||
buildInputs = [ vim-customized ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
# generate the helptags
|
||||
vim -u NONE -c "helptags $(pwd)/doc" -c q
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Don't generate helptags at runtime into read-only $SPACEVIMDIR
|
||||
./helptags.patch
|
||||
];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@@ -58,21 +41,42 @@ stdenv.mkDerivation rec {
|
||||
cp -r $(pwd) $out/SpaceVim
|
||||
|
||||
# trailing slash very important for SPACEVIMDIR
|
||||
makeWrapper "${vim-customized}/bin/vim" "$out/bin/spacevim" \
|
||||
makeWrapper "${vim-full}/bin/vim" "$out/bin/spacevim" \
|
||||
--add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \
|
||||
--prefix PATH : ${lib.makeBinPath [ fzf git ripgrep]}
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
fzf
|
||||
git
|
||||
ripgrep
|
||||
]
|
||||
}
|
||||
makeWrapper "${neovim}/bin/nvim" "$out/bin/spacenvim" \
|
||||
--add-flags "-u $out/SpaceVim/init.vim" --set SPACEVIMDIR "${spacevimdir}/" \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
fzf
|
||||
git
|
||||
ripgrep
|
||||
]
|
||||
}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern Vim distribution";
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Modular Vim/Neovim configuration";
|
||||
longDescription = ''
|
||||
SpaceVim is a distribution of the Vim editor that’s inspired by spacemacs.
|
||||
SpaceVim is a modular configuration of Vim and Neovim. It's inspired by
|
||||
spacemacs. It manages collections of plugins in layers, which help to
|
||||
collect related packages together to provide features. This approach
|
||||
helps keep the configuration organized and reduces overhead for the user
|
||||
by keeping them from having to think about what packages to install.
|
||||
'';
|
||||
homepage = "https://spacevim.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.fzakaria ];
|
||||
platforms = platforms.all;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.perchun ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "spacevim";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
unpackCmd = ''
|
||||
dpkg-deb -x ${src} ./sslmate-agent-${pname}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user