mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-10 16:45:51 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
6458cb74a2
@ -20,7 +20,7 @@ let
|
||||
''
|
||||
else
|
||||
pkgs.writeText "ntopng.conf" ''
|
||||
${concatStringsSep " " (map (e: "--interface=" + e) cfg.interfaces)}
|
||||
${concatStringsSep "\n" (map (e: "--interface=${e}") cfg.interfaces)}
|
||||
--http-port=${toString cfg.httpPort}
|
||||
--redis=${cfg.redis.address}
|
||||
--data-dir=/var/lib/ntopng
|
||||
|
||||
29
pkgs/applications/misc/colorstorm/default.nix
Normal file
29
pkgs/applications/misc/colorstorm/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, zigHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "colorstorm";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benbusby";
|
||||
repo = "colorstorm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6+P+QQpP1jxsydqhVrZkjl1gaqNcx4kS2994hOBhtu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
zigHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A color theme generator for editors and terminal emulators";
|
||||
homepage = "https://github.com/benbusby/colorstorm";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
inherit (zigHook.meta) platforms;
|
||||
};
|
||||
})
|
||||
@ -1,66 +1,60 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, pkg-config
|
||||
, zig
|
||||
, makeWrapper
|
||||
, busybox
|
||||
, curl
|
||||
, SDL2
|
||||
, SDL2_gfx
|
||||
, SDL2_image
|
||||
, SDL2_ttf
|
||||
, busybox
|
||||
, curl
|
||||
, findutils
|
||||
, jq
|
||||
, ncurses
|
||||
, gnome
|
||||
, xorg
|
||||
, util-linux
|
||||
, gpsd
|
||||
, geoclue2-with-demo-agent
|
||||
, gpsd
|
||||
, jq
|
||||
, makeWrapper
|
||||
, ncurses
|
||||
, pkg-config
|
||||
, util-linux
|
||||
, xwininfo
|
||||
, zenity
|
||||
, zigHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mepo";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~mil";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "mepo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-OIZ617QLjiTiDwcsn0DnRussYtjDkVyifr2mdSqA98A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config zig makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
curl SDL2 SDL2_gfx SDL2_image SDL2_ttf jq ncurses
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
zigHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
buildInputs = [
|
||||
curl
|
||||
SDL2
|
||||
SDL2_gfx
|
||||
SDL2_image
|
||||
SDL2_ttf
|
||||
jq
|
||||
ncurses
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
zig build test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
zig build -Drelease-safe=true -Dcpu=baseline --prefix $out install
|
||||
install -d $out/share/man/man1
|
||||
$out/bin/mepo -docman > $out/share/man/man1/mepo.1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -d $out/share/man/man1
|
||||
$out/bin/mepo -docman > $out/share/man/man1/mepo.1
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/bin/mepo_ui_menu_user_pin_updater.sh \
|
||||
--replace /usr/libexec/geoclue-2.0 ${geoclue2-with-demo-agent}/libexec/geoclue-2.0
|
||||
substituteInPlace $out/bin/mepo_ui_central_menu.sh \
|
||||
@ -68,19 +62,37 @@ stdenv.mkDerivation rec {
|
||||
--replace " ls " " ls -a " #circumvent wrapping for script detection
|
||||
for program in $out/bin/* ; do
|
||||
wrapProgram $program \
|
||||
--suffix PATH : $out/bin:${lib.makeBinPath ([ jq ncurses curl busybox findutils util-linux gpsd gnome.zenity xorg.xwininfo ])}
|
||||
--suffix PATH : $out/bin:${lib.makeBinPath ([
|
||||
busybox
|
||||
curl
|
||||
findutils
|
||||
gpsd
|
||||
jq
|
||||
ncurses
|
||||
util-linux
|
||||
xwininfo
|
||||
zenity
|
||||
])}
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://mepo.milesalan.com";
|
||||
description = "Fast, simple, and hackable OSM map viewer";
|
||||
longDescription = ''
|
||||
It is recommended to use the corresponding NixOS module.
|
||||
Mepo is a fast, simple, and hackable OSM map viewer for desktop & mobile
|
||||
Linux devices (like the PinePhone, Librem 5, postmarketOS devices etc.)
|
||||
and both environment's various user interfaces (Wayland & X
|
||||
inclusive). Environments supported include Phosh, Sxmo, Plasma Mobile,
|
||||
desktop X, and desktop Wayland. Mepo works both offline and online,
|
||||
features a minimalist both touch/mouse and keyboard compatible interface,
|
||||
and offers a UNIX-philosophy inspired underlying design, exposing a
|
||||
powerful command language called Mepolang capable of being scripted to
|
||||
provide things like custom bounding-box search scripts, bookmarks, and
|
||||
more.
|
||||
'';
|
||||
|
||||
homepage = "https://mepo.milesalan.com";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ sikmir McSinyx laalsaas ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ sikmir McSinyx laalsaas ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,49 +1,47 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, zig
|
||||
, pkg-config
|
||||
, river
|
||||
, wayland
|
||||
, pkg-config
|
||||
, zigHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rivercarro";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~novakane";
|
||||
repo = pname;
|
||||
repo = "rivercarro";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eATbbwIt5ytEVLPodyq9vFF9Rs5S1xShpvNYQnfwdV4=";
|
||||
hash = "sha256-eATbbwIt5ytEVLPodyq9vFF9Rs5S1xShpvNYQnfwdV4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
river
|
||||
wayland
|
||||
zig
|
||||
zigHook
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
zig build -Drelease-safe -Dcpu=baseline --prefix $out install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://git.sr.ht/~novakane/rivercarro";
|
||||
description = "A layout generator for river Wayland compositor, fork of rivertile";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ kraem ];
|
||||
};
|
||||
}
|
||||
longDescription = ''
|
||||
A slightly modified version of rivertile layout generator for river.
|
||||
|
||||
Compared to rivertile, rivercarro adds:
|
||||
- Monocle layout, views will takes all the usable area on the screen.
|
||||
- Gaps instead of padding around views or layout area.
|
||||
- Modify gaps size at runtime.
|
||||
- Smart gaps, if there is only one view, gaps will be disable.
|
||||
- Limit the width of the usable area of the screen.
|
||||
'';
|
||||
changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kraem ];
|
||||
inherit (zigHook.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,27 +1,33 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, zig
|
||||
, wayland
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, wayland-protocols
|
||||
, libxkbcommon
|
||||
, pam
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, zigHook
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waylock";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ifreund";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0=";
|
||||
repo = "waylock";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig wayland scdoc pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
scdoc
|
||||
wayland
|
||||
zigHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wayland-protocols
|
||||
@ -29,23 +35,13 @@ stdenv.mkDerivation rec {
|
||||
pam
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
zigBuildFlags = [ "-Dman-pages" ];
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
zig build -Drelease-safe -Dman-pages -Dcpu=baseline --prefix $out install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/ifreund/waylock";
|
||||
description = "A small screenlocker for Wayland compositors";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jordanisaacs ];
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ jordanisaacs ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "timoni";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stefanprodan";
|
||||
repo = "timoni";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1l+PEG3ptlWmM48v9K7Rm090WF8cv+e2ezYFN2JRK/o=";
|
||||
hash = "sha256-o5s/3c6fi6aYzKIBKq23U6FtzueDN0WVsG/wdCMEjDU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Mgo6Q3P8Piv5uLgyXDGpRI4CgbZn1DUcM7XhVZxl8EE=";
|
||||
vendorHash = "sha256-rMLswgEWWaDupBHDXs/JATaaw4n5D+LjlM72eq8hPAM=";
|
||||
|
||||
subPackages = [ "cmd/timoni" ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "profanity";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "profanity-im";
|
||||
repo = "profanity";
|
||||
rev = version;
|
||||
hash = "sha256-A9ZgHliLb4v/3W5tm5zD0WN8mRmxLE/MUSTBXGvBCCM=";
|
||||
hash = "sha256-u/mp+vtMj602LfrulA+nhLNH8K6sqKIOuPJzhZusVmE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -9,21 +9,21 @@
|
||||
let
|
||||
appName = "LibreOffice.app";
|
||||
scriptName = "soffice";
|
||||
version = "7.4.7";
|
||||
version = "7.5.5";
|
||||
|
||||
dist = {
|
||||
aarch64-darwin = rec {
|
||||
arch = "aarch64";
|
||||
archSuffix = arch;
|
||||
url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
|
||||
sha256 = "d02513c6a58f35cb0da6880f76be3f4b3a620daaa9ce5c244d6efc40ed26a273";
|
||||
sha256 = "75a7d64aa5d08b56c9d9c1c32484b9aff07268c1642cc01a03e45b7690500745";
|
||||
};
|
||||
|
||||
x86_64-darwin = rec {
|
||||
arch = "x86_64";
|
||||
archSuffix = "x86-64";
|
||||
url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
|
||||
sha256 = "c8ae0cbaa043b30718a4ac0ca93369e887fe6a46bb3618cea054bffaafd8b8e2";
|
||||
sha256 = "4aad9f08ef7a4524b85fc46b3301fdf4f5ab8ab63dd01d01c297f96ff474804a";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dataexplorer";
|
||||
version = "3.7.8";
|
||||
version = "3.7.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz";
|
||||
sha256 = "sha256-NiCtUqavYNUXsTkgi2V9u2qn8dBTLTEm52ju450d5Lw=";
|
||||
sha256 = "sha256-CdIWAde7mytXP9U1PfI9d/rFK7Agy5biIq5tMTW9RD4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant makeWrapper ];
|
||||
|
||||
@ -45,14 +45,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# LAMMPS has weird versioning converted to ISO 8601 format
|
||||
version = "23Jun2022_update4";
|
||||
version = "2Aug2023";
|
||||
pname = "lammps";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lammps";
|
||||
repo = "lammps";
|
||||
rev = "stable_${version}";
|
||||
hash = "sha256-zGztc+iUFNIa0KKtfpAhwitInvMmXeTHp1XsOLibfzM=";
|
||||
hash = "sha256-6T4YAa4iN3pJpODGPW+faR16xxyYYdkHLavtiPUbZ4o=";
|
||||
};
|
||||
preConfigure = ''
|
||||
cd cmake
|
||||
|
||||
@ -8,19 +8,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gex";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Piturnah";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-J2tmDpt4vRFgD5yfFZOdBLROvyZVEthc+MHM1Yta5jI=";
|
||||
hash = "sha256-OCC2kHPHWFwqdE0THNZbH7d3gxTBD5MUMWY6PO5GuHU";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libgit2 ];
|
||||
|
||||
cargoHash = "sha256-AsUHswR7+wMyAvOp3rkvRJvThHLH993gQ+/V38vbbNQ=";
|
||||
cargoHash = "sha256-28sMY47LAdaGmPNmxeu/w1Pn6AV3JlWbxFcit5pLkI0";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit";
|
||||
|
||||
@ -1,75 +1,91 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, zig
|
||||
, wayland
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, xwayland
|
||||
, wayland-protocols
|
||||
, wlroots_0_16
|
||||
, libxkbcommon
|
||||
, pixman
|
||||
, udev
|
||||
, libevdev
|
||||
, libinput
|
||||
, libGL
|
||||
, libX11
|
||||
, libevdev
|
||||
, libinput
|
||||
, libxkbcommon
|
||||
, pixman
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, udev
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlroots_0_16
|
||||
, xwayland
|
||||
, zigHook
|
||||
, withManpages ? true
|
||||
, xwaylandSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "river";
|
||||
version = "0.2.4";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "riverwm";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cIcO6owM6eYn+obYVaBOVQpnBx4++KOqQk5Hzo3GcNs=";
|
||||
repo = "river";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-cIcO6owM6eYn+obYVaBOVQpnBx4++KOqQk5Hzo3GcNs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig wayland xwayland scdoc pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wayland
|
||||
xwayland
|
||||
zigHook
|
||||
]
|
||||
++ lib.optional withManpages scdoc;
|
||||
|
||||
buildInputs = [
|
||||
wayland-protocols
|
||||
wlroots_0_16
|
||||
libGL
|
||||
libevdev
|
||||
libinput
|
||||
libxkbcommon
|
||||
pixman
|
||||
udev
|
||||
libevdev
|
||||
libinput
|
||||
libGL
|
||||
wayland-protocols
|
||||
wlroots_0_16
|
||||
] ++ lib.optional xwaylandSupport libX11;
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
zigBuildFlags = lib.optional withManpages "-Dman-pages"
|
||||
++ lib.optional xwaylandSupport "-Dxwayland";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
zig build -Drelease-safe -Dcpu=baseline ${lib.optionalString xwaylandSupport "-Dxwayland"} -Dman-pages --prefix $out install
|
||||
postInstall = ''
|
||||
install contrib/river.desktop -Dt $out/share/wayland-sessions
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
/* Builder patch install dir into river to get default config
|
||||
When installFlags is removed, river becomes half broken.
|
||||
See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
|
||||
*/
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
passthru.providedSessions = [ "river" ];
|
||||
|
||||
passthru.providedSessions = ["river"];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/ifreund/river/releases/tag/v${version}";
|
||||
meta = {
|
||||
homepage = "https://github.com/ifreund/river";
|
||||
description = "A dynamic tiling wayland compositor";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fortuneteller2k adamcstephens rodrgz ];
|
||||
longDescription = ''
|
||||
River is a dynamic tiling Wayland compositor with flexible runtime
|
||||
configuration.
|
||||
|
||||
Its design goals are:
|
||||
- Simple and predictable behavior, river should be easy to use and have a
|
||||
low cognitive load.
|
||||
- Window management based on a stack of views and tags.
|
||||
- Dynamic layouts generated by external, user-written executables. A
|
||||
default rivertile layout generator is provided.
|
||||
- Scriptable configuration and control through a custom Wayland protocol
|
||||
and separate riverctl binary implementing it.
|
||||
'';
|
||||
changelog = "https://github.com/ifreund/river/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
adamcstephens
|
||||
fortuneteller2k
|
||||
rodrgz
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, intltool
|
||||
@ -35,6 +36,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-2zqlfoN4L+V237cQ3PVh49YaZfNKGiLqh2JIiGJE340=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 1.2, can be dropped on next bump
|
||||
# https://github.com/linuxmint/xreader/issues/612
|
||||
(fetchpatch {
|
||||
url = "https://github.com/linuxmint/xreader/commit/06b18a884c8cf3257ea1f053a82784da078999ed.patch";
|
||||
sha256 = "sha256-+LXEW3OkfhkIcbxtvfQYjdaC18O8imOx22t91ad/XZw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
shared-mime-info
|
||||
wrapGAppsHook
|
||||
|
||||
@ -165,6 +165,10 @@
|
||||
"noannoyance@sindex.com",
|
||||
"noannoyance@daase.net"
|
||||
],
|
||||
"somafm-internet-radio": [
|
||||
"SomaFm-Radio@alireza6677.gmail.com",
|
||||
"SomaFm-Radio@cajhne.gmail.com"
|
||||
],
|
||||
"fuzzy-clock": [
|
||||
"fuzzy-clock@keepawayfromfire.co.uk",
|
||||
"FuzzyClock@johngoetz"
|
||||
@ -227,6 +231,10 @@
|
||||
"noannoyance@sindex.com",
|
||||
"noannoyance@daase.net"
|
||||
],
|
||||
"somafm-internet-radio": [
|
||||
"SomaFm-Radio@alireza6677.gmail.com",
|
||||
"SomaFm-Radio@cajhne.gmail.com"
|
||||
],
|
||||
"virtualbox-applet": [
|
||||
"vbox-applet@gs.eros2.info",
|
||||
"vbox-applet@buba98"
|
||||
|
||||
@ -64,6 +64,9 @@
|
||||
"true-color-invert@jackkenney" = "true-color-invert";
|
||||
"true-color-window-invert@lynet101" = "true-color-window-invert";
|
||||
|
||||
"SomaFm-Radio@alireza6677.gmail.com" = "somafm-internet-radio";
|
||||
"SomaFm-Radio@cajhne.gmail.com" = "somafm-internet-radio-2";
|
||||
|
||||
# ####### GNOME 41 #######
|
||||
|
||||
"floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
|
||||
@ -90,9 +93,6 @@
|
||||
"Hide_Activities@shay.shayel.org" = "hide-activities-button";
|
||||
"hide-activities-button@nmingori.gnome-shell-extensions.org" = "hide-activities-button-2";
|
||||
|
||||
"SomaFm-Radio@alireza6677.gmail.com" = "somafm-internet-radio";
|
||||
"SomaFm-Radio@cajhne.gmail.com" = "somafm-internet-radio-2";
|
||||
|
||||
"extension-list@tu.berry" = "extension-list";
|
||||
"screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,50 +1,60 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, guile
|
||||
, lzip
|
||||
, pkg-config
|
||||
, SDL
|
||||
, SDL_image
|
||||
, SDL_mixer
|
||||
, SDL_ttf
|
||||
, buildEnv
|
||||
, guile
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guile-sdl";
|
||||
version = "0.5.2";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-ATx1bnnDlj69h6ZUy7wd2lVsuDGS424sFCIlJQLQTzI=";
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.lz";
|
||||
hash = "sha256-/9sTTvntkRXck3FoRalROjqUQC8hkePtLTnHNZotKOE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
guile
|
||||
lzip
|
||||
pkg-config
|
||||
SDL
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
guile
|
||||
(lib.getDev SDL)
|
||||
SDL_image
|
||||
SDL_mixer
|
||||
SDL_ttf
|
||||
];
|
||||
|
||||
makeFlags = let
|
||||
sdl-env = buildEnv {
|
||||
name = "sdl-env";
|
||||
paths = buildInputs;
|
||||
};
|
||||
in [
|
||||
"GUILE_AUTO_COMPILE=0"
|
||||
"SDLMINUSI=-I${sdl-env}/include/SDL"
|
||||
];
|
||||
makeFlags =
|
||||
let
|
||||
sdl-env = buildEnv {
|
||||
name = "sdl-env";
|
||||
paths = buildInputs;
|
||||
};
|
||||
in
|
||||
[
|
||||
"SDLMINUSI=-I${sdl-env}/include/SDL"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/guile-sdl/";
|
||||
description = "Guile bindings for SDL";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ vyp ];
|
||||
platforms = platforms.linux;
|
||||
platforms = guile.meta.platforms;
|
||||
# configure: error: *** SDL version not found!
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gvm-libs";
|
||||
version = "22.6.3";
|
||||
version = "22.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YxM4vss528sR6uPNoUIBVvJtRF/zIepz31YMRyQu9wU=";
|
||||
hash = "sha256-Jc8qNONdlyzpCCgwhMdwG2D2CO9o0l4vH9sE+NjidE4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libstrophe";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strophe";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jT4VIqqUldCj3Rsb5MC74WXYQyTqOZxzFADf47TBV8c=";
|
||||
sha256 = "EDgdKJ7wqUoThy0t1r39p2lbn64uvTDoIqNCzhpWnZ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-keyvault";
|
||||
version = "10.2.2";
|
||||
version = "10.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-LG6oMTZepgT87KdJrwCpc4ZYEclUsEAHUitZrxFCkL4=";
|
||||
hash = "sha256-JDM6F0ToMpUeBlLULih17TLzCbrNdxrGrcq5oIfsybU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deploykit";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "numtide";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-I1vAefWQBBRNykDw38LTNwdiPFxpPkLzCcevYAXO+Zo=";
|
||||
hash = "sha256-re7r2K9F5FTTVn84WC+wZX30JA9AXQcHK3pLjYglMs8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-talisman";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IF0958Xs+tZnyEEj9fvlgLH2jNmhsFjXNTzANI4Vsb8=";
|
||||
hash = "sha256-xfSG9fVEIHKfhLPDhQzWP5bosDOpYpvuZsUk6jY3l/8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-artifact-registry";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FuuxwOMV7IB1drn5hzX7p4BwJYQCUsgnZNVR+E6XKhM=";
|
||||
hash = "sha256-kgbSwGR5ObkMbup4p4ePXnxl7uRn0nYeGCOU1LMPZSE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -35,5 +35,6 @@ buildPythonPackage rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ atemu ];
|
||||
changelog = "https://github.com/kellyjonbrazil/jc/blob/v${version}/CHANGELOG";
|
||||
mainProgram = "jc";
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pglast";
|
||||
version = "5.2";
|
||||
version = "5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zj7/WGECL5Ou4F2FdFaA3M9F92ETZbhEXbZJ628gg0o=";
|
||||
hash = "sha256-fiNd+11hqMHgzSMNT7fgne3pTeJ4nu5krA48LCgIaIQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.13.16";
|
||||
version = "8.13.18";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kncrFC6snzrrDoeVjENplqwW1GjZZkZIOZfIpXUXkzs=";
|
||||
hash = "sha256-s2DHViUoBdRLRHtbym0lDPa9bGm28PQljzv+Wrgb72k=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qiling";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MEafxry/ewqlzOMu9TJMQodXLChGMYjS2jX3yv7FZJk=";
|
||||
hash = "sha256-l3WQBlJic4lXCe5Z1FmoxaqOblE7uAaW2gG/nTn84Kc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,37 +1,33 @@
|
||||
{ stdenv, lib, fetchFromGitHub, zig }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, zigHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zls";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigtools";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-M0GG4KIMcHN+bEprUv6ISZkWNvWN12S9vqSKP+DRU9M=";
|
||||
repo = "zls";
|
||||
rev = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-M0GG4KIMcHN+bEprUv6ISZkWNvWN12S9vqSKP+DRU9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig ];
|
||||
nativeBuildInputs = [
|
||||
zigHook
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
zig build -Drelease-safe -Dcpu=baseline --prefix $out install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Zig LSP implementation + Zig Language Server";
|
||||
changelog = "https://github.com/zigtools/zls/releases/tag/${version}";
|
||||
changelog = "https://github.com/zigtools/zls/releases/tag/${finalAttrs.version}";
|
||||
homepage = "https://github.com/zigtools/zls";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fortuneteller2k ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fortuneteller2k ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lazygit";
|
||||
version = "0.39.4";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesseduffield";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1eJmnLsQrcGw+A0rGXfZUFHwJAthZSNhNcc2zt/dx5M=";
|
||||
hash = "sha256-UGIqrdjIP7AyLck1DT38wS48hSn46uZXcMrSehXOui8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "runme";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stateful";
|
||||
repo = "runme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vtlsa+XdsE33oR5MH1zaHUIJ4Rsn/RqtryTgNGgEHJw=";
|
||||
hash = "sha256-WsYaOaXaNGztVqHMURn/96lWA9grccoKw6AJOhqUdfQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5FMrz4I/i/uJDI4vK9hiet4zMRf0CSbc/YJAFi8hlEM=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-script";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fornwall";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-H1F+sz7PLpuBgQCo/InxPStbg/S6JILjr0IZ+GEGaSM=";
|
||||
sha256 = "sha256-W0+UaP0aROfGuvWhPcq6QYJZ6XgUAp4XARTzr3Pch/o=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-O8JveH5RzkhUVHqUSzfPOujfH3HcoRMZ455QvMFyJLI=";
|
||||
cargoSha256 = "sha256-dNtAee7lyrlamZEtkrrGgs25xW74UixI4NdeD35wzJU=";
|
||||
|
||||
# tests require network access
|
||||
doCheck = false;
|
||||
|
||||
@ -1,34 +1,41 @@
|
||||
{ lib, stdenv, fetchFromSourcehut
|
||||
, zig, glfw, libGLU, libGL, openal, libsndfile }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, glfw
|
||||
, libGL
|
||||
, libGLU
|
||||
, libsndfile
|
||||
, openal
|
||||
, zigHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "blackshades";
|
||||
version = "2.4.9";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~cnx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "blackshades";
|
||||
rev = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I=";
|
||||
hash = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig ];
|
||||
buildInputs = [ glfw libGLU libGL openal libsndfile ];
|
||||
nativeBuildInputs = [ zigHook ];
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
zig build -Drelease-fast -Dcpu=baseline --prefix $out install
|
||||
'';
|
||||
buildInputs = [
|
||||
glfw
|
||||
libGLU
|
||||
libGL
|
||||
libsndfile
|
||||
openal
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://sr.ht/~cnx/blackshades";
|
||||
description = "A psychic bodyguard FPS";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ McSinyx viric ];
|
||||
platforms = with lib.platforms; linux;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -22,19 +22,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vintagestory";
|
||||
version = if experimental then "1.18.6" else "1.18.6";
|
||||
version = if experimental then "1.18.8-rc.1" else "1.18.7";
|
||||
|
||||
src =
|
||||
if experimental
|
||||
then
|
||||
(fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/net7/vs_client_linux-x64_${version}.tar.gz";
|
||||
sha256 = "sha256-h4TyMDFid3eB6oPJix92/tmS0v+Ox6CFSRyn/JRNbxg=";
|
||||
url = "https://cdn.vintagestory.at/gamefiles/unstable/vs_client_linux-x64_${version}.tar.gz";
|
||||
hash = "sha256-FxyAJTiLENTp5QxPKRgsiOhkMXz88CTn3QRvIHtOH+A=";
|
||||
})
|
||||
else
|
||||
(fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
|
||||
sha256 = "sha256-Sa5R/Msg36pKRpZJXXJgM4lcCADJX9x81fMnTD3tjAI=";
|
||||
hash = "sha256-geJoNxBxODXQeTExLdTOaH84asjo2yg2xFm8Pj0IMc0=";
|
||||
});
|
||||
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "plistwatch";
|
||||
version = "unstable-2020-12-22";
|
||||
version = "unstable-2023-06-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catilac";
|
||||
repo = "plistwatch";
|
||||
rev = "c3a9afd8d3e5ffa8dcc379770bc4216bae88a671";
|
||||
sha256 = "0a5rfmpy6h06p02z9gdilh7vr3h9cc6n6zzygpjk6zvnqs3mm3vx";
|
||||
rev = "34d808c1509eea22fe88a2dbb6f0a1669a2a5b23";
|
||||
hash = "sha256-kMHi5xKbiwO+/6Eb8oJz7ECoUybFE+IUDz7VfJueB3g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Layg1axFN86OFgxEyNFtIlm6Jtx317jZb/KH6IjJ8e4=";
|
||||
vendorHash = "sha256-Layg1axFN86OFgxEyNFtIlm6Jtx317jZb/KH6IjJ8e4=";
|
||||
|
||||
#add missing dependencies and hashes
|
||||
patches = [ ./go-modules.patch ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is autogenerated! Run ./update.sh to regenerate.
|
||||
{
|
||||
version = "unstable-2023-07-24";
|
||||
revision = "59fbffa9ec8e4b0b31d2d13e715cf6580ad0e99c";
|
||||
sourceHash = "sha256-WyO/+fxQljfo6OXLC8/BomGmKtUQaJ1Lt9V5Fdv172g=";
|
||||
outputHash = "sha256-wHWPSyqxP+MGmerbc2v/hclFFJ7qKCDsupK5GASjp8s=";
|
||||
version = "20230804";
|
||||
revision = "20230804";
|
||||
sourceHash = "sha256-TejOQazlH0rBuFHkHooYjR5slpjoSF7TaXvCVUvzevs=";
|
||||
outputHash = "sha256-lD31M1Vio/MJlfKeHGT21xBzQETwgdeiObxPq79SrvU=";
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.123";
|
||||
version = "5.15.124";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "14xzk4rn7fwgdysnd763rbl25krvq40wk3y5cf8hasifl529brid";
|
||||
sha256 = "1v927z1grqwcwj6769qm14828fzjzi58lsd86al2l0ddc016l0q0";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.1.42";
|
||||
version = "6.1.43";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "1lqy72yvsbcv7an1gr8sam6ym3788ss811xb3sw7d2qwaldjdy5a";
|
||||
sha256 = "02588pl1z8jxgxpa03rsdyg5pr0r3v0aylzp8r5ykm32193lhli4";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.4.7";
|
||||
version = "6.4.8";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "1n57qijg0m27wcrqll8rb1hi1n0n8ca3bzsnbz05d9ya3nv3q56y";
|
||||
sha256 = "1djqqhw542jphqsicpbn1259sgw9pwd08wwkdch31nw4kvhk97y5";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "unstable-2023-06-29";
|
||||
version = "unstable-2023-08-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "a96608add40e316f25f15d9c9d1c1fbd86dbbebe";
|
||||
sha256 = "sha256-bGJSeWq2TN7ukStu+oiYboGnm/RHbO6N0NdZC81IQ8k=";
|
||||
rev = "ed66982b8eb06ce8843d8b5163c6bd290e1754c9";
|
||||
sha256 = "sha256-17iWI+FEX2+liaiVpbpdp0nN7BLxdnTV8qahdsO2ZOg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/klippy";
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ser2net";
|
||||
version = "4.3.13";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cminyard";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SAyZ1Ob6swF6i1LFLpwyfMVSi/tOAfz6aiUNOVeJIa0=";
|
||||
hash = "sha256-g+im3WH8ddE4jxKKbb/klkqlmPegKRv1r10HjFIHnQw=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -1,36 +1,74 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, byacc
|
||||
, ncurses, readline, pkgsStatic
|
||||
, historySupport ? false, readlineSupport ? true }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, byacc
|
||||
, ed
|
||||
, ncurses
|
||||
, readline
|
||||
, installShellFiles
|
||||
, pkgsStatic
|
||||
, historySupport ? true
|
||||
, readlineSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rc";
|
||||
version = "unstable-2021-08-03";
|
||||
version = "unstable-2023-06-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakitzis";
|
||||
repo = "rc";
|
||||
rev = "8ca9ab1305c3e30cd064290081d6e5a1fa841d26";
|
||||
sha256 = "0744ars6y9zzsjr9xazms91qy6bi7msg2gg87526waziahfh4s4z";
|
||||
rev = "4aaba1a9cb9fdbb8660696a87850836ffdb09599";
|
||||
hash = "sha256-Yql3mt7hTO2W7wTfPje+X2zBGTHiNXGGXYORJewJIM8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ autoreconfHook byacc ];
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
# acinclude.m4 wants headers for tgetent().
|
||||
buildInputs = [ ncurses ]
|
||||
++ lib.optionals readlineSupport [ readline ];
|
||||
|
||||
CPPFLAGS = ["-DSIGCLD=SIGCHLD"];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-def-interp=${stdenv.shell}" #183
|
||||
] ++ lib.optionals historySupport [ "--with-history" ]
|
||||
++ lib.optionals readlineSupport [ "--with-edit=readline" ];
|
||||
|
||||
#reproducible-build
|
||||
# TODO: think on a less ugly fixup
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace "$(git describe || echo '(git description unavailable)')" "${builtins.substring 0 7 src.rev}"
|
||||
ed -v -s Makefile << EOS
|
||||
# - remove reference to now-inexistent git index file
|
||||
/version.h:/ s| .git/index||
|
||||
# - manually insert the git revision string
|
||||
/v=/ c
|
||||
${"\t"}v=${builtins.substring 0 7 finalAttrs.src.rev}
|
||||
.
|
||||
/\.git\/index:/ d
|
||||
w
|
||||
q
|
||||
EOS
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
byacc
|
||||
ed
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
]
|
||||
++ lib.optionals readlineSupport [
|
||||
readline
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"MANPREFIX=${placeholder "man"}/share/man"
|
||||
"CPPFLAGS=\"-DSIGCLD=SIGCHLD\""
|
||||
];
|
||||
|
||||
buildFlags = [
|
||||
"all"
|
||||
] ++ lib.optionals historySupport [
|
||||
"history"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString historySupport ''
|
||||
installManPage history.1
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@ -38,13 +76,12 @@ stdenv.mkDerivation rec {
|
||||
tests.static = pkgsStatic.rc;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/rakitzis/rc";
|
||||
description = "The Plan 9 shell";
|
||||
longDescription = "Byron Rakitzis' UNIX reimplementation of Tom Duff's Plan 9 shell";
|
||||
homepage = "https://web.archive.org/web/20180820053030/tobold.org/article/rc";
|
||||
license = with licenses; zlib;
|
||||
maintainers = with maintainers; [ ramkromberg ];
|
||||
license = lib.licenses.zlib;
|
||||
maintainers = with lib.maintainers; [ ramkromberg AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "rc";
|
||||
platforms = with platforms; all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -2,62 +2,36 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, zig
|
||||
, zigHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "linuxwave";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "linuxwave";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5c8h9bAe3Qv7PJ3PPcwMJYKPlWsmnqshe6vLIgtdDiQ=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-5c8h9bAe3Qv7PJ3PPcwMJYKPlWsmnqshe6vLIgtdDiQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
zig
|
||||
zigHook
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
export XDG_CACHE_HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
zig build -Drelease-safe -Dcpu=baseline
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
zig build test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
zig build -Drelease-safe -Dcpu=baseline --prefix $out install
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/linuxwave.1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate music from the entropy of Linux";
|
||||
meta = {
|
||||
homepage = "https://github.com/orhun/linuxwave";
|
||||
changelog = "https://github.com/orhun/linuxwave/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
platforms = platforms.all;
|
||||
description = "Generate music from the entropy of Linux";
|
||||
changelog = "https://github.com/orhun/linuxwave/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ figsoda ];
|
||||
inherit (zigHook.meta) platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,31 +1,33 @@
|
||||
{ stdenv, lib, fetchFromSourcehut, zig, libX11, libXfixes }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, libX11
|
||||
, libXfixes
|
||||
, zigHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clipbuzz";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~cnx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1qn98bwp7v7blw4v0g4pckgxrky5ggvq9m0kck2kqw8jg9jc15jp";
|
||||
repo = "clipbuzz";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-V5bAZHoScTzFZBPUhPd7xc/c32SXPLAJp+vsc/lCyeI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig ];
|
||||
buildInputs = [ libX11 libXfixes ];
|
||||
nativeBuildInputs = [ zigHook ];
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXfixes
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
zig build -Drelease-safe -Dcpu=baseline --prefix $out install
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Buzz on new X11 clipboard events";
|
||||
homepage = "https://git.sr.ht/~cnx/clipbuzz";
|
||||
license = licenses.unlicense;
|
||||
maintainers = [ maintainers.McSinyx ];
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = [ lib.maintainers.McSinyx ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,39 +1,30 @@
|
||||
{ lib, stdenv, fetchFromGitHub, zig, testers, findup }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, findup
|
||||
, testers
|
||||
, zigHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "findup";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "booniepepper";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Tpyiy5oJQ04lqVEOFshFC0+90VoNILQ+N6Dd7lbuH/Q=";
|
||||
repo = "findup";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Tpyiy5oJQ04lqVEOFshFC0+90VoNILQ+N6Dd7lbuH/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig ];
|
||||
nativeBuildInputs = [ zigHook ];
|
||||
|
||||
# Builds and installs (at the same time) with Zig.
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
passthru.tests.version = testers.testVersion { package = finalAttrs.findup; };
|
||||
|
||||
# Give Zig a directory for intermediate work.
|
||||
preInstall = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
zig build -Drelease-safe -Dcpu=baseline --prefix $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = findup; };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/booniepepper/findup";
|
||||
description = "Search parent directories for sentinel files";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ booniepepper ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ booniepepper ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "infracost";
|
||||
version = "0.10.26";
|
||||
version = "0.10.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infracost";
|
||||
rev = "v${version}";
|
||||
repo = "infracost";
|
||||
sha256 = "sha256-Tw+peSlcnSge4xOXslsFT6UTz7NQsy1Sy89vP2YjI90=";
|
||||
sha256 = "sha256-oxN1Ylrny/f72duLQQSt+Rz1h5s0BC3eUNXqh1sEL8Y=";
|
||||
};
|
||||
vendorHash = "sha256-nObY/79e6I5PYso917rZxwVt6pwwI5BY0nguP/1yirc=";
|
||||
vendorHash = "sha256-CGweNNOqgOiyyvVF20paO4LtvFiImQhu/kuLbXcYwwA=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];
|
||||
|
||||
|
||||
@ -1,32 +1,33 @@
|
||||
{ lib, stdenv, fetchurl, zig, ncurses }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, ncurses
|
||||
, zigHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ncdu";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
|
||||
url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-kNkgAk51Ixi0aXds5X4Ds8cC1JMprZglruqzbDur+ZM=";
|
||||
};
|
||||
|
||||
XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv
|
||||
|
||||
nativeBuildInputs = [
|
||||
zig
|
||||
zigHook
|
||||
];
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
buildInputs = [
|
||||
ncurses
|
||||
];
|
||||
|
||||
PREFIX = placeholder "out";
|
||||
|
||||
# Avoid CPU feature impurity, see https://github.com/NixOS/nixpkgs/issues/169461
|
||||
ZIG_FLAGS = "-Drelease-safe -Dcpu=baseline";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Disk usage analyzer with an ncurses interface";
|
||||
meta = {
|
||||
homepage = "https://dev.yorhel.nl/ncdu";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ pSub rodrgz ];
|
||||
description = "Disk usage analyzer with an ncurses interface";
|
||||
changelog = "https://dev.yorhel.nl/ncdu/changes2";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pSub rodrgz ];
|
||||
inherit (zigHook.meta) platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
36
pkgs/tools/misc/rtz/Cargo.lock
generated
36
pkgs/tools/misc/rtz/Cargo.lock
generated
@ -252,9 +252,18 @@ name = "bincode"
|
||||
version = "2.0.0-rc.3"
|
||||
source = "git+https://github.com/bincode-org/bincode.git#224e41274b089e3833a3533459f5c5758c43ab2c"
|
||||
dependencies = [
|
||||
"bincode_derive",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bincode_derive"
|
||||
version = "2.0.0-rc.3"
|
||||
source = "git+https://github.com/bincode-org/bincode.git#224e41274b089e3833a3533459f5c5758c43ab2c"
|
||||
dependencies = [
|
||||
"virtue",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
@ -2249,7 +2258,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rtz"
|
||||
version = "0.4.2"
|
||||
version = "0.5.3"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -2281,20 +2290,19 @@ dependencies = [
|
||||
"wasm-bindgen",
|
||||
"wasm-bindgen-futures",
|
||||
"wee_alloc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rtz-build"
|
||||
version = "0.2.3"
|
||||
dependencies = [
|
||||
"reqwest",
|
||||
"rtz-core",
|
||||
"zip",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rtz-build"
|
||||
version = "0.2.6"
|
||||
dependencies = [
|
||||
"rtz-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rtz-core"
|
||||
version = "0.1.1"
|
||||
version = "0.1.4"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bincode",
|
||||
@ -2303,8 +2311,10 @@ dependencies = [
|
||||
"geojson",
|
||||
"pretty_assertions",
|
||||
"rayon",
|
||||
"reqwest",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"zip",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3111,6 +3121,12 @@ version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||
|
||||
[[package]]
|
||||
name = "virtue"
|
||||
version = "0.0.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b522f715ead3537dc57c9907899a08e461a8f1e87fc8414a4a89bbd9854289ff"
|
||||
|
||||
[[package]]
|
||||
name = "want"
|
||||
version = "0.3.1"
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rtz";
|
||||
version = "0.4.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twitchax";
|
||||
repo = "rtz";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hxRZhUSmocHQJqrWVjT6af5zTM6KKCv4GycWlO1T6qM=";
|
||||
hash = "sha256-cc5yGZ4zHB9V//ywvKv9qgKGDpKotzkJKbfwv1rK2tM=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -1,18 +1,17 @@
|
||||
{ lib, buildGoModule, fetchFromGitea, asciidoctor, installShellFiles }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, asciidoctor, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "webcat";
|
||||
version = "unstable-2021-09-06";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rumpelsepp";
|
||||
repo = "webcat";
|
||||
rev = "57a65558f0affac0b2f8f4831c52964eb9ad5386";
|
||||
sha256 = "15c62sjr15l5hwkvc4xarfn76341wi16pjv9qbr1agaz1vqgr6rd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JyZHH8JgS3uoNVicx1wj0SAzlrXyTrpwIBZuok6buRw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1apnra58mqrazbq53f0qlqnyyhjdvvdz995yridxva0fxmwpwcjy";
|
||||
vendorHash = "sha256-duVp/obT+5M4Dl3BAdSgRaP3+LKmS0y51loMMdoGysw=";
|
||||
|
||||
nativeBuildInputs = [ asciidoctor installShellFiles ];
|
||||
|
||||
|
||||
@ -1,61 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
zig,
|
||||
testers,
|
||||
installShellFiles,
|
||||
zf,
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, testers
|
||||
, zf
|
||||
, zigHook
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zf";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natecraddock";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
repo = "zf";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-MzlSU5x2lb6PJZ/iNAi2aebfuClBprlfHMIG/4OPmuc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zig installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
zigHook
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
doCheck = false; # it's failing somehow
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
zig build -Drelease-safe -Dcpu=baseline
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
zig build test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
zig build -Drelease-safe -Dcpu=baseline --prefix $out install
|
||||
postInstall = ''
|
||||
installManPage doc/zf.1
|
||||
installShellCompletion \
|
||||
--bash complete/zf \
|
||||
--fish complete/zf.fish \
|
||||
--zsh complete/_zf
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {package = zf;};
|
||||
passthru.tests.version = testers.testVersion { package = finalAttrs.zf; };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/natecraddock/zf";
|
||||
description = "A commandline fuzzy finder that prioritizes matches on filenames";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dit7ya mmlb ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ dit7ya mmlb ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.65.0";
|
||||
version = "0.65.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Dqjdl0fco3t8/jVt9/7pwXzoKapctU3T+ixkKTQ6sAE=";
|
||||
hash = "sha256-hmjg1W1E1pdrHxPA7qbEJP0R1mEiV0P54+y+RXxKH4c=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
||||
@ -1,38 +1,42 @@
|
||||
{ lib, stdenv, fetchFromSourcehut, buildPackages }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scdoc";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "07c2vmdgqifbynm19zjnrk7h102pzrriv73izmx8pmd7b3xl5mfq";
|
||||
repo = "scdoc";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-2NVC+1in1Yt6/XGcHXP+V4AAz8xW/hSq9ctF/Frdgh0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "dev" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "-static" "" \
|
||||
--replace "/usr/local" "$out"
|
||||
--replace "-static" ""
|
||||
'';
|
||||
|
||||
makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"HOST_SCDOC=${buildPackages.scdoc}/bin/scdoc"
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
"HOST_SCDOC=${lib.getExe buildPackages.scdoc}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple man page generator";
|
||||
longDescription = ''
|
||||
scdoc is a simple man page generator written for POSIX systems written in
|
||||
C99.
|
||||
'';
|
||||
meta = {
|
||||
description = "A simple man page generator written in C99 for POSIX systems";
|
||||
homepage = "https://git.sr.ht/~sircmpwn/scdoc";
|
||||
changelog = "https://git.sr.ht/~sircmpwn/scdoc/refs/${version}";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
changelog = "https://git.sr.ht/~sircmpwn/scdoc/refs/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ primeos AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "scdoc";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -509,6 +509,12 @@ with pkgs;
|
||||
|
||||
colorpicker = callPackage ../tools/misc/colorpicker { };
|
||||
|
||||
colorstorm = callPackage ../applications/misc/colorstorm {
|
||||
zigHook = zigHook.override {
|
||||
zig = buildPackages.zig_0_9;
|
||||
};
|
||||
};
|
||||
|
||||
comedilib = callPackage ../development/libraries/comedilib { };
|
||||
|
||||
commix = callPackage ../tools/security/commix { };
|
||||
@ -6118,7 +6124,9 @@ with pkgs;
|
||||
river = callPackage ../applications/window-managers/river { };
|
||||
|
||||
rivercarro = callPackage ../applications/misc/rivercarro {
|
||||
zig = buildPackages.zig_0_9;
|
||||
zigHook = zigHook.override {
|
||||
zig = buildPackages.zig_0_9;
|
||||
};
|
||||
};
|
||||
|
||||
river-luatile = callPackage ../applications/misc/river-luatile{ };
|
||||
@ -18267,7 +18275,9 @@ with pkgs;
|
||||
vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { };
|
||||
|
||||
zls = callPackage ../development/tools/language-servers/zls {
|
||||
zig = buildPackages.zig_0_10;
|
||||
zigHook = zigHook.override {
|
||||
zig = buildPackages.zig_0_10;
|
||||
};
|
||||
};
|
||||
|
||||
ansible-later = callPackage ../tools/admin/ansible/later.nix { };
|
||||
@ -32342,7 +32352,9 @@ with pkgs;
|
||||
waycorner = callPackage ../applications/misc/waycorner { };
|
||||
|
||||
waylock = callPackage ../applications/misc/waylock {
|
||||
zig = buildPackages.zig_0_10;
|
||||
zigHook = zigHook.override {
|
||||
zig = buildPackages.zig_0_10;
|
||||
};
|
||||
};
|
||||
|
||||
wayshot = callPackage ../tools/misc/wayshot { };
|
||||
@ -33316,7 +33328,10 @@ with pkgs;
|
||||
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
|
||||
|
||||
mepo = callPackage ../applications/misc/mepo {
|
||||
zig = buildPackages.zig_0_9;
|
||||
inherit (gnome) zenity;
|
||||
zigHook = zigHook.override {
|
||||
zig = buildPackages.zig_0_9;
|
||||
};
|
||||
};
|
||||
|
||||
meshcentral = callPackage ../tools/admin/meshcentral { };
|
||||
@ -33982,7 +33997,9 @@ with pkgs;
|
||||
netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
|
||||
|
||||
ncdu = callPackage ../tools/misc/ncdu {
|
||||
zig = buildPackages.zig_0_10;
|
||||
zigHook = zigHook.override {
|
||||
zig = buildPackages.zig_0_10;
|
||||
};
|
||||
};
|
||||
|
||||
ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };
|
||||
@ -37146,7 +37163,9 @@ with pkgs;
|
||||
};
|
||||
|
||||
blackshades = callPackage ../games/blackshades {
|
||||
zig = buildPackages.zig_0_9;
|
||||
zigHook = zigHook.override {
|
||||
zig = buildPackages.zig_0_9;
|
||||
};
|
||||
};
|
||||
|
||||
blobby = callPackage ../games/blobby { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user