Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
1ac9e3255b
|
|
@ -6557,6 +6557,12 @@
|
|||
githubId = 6445082;
|
||||
name = "Joseph Lukasik";
|
||||
};
|
||||
jhh = {
|
||||
email = "jeff@j3ff.io";
|
||||
github = "jhh";
|
||||
githubId = 14412;
|
||||
name = "Jeff Hutchison";
|
||||
};
|
||||
jhhuh = {
|
||||
email = "jhhuh.note@gmail.com";
|
||||
github = "jhhuh";
|
||||
|
|
@ -14367,6 +14373,7 @@
|
|||
};
|
||||
urandom = {
|
||||
email = "colin@urandom.co.uk";
|
||||
matrix = "@urandom0:matrix.org";
|
||||
github = "urandom2";
|
||||
githubId = 2526260;
|
||||
keys = [{
|
||||
|
|
@ -16020,4 +16027,10 @@
|
|||
github = "wuyoli";
|
||||
githubId = 104238274;
|
||||
};
|
||||
ziguana = {
|
||||
name = "Zig Uana";
|
||||
email = "git@ziguana.dev";
|
||||
github = "ziguana";
|
||||
githubId = 45833444;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@
|
|||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
Create the first release note entry in this section!
|
||||
<link xlink:href="https://github.com/junegunn/fzf">fzf</link>,
|
||||
a command line fuzzyfinder. Available as
|
||||
<link linkend="opt-programs.fzf.fuzzyCompletion">programs.fzf</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-23.05-incompatibilities}
|
||||
|
||||
|
|
|
|||
|
|
@ -165,6 +165,7 @@
|
|||
./programs/flexoptix-app.nix
|
||||
./programs/freetds.nix
|
||||
./programs/fuse.nix
|
||||
./programs/fzf.nix
|
||||
./programs/gamemode.nix
|
||||
./programs/geary.nix
|
||||
./programs/git.nix
|
||||
|
|
|
|||
37
nixos/modules/programs/fzf.nix
Normal file
37
nixos/modules/programs/fzf.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{pkgs, config, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.programs.fzf;
|
||||
in {
|
||||
options = {
|
||||
programs.fzf = {
|
||||
fuzzyCompletion = mkOption {
|
||||
type = types.bool;
|
||||
description = lib.mdDoc "Whether to use fzf for fuzzy completion";
|
||||
default = false;
|
||||
example = true;
|
||||
};
|
||||
keybindings = mkOption {
|
||||
type = types.bool;
|
||||
description = lib.mdDoc "Whether to set up fzf keybindings";
|
||||
default = false;
|
||||
example = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
config = {
|
||||
environment.systemPackages = optional (cfg.keybindings || cfg.fuzzyCompletion) pkgs.fzf;
|
||||
programs.bash.interactiveShellInit = optionalString cfg.fuzzyCompletion ''
|
||||
source ${pkgs.fzf}/share/fzf/completion.bash
|
||||
'' + optionalString cfg.keybindings ''
|
||||
source ${pkgs.fzf}/share/fzf/key-bindings.bash
|
||||
'';
|
||||
|
||||
programs.zsh.interactiveShellInit = optionalString cfg.fuzzyCompletion ''
|
||||
source ${pkgs.fzf}/share/fzf/completion.zsh
|
||||
'' + optionalString cfg.keybindings ''
|
||||
source ${pkgs.fzf}/share/fzf/key-bindings.zsh
|
||||
'';
|
||||
};
|
||||
meta.maintainers = with maintainers; [ laalsaas ];
|
||||
}
|
||||
|
|
@ -51,6 +51,7 @@ let
|
|||
"nginx"
|
||||
"nginxlog"
|
||||
"node"
|
||||
"nut"
|
||||
"openldap"
|
||||
"openvpn"
|
||||
"pihole"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.nut;
|
||||
in
|
||||
{
|
||||
port = 9199;
|
||||
extraOpts = {
|
||||
nutServer = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
description = lib.mdDoc ''
|
||||
Hostname or address of the NUT server
|
||||
'';
|
||||
};
|
||||
nutUser = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
example = "nut";
|
||||
description = lib.mdDoc ''
|
||||
The user to log in into NUT server. If set, passwordPath should
|
||||
also be set.
|
||||
|
||||
Default NUT configs usually permit reading variables without
|
||||
authentication.
|
||||
'';
|
||||
};
|
||||
passwordPath = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
apply = final: if final == null then null else toString final;
|
||||
description = lib.mdDoc ''
|
||||
A run-time path to the nutUser password file, which should be
|
||||
provisioned outside of Nix store.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
script = ''
|
||||
${optionalString (cfg.passwordPath != null)
|
||||
"export NUT_EXPORTER_PASSWORD=$(cat ${toString cfg.passwordPath})"}
|
||||
${pkgs.prometheus-nut-exporter}/bin/nut_exporter \
|
||||
--nut.server=${cfg.nutServer} \
|
||||
--web.listen-address="${cfg.listenAddress}:${toString cfg.port}" \
|
||||
${optionalString (cfg.nutUser != "") "--nut.username=${cfg.nutUser}"}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,68 +1,45 @@
|
|||
{ lib, stdenv, fetchFromGitLab, fetchpatch }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, autoconf
|
||||
, automake
|
||||
, libtool
|
||||
, faad2
|
||||
, mp4v2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aacgain";
|
||||
version = "1.9.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mulx";
|
||||
repo = "aacgain";
|
||||
rev = "7c29dccd878ade1301710959aeebe87a8f0828f5";
|
||||
sha256 = "07hl432vsscqg01b6wr99qmsj4gbx0i02x4k565432y6zpfmaxm0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgilman";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9Y23Zh7q3oB4ha17Fpm1Hu2+wtQOA1llj6WDUAO2ARU=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# -Wnarrowing is enabled by default in recent GCC versions,
|
||||
# causing compilation to fail.
|
||||
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
|
||||
|
||||
postPatch = ''
|
||||
(
|
||||
cd mp4v2
|
||||
patch -p0 < ${fetchpatch {
|
||||
name = "fix_missing_ptr_deref.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_missing_ptr_deref.patch?h=aacgain-cvs&id=e1a19c920f57063e64bab75cb0d8624731f6e3d7";
|
||||
sha256 = "1cq7r005nvmwdjb25z80grcam7jv6k57jnl2bh349mg3ajmslbq9";
|
||||
}}
|
||||
)
|
||||
cp -R ${faad2.src}/* 3rdparty/faad2
|
||||
cp -R ${mp4v2.src}/* 3rdparty/mp4v2
|
||||
chmod -R +w 3rdparty
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
cd mp4v2
|
||||
./configure
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
];
|
||||
|
||||
cd ../faad2
|
||||
./configure
|
||||
|
||||
cd ..
|
||||
./configure
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cd mp4v2
|
||||
make libmp4v2.la
|
||||
|
||||
cd ../faad2
|
||||
make LDFLAGS=-static
|
||||
|
||||
cd ..
|
||||
make
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -D aacgain/aacgain "$out/bin/aacgain"
|
||||
'';
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
|
||||
|
||||
meta = with lib; {
|
||||
description = "ReplayGain for AAC files";
|
||||
homepage = "https://aacgain.altosdesign.com";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://github.com/dgilman/aacgain";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.robbinch ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, lib
|
||||
, pango
|
||||
, pkg-config
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
|
@ -25,6 +26,7 @@ buildGoModule rec {
|
|||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -42,6 +44,6 @@ buildGoModule rec {
|
|||
description = "GTK4 Discord client in Go, attempt #4.";
|
||||
homepage = "https://github.com/diamondburned/gtkcord4";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
maintainers = with maintainers; [ hmenke urandom ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -301,6 +301,23 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
astro-build.astro-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "astro-vscode";
|
||||
publisher = "astro-build";
|
||||
version = "0.29.1";
|
||||
sha256 = "sha256-fMeEeYCZuORhZRds0A8HjHPncK0+SQbV0+f/zU5AIg4=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog";
|
||||
description = "Astro language support for VSCode";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=astro-build.astro-vscode";
|
||||
homepage = "https://github.com/withastro/language-tools";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wackbyte ];
|
||||
};
|
||||
};
|
||||
|
||||
asvetliakov.vscode-neovim = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-neovim";
|
||||
|
|
@ -2546,8 +2563,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "svelte-vscode";
|
||||
publisher = "svelte";
|
||||
version = "105.21.0";
|
||||
sha256 = "12p6msv8wi773piqm1y5zik3ky652bdaw9s83ffwnlndsh87s9n5";
|
||||
version = "106.3.0";
|
||||
sha256 = "sha256-xe1Ad24r2Ks85WAfaD5em8KGwaQ5h6i5qkUouU6lmtc=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/sveltejs/language-tools/releases";
|
||||
|
|
|
|||
|
|
@ -78,6 +78,5 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ podocarp ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -112,13 +112,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-e+D9xI3lZfMDze1YW+Wjni29cPfsSlghmCkLFP/4ork=",
|
||||
"hash": "sha256-g38aJ8JN/0PZ0ArSti1/5nzflIlkz/qhn5Qz4yXCie8=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.44.0",
|
||||
"rev": "v4.45.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-mDn16Cww7PD5tPKRKf4uoOK3UJH9se8LCziTX10XcXY="
|
||||
"vendorHash": "sha256-C3wr/3huORBacbe0+Z0qqH+iSaJCxQwLq9wqLSirDiM="
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-itaFeOEnoTIJfACvJZCIe9RWNVgewdVFZzXUK7yGglQ=",
|
||||
|
|
@ -130,11 +130,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-aUTapTSpNZo2Tg3e/BMBGedEVwX0Sa+T2UrbgyiLOhk=",
|
||||
"hash": "sha256-2RjraGiMtITdBJ47crqlqFR51WbKpk4U6fkGHCTNXuo=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.33.0",
|
||||
"rev": "v3.34.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -149,11 +149,11 @@
|
|||
},
|
||||
"baiducloud": {
|
||||
"deleteVendor": true,
|
||||
"hash": "sha256-0L/T12jeSkdZDJknVu5JffyaniZ1RVWgMpPu3qKNmWU=",
|
||||
"hash": "sha256-Yw0dtfPiXLSLDvlAL3OUfZsd8ihc/OCBedsSSUcedOU=",
|
||||
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
|
||||
"owner": "baidubce",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.18.2",
|
||||
"rev": "v1.18.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4="
|
||||
},
|
||||
|
|
@ -231,11 +231,11 @@
|
|||
"vendorHash": "sha256-2H+xp/A3J/xUf02voYyWP+J5MSsFM7Kz7KlgjaF99ao="
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"hash": "sha256-OOORVbjcXhH6gVjLdOu8kTqy6dzIARruF4H8byMNkko=",
|
||||
"hash": "sha256-RYUs35sSL9CuwrOfUQ/S1G6W8ILgpJqVn8Xk9s2s35Y=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry",
|
||||
"owner": "cloudfoundry-community",
|
||||
"repo": "terraform-provider-cloudfoundry",
|
||||
"rev": "v0.50.1",
|
||||
"rev": "v0.50.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA="
|
||||
},
|
||||
|
|
@ -625,11 +625,11 @@
|
|||
"vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8="
|
||||
},
|
||||
"ksyun": {
|
||||
"hash": "sha256-Rye7gKARdbrB6KDEygEJy9m7VqlGw6QeE2F1oa3n8as=",
|
||||
"hash": "sha256-PfUTE8j2tb4piNeRx4FRy8s45w8euQU773oJHbcdlVE=",
|
||||
"homepage": "https://registry.terraform.io/providers/kingsoftcloud/ksyun",
|
||||
"owner": "kingsoftcloud",
|
||||
"repo": "terraform-provider-ksyun",
|
||||
"rev": "v1.3.58",
|
||||
"rev": "v1.3.59",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ="
|
||||
},
|
||||
|
|
@ -707,11 +707,11 @@
|
|||
"vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M="
|
||||
},
|
||||
"mailgun": {
|
||||
"hash": "sha256-EQDpDuLX3uKVom/UuNbWX72N6pTPSvK+qh6nyHTcMiI=",
|
||||
"hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=",
|
||||
"homepage": "https://registry.terraform.io/providers/wgebis/mailgun",
|
||||
"owner": "wgebis",
|
||||
"repo": "terraform-provider-mailgun",
|
||||
"rev": "v0.7.3",
|
||||
"rev": "v0.7.4",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-yUXxq8NTOv8ZmWp0WiIID2cRU6AZiItIs99uGZpt9dc="
|
||||
},
|
||||
|
|
@ -1086,20 +1086,20 @@
|
|||
"vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag="
|
||||
},
|
||||
"tailscale": {
|
||||
"hash": "sha256-/qC8TOtoVoBTWeAFpt2TYE8tlYBCCcn/mzVQ/DN51YQ=",
|
||||
"hash": "sha256-X3YV640d3pLyKm/v88oEhXfYnox+ksrEWKgiJbYl6gk=",
|
||||
"homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
|
||||
"owner": "tailscale",
|
||||
"repo": "terraform-provider-tailscale",
|
||||
"rev": "v0.13.5",
|
||||
"rev": "v0.13.6",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4="
|
||||
"vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-kmcZfq9gL3kybCVl4MHXYKykrqtupf7dvizbhNVVhms=",
|
||||
"hash": "sha256-beoS4io1KffsMCvYHwpWzo6NNwdi7JyPBBi/BwGFU9Y=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.78.16",
|
||||
"rev": "v1.79.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, src
|
||||
, jami-meta
|
||||
, lib
|
||||
, fetchpatch
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, cmake
|
||||
|
|
@ -25,13 +26,20 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "jami-client-qt";
|
||||
pname = "jami-client";
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "source/client-qt";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-build-without-webengine.patch";
|
||||
url = "https://git.jami.net/savoirfairelinux/jami-client-qt/-/commit/9b2dbb64eaa9256f800dfa69d897545f4b0affd2.patch";
|
||||
hash = "sha256-lgDlSlXIjtdymBa7xSe1PabSK9DnSG5KnJggOLWyn+A=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
python gen-resources.py
|
||||
echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h
|
||||
'';
|
||||
|
||||
|
|
@ -61,8 +69,8 @@ stdenv.mkDerivation {
|
|||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DRING_BUILD_DIR=${jami-daemon}/include"
|
||||
"-DRING_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces"
|
||||
"-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami"
|
||||
"-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces"
|
||||
] ++ lib.optionals (!withWebengine) [
|
||||
"-DWITH_WEBENGINE=false"
|
||||
];
|
||||
|
|
@ -12,11 +12,11 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "20220825.0828.c10f01f";
|
||||
version = "20221031.1308.130cc26";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz";
|
||||
hash = "sha256-axQYU7+kOFE9SnI8fR4F6NFvD9ITZ85UJhg5OVniSlg=";
|
||||
hash = "sha256-+xpSoSsG+G+w8+g0FhXx+6Phroj83ijW8xWvYO+kdqY=";
|
||||
|
||||
stripRoot = false;
|
||||
postFetch = ''
|
||||
|
|
@ -87,7 +87,7 @@ rec {
|
|||
inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami;
|
||||
};
|
||||
|
||||
jami-client-qt = qt6Packages.callPackage ./client-qt.nix {
|
||||
jami-client = qt6Packages.callPackage ./client.nix {
|
||||
inherit version src jami-meta ffmpeg-jami;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,36 @@
|
|||
{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus
|
||||
, qtbase, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc
|
||||
, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes, coreutils
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
, xdg-utils
|
||||
, dbus
|
||||
, qtbase
|
||||
, qtwebengine
|
||||
, qtx11extras
|
||||
, getconf
|
||||
, glibc
|
||||
, libXrandr
|
||||
, libX11
|
||||
, libXext
|
||||
, libXdamage
|
||||
, libXtst
|
||||
, libSM
|
||||
, libXfixes
|
||||
, coreutils
|
||||
, wrapQtAppsHook
|
||||
, icu63
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "teamviewer";
|
||||
# teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime
|
||||
outputs = [ "out" "dev" ];
|
||||
version = "15.29.4";
|
||||
version = "15.35.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
|
||||
sha256 = "sha256-jkFqOtU+D62S7QmNPvz58Z8wJ79lkN11pWQrtNdD+Uk=";
|
||||
sha256 = "sha256-KNUhe0c6Th2pW7+Lmo62FYdOv+8t7Z5/eQkYPN8eusc=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
@ -21,8 +39,7 @@ mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ];
|
||||
buildInputs = [ dbus getconf qtbase qtwebengine qtx11extras libX11 ];
|
||||
propagatedBuildInputs = [ qtquickcontrols ];
|
||||
buildInputs = [ qtbase qtwebengine qtx11extras icu63 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/teamviewer $out/bin $out/share/applications
|
||||
|
|
@ -30,10 +47,28 @@ mkDerivation rec {
|
|||
rm -R \
|
||||
$out/share/teamviewer/logfiles \
|
||||
$out/share/teamviewer/config \
|
||||
$out/share/teamviewer/tv_bin/RTlib \
|
||||
$out/share/teamviewer/tv_bin/xdg-utils \
|
||||
$out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,tv-delayed-start.sh}
|
||||
|
||||
# Teamviewer packages its own qt library files.
|
||||
# Most of them can be replaced by nixpkgs libraries, but the following need to be used beginning at version 15.35.7
|
||||
# because teamviewer will not start without them, either stalling at startup or even segfaulting. In the logfiles, some missing qt libraries
|
||||
# can be observed, although they are present from nixpkgs. AutoPatchelfHook will automatically choose the included libraries, if present.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/202024
|
||||
|
||||
# delete all library files except "qt" folder
|
||||
find $out/share/teamviewer/tv_bin/RTlib -depth -maxdepth 1 ! -type d -execdir rm -rf {} +
|
||||
|
||||
# remove all other folders except "qml" and "plugins" from the qml directory
|
||||
find $out/share/teamviewer/tv_bin/RTlib/qt -depth -maxdepth 1 -mindepth 1 -type d ! \( -name "qml" -o -name "plugins" \) -execdir rm -rf {} +
|
||||
|
||||
# keep "QtQuick" and "QtQuick.2" directory
|
||||
find $out/share/teamviewer/tv_bin/RTlib/qt/qml -depth -maxdepth 1 -mindepth 1 -type d ! \( -name "QtQuick" -o -name "QtQuick.2" \) -execdir rm -rf {} +
|
||||
|
||||
# delete all folders except "platforms" from the plugins directory
|
||||
# it contains libqxcb.so from qtbase which seems to be incompatible with our nixpkgs version
|
||||
find $out/share/teamviewer/tv_bin/RTlib/qt/plugins -depth -maxdepth 1 -mindepth 1 -type d ! -name "platforms" -execdir rm -rf {} +
|
||||
|
||||
ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin
|
||||
ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin
|
||||
ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications
|
||||
|
|
@ -79,7 +114,7 @@ mkDerivation rec {
|
|||
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [ getconf coreutils ]}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus ]}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus icu63 ]}"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
|
@ -100,6 +135,6 @@ mkDerivation rec {
|
|||
license = licenses.unfree;
|
||||
description = "Desktop sharing application, providing remote support and online meetings";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ jagajaga jraygauthier ];
|
||||
maintainers = with maintainers; [ jagajaga jraygauthier gador ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
93
pkgs/applications/science/electronics/flopoco/default.nix
Normal file
93
pkgs/applications/science/electronics/flopoco/default.nix
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, installShellFiles
|
||||
, bison
|
||||
, boost
|
||||
, flex
|
||||
, gmp
|
||||
, libxml2
|
||||
, mpfi
|
||||
, mpfr
|
||||
, scalp
|
||||
, sollya
|
||||
, wcpg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flopoco";
|
||||
version = "4.1.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
# flopoco-4.1.3 is not tagged on GitLab
|
||||
rev = "67598298207c9f3261c35679c8a5966480c4343c";
|
||||
sha256 = "sha256-0jRjg4/qciqBcjsi6BTbKO4VJkcoEzpC98wFkUOIGbI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-clang-error-sin-cos.patch";
|
||||
url = "https://gitlab.com/flopoco/flopoco/-/commit/de3aa60ad19333952c176c2a2e51f12653ca736b.patch";
|
||||
postFetch = ''
|
||||
substituteInPlace $out \
|
||||
--replace 'FixSinCosCORDIC.hpp' 'CordicSinCos.hpp'
|
||||
'';
|
||||
sha256 = "sha256-BlamA/MZuuqqvGYto+jPeQPop6gwva0y394Odw8pdwg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-clang-error-atan2.patch";
|
||||
url = "https://gitlab.com/flopoco/flopoco/-/commit/a3ffe2436c1b59ee0809b3772b74f2d43c6edb99.patch";
|
||||
sha256 = "sha256-dSYcufLHDL0p1V1ghmy6X6xse5f6mjUqckaVqLZnTaA=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
|
||||
sed -i "s/-pg//g" {,src/Apps/TaMaDi/}CMakeLists.txt
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
flex
|
||||
gmp
|
||||
libxml2
|
||||
mpfi
|
||||
mpfr
|
||||
scalp
|
||||
sollya
|
||||
wcpg
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
./flopoco BuildAutocomplete
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 flopoco $out/bin/flopoco
|
||||
cp bin* fp* ieee* longacc* $out/bin/
|
||||
installShellCompletion --bash flopoco_autocomplete
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The FloPoCo arithmetic core generator";
|
||||
homepage = "https://flopoco.org/";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +1,15 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, automake, pkg-config
|
||||
, cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.10.12";
|
||||
version = "3.10.37";
|
||||
pname = "xcircuit";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://opencircuitdesign.com/xcircuit/archive/xcircuit-${version}.tgz";
|
||||
sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RTimothyEdwards";
|
||||
repo = "XCircuit";
|
||||
rev = "0056213308c92bec909e8469a0fa1515b72fc3d2";
|
||||
sha256 = "sha256-LXU5VEkLF1aKYz9ynI1qQjJUwt/zKFMPYj153OgJOOI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook automake pkg-config ];
|
||||
|
|
@ -26,6 +28,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://opencircuitdesign.com/xcircuit";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ spacefrogg thoughtpolice ];
|
||||
maintainers = with maintainers; [ john-shaffer spacefrogg thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dmlive";
|
||||
version = "unstable-2022-08-22";
|
||||
version = "unstable-2022-11-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "THMonster";
|
||||
repo = pname;
|
||||
rev = "fd4fa1859f05350658db598a50d29f59d22b55a1";
|
||||
hash = "sha256-NVabHLxPHi7hWoztthPmVC5VRKQKglpytuUQOY1Hzrw=";
|
||||
rev = "711319043dca3c1fee44cd60841ef51605b42bce";
|
||||
hash = "sha256-weWl9voqTP/1ZBSLuMFzfWE5NskHNPJnFYy9n9IgcZk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TziP7n9Xgi/wHaiF/NI6noMp1iR6vRuAXxvKJwQHbTw=";
|
||||
cargoHash = "sha256-9bonyOCQfO5Eq8T2GVCri+INCe4RUOK28nw4cnmmAWs=";
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, copyDesktopItems
|
||||
, fetchPypi
|
||||
, gobject-introspection
|
||||
, jellyfin-apiclient-python
|
||||
, jinja2
|
||||
, makeDesktopItem
|
||||
, mpv
|
||||
, pillow
|
||||
, pystray
|
||||
, python
|
||||
, python-mpv-jsonipc
|
||||
, pywebview
|
||||
, tkinter
|
||||
|
|
@ -23,6 +26,7 @@ buildPythonApplication rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
];
|
||||
|
|
@ -59,6 +63,15 @@ buildPythonApplication rec {
|
|||
--replace "notify_updates: bool = True" "notify_updates: bool = False"
|
||||
'';
|
||||
|
||||
# Install all the icons for the desktop item
|
||||
postInstall = ''
|
||||
for s in 16 32 48 64 128 256; do
|
||||
mkdir -p $out/share/icons/hicolor/''${s}x''${s}/apps
|
||||
ln -s $out/${python.sitePackages}/jellyfin_mpv_shim/integration/jellyfin-''${s}.png \
|
||||
$out/share/icons/hicolor/''${s}x''${s}/apps/${pname}.png
|
||||
done
|
||||
'';
|
||||
|
||||
# needed for pystray to access appindicator using GI
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
|
|
@ -69,6 +82,16 @@ buildPythonApplication rec {
|
|||
doCheck = false;
|
||||
pythonImportsCheck = [ "jellyfin_mpv_shim" ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
exec = pname;
|
||||
icon = pname;
|
||||
desktopName = "Jellyfin MPV Shim";
|
||||
categories = [ "Video" "AudioVideo" "TV" "Player" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jellyfin/jellyfin-mpv-shim";
|
||||
description = "Allows casting of videos to MPV via the jellyfin mobile and web app";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m0lDnVu6T8P1di8DeQYAKBA6Y+4iSqmc0nE3iBHY5+M=";
|
||||
sha256 = "sha256-6dTVDAFq5CwLvTzOczyaM+ZILKjKZzR2SAaRq2hqk7M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
rm -rf e2e/
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-xigDihg2SvvcFSrKYlo5VluqhqK9xzWVbrsBvsJsLXA=";
|
||||
vendorSha256 = "sha256-B6xqMsspWexTdYX+o2BJNlXuJFL7/rv8oexFUxOO8BI=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,18 @@ dotnetConfigureHook() {
|
|||
|
||||
(( "${#projectFile[@]}" == 0 )) && dotnetRestore
|
||||
|
||||
# Generate a NuGet.config file to make sure everything,
|
||||
# including things like <Sdk /> dependencies, is restored from the proper source
|
||||
cat <<EOF > "./NuGet.config"
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<clear />
|
||||
<add key="nugetSource" value="@nugetSource@/lib" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
EOF
|
||||
|
||||
for project in ${projectFile[@]} ${testProjectFile[@]-}; do
|
||||
dotnetRestore "$project"
|
||||
done
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ let
|
|||
|
||||
bootstrapCompiler = stdenv.mkDerivation {
|
||||
pname = "nim-bootstrap";
|
||||
inherit (nim-unwrapped) version src;
|
||||
inherit (nim-unwrapped) version src preBuild;
|
||||
enableParallelBuilding = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
@ -118,12 +118,14 @@ in {
|
|||
"-d:useGnuReadline"
|
||||
] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace";
|
||||
|
||||
preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
substituteInPlace makefile \
|
||||
--replace "aarch64" "arm64"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
local HOME=$TMPDIR
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
sed -i "s/aarch64/arm64/g" makefile
|
||||
'' + ''
|
||||
./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch
|
||||
./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
|
||||
./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p dotnet-sdk_5 -p jq -p xmlstarlet -p curl
|
||||
set -euo pipefail
|
||||
|
||||
cat << EOL
|
||||
{ fetchurl }: [
|
||||
EOL
|
||||
|
||||
tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root
|
||||
trap 'rm -rf "$tmpdir"' EXIT
|
||||
|
||||
HOME="$tmpdir" dotnet msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir"/.nuget/packages \
|
||||
-p:RestoreNoCache=true -p:RestoreForce=true \
|
||||
src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj >&2
|
||||
|
||||
mapfile -t repos < <(
|
||||
xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config "$tmpdir"/.nuget/NuGet/NuGet.Config |
|
||||
while IFS= read index
|
||||
do
|
||||
curl --compressed -fsL "$index" | \
|
||||
jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"'
|
||||
done
|
||||
)
|
||||
|
||||
cd "$tmpdir/.nuget/packages"
|
||||
for package in *
|
||||
do
|
||||
cd "$package"
|
||||
for version in *
|
||||
do
|
||||
found=false
|
||||
for repo in "${repos[@]}"
|
||||
do
|
||||
url="$repo$package/$version/$package.$version.nupkg"
|
||||
if curl -fsL "$url" -o /dev/null
|
||||
then
|
||||
found=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if ! $found
|
||||
then
|
||||
echo "couldn't find $package $version" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sha256=$(nix-prefetch-url "$url" 2>/dev/null)
|
||||
cat << EOL
|
||||
{
|
||||
pname = "$package";
|
||||
version = "$version";
|
||||
src = fetchurl {
|
||||
url = "$url";
|
||||
sha256 = "$sha256";
|
||||
};
|
||||
}
|
||||
EOL
|
||||
done
|
||||
cd ..
|
||||
done
|
||||
|
||||
cat << EOL
|
||||
]
|
||||
EOL
|
||||
|
|
@ -1,90 +1,40 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, mono
|
||||
, dotnet-sdk_5
|
||||
, makeWrapper
|
||||
, dotnetPackages
|
||||
, buildDotnetModule
|
||||
, dotnetCorePackages
|
||||
, unzip
|
||||
, writeText
|
||||
, symlinkJoin
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
deps = map (package: stdenv.mkDerivation (with package; {
|
||||
inherit pname version src;
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
unpackPhase = ''
|
||||
unzip -o $src
|
||||
chmod -R u+r .
|
||||
function traverseRename () {
|
||||
for e in *
|
||||
do
|
||||
t="$(echo "$e" | sed -e "s/%20/\ /g" -e "s/%2B/+/g")"
|
||||
[ "$t" != "$e" ] && mv -vn "$e" "$t"
|
||||
if [ -d "$t" ]
|
||||
then
|
||||
cd "$t"
|
||||
traverseRename
|
||||
cd ..
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
traverseRename
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
package=$out/lib/dotnet/${pname}/${version}
|
||||
mkdir -p $package
|
||||
cp -r . $package
|
||||
echo "{}" > $package/.nupkg.metadata
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontFixup = true;
|
||||
}))
|
||||
(import ./deps.nix { inherit fetchurl; });
|
||||
|
||||
nuget-config = writeText "NuGet.Config" ''
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<clear />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
'';
|
||||
|
||||
packages = symlinkJoin { name = "roslyn-deps"; paths = deps; };
|
||||
|
||||
packageVersion = "3.10.0";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "roslyn";
|
||||
version = "${packageVersion}-1.21102.26";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotnet";
|
||||
repo = "roslyn";
|
||||
rev = "v${version}";
|
||||
sha256 = "0yf4f4vpqn9lixr37lkp29m2mk51xcm3ysv2ag332xn6zm5zpm2b";
|
||||
hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper dotnet-sdk_5 unzip ];
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
|
||||
projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ];
|
||||
|
||||
nugetDeps = ./extended-deps.nix;
|
||||
|
||||
dontDotnetFixup = true;
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/latestPatch/latestFeature/' global.json
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
rm NuGet.config
|
||||
install -m644 -D ${nuget-config} fake-home/.nuget/NuGet/NuGet.Config
|
||||
ln -s ${packages}/lib/dotnet fake-home/.nuget/packages
|
||||
HOME=$(pwd)/fake-home dotnet msbuild -r -v:m -t:pack \
|
||||
dotnet msbuild -v:m -t:pack \
|
||||
-p:Configuration=Release \
|
||||
-p:RepositoryUrl="${meta.homepage}" \
|
||||
-p:RepositoryCommit="v${version}" \
|
||||
|
|
@ -94,22 +44,24 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
pkg=$out/lib/dotnet/microsoft.net.compilers.toolset/${packageVersion}
|
||||
mkdir -p $out/bin $pkg
|
||||
unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.${packageVersion}-dev.nupkg \
|
||||
-d $pkg
|
||||
pkg="$out/lib/dotnet/microsoft.net.compilers.toolset/${version}"
|
||||
mkdir -p "$out/bin" "$pkg"
|
||||
|
||||
unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.${version}-dev.nupkg \
|
||||
-d "$pkg"
|
||||
# nupkg has 0 permissions for a bunch of things
|
||||
chmod -R +rw $pkg
|
||||
chmod -R +rw "$pkg"
|
||||
|
||||
makeWrapper ${mono}/bin/mono $out/bin/csc \
|
||||
--add-flags "$pkg/tasks/net472/csc.exe"
|
||||
makeWrapper ${mono}/bin/mono $out/bin/vbs \
|
||||
--add-flags "$pkg/tasks/net472/vbs.exe"
|
||||
makeWrapper ${mono}/bin/mono $out/bin/vbc \
|
||||
--add-flags "$pkg/tasks/net472/vbc.exe"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = ".NET C# and Visual Basic compiler";
|
||||
homepage = "https://github.com/dotnet/roslyn";
|
||||
mainProgram = "csc";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ corngood ];
|
||||
|
|
|
|||
1305
pkgs/development/compilers/roslyn/deps.nix
generated
1305
pkgs/development/compilers/roslyn/deps.nix
generated
File diff suppressed because it is too large
Load diff
11
pkgs/development/compilers/roslyn/extended-deps.nix
Normal file
11
pkgs/development/compilers/roslyn/extended-deps.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
# Some required nuget packages are not picked up by the deps generation script,
|
||||
# since they are referenced as a SDK reference, which unfortunately only gets
|
||||
# downloaded during build time. So we include them manually.
|
||||
{ fetchNuGet }: (import ./deps.nix { inherit fetchNuGet; }) ++ [
|
||||
(fetchNuGet rec {
|
||||
pname = "Microsoft.DotNet.Arcade.Sdk";
|
||||
version = "7.0.0-beta.22171.2";
|
||||
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/${version}/microsoft.dotnet.arcade.sdk.${version}.nupkg";
|
||||
sha256 = "15y26skavivkwhnpfa984if3cnpnllbbwbdsjiyfdcalp32fhmjq";
|
||||
})
|
||||
]
|
||||
27
pkgs/development/libraries/level-zero/default.nix
Normal file
27
pkgs/development/libraries/level-zero/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "level-zero";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "level-zero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hfbTgEbvrhWkZEi8Km7KaxJBAc9X1kA/T2DLooKa7KQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake addOpenGLRunpath ];
|
||||
|
||||
postFixup = ''
|
||||
addOpenGLRunpath $out/lib/libze_loader.so
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.oneapi.io/";
|
||||
description = "oneAPI Level Zero Specification Headers and Loader";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ziguana ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -2,29 +2,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mp4v2";
|
||||
version = "4.1.3";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
# 2020-06-20: THE current upstream, maintained and used in distros fork.
|
||||
owner = "TechSmith";
|
||||
repo = "mp4v2";
|
||||
rev = "Release-ThirdParty-MP4v2-${version}";
|
||||
sha256 = "053a0lgy819sbz92cfkq0vmkn2ky39bva554pj4ypky1j6vs04fv";
|
||||
sha256 = "sha256-OP+oVTH9pqYfHtYL1Kjrs1qey/J40ijLi5Gu8GJnvSY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
# 2020-06-19: NOTE: # Fix build with C++11
|
||||
# Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed.
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/203f5a72bc97ffe089b424c47b07dd9eaea35713/trunk/libmp4v2-c++11.patch";
|
||||
sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w";
|
||||
})
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
# unbreak build with Clang≥6 (C++14 by default). Based on https://reviews.freebsd.org/rP458678
|
||||
./fix-build-clang.patch
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ];
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
|
||||
|
||||
# `faac' expects `mp4.h'.
|
||||
postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ qtModule, qtbase, qtdeclarative }:
|
||||
{ lib, stdenv, qtModule, qtbase, qtdeclarative }:
|
||||
|
||||
qtModule {
|
||||
pname = "qt3d";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
# error: use of undeclared identifier 'stat64'
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@
|
|||
, buildPythonPackage
|
||||
, distro
|
||||
, fetchFromGitHub
|
||||
, jdk
|
||||
, jre
|
||||
, numpy
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -24,6 +25,14 @@ buildPythonPackage rec {
|
|||
hash = "sha256-Dfi6LzrLDz9VVDmbeK1dEaWuQosD4tvAH13Q4Mp3smA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./java-interpreter-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's|@JAVA@|${jre}/bin/java|g' $(find -name '*.py')
|
||||
'';
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -34,10 +43,10 @@ buildPythonPackage rec {
|
|||
distro
|
||||
numpy
|
||||
pandas
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
jdk
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
diff -ru origsource/tabula/io.py source/tabula/io.py
|
||||
--- origsource/tabula/io.py 2022-11-23 17:19:35.419837514 +0100
|
||||
+++ source/tabula/io.py 2022-11-23 17:22:08.204194807 +0100
|
||||
@@ -79,7 +79,7 @@
|
||||
)
|
||||
)
|
||||
|
||||
- args = ["java"] + java_options + ["-jar", _jar_path()] + options.build_option_list()
|
||||
+ args = ["@JAVA@"] + java_options + ["-jar", _jar_path()] + options.build_option_list()
|
||||
if path:
|
||||
args.append(path)
|
||||
|
||||
diff -ru origsource/tabula/util.py source/tabula/util.py
|
||||
--- origsource/tabula/util.py 2022-11-23 17:19:35.422837521 +0100
|
||||
+++ source/tabula/util.py 2022-11-23 17:21:41.514132392 +0100
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
try:
|
||||
res = subprocess.check_output(
|
||||
- ["java", "-version"], stderr=subprocess.STDOUT
|
||||
+ ["@JAVA@", "-version"], stderr=subprocess.STDOUT
|
||||
).decode()
|
||||
|
||||
except FileNotFoundError:
|
||||
diff -ru origsource/tests/test_read_pdf_table.py source/tests/test_read_pdf_table.py
|
||||
--- origsource/tests/test_read_pdf_table.py 2022-11-23 17:19:35.422837521 +0100
|
||||
+++ source/tests/test_read_pdf_table.py 2022-11-23 17:21:22.008086776 +0100
|
||||
@@ -281,7 +281,7 @@
|
||||
|
||||
tabula.read_pdf(self.pdf_path, encoding="utf-8")
|
||||
|
||||
- target_args = ["java"]
|
||||
+ target_args = ["@JAVA@"]
|
||||
if platform.system() == "Darwin":
|
||||
target_args += ["-Djava.awt.headless=true"]
|
||||
target_args += [
|
||||
@@ -355,7 +355,7 @@
|
||||
|
||||
tabula.read_pdf(self.pdf_path, encoding="utf-8", silent=False)
|
||||
|
||||
- target_args = ["java"]
|
||||
+ target_args = ["@JAVA@"]
|
||||
if platform.system() == "Darwin":
|
||||
target_args += ["-Djava.awt.headless=true"]
|
||||
target_args += [
|
||||
@@ -382,7 +382,7 @@
|
||||
|
||||
tabula.read_pdf(self.pdf_path, encoding="utf-8", silent=True)
|
||||
|
||||
- target_args = ["java"]
|
||||
+ target_args = ["@JAVA@"]
|
||||
if platform.system() == "Darwin":
|
||||
target_args += ["-Djava.awt.headless=true"]
|
||||
target_args += [
|
||||
58
pkgs/development/tools/refurb/default.nix
Normal file
58
pkgs/development/tools/refurb/default.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "refurb";
|
||||
version = "1.7.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dosisod";
|
||||
repo = "refurb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JA/kU+2cpNKY2umA3NXwsqbfOMv9t6I7GlMYhiA6GTg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
mypy
|
||||
mypy-extensions
|
||||
tomli
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
attrs
|
||||
click
|
||||
colorama
|
||||
iniconfig
|
||||
mccabe
|
||||
packaging
|
||||
pathspec
|
||||
platformdirs
|
||||
pluggy
|
||||
py
|
||||
pyparsing
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^addopts/d" pyproject.toml
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"refurb"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for refurbishing and modernizing Python codebases";
|
||||
homepage = "https://github.com/dosisod/refurb";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ knl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "treefmt";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtide";
|
||||
repo = "treefmt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+EcqrmjZR8pkBiIXpdJ/KfmTm719lgz7oC9tH7OhJKY=";
|
||||
hash = "sha256-v+hXWyrY0GfSgXeqgYLgoOmeiHsZyhRO9Fmj5rPiNJ8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-DXsKUeSmNUIKPsvrLxkg+Kp78rEfjmJQYf2pj1LWW38=";
|
||||
cargoSha256 = "sha256-/WyaZxRFYJmz/qRp2s2v8swdwAtuNR7KXND20IzQoy8=";
|
||||
|
||||
meta = {
|
||||
description = "one CLI to format the code tree";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, wxGTK30
|
||||
, wxGTK32
|
||||
, openal
|
||||
, pkg-config
|
||||
, curl
|
||||
|
|
@ -13,7 +12,7 @@
|
|||
, gettext
|
||||
, boost
|
||||
, libnotify
|
||||
, gtk2
|
||||
, gtk3
|
||||
, doxygen
|
||||
, spring
|
||||
, makeWrapper
|
||||
|
|
@ -26,16 +25,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "springlobby";
|
||||
version = "0.270";
|
||||
version = "0.273";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://springlobby.springrts.com/dl/stable/springlobby-${version}.tar.bz2";
|
||||
sha256 = "1r1g2hw9ipsmsmzbhsi7bxqra1za6x7j1kw12qzl5psqyq8rqbgs";
|
||||
sha256 = "sha256-XkU6i6ABCgw3H9vJu0xjHRO1BglueYM1LyJxcZdOrDk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config gettext doxygen makeWrapper ];
|
||||
buildInputs = [
|
||||
wxGTK30
|
||||
wxGTK32
|
||||
openal
|
||||
curl
|
||||
libtorrent-rasterbar
|
||||
|
|
@ -45,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
libpng
|
||||
libX11
|
||||
libnotify
|
||||
gtk2
|
||||
gtk3
|
||||
glib
|
||||
minizip
|
||||
alure
|
||||
|
|
@ -54,10 +53,6 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
./revert_58b423e.patch # Allows springLobby to continue using system installed spring until #707 is fixed
|
||||
./fix-certs.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/springlobby/springlobby/commit/252c4cb156c1442ed9b4faec3f26265bc7c295ff.patch";
|
||||
sha256 = "sha256-Nq1F5fRPnCkZwl9KgrfuUmpIMK3hUOyZQYIKElWpmzU=";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, pkg-config
|
||||
, intel-gmmlib
|
||||
, intel-graphics-compiler
|
||||
, level-zero
|
||||
, libva
|
||||
}:
|
||||
|
||||
|
|
@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ intel-gmmlib intel-graphics-compiler libva ];
|
||||
buildInputs = [ intel-gmmlib intel-graphics-compiler libva level-zero ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSKIP_UNIT_TESTS=1"
|
||||
|
|
@ -32,9 +33,14 @@ stdenv.mkDerivation rec {
|
|||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
|
||||
outputs = [ "out" "drivers" ];
|
||||
|
||||
postInstall = ''
|
||||
# Avoid clash with intel-ocl
|
||||
mv $out/etc/OpenCL/vendors/intel.icd $out/etc/OpenCL/vendors/intel-neo.icd
|
||||
|
||||
mkdir -p $drivers/lib
|
||||
mv -t $drivers/lib $out/lib/libze_intel*
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ rec {
|
|||
stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
|
||||
|
||||
production = generic {
|
||||
version = "515.86.01";
|
||||
sha256_64bit = "sha256-FBd34covEel9jTMmAhPxvjJ+tzkiriL03atAS7LvRmQ=";
|
||||
openSha256 = "sha256-9QVq6eN+usbzMb0hYvAFPlyr6MDYHvgWPz2orm+5QFc=";
|
||||
settingsSha256 = "sha256-I8CE4EywZrsqzEy7plEG3bNfzTiT+vZJ1sqEQBrtLUQ=";
|
||||
persistencedSha256 = "sha256-vjn315k7i16U1NjY3EB0pw6sLddEcnKaT9CrHOCY268=";
|
||||
version = "525.60.11";
|
||||
sha256_64bit = "sha256-gW7mwuCBPMw9SnlY9x/EmjfGDv4dUdYUbBznJAOYPV0=";
|
||||
openSha256 = "sha256-33ATZuYu+SOOxM6UKXp6J+f1+zbmHvaK4v13X3UZTTM=";
|
||||
settingsSha256 = "sha256-gA1x6oEpnkr/OPP4eR1L5gC5srvEKtDrSpnv2QEaEpE=";
|
||||
persistencedSha256 = "sha256-AFMy3agoJ6yVsGgUvTfOzHlz30iApBpAReckq9iS7AA=";
|
||||
};
|
||||
|
||||
latest = selectHighestVersion production (generic {
|
||||
|
|
|
|||
22
pkgs/servers/monitoring/prometheus/nut-exporter.nix
Normal file
22
pkgs/servers/monitoring/prometheus/nut-exporter.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nut-exporter";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DRuggeri";
|
||||
repo = "nut_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fymVx6FJGII2PmWXVfeCRTxfO+35bmyn/9iL0iPuBgo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ji8JlEYChPBakt5y6+zcm1l04VzZ0/fjfGFJ9p+1KHE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prometheus exporter for Network UPS Tools";
|
||||
homepage = "https://github.com/DRuggeri/nut_exporter";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jhh ];
|
||||
};
|
||||
}
|
||||
33
pkgs/shells/zsh/zsh-edit/default.nix
Normal file
33
pkgs/shells/zsh/zsh-edit/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ stdenv, lib, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zsh-edit";
|
||||
version = "unstable-2022-05-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marlonrichert";
|
||||
repo = "zsh-edit";
|
||||
rev = "4a8fa599792b6d52eadbb3921880a40872013d28";
|
||||
sha256 = "PI4nvzB/F0mHlc0UZJdD49vjzB6pXhhJYNTSmBhY8iU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
outdir=$out/share/zsh/${pname}
|
||||
install -D zsh-edit.plugin.zsh $outdir/zsh-edit.plugin.zsh
|
||||
install -D _bind $outdir/_bind
|
||||
install -d $outdir/functions
|
||||
install -D functions/{,.edit}* $outdir/functions
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/marlonrichert/zsh-edit";
|
||||
description = "A set of powerful extensions to the Zsh command line editor";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ deejayem ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,12 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }:
|
||||
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, writeText
|
||||
, runtimeShell
|
||||
, installShellFiles
|
||||
, ncurses
|
||||
, perl
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "fzf";
|
||||
version = "0.35.1";
|
||||
|
|
@ -15,7 +22,7 @@ buildGoModule rec {
|
|||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings";
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
|
|
@ -38,22 +45,19 @@ buildGoModule rec {
|
|||
--replace " perl -n " " ${perl}/bin/perl -n "
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d}
|
||||
cp shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish
|
||||
cp ${fishHook} $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
cp bin/fzf-tmux $out/bin
|
||||
install bin/fzf-tmux $out/bin
|
||||
|
||||
mkdir -p $man/share/man
|
||||
cp -r man/man1 $man/share/man
|
||||
installManPage man/man1/fzf.1 man/man1/fzf-tmux.1
|
||||
|
||||
mkdir -p $out/share/vim-plugins/${pname}
|
||||
cp -r plugin $out/share/vim-plugins/${pname}
|
||||
install -D plugin/* -t $out/share/vim-plugins/${pname}/plugin
|
||||
|
||||
# Install shell integrations
|
||||
install -D shell/* -t $out/share/fzf/
|
||||
install -D shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish
|
||||
mkdir -p $out/share/fish/vendor_conf.d
|
||||
echo fzf_key_bindings > $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
|
||||
|
||||
cp -R shell $out/share/fzf
|
||||
cat <<SCRIPT > $out/bin/fzf-share
|
||||
#!${runtimeShell}
|
||||
# Run this script to find the fzf shared folder where all the shell
|
||||
|
|
|
|||
|
|
@ -50,7 +50,5 @@ rustPlatform.buildRustPackage rec {
|
|||
changelog = "https://github.com/svenstaro/miniserve/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
# https://hydra.nixos.org/build/162650896/nixlog/1
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "apc-temp-fetch";
|
||||
version = "0.0.1";
|
||||
version = "0.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonApplication rec {
|
|||
src = fetchPypi {
|
||||
pname = "APC-Temp-fetch";
|
||||
inherit version;
|
||||
hash = "sha256-2hNrTrYQadNJWzj7/dDou+a6uI+Ksyrbru9rBqIHXaM=";
|
||||
hash = "sha256-lXGj/xrOkdMMYvuyVVSCojjQlzISFUT14VTn//iOARo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.46.2";
|
||||
version = "0.46.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yqlnjPy0rjA0C2hBtFfc+hMwOk18okSKZufqc0uDJLE=";
|
||||
sha256 = "sha256-7Sp46Rk99P/QgkL4ge9wCHIJ4MUqDo9f/uGA0xKlyaw=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
32
pkgs/tools/security/hashrat/default.nix
Normal file
32
pkgs/tools/security/hashrat/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hashrat";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColumPaget";
|
||||
repo = "Hashrat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+3IPCJS++7CE0ZrJb62LCRrAn2J4uCF3a1oOzDoOW0w=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-xattr" ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line hash-generation utility";
|
||||
longDescription = ''
|
||||
Hashing tool supporting md5,sha1,sha256,sha512,whirlpool,jh and hmac versions of these.
|
||||
Includes recursive file hashing and other features.
|
||||
'';
|
||||
homepage = "http://www.cjpaget.co.uk/Code/Hashrat";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,52 +9,74 @@
|
|||
, qttools
|
||||
, radare2
|
||||
, wrapQtAppsHook
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
# TODO MacOS support.
|
||||
# TODO Build and install translations.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iaito";
|
||||
version = "5.7.6";
|
||||
version = "5.7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radareorg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-PnIOoWPYLK30lMmLVctihCs7GBo0rTN8yetWAr21h9w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config python3 qttools wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ radare2 qtbase ];
|
||||
srcs = [
|
||||
(fetchFromGitHub rec {
|
||||
owner = "radareorg";
|
||||
repo = "iaito";
|
||||
rev = version;
|
||||
hash = "sha256-c36WLpVUnffeY6cXSEHvguo8BHyxaLAluN9hBKsQc0s=";
|
||||
name = repo;
|
||||
})
|
||||
(fetchFromGitHub rec {
|
||||
owner = "radareorg";
|
||||
repo = "iaito-translations";
|
||||
rev = "ab923335409fa298c39f0014588d78d926c6f3a2";
|
||||
hash = "sha256-qkIC67a6YRwOa2Sr16Vg6If1TmAiSKUV7hw13Wxwl/w=";
|
||||
name = repo;
|
||||
})
|
||||
];
|
||||
sourceRoot = "iaito/src";
|
||||
|
||||
postUnpack = ''
|
||||
sourceRoot=$sourceRoot/src
|
||||
chmod -R u+w iaito-translations
|
||||
'';
|
||||
|
||||
# TODO Fix version checking and version information for r2.
|
||||
# Version checking always fails due to values being empty strings for some
|
||||
# reason. Meanwhile, we can safely assume that radare2's runtime and
|
||||
# compile-time implementations are the same and remove this check.
|
||||
patches = [ ./remove-broken-version-check.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace common/ResourcePaths.cpp \
|
||||
--replace "/app/share/iaito/translations" "$out/share/iaito/translations"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
radare2
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
pushd ../../../iaito-translations
|
||||
make build PREFIX=$out
|
||||
popd
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m755 -Dt $out/bin iaito
|
||||
install -m644 -Dt $out/share/metainfo $src/src/org.radare.iaito.appdata.xml
|
||||
install -m644 -Dt $out/share/applications $src/src/org.radare.iaito.desktop
|
||||
install -m644 -Dt $out/share/pixmaps $src/src/img/iaito-o.svg
|
||||
install -m644 -Dt $out/share/metainfo ../org.radare.iaito.appdata.xml
|
||||
install -m644 -Dt $out/share/applications ../org.radare.iaito.desktop
|
||||
install -m644 -Dt $out/share/pixmaps ../img/iaito-o.svg
|
||||
|
||||
pushd ../../../iaito-translations
|
||||
make install PREFIX=$out -j$NIX_BUILD_CORES
|
||||
popd
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An official graphical interface of radare2";
|
||||
longDescription = ''
|
||||
|
|
@ -62,7 +84,7 @@ stdenv.mkDerivation rec {
|
|||
continuation of Cutter for radare2 after the Rizin fork.
|
||||
'';
|
||||
homepage = "https://radare.org/n/iaito.html";
|
||||
changelog = "https://github.com/radareorg/iaito/releases/tag/${src.rev}";
|
||||
changelog = "https://github.com/radareorg/iaito/releases/tag/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
diff --git i/IaitoApplication.cpp w/IaitoApplication.cpp
|
||||
index 25b6a4e7..4cbde5c4 100644
|
||||
--- i/IaitoApplication.cpp
|
||||
+++ w/IaitoApplication.cpp
|
||||
@@ -33,27 +33,6 @@
|
||||
#include <R2GhidraDecompiler.h>
|
||||
#endif
|
||||
|
||||
-static bool versionCheck() {
|
||||
- // Check r2 version
|
||||
- QString a = r_core_version (); // runtime library version
|
||||
- QString b = "" R2_GITTAP; // compiled version
|
||||
- QStringList la = a.split(".");
|
||||
- QStringList lb = b.split(".");
|
||||
- if (la.size() < 2 && lb.size() < 2) {
|
||||
- eprintf ("Invalid version string somwhere\n");
|
||||
- return false;
|
||||
- }
|
||||
- if (la.at(0) != lb.at(0)) {
|
||||
- eprintf ("Major version differs\n");
|
||||
- return false;
|
||||
- }
|
||||
- if (la.at(1) != lb.at(1)) {
|
||||
- eprintf ("Minor version differs\n");
|
||||
- return false;
|
||||
- }
|
||||
- return true;
|
||||
-}
|
||||
-
|
||||
IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc, argv)
|
||||
{
|
||||
// Setup application information
|
||||
@@ -101,21 +80,6 @@ IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc,
|
||||
std::exit(1);
|
||||
}
|
||||
|
||||
- if (!versionCheck ()) {
|
||||
- QMessageBox msg;
|
||||
- msg.setIcon(QMessageBox::Critical);
|
||||
- msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
|
||||
- msg.setWindowTitle(QObject::tr("Version mismatch!"));
|
||||
- QString localVersion = r_core_version ();
|
||||
- QString r2version = R2_GITTAP;
|
||||
- msg.setText(QString(
|
||||
- QObject::tr("The version used to compile Iaito (%1) does not match the binary version of radare2 (%2). This could result in unexpected behaviour. Are you sure you want to continue?")).arg(
|
||||
- localVersion, r2version));
|
||||
- if (msg.exec() == QMessageBox::No) {
|
||||
- std::exit(1);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
#ifdef IAITO_ENABLE_PYTHON
|
||||
// Init python
|
||||
if (!clOptions.pythonHome.isEmpty()) {
|
||||
53
pkgs/tools/system/wsysmon/default.nix
Normal file
53
pkgs/tools/system/wsysmon/default.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, cmake
|
||||
, pkg-config
|
||||
, gtkmm3
|
||||
, gtk3
|
||||
, procps
|
||||
, spdlog
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wsysmon";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slyfabi";
|
||||
repo = "wsysmon";
|
||||
rev = version;
|
||||
sha256 = "sha256-5kfZT+hm064qXoAzi0RdmUqXi8VaXamlbm+FJOrGh3A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Prevent CMake from trying to fetch libraries from GitHub
|
||||
(substituteAll {
|
||||
src = ./dependencies.patch;
|
||||
spdlog_src = spdlog.src;
|
||||
})
|
||||
# Add an installPhase
|
||||
./install.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtkmm3
|
||||
gtk3
|
||||
procps
|
||||
spdlog
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A windows task manager clone for Linux";
|
||||
homepage = "https://github.com/SlyFabi/WSysMon";
|
||||
license = [ licenses.mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ totoroot ];
|
||||
};
|
||||
}
|
||||
14
pkgs/tools/system/wsysmon/dependencies.patch
Normal file
14
pkgs/tools/system/wsysmon/dependencies.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 31e8048..1eec936 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -7,8 +7,7 @@ include(FetchContent)
|
||||
|
||||
FetchContent_Declare(
|
||||
spdlog
|
||||
- GIT_REPOSITORY https://github.com/gabime/spdlog.git
|
||||
- GIT_TAG v1.10.0
|
||||
+ SOURCE_DIR @spdlog_src@
|
||||
)
|
||||
FetchContent_MakeAvailable(spdlog)
|
||||
|
||||
14
pkgs/tools/system/wsysmon/install.patch
Normal file
14
pkgs/tools/system/wsysmon/install.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 31e8048..a125b3f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,3 +20,9 @@ include_directories(${GTKMM_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
|
||||
|
||||
add_executable(WSysMon src/main.cpp src/ui/MainWindow.cpp src/ui/widgets/GraphWidget.cpp src/ui/widgets/PerformanceButton.cpp src/ui/views/ProcessesView.cpp src/ui/views/PerformanceView.cpp src/ui/views/performance/PerformanceCPUView.cpp src/ui/views/performance/PerformanceGPUView.cpp src/ui/views/performance/PerformanceNetworkView.cpp src/ui/views/performance/PerformanceRAMView.cpp src/utils/DispatcherThread.cpp src/utils/UnitConverter.cpp src/utils/X11Utils.cpp src/api/process/ProcessManager.cpp src/api/process/ProcessNode.cpp src/api/linux/ProcessesApi.cpp src/api/linux/GPUApi.cpp src/api/linux/NetworkApi.cpp src/api/linux/SystemInfoApi.cpp src/api/DiskApi.h src/api/linux/DiskApi.cpp src/ui/views/performance/PerformanceDiskView.cpp src/ui/views/performance/PerformanceDiskView.h src/api/linux/gpu/nvml.h src/api/linux/gpu/nvml_hook_funcs.inl src/api/linux/gpu/NvGpuApi.cpp src/api/linux/gpu/NvGpuApi.h src/api/HwMonApi.h src/api/linux/HwMonApi.cpp)
|
||||
target_link_libraries(WSysMon PRIVATE spdlog::spdlog pthread procps ${CMAKE_DL_LIBS} ${GTKMM_LIBRARIES} ${X11_LIBRARIES})
|
||||
+
|
||||
+install(
|
||||
+ TARGETS
|
||||
+ WSysMon
|
||||
+ RUNTIME DESTINATION bin
|
||||
+)
|
||||
|
|
@ -673,6 +673,7 @@ mapAliases ({
|
|||
|
||||
jack2Full = jack2; # moved from top-level 2021-03-14
|
||||
jami-client-gnome = throw "jami-client-gnome has been removed: abandoned upstream"; # Added 2022-05-15
|
||||
jami-client-qt = jami-client; # Added 2022-11-06
|
||||
jami-libclient = throw "jami-libclient has been removed: moved into jami-qt"; # Added 2022-07-29
|
||||
jamomacore = throw "jamomacore has been removed: abandoned upstream"; # Added 2020-11-21
|
||||
jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15
|
||||
|
|
|
|||
|
|
@ -7883,6 +7883,8 @@ with pkgs;
|
|||
|
||||
hashcat-utils = callPackage ../tools/security/hashcat-utils { };
|
||||
|
||||
hashrat = callPackage ../tools/security/hashrat { };
|
||||
|
||||
hash_extender = callPackage ../tools/security/hash_extender {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
|
|
@ -13122,6 +13124,8 @@ with pkgs;
|
|||
|
||||
wrk2 = callPackage ../tools/networking/wrk2 { };
|
||||
|
||||
wsysmon = callPackage ../tools/system/wsysmon { };
|
||||
|
||||
wuzz = callPackage ../tools/networking/wuzz { };
|
||||
|
||||
wv = callPackage ../tools/misc/wv { };
|
||||
|
|
@ -13372,6 +13376,8 @@ with pkgs;
|
|||
|
||||
zsh-clipboard = callPackage ../shells/zsh/zsh-clipboard { };
|
||||
|
||||
zsh-edit = callPackage ../shells/zsh/zsh-edit { };
|
||||
|
||||
zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
|
||||
|
||||
zsh-history = callPackage ../shells/zsh/zsh-history { };
|
||||
|
|
@ -16374,6 +16380,8 @@ with pkgs;
|
|||
llvmPackages = llvmPackages_latest;
|
||||
};
|
||||
|
||||
refurb = callPackage ../development/tools/refurb { };
|
||||
|
||||
srandrd = callPackage ../tools/X11/srandrd { };
|
||||
|
||||
srecord = callPackage ../development/tools/misc/srecord { };
|
||||
|
|
@ -24520,6 +24528,7 @@ with pkgs;
|
|||
prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
|
||||
};
|
||||
prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { };
|
||||
prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix {
|
||||
buildGoModule = buildGo118Module; # nixosTests.prometheus-exporter.ldap fails with 1.19
|
||||
};
|
||||
|
|
@ -25256,6 +25265,8 @@ with pkgs;
|
|||
|
||||
intel-ocl = callPackage ../os-specific/linux/intel-ocl { };
|
||||
|
||||
level-zero = callPackage ../development/libraries/level-zero { };
|
||||
|
||||
iomelt = callPackage ../os-specific/linux/iomelt { };
|
||||
|
||||
iotop = callPackage ../os-specific/linux/iotop { };
|
||||
|
|
@ -36120,6 +36131,8 @@ with pkgs;
|
|||
|
||||
flatcam = callPackage ../applications/science/electronics/flatcam { };
|
||||
|
||||
flopoco = callPackage ../applications/science/electronics/flopoco { };
|
||||
|
||||
fparser = callPackage ../applications/science/electronics/fparser { };
|
||||
|
||||
geda = callPackage ../applications/science/electronics/geda {
|
||||
|
|
@ -38108,7 +38121,7 @@ with pkgs;
|
|||
udev = systemdMinimal;
|
||||
jack = libjack2;
|
||||
};
|
||||
inherit (jami) jami-daemon jami-client-qt;
|
||||
inherit (jami) jami-daemon jami-client;
|
||||
|
||||
jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue