gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-01-20 00:02:22 +00:00
committed by GitHub
parent 5c88bd544f be83a2edc0
commit f1af3f1c51
52 changed files with 395 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/systems/doubles.nix
+3
View File
@@ -68,6 +68,7 @@ in {
none = [];
arm = filterDoubles predicates.isAarch32;
armv7 = filterDoubles predicates.isArmv7;
aarch64 = filterDoubles predicates.isAarch64;
x86 = filterDoubles predicates.isx86;
i686 = filterDoubles predicates.isi686;
@@ -75,6 +76,7 @@ in {
microblaze = filterDoubles predicates.isMicroBlaze;
mips = filterDoubles predicates.isMips;
mmix = filterDoubles predicates.isMmix;
power = filterDoubles predicates.isPower;
riscv = filterDoubles predicates.isRiscV;
riscv32 = filterDoubles predicates.isRiscV32;
riscv64 = filterDoubles predicates.isRiscV64;
@@ -83,6 +85,7 @@ in {
or1k = filterDoubles predicates.isOr1k;
m68k = filterDoubles predicates.isM68k;
s390 = filterDoubles predicates.isS390;
s390x = filterDoubles predicates.isS390x;
js = filterDoubles predicates.isJavaScript;
bigEndian = filterDoubles predicates.isBigEndian;
lib/systems/inspect.nix
+4
View File
@@ -22,6 +22,9 @@ rec {
];
isx86 = { cpu = { family = "x86"; }; };
isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
isArmv7 = map ({ arch, ... }: { cpu = { inherit arch; }; })
(lib.filter (cpu: lib.hasPrefix "armv7" cpu.arch or "")
(lib.attrValues cpuTypes));
isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
isAarch = { cpu = { family = "arm"; }; };
isMicroBlaze = { cpu = { family = "microblaze"; }; };
@@ -44,6 +47,7 @@ rec {
isOr1k = { cpu = { family = "or1k"; }; };
isM68k = { cpu = { family = "m68k"; }; };
isS390 = { cpu = { family = "s390"; }; };
isS390x = { cpu = { family = "s390"; bits = 64; }; };
isJavaScript = { cpu = cpuTypes.js; };
is32bit = { cpu = { bits = 32; }; };
lib/tests/systems.nix
+3
View File
@@ -16,12 +16,15 @@ with lib.systems.doubles; lib.runTests {
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox);
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ];
testarmv7 = mseteq armv7 [ "armv7a-darwin" "armv7a-linux" "armv7l-linux" "armv7a-netbsd" "armv7l-netbsd" ];
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd13" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ];
testmmix = mseteq mmix [ "mmix-mmixware" ];
testpower = mseteq power [ "powerpc-netbsd" "powerpc-none" "powerpc64-linux" "powerpc64le-linux" "powerpcle-none" ];
testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ];
testriscv32 = mseteq riscv32 [ "riscv32-linux" "riscv32-netbsd" "riscv32-none" ];
testriscv64 = mseteq riscv64 [ "riscv64-linux" "riscv64-netbsd" "riscv64-none" ];
tests390x = mseteq s390x [ "s390x-linux" "s390x-none" ];
testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd13" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
nixos/tests/tracee.nix
+1 -1
View File
@@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
buildPhase = ''
runHook preBuild
# just build the static lib we need for the go test binary
make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES} bpf-core ./dist/btfhub
make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} bpf-core ./dist/btfhub
# remove the /usr/bin prefix to work with the patch above
substituteInPlace tests/integration/integration_test.go \
pkgs/applications/blockchains/lighthouse/default.nix
+2 -1
View File
@@ -15,6 +15,7 @@
, testers
, unzip
, nix-update-script
, SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
@@ -41,7 +42,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isDarwin [
Security
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
CoreFoundation
CoreFoundation SystemConfiguration
];
depositContractSpec = fetchurl {
pkgs/applications/blockchains/torq/default.nix
+5 -5
View File
@@ -1,16 +1,17 @@
{ lib
, buildGoModule
, fetchFromGitHub }:
, fetchFromGitHub
}:
buildGoModule rec {
pname = "torq";
version = "0.16.9";
version = "0.16.15";
src = fetchFromGitHub {
owner = "lncapital";
repo = pname;
rev = "v${version}";
hash = "sha256-jr4DNjHP8xVtl0Y1egVUmvzLRR6YjyUqvvhOAZNKFu0=";
hash = "sha256-ibrPq/EC61ssn4072gTNvJg9QO41+aTsU1Hhc6X6NPk=";
};
vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs=";
@@ -20,8 +21,7 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/lncapital/torq/build.Repository=github.com/${src.owner}/${src.repo}"
"-X github.com/lncapital/torq/build.overrideBuildVer=${version}"
"-X github.com/lncapital/torq/build.version=v${version}"
];
meta = with lib; {
pkgs/applications/editors/vim/plugins/generated.nix
+38 -25
View File
@@ -2709,12 +2709,12 @@ final: prev:
dracula-nvim = buildVimPluginFrom2Nix {
pname = "dracula.nvim";
version = "2022-12-22";
version = "2023-01-19";
src = fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
rev = "9195c478cf05c3369131a7a9c606cbbc5247b0c6";
sha256 = "12288w7071d9s4sfv0bd7bzahrmwds9yabqzfpapassr8958w84j";
rev = "a0b129d7dea51b317fa8064f13b29f68004839c4";
sha256 = "0q7ly95hp123z9z8qh4sih5a53dnbxv0jxa80b1s7d6h1wpr2w5j";
};
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
};
@@ -4131,8 +4131,8 @@ final: prev:
src = fetchFromGitHub {
owner = "folke";
repo = "lazy.nvim";
rev = "4739c2d95af17acb786ed33445f59b7b13671417";
sha256 = "0mvgvx6xhbcyrryazaj664i2b9i1p7zf10sr0wip3rmclp5mdfzj";
rev = "75dcd5741d76e09b1a41c771fbc8b010a109b5cb";
sha256 = "0p0idwnzx0x3v7vsjsk2ld4i61xgpa036cs7h3jdgynssgwdp8yg";
};
meta.homepage = "https://github.com/folke/lazy.nvim/";
};
@@ -4187,12 +4187,12 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
version = "2023-01-03";
version = "2023-01-19";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
rev = "a968ab4250840dc879e805f918b4f3b892310a12";
sha256 = "1yirhsyybynpjmjp02jfcd5i9anklnj3wklcxb9i522ia6w67hsd";
rev = "ff4c3663e5a0a0ecbb3fffbc8318825def35d2aa";
sha256 = "1pxm1b3crqmvbmds5cjfnqirvqbjqzc6vc59i6jsr8i79vymf16z";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
@@ -4811,12 +4811,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2023-01-16";
version = "2023-01-19";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "305debd01d486f94a9f6ecfec90321ea98dc5dd9";
sha256 = "0m5vva498cpji3i111v57nl5d02asamla8acpw3gj15gixdi7ivc";
rev = "91017a96693408ef96efe9a2513c6ace0a87dc8d";
sha256 = "0xhc2npbpz7rhlis9cchda5pg7j5qkfxqb9qjsk86cxga1ma0c8r";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@@ -5519,12 +5519,12 @@ final: prev:
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
version = "2023-01-18";
version = "2023-01-19";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
rev = "ac1e6f363c24814a047b1142038c802a145d6768";
sha256 = "04kfkzxf33rp2gxd0jlnb9ijaq28p6a61qv88718ql18fbjgg5zq";
rev = "421c066ce09faefe5ed066aa22c1659b76e15239";
sha256 = "0ih9n5lhn8r06b9m9jsg16avqa6jrvc56zhwhiqr267r9ylwyn3w";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@@ -5627,12 +5627,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
version = "2023-01-17";
version = "2023-01-19";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "7bd74a821d991057ca1c0ca569d8252c4f89f860";
sha256 = "0frzqsgca6lsracz1ybz1zj9150clgs2y7xj6nkgmzn2f8h20kr2";
rev = "ef3d4a438f96865e3ae018e33ed30156a955ed00";
sha256 = "0aq4w4dsnzi31h2qqm2fdqnn9h021l5j1h9qm4xzk7ywa10ikq73";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -6560,6 +6560,19 @@ final: prev:
meta.homepage = "https://github.com/pwntester/octo.nvim/";
};
oil-nvim = buildVimPluginFrom2Nix {
pname = "oil.nvim";
version = "2023-01-19";
src = fetchFromGitHub {
owner = "stevearc";
repo = "oil.nvim";
rev = "f5961e731f641206727eaded197e5879694c35f7";
sha256 = "1q4wcmdbpx2si4ynq4hldbq2asq16qqwrf0lmcpqrldpziffgdv2";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/oil.nvim/";
};
omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix {
pname = "omnisharp-extended-lsp.nvim";
version = "2022-10-29";
@@ -9066,12 +9079,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2023-01-18";
version = "2023-01-19";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "1d9ae3f972e76a1d36384da7a2890f6402d07d6c";
sha256 = "0xgin7kjy3lslkil9wmzp36v9qhp770106lamyipa9m1hpimz4bi";
rev = "31e01612f3b9eef79e6a71d4708b85505f50e255";
sha256 = "0bvxqjhfizckshw59gkd1g3zx9qvswp0mgjdp80w7y0vsxl0m9rf";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -13824,12 +13837,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
version = "2023-01-18";
version = "2023-01-19";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "b17cfa01cf0517cc3614602df39e8433dc116fab";
sha256 = "1s5nqz8xr4pi2dwbaagjk27b0f5imgs55pw1raharniziad40mnx";
rev = "e1fc2c3ade0d8872665d7570c493bbd5e11919c7";
sha256 = "0svhbb1860wsgms9qp03y28p5v2iz9kw5n7sxz5zz7a33dwcrjdk";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@@ -13900,8 +13913,8 @@ final: prev:
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
rev = "79e1f5b81e9356b27e52b162dbfd1d5e242b8c7d";
sha256 = "1wjrx6c9nahygrs4wplrn6brxl12qq232bkf5d9rksbyjkril12v";
rev = "ca5bc84ef68f18c6dc99962791f08dbc0163dce8";
sha256 = "17kl1cwbr92c279jbvl230q98dc7i006hnz2d8lc23xki6ym8zix";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -552,6 +552,7 @@ https://github.com/neovim/nvimdev.nvim/,,
https://github.com/glepnir/oceanic-material/,,
https://github.com/mhartington/oceanic-next/,,
https://github.com/pwntester/octo.nvim/,,
https://github.com/stevearc/oil.nvim/,HEAD,
https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,
https://github.com/Th3Whit3Wolf/one-nvim/,,
https://github.com/navarasu/onedark.nvim/,,
pkgs/applications/graphics/pureref/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ lib, appimageTools, requireFile }:
appimageTools.wrapType1 rec {
pname = "pureref";
version = "1.11.1";
src = requireFile {
name = "PureRef-${version}_x64.Appimage";
sha256 = "05naywdgykqrsgc3xybskr418cyvbx7vqs994yv9w8zf98gxvbvm";
url = "https://www.pureref.com/download.php";
};
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
'';
meta = with lib; {
description = "Reference Image Viewer";
homepage = "https://www.pureref.com";
license = licenses.unfree;
maintainers = with maintainers; [ elnudev ];
platforms = [ "x86_64-linux" ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
};
}
pkgs/applications/misc/pw-viz/default.nix
+4
View File
@@ -47,6 +47,10 @@ rustPlatform.buildRustPackage rec {
--add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]}
'';
# enables pipewire API deprecated in 0.3.64
# fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55
NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ];
meta = with lib; {
description = "A simple and elegant pipewire graph editor ";
homepage = "https://github.com/ax9d/pw-viz";
pkgs/applications/networking/instant-messengers/tangram/default.nix
+52 -18
View File
@@ -1,22 +1,40 @@
{ stdenv, lib, fetchFromGitHub, appstream-glib, desktop-file-utils, gdk-pixbuf
, gettext, gjs, glib, gobject-introspection, gsettings-desktop-schemas, gtk3
, hicolor-icon-theme, meson, ninja, pkg-config, python3, webkitgtk, wrapGAppsHook
{ stdenv
, lib
, fetchFromGitHub
, appstream-glib
, desktop-file-utils
, gdk-pixbuf
, gettext
, gjs
, glib
, glib-networking
, gobject-introspection
, gsettings-desktop-schemas
, gtk4
, libadwaita
, gst_all_1
, hicolor-icon-theme
, meson
, ninja
, pkg-config
, python3
, webkitgtk_5_0
, blueprint-compiler
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "tangram";
version = "1.3.2";
version = "2.0";
src = fetchFromGitHub {
owner = "sonnyp";
repo = "Tangram";
rev = "v${version}";
sha256 = "sha256-WI0H3bforQ6Jc/+TWFT1zUs4KRtWwvXY2/va+Fnd+iU=";
hash = "sha256-ocHE8IztiNm9A1hbzzHXstWpPaOau/IrQ44ccxbsGb0=";
fetchSubmodules = true;
};
buildInputs = [ gdk-pixbuf gjs glib gsettings-desktop-schemas gtk3 webkitgtk ];
nativeBuildInputs = [
appstream-glib
desktop-file-utils
@@ -27,23 +45,39 @@ stdenv.mkDerivation rec {
ninja
pkg-config
python3
blueprint-compiler
wrapGAppsHook
];
dontWrapGApps = true;
buildInputs = [
gdk-pixbuf
gjs
glib
glib-networking
gsettings-desktop-schemas
gtk4
libadwaita
webkitgtk_5_0
] ++ (with gst_all_1; [
gstreamer
gst-libav
gst-plugins-base
(gst-plugins-good.override { gtkSupport = true; })
gst-plugins-bad
]);
dontPatchShebangs = true;
# Fixes https://github.com/NixOS/nixpkgs/issues/31168
postPatch = ''
chmod +x build-aux/meson/postinstall.py
patchShebangs build-aux/meson/postinstall.py
substituteInPlace src/meson.build --replace "/app/bin/blueprint-compiler" "blueprint-compiler"
substituteInPlace {src/,}re.sonny.Tangram troll/gjspack/bin/gjspack \
--replace "#!/usr/bin/env -S gjs -m" "#!${gjs}/bin/gjs -m"
'';
postFixup = ''
for file in $out/bin/re.sonny.Tangram; do
sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \
-i $file
wrapGApp "$file"
done
# https://github.com/NixOS/nixpkgs/issues/31168#issuecomment-341793501
preFixup = ''
sed -e '2iimports.package._findEffectiveEntryPointName = () => "re.sonny.Tangram"' \
-i $out/bin/re.sonny.Tangram
'';
meta = with lib; {
@@ -51,6 +85,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/sonnyp/Tangram";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ austinbutler ];
maintainers = with maintainers; [ austinbutler chuangzhu ];
};
}
pkgs/applications/office/trilium/default.nix
+3 -3
View File
@@ -10,13 +10,13 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
version = "0.58.5";
version = "0.58.7";
desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
desktopSource.sha256 = "1mkn9wflmgazgyg26wkmfskmawgcf9sfk7y46msivwrj2gjwaban";
desktopSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c";
serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
serverSource.sha256 = "1h3qkpcl0vdz8vvn4h01b1w84v1ckinkdmyvm8312313fcvmyjzs";
serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka";
in {
pkgs/applications/terminal-emulators/blackbox-terminal/default.nix
+4 -2
View File
@@ -14,6 +14,7 @@
, pcre2
, libxml2
, librsvg
, libgee
, callPackage
, python3
, gtk3
@@ -26,14 +27,14 @@ let
in
stdenv.mkDerivation rec {
pname = "blackbox";
version = "0.12.2";
version = "0.13.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "raggesilver";
repo = "blackbox";
rev = "v${version}";
sha256 = "sha256-4/rtviBv5KXheLLExxOvaF0wU87eRKMNxlYCVxuIQgU=";
hash = "sha256-WeR7zdYdRWBR+kmxLjRFE6QII9RdBig7wrbVoCPA5go=";
};
postPatch = ''
@@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
pcre2
libxml2
librsvg
libgee
];
meta = with lib; {
pkgs/applications/video/kodi/addons/a4ksubtitles/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "a4ksubtitles";
namespace = "service.subtitles.a4ksubtitles";
version = "2.8.0";
version = "3.3.0";
src = fetchFromGitHub {
owner = "a4k-openproject";
repo = "a4kSubtitles";
rev = "${namespace}/${namespace}-${version}";
sha256 = "0fg5mcvxdc3hqybp1spy7d1nnqirwhcvrblbwksikym9m3qgw2m5";
sha256 = "sha256-t6oclFAOsUC+hFtw6wjRh1zl2vQfc7RKblVJpBPfE9w=";
};
propagatedBuildInputs = [
pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
let
drv = stdenv.mkDerivation {
pname = "controller-topology-project";
version = "unstable-2022-01-22";
version = "unstable-2022-11-19";
src = fetchFromGitHub {
owner = "kodi-game";
repo = "controller-topology-project";
rev = "e2a9bac903f21b2acfeee374070cfc97d03aba2d";
sha256 = "sha256-o6uKxOjEYNAK27drvNOokOFPdjkOEnr49mBre9ycM0w=";
rev = "d96894ca68678000f26f56d14aa3ceea47b1a3a8";
sha256 = "sha256-KfDr2bSJFey/aNO5WzoOQ8Mz0v4uitKkOesymIMZH1o=";
};
postPatch = ''
pkgs/applications/video/kodi/addons/iagl/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "iagl";
namespace = "plugin.program.iagl";
version = "3.0.5";
version = "3.0.6";
src = fetchFromGitHub {
owner = "zach-morris";
repo = "plugin.program.iagl";
rev = version;
sha256 = "sha256-Ha9wUHURPql6xew5bUd33DpgRt+8vwIHocxPopmXj4c=";
sha256 = "sha256-fwPrNDsEGoysHbl9k9cRYKlr3MxDRiUmJhSsWVT2HHQ=";
};
propagatedBuildInputs = [
pkgs/applications/video/kodi/addons/jellyfin/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@ in
buildKodiAddon rec {
pname = "jellyfin";
namespace = "plugin.video.jellyfin";
version = "0.7.7";
version = "0.7.10";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-kodi";
rev = "v${version}";
sha256 = "06glhnpayldficvvhlkbxg7zizl2wqms66fnc3p63nm3y7mqa9dd";
sha256 = "sha256-hR4cJEpP/RZH24M4Ma33ZUe9oydRg7CyP1hHncvDW8Y=";
};
nativeBuildInputs = [
pkgs/applications/video/kodi/addons/joystick/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = namespace;
namespace = "peripheral.joystick";
version = "1.7.1";
version = "19.0.1";
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914";
sha256 = "sha256-jSz0AgxhbCIbbZJxm4oq22y/hqew949UsqEAPoqEnHA=";
};
extraBuildInputs = [ tinyxml udev ];
pkgs/applications/video/kodi/addons/keymap/default.nix
+9 -3
View File
@@ -1,13 +1,13 @@
{ lib, buildKodiAddon, fetchzip, defusedxml, kodi-six }:
{ lib, buildKodiAddon, fetchzip, addonUpdateScript, defusedxml, kodi-six }:
buildKodiAddon rec {
pname = "keymap";
namespace = "script.keymap";
version = "1.1.3+matrix.1";
version = "1.1.4";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "1icrailzpf60nw62xd0khqdp66dnr473m2aa9wzpmkk3qj1ay6jv";
sha256 = "eWzMqsE8H0wUvPyd3wvjiaXEg4+sgkQ3CQYjE0VS+9g=";
};
propagatedBuildInputs = [
@@ -15,6 +15,12 @@ buildKodiAddon rec {
kodi-six
];
passthru = {
updateScript = addonUpdateScript {
attrPath = "kodi.packages.keymap";
};
};
meta = with lib; {
homepage = "https://github.com/tamland/xbmc-keymap-editor";
description = "A GUI for configuring mappings for remotes, keyboard and other inputs supported by Kodi";
pkgs/applications/video/kodi/addons/libretro-genplus/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
buildKodiBinaryAddon rec {
pname = "kodi-libretro-genplus";
namespace = "game.libretro.genplus";
version = "1.7.4.31";
version = "1.7.4.35";
src = fetchFromGitHub {
owner = "kodi-game";
repo = "game.libretro.genplus";
rev = "${version}-${rel}";
sha256 = "0lcii32wzpswjjkwhv250l238g31akr66dhkbv8gj4v1i4z7hry8";
sha256 = "sha256-F3bt129lBZKlDtp7X0S0q10T9k9C2zNeHG+yIP3818Q=";
};
extraCMakeFlags = [
pkgs/applications/video/kodi/addons/libretro-mgba/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
buildKodiBinaryAddon rec {
pname = "kodi-libretro-mgba";
namespace = "game.libretro.mgba";
version = "0.9.2.31";
version = "0.10.0.35";
src = fetchFromGitHub {
owner = "kodi-game";
repo = "game.libretro.mgba";
rev = "${version}-${rel}";
sha256 = "sha256-eZLuNhLwMTtzpLGkymc9cLC83FQJWZ2ZT0iyz4sY4EA=";
sha256 = "sha256-lxpj6Y34apYcE22q4W3Anhigp79r4RgiJ36DbES1kzU=";
};
extraCMakeFlags = [
pkgs/applications/video/kodi/addons/libretro-snes9x/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
buildKodiBinaryAddon rec {
pname = "kodi-libretro-snes9x";
namespace = "game.libretro.snes9x";
version = "1.60.0.29";
version = "1.61.0.34";
src = fetchFromGitHub {
owner = "kodi-game";
repo = "game.libretro.snes9x";
rev = "${version}-${rel}";
sha256 = "1wyfkg4fncc604alnbaqk92fi1h80n7bwiqfkb8479x5517byab1";
sha256 = "sha256-LniZf8Gae4+4Rgc9OGhMCkOI3IA7CPjVrN/gbz9te38=";
};
extraCMakeFlags = [
pkgs/applications/video/kodi/addons/netflix/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "netflix";
namespace = "plugin.video.netflix";
version = "1.18.2";
version = "1.20.2";
src = fetchFromGitHub {
owner = "CastagnaIT";
repo = namespace;
rev = "v${version}";
sha256 = "sha256-nunjcVapWWTxYtILEcrkfJiWvSz71zyxSCbWQ4aCfLM=";
sha256 = "sha256-k2O8a0P+TzQVoFQJkzmdqmkKh3Aj7OlsnuhJfUwxOmI=";
};
propagatedBuildInputs = [
pkgs/applications/video/kodi/addons/orftvthek/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "orftvthek";
namespace = "plugin.video.orftvthek";
version = "0.12.3+matrix.1";
version = "0.12.6";
src = fetchFromGitHub {
owner = "s0faking";
repo = namespace;
rev = version;
sha256 = "sha256-GB9VkC9Vbi7TJXl/vF3ViF/tAcHGH0KxYQ0zkfMLZCY=";
sha256 = "sha256-r18vQ+2TSeflwByEAX33vIZG5qIGneraf5rLBugl5BU=";
};
propagatedBuildInputs = [
pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-iptvsimple";
namespace = "pvr.iptvsimple";
version = "19.1.1";
version = "19.2.2";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.iptvsimple";
rev = "${version}-${rel}";
sha256 = "sha256-ZkB+Va9w/AHLZ+LSOJpJ93nVOw33tcNqjScbLt77zJw=";
sha256 = "sha256-snW6sgbdyGqdZtd7HU5FTf4Kx5/Zjk2fLLi0MS+9tTU=";
};
extraBuildInputs = [
pkgs/applications/video/kodi/addons/vfs-libarchive/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = namespace;
namespace = "vfs.libarchive";
version = "2.0.0";
version = "19.0.1";
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
sha256 = "sha256-4sERFC/XBEE46n+iq6YJg/5Wz0+223tq4+O5cIf6X6E=";
};
extraBuildInputs = [ libarchive xz bzip2 zlib lz4 lzo openssl ];
pkgs/applications/video/kodi/addons/vfs-sftp/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = namespace;
namespace = "vfs.sftp";
version = "2.0.0";
version = "19.0.1";
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk";
sha256 = "sha256-UXycPqPEn3W5X3SQs1fxgkdV5PSkzs3pjYyuhAVngt8=";
};
extraBuildInputs = [ openssl libssh zlib ];
pkgs/applications/video/kodi/addons/visualization-waveform/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
buildKodiBinaryAddon rec {
pname = "visualization-waveform";
namespace = "visualization.waveform";
version = "19.0.2";
version = "19.0.3";
src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
hash = "sha256-IQLW4CDNtt/ptE679hnoXbharq61Ru9S2m7QbJLtNSI=";
hash = "sha256-3mTfL1UjPLDKardJy4IDNyzvHnkF//4nmWInOxP/XhQ=";
};
extraBuildInputs = [ pkg-config libGL ];
pkgs/development/compilers/souffle/default.nix
+12 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, bash-completion, perl, ncurses, zlib, sqlite, libffi
, mcpp, cmake, bison, flex, doxygen, graphviz
, makeWrapper
@@ -19,6 +19,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-wdTBSmyA2I+gaSV577NNKA2oY2fdVTGmvV7h15NY1tU=";
};
patches = [
./threads.patch
(fetchpatch {
name = "missing-override.patch";
url = "https://github.com/souffle-lang/souffle/commit/da2d778f0cca94f206686546fa56b9ffc738ad75.patch";
sha256 = "Oefm3vRRwOyom94oGSOK2w9m23gkbJ++9gcWrdLlkyk=";
})
];
hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ];
nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ];
buildInputs = [ bash-completion ncurses zlib sqlite libffi ];
# these propagated inputs are needed for the compiled Souffle mode to work,
@@ -35,7 +46,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" ];
meta = with lib; {
broken = stdenv.isDarwin;
description = "A translator of declarative Datalog programs into the C++ language";
homepage = "https://souffle-lang.github.io/";
platforms = platforms.unix;
pkgs/development/compilers/souffle/threads.patch
+31
View File
@@ -0,0 +1,31 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73d5c3c84..e4b0dbfd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,13 +104,6 @@ option(SOUFFLE_CUSTOM_GETOPTLONG "Enable/Disable custom getopt_long implementati
cmake_dependent_option(SOUFFLE_USE_LIBCPP "Link to libc++ instead of libstdc++" ON
"CMAKE_CXX_COMPILER_ID STREQUAL Clang" OFF)
-# Using Clang? Likely want to use `lld` too.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld")
-endif()
-
# Add aditional modules to CMake
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
@@ -247,7 +240,11 @@ endif()
# pthreads
# --------------------------------------------------
set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
+set(CMAKE_THREAD_LIBS_INIT "-lpthread")
+set(CMAKE_HAVE_THREADS_LIBRARY 1)
+set(CMAKE_USE_WIN32_THREADS_INIT 0)
+set(CMAKE_USE_PTHREADS_INIT 1)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
# --------------------------------------------------
# OpenMP
pkgs/development/interpreters/erlang/R25.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "25.2";
sha256 = "zZ6i0NIftTcjzB5J51Q16GmVPlc5gPnGfo6EoBT2HY0=";
version = "25.2.1";
sha256 = "xJ3fadveOFZ0TeHhjl3VnAtWyFTOVUIoFubXofvrsT0=";
}
pkgs/development/python-modules/johnnycanencrypt/default.nix
+15 -28
View File
@@ -1,6 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchPypi
, buildPythonPackage
, rustPlatform
, llvmPackages
@@ -8,36 +8,31 @@
, pcsclite
, nettle
, httpx
, numpy
, pytestCheckHook
, pythonOlder
, vcrpy
, PCSC
, libiconv
}:
buildPythonPackage rec {
pname = "johnnycanencrypt";
version = "0.11.0";
disabled = pythonOlder "3.7";
version = "0.12.0";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "kushaldas";
repo = "johnnycanencrypt";
rev = "v${version}";
hash = "sha256-YhuYejxuKZEv1xQ1fQcXSkt9I80iJOJ6MecG622JJJo=";
src = fetchPypi {
inherit pname version;
hash = "sha256-aGhM/uyYE7l0h6L00qp+HRUVaj7s/tnHWIHJpLAkmR4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit patches src;
inherit src;
name = "${pname}-${version}";
hash = "sha256-r2NU1e3yeZDLOBy9pndGYM3JoH6BBKQkXMLsJR6PTRs=";
hash = "sha256-fcwDxkUFtA6LS77xdLktNnZJXmyl/ZzArvIW69SPpmI=";
};
format = "pyproject";
# https://github.com/kushaldas/johnnycanencrypt/issues/125
patches = [ ./Cargo.lock.patch ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
propagatedBuildInputs = [
@@ -61,31 +56,23 @@ buildPythonPackage rec {
libiconv
];
# Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
doCheck = false;
doInstallCheck = true;
installCheckInputs = [
checkInputs = [
pytestCheckHook
numpy
vcrpy
];
preCheck = ''
export TESTDIR=$(mktemp -d)
cp -r tests/ $TESTDIR
pushd $TESTDIR
'';
postCheck = ''
popd
# import from $out
rm -r johnnycanencrypt
'';
pythonImportsCheck = [ "johnnycanencrypt" ];
meta = with lib; {
homepage = "https://github.com/kushaldas/johnnycanencrypt";
changelog = "https://github.com/kushaldas/johnnycanencrypt/blob/v${version}/changelog.md";
description = "Python module for OpenPGP written in Rust";
license = licenses.gpl3Plus;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ _0x4A6F ];
};
}
pkgs/development/python-modules/pyqt/6.x.nix
+1 -1
View File
@@ -59,7 +59,7 @@ buildPythonPackage rec {
# pkgs/development/interpreters/python/hooks/pip-build-hook.sh
# does not use the enableParallelBuilding flag
postUnpack = ''
export MAKEFLAGS+=" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES"
export MAKEFLAGS+=" -j$NIX_BUILD_CORES"
'';
outputs = [ "out" "dev" ];
pkgs/development/python-modules/pyqt6-webengine.nix
+1 -1
View File
@@ -40,7 +40,7 @@ buildPythonPackage rec {
# pkgs/development/interpreters/python/hooks/pip-build-hook.sh
# does not use the enableParallelBuilding flag
postUnpack = ''
export MAKEFLAGS+=" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES"
export MAKEFLAGS+=" -j$NIX_BUILD_CORES"
'';
outputs = [ "out" "dev" ];
pkgs/development/tools/analysis/valgrind/default.nix
+3 -7
View File
@@ -119,13 +119,9 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.unix;
badPlatforms = [
"armv5tel-linux" "armv6l-linux" "armv6m-linux"
"sparc-linux" "sparc64-linux"
"riscv32-linux" "riscv64-linux"
"alpha-linux"
];
platforms = with lib.platforms; lib.intersectLists
(x86 ++ power ++ s390x ++ armv7 ++ aarch64 ++ mips)
(darwin ++ freebsd ++ illumos ++ linux);
broken = stdenv.isDarwin || stdenv.hostPlatform.isStatic; # https://hydra.nixos.org/build/128521440/nixlog/2
};
}
pkgs/development/tools/continuous-integration/github-runner/default.nix
+2 -2
View File
@@ -45,13 +45,13 @@ let
in
stdenv.mkDerivation rec {
pname = "github-runner";
version = "2.300.2";
version = "2.301.1";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
hash = "sha256-4TCClrCCHMVtbGAlxmAhZt63nQlMxkaLLZ9EOgurSMA=";
hash = "sha256-GIWuN3/CnA0uZfpo1Gty+5tL2eDXmFyzYFHrRozHwk0=";
};
nativeBuildInputs = [
pkgs/development/tools/okteto/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "okteto";
version = "2.11.0";
version = "2.11.1";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
hash = "sha256-BKDjtC3NDazFsvX/FM0qXpHd1muXUQDgzBMSLipA4/U=";
hash = "sha256-Eprsy/wd5lMBXk3yVGhofYD9ZBfdmjGMwXZ61RMgd4k=";
};
vendorHash = "sha256-Yi+4fGCHLH/kA4DuPI2uQ/27xhMd4cPFkTWlI6Bc13A=";
pkgs/development/tools/rust/cargo-release/default.nix
+12 -7
View File
@@ -1,11 +1,12 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, Security
, curl
, openssl
, pkg-config
, openssl
, stdenv
, curl
, darwin
, git
}:
rustPlatform.buildRustPackage rec {
@@ -28,15 +29,19 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
Security
curl
darwin.apple_sdk.frameworks.Security
];
checkInputs = [
git
];
meta = with lib; {
description = ''Cargo subcommand "release": everything about releasing a rust crate'';
homepage = "https://github.com/sunng87/cargo-release";
homepage = "https://github.com/crate-ci/cargo-release";
changelog = "https://github.com/crate-ci/cargo-release/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ gerschtli ];
maintainers = with maintainers; [ figsoda gerschtli ];
};
}
pkgs/games/lgogdownloader/default.nix
+11 -1
View File
@@ -11,8 +11,13 @@
, rhash
, tinyxml-2
, help2man
, wrapQtAppsHook
, qtbase
, qtwebengine
, testers
, lgogdownloader
, enableGui ? true
}:
stdenv.mkDerivation rec {
@@ -30,7 +35,7 @@ stdenv.mkDerivation rec {
cmake
pkg-config
help2man
];
] ++ lib.optional enableGui wrapQtAppsHook;
buildInputs = [
boost
@@ -40,8 +45,13 @@ stdenv.mkDerivation rec {
liboauth
rhash
tinyxml-2
] ++ lib.optionals enableGui [
qtbase
qtwebengine
];
cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON";
passthru.tests = {
version = testers.testVersion { package = lgogdownloader; };
};
pkgs/servers/frr/default.nix
+2 -2
View File
@@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "frr";
version = "8.4.1";
version = "8.4.2";
src = fetchFromGitHub {
owner = "FRRouting";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-SJKDIs6bL8NroSieNeSYBv+8JTGgFdhP4WYKUWYhpbk=";
hash = "sha256-pfsBf5UDAfI+tBmK/xRAR2xBANwVcBDabw7tPBB0yPE=";
};
nativeBuildInputs = [
pkgs/shells/ion/build-script.patch
+17
View File
@@ -0,0 +1,17 @@
--- a/build.rs
+++ b/build.rs
@@ -23,13 +23,7 @@ fn write_version_file() -> io::Result<()> {
let target = env::var("TARGET").unwrap();
let version_fname = Path::new(&env::var("OUT_DIR").unwrap()).join("version_string");
let mut version_file = File::create(&version_fname)?;
- write!(
- &mut version_file,
- "r#\"ion {} ({})\nrev {}\"#",
- version,
- target,
- get_git_rev()?.trim()
- )?;
+ write!(&mut version_file, "r#\"ion {version} ({target})\n\"#")?;
Ok(())
}
pkgs/shells/ion/default.nix
+28 -16
View File
@@ -1,17 +1,40 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, libiconv }:
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "ion";
version = "unstable-2021-05-10";
version = "unstable-2022-11-27";
src = fetchFromGitHub {
owner = "redox-os";
repo = "ion";
rev = "1170b84587bbad260a3ecac8e249a216cb1fd5e9";
sha256 = "sha256-lI1GwA3XerRJaC/Z8vTZc6GzRDLjv3w768C+Ui6Q+3Q=";
rev = "3bb8966fc99ba223033e1e02b0a6d50fc25cbef4";
sha256 = "sha256-6KW/YkMQFeGb1i+1YdADZRW89UruHsfPhMq9Cvxjl/4=";
};
cargoSha256 = "sha256-hURpgxc99iIMtzIlR6Kbfqcbu1uYLDHnfVLqgmMbvFA=";
cargoSha256 = "sha256-KLKPnj4SmAuspjMPAGLJ8Yy9SxAi6FvGE/FIF58lAH8=";
patches = [
# remove git revision from the build script to fix build
./build-script.patch
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
checkFlags = lib.optionals stdenv.isDarwin [
# test assumes linux
"--skip=binary::completer::tests::filename_completion"
];
passthru = {
shellPath = "/bin/ion";
};
meta = with lib; {
description = "Modern system shell with simple (and powerful) syntax";
@@ -19,15 +42,4 @@ rustPlatform.buildRustPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ dywedir ];
};
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
Security
libiconv
];
doCheck = !stdenv.hostPlatform.isDarwin;
passthru = {
shellPath = "/bin/ion";
};
}
pkgs/tools/graphics/texture-synthesis/default.nix
+4 -1
View File
@@ -1,4 +1,4 @@
{ fetchFromGitHub, lib, rustPlatform }:
{ lib, rustPlatform, fetchFromGitHub, stdenv }:
rustPlatform.buildRustPackage rec {
pname = "texture-synthesis";
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1xszis3ip1hymzbhdili2hvdwd862cycwvsxxyjqmz3g2rlg5b64";
# tests fail for unknown reasons on aarch64-darwin
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
meta = with lib; {
description = "Example-based texture synthesis written in Rust";
homepage = "https://github.com/embarkstudios/texture-synthesis";
pkgs/tools/misc/bmon/default.nix
+11 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, ncurses, libconfuse
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, ncurses, libconfuse
, libnl }:
stdenv.mkDerivation rec {
@@ -12,6 +12,16 @@ stdenv.mkDerivation rec {
sha256 = "1ilba872c09mnlvylslv4hqv6c9cz36l76q74rr99jvis1dg69gf";
};
# The source code defines `__unused__`, which is a reserved name
# https://github.com/tgraf/bmon/issues/89
patches = [
(fetchpatch {
url = "https://github.com/macports/macports-ports/raw/6d1dd5e9c8fae608bd22f3ede21e576f29c6358c/net/bmon/files/patch-fix__unused.diff";
extraPrefix = "";
sha256 = "sha256-UYIiJZzipsx9a0xabrKfyj8TWNW7IM77oXnVnSPkQkc=";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.isLinux libnl;
@@ -30,7 +40,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ bjornfor pSub ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}
pkgs/tools/misc/macchina/default.nix
+6 -7
View File
@@ -1,10 +1,9 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, installShellFiles
, libiconv
, Foundation
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
@@ -25,12 +24,12 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
Foundation
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.DisplayServices
];
postInstall = ''
installShellCompletion target/completions/*.{bash,fish}
installManPage doc/macchina.{1,7}
'';
meta = with lib; {
@@ -38,6 +37,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/Macchina-CLI/macchina";
changelog = "https://github.com/Macchina-CLI/macchina/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ _414owen ];
maintainers = with maintainers; [ _414owen figsoda ];
};
}
pkgs/tools/misc/tz/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tz";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "oz";
repo = "tz";
rev = "v${version}";
sha256 = "sha256-fl+Q6HNMSIo6E5SMBkTr6/hJN9akfJRBwSPaq7FcYDY=";
sha256 = "sha256-yeCoBDorwwj3+tqKzoAjtMdYmjqscks/qU8EkmO/D5k=";
};
vendorSha256 = "sha256-lcCra4LyebkmelvBs0Dd2mn6R64Q5MaUWc5AP8V9pec=";
vendorHash = "sha256-lcCra4LyebkmelvBs0Dd2mn6R64Q5MaUWc5AP8V9pec=";
meta = with lib; {
description = "A time zone helper";
pkgs/tools/misc/vector/default.nix
+5 -10
View File
@@ -28,12 +28,12 @@
# building on linux fails without this feature flag (both x86_64 and AArch64)
++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ]
++ lib.optional stdenv.targetPlatform.isUnix "unix")
, nix-update-script
}:
let
pname = "vector";
pinData = lib.importJSON ./pin.json;
version = pinData.version;
version = "0.27.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -42,15 +42,10 @@ rustPlatform.buildRustPackage {
owner = "vectordotdev";
repo = pname;
rev = "v${version}";
sha256 = pinData.sha256;
sha256 = "sha256-+jap7cexevEky3H+Ct9LXXUwHR5tnbzdN+b13pv3f70=";
};
patches = [
# replace with https://github.com/vectordotdev/vector/pull/15093 when ready
./fix-for-rust-1.66.diff
];
cargoSha256 = pinData.cargoSha256;
cargoSha256 = "sha256-KehBEwoz5N0zQLDk+9vwFSrn1TrVwljFj+asr7q7hmw=";
nativeBuildInputs = [ pkg-config cmake perl ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
@@ -110,7 +105,7 @@ rustPlatform.buildRustPackage {
passthru = {
inherit features;
updateScript = ./update.sh;
updateScript = nix-update-script { };
};
meta = with lib; {
pkgs/tools/misc/vector/fix-for-rust-1.66.diff
-13
View File
@@ -1,13 +0,0 @@
diff --git a/src/sources/aws_kinesis_firehose/filters.rs b/src/sources/aws_kinesis_firehose/filters.rs
index ac33682..fe65ed4 100644
--- a/src/sources/aws_kinesis_firehose/filters.rs
+++ b/src/sources/aws_kinesis_firehose/filters.rs
@@ -28,7 +28,7 @@ pub fn firehose(
acknowledgements: bool,
out: SourceSender,
log_namespace: LogNamespace,
-) -> impl Filter<Extract = impl warp::Reply, Error = Infallible> + Clone {
+) -> impl Filter<Extract = (impl warp::Reply,), Error = Infallible> + Clone {
let bytes_received = register!(BytesReceived::from(Protocol::HTTP));
let context = handlers::Context {
compression: record_compression,
pkgs/tools/misc/vector/pin.json
-5
View File
@@ -1,5 +0,0 @@
{
"version": "0.26.0",
"sha256": "sha256-0h9hcNgaVBDBeSKo39TvrMlloTS5ZoXrbVhm7Y43U+o=",
"cargoSha256": "sha256-UHc8ZyLJ1pxaBuP6bOXdbAI1oVZD4CVHAIa8URnNdaI="
}
pkgs/tools/misc/vector/update.sh
-33
View File
@@ -1,33 +0,0 @@
#!/usr/bin/env nix-shell
#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep
# TODO set to `verbose` or `extdebug` once implemented in oil
shopt --set xtrace
# we need failures inside of command subs to get the correct cargoSha256
shopt --unset inherit_errexit
const directory = $(dirname $0 | xargs realpath)
const owner = "vectordotdev"
const repo = "vector"
const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
jq -r '.tag_name')
const latest_version = $(echo $latest_rev | sd 'v' '')
const current_version = $(jq -r '.version' $directory/pin.json)
if ("$latest_version" === "$current_version") {
echo "$repo is already up-to-date"
return 0
} else {
const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')"
jq ".version = \"$latest_version\" | \
.\"sha256\" = \"$tarball_hash\" | \
.\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
const new_cargo_sha256 = $(nix-build -A vector 2>&1 | \
tail -n 2 | \
head -n 1 | \
sd '\s+got:\s+' '')
jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json
}
pkgs/tools/text/rsbkb/default.nix
+35
View File
@@ -0,0 +1,35 @@
{ lib,
fetchFromGitHub,
rustPlatform,
enableAppletSymlinks ? true,
}:
rustPlatform.buildRustPackage rec {
pname = "rsbkb";
version = "1.1";
src = fetchFromGitHub {
owner = "trou";
repo = "rsbkb";
rev = "release-${version}";
hash = "sha256-SqjeH0eOo+upSfPWh2IW75p1VHMqmzAbCchDrXhvMxs=";
};
cargoSha256 = "N3Xlw2JzTjqWLiVNCZaomsWQl330kGVlwdz4Gf05TGU=";
# Setup symlinks for all the utilities,
# busybox style
postInstall = lib.optionalString enableAppletSymlinks
''
cd $out/bin || exit 1
path="$(realpath --canonicalize-missing ./rsbkb)"
for i in $(./rsbkb list) ; do ln -s $path $i ; done
'';
meta = with lib; {
description = "Command line tools to encode/decode things";
homepage = "https://github.com/trou/rsbkb";
changelog = "https://github.com/trou/rsbkb/releases/tag/release-${version}";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ProducerMatt ];
};
}
pkgs/top-level/all-packages.nix
+9 -11
View File
@@ -5477,6 +5477,8 @@ with pkgs;
rsbep = callPackage ../tools/backup/rsbep { };
rsbkb = callPackage ../tools/text/rsbkb { };
rsyslog = callPackage ../tools/system/rsyslog {
withHadoop = false; # Currently Broken
withKsi = false; # Currently Broken
@@ -9469,9 +9471,7 @@ with pkgs;
macchanger = callPackage ../os-specific/linux/macchanger { };
macchina = callPackage ../tools/misc/macchina {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
macchina = callPackage ../tools/misc/macchina { };
madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang;
@@ -13711,9 +13711,7 @@ with pkgs;
fzf-git-sh = callPackage ../shells/fzf-git-sh {};
ion = callPackage ../shells/ion {
inherit (darwin) Security;
};
ion = callPackage ../shells/ion { };
jush = callPackage ../shells/jush { };
@@ -15560,9 +15558,7 @@ with pkgs;
cargo-pgx = callPackage ../development/tools/rust/cargo-pgx {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-release = callPackage ../development/tools/rust/cargo-release {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-release = callPackage ../development/tools/rust/cargo-release { };
cargo-rr = callPackage ../development/tools/rust/cargo-rr { };
cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -29892,6 +29888,8 @@ with pkgs;
popura = callPackage ../tools/networking/popura {};
pureref = callPackage ../applications/graphics/pureref { };
shepherd = nodePackages."@nerdwallet/shepherd";
skate = callPackage ../applications/misc/skate { };
@@ -34914,7 +34912,7 @@ with pkgs;
left4gore-bin = callPackage ../games/left4gore { };
lgogdownloader = callPackage ../games/lgogdownloader { };
lgogdownloader = libsForQt5.callPackage ../games/lgogdownloader { };
liberal-crime-squad = callPackage ../games/liberal-crime-squad { };
@@ -37305,7 +37303,7 @@ with pkgs;
lguf-brightness = callPackage ../misc/lguf-brightness { };
lighthouse = darwin.apple_sdk_11_0.callPackage ../applications/blockchains/lighthouse {
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security;
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security SystemConfiguration;
};
lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };