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]
2024-07-16 12:01:08 +00:00
committed by GitHub
parent 4faa62d6b3 9023e58169
commit ab680a2184
94 changed files with 972 additions and 4126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+12
View File
@@ -12660,6 +12660,13 @@
name = "Matthias Wimmer";
keys = [ { fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898"; } ];
};
max = {
email = "max+nixpkgs@privatevoid.net";
matrix = "@max:privatevoid.net";
github = "max-privatevoid";
githubId = 55053574;
name = "Max Headroom";
};
max-amb = {
email = "max_a@e.email";
github = "max-amb";
@@ -16163,6 +16170,11 @@
githubId = 146413;
name = "Tobias Poschwatta";
};
potb = {
name = "Peïo Thibault";
github = "potb";
githubId = 10779093;
};
poweredbypie = {
name = "poweredbypie";
github = "poweredbypie";
maintainers/team-list.nix
+1
View File
@@ -362,6 +362,7 @@ with lib.maintainers;
geospatial = {
members = [
autra
imincik
l0b0
nh2
nixos/maintainers/scripts/ec2/amazon-image.nix
+4 -4
View File
@@ -1,8 +1,8 @@
{ config, lib, pkgs, ... }:
with lib;
let
inherit (lib) mkOption optionalString types versionAtLeast;
inherit (lib.options) literalExpression;
cfg = config.amazonImage;
amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios";
@@ -15,7 +15,7 @@ in {
# https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes
config.boot.kernelParams =
let timeout =
if pkgs.lib.versionAtLeast config.boot.kernelPackages.kernel.version "4.15"
if versionAtLeast config.boot.kernelPackages.kernel.version "4.15"
then "4294967295"
else "255";
in [ "nvme_core.io_timeout=${timeout}" ];
@@ -156,5 +156,5 @@ in {
};
in if config.ec2.zfs.enable then zfsBuilder else extBuilder;
meta.maintainers = with maintainers; [ arianvp ];
meta.maintainers = with lib.maintainers; [ arianvp ];
}
nixos/modules/module-list.nix
-1
View File
@@ -842,7 +842,6 @@
./services/misc/wastebin.nix
./services/misc/weechat.nix
./services/misc/workout-tracker.nix
./services/misc/xmr-stak.nix
./services/misc/xmrig.nix
./services/misc/zoneminder.nix
./services/misc/zookeeper.nix
nixos/modules/programs/ydotool.nix
-1
View File
@@ -68,7 +68,6 @@ in
ProtectKernelTunables = true;
ProtectProc = "invisible";
ProtectSystem = "strict";
ProtectUser = true;
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
nixos/modules/rename.nix
+1
View File
@@ -106,6 +106,7 @@ in
as the underlying package isn't being maintained. Working alternatives are
libinput and synaptics.
'')
(mkRemovedOptionModule [ "services" "xmr-stak" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream")
(mkRemovedOptionModule [ "services" "racoon" ] ''
The racoon module has been removed, because the software project was abandoned upstream.
nixos/modules/services/misc/xmr-stak.nix
-89
View File
@@ -1,89 +0,0 @@
{ lib, config, pkgs, ... }:
with lib;
let
cfg = config.services.xmr-stak;
pkg = pkgs.xmr-stak.override {
inherit (cfg) openclSupport;
};
in
{
options = {
services.xmr-stak = {
enable = mkEnableOption "xmr-stak miner";
openclSupport = mkEnableOption "support for OpenCL (AMD/ATI graphics cards)";
extraArgs = mkOption {
type = types.listOf types.str;
default = [];
example = [ "--noCPU" "--currency monero" ];
description = "List of parameters to pass to xmr-stak.";
};
configFiles = mkOption {
type = types.attrsOf types.str;
default = {};
example = literalExpression ''
{
"config.txt" = '''
"verbose_level" : 4,
"h_print_time" : 60,
"tls_secure_algo" : true,
''';
"pools.txt" = '''
"currency" : "monero7",
"pool_list" :
[ { "pool_address" : "pool.supportxmr.com:443",
"wallet_address" : "my-wallet-address",
"rig_id" : "",
"pool_password" : "nixos",
"use_nicehash" : false,
"use_tls" : true,
"tls_fingerprint" : "",
"pool_weight" : 23
},
],
''';
}
'';
description = ''
Content of config files like config.txt, pools.txt or cpu.txt.
'';
};
};
};
config = mkIf cfg.enable {
systemd.services.xmr-stak = {
wantedBy = [ "multi-user.target" ];
bindsTo = [ "network-online.target" ];
after = [ "network-online.target" ];
preStart = concatStrings (flip mapAttrsToList cfg.configFiles (fn: content: ''
ln -sf '${pkgs.writeText "xmr-stak-${fn}" content}' '${fn}'
''));
serviceConfig = let rootRequired = cfg.openclSupport; in {
ExecStart = "${pkg}/bin/xmr-stak ${concatStringsSep " " cfg.extraArgs}";
# xmr-stak generates cpu and/or gpu configuration files
WorkingDirectory = "/tmp";
PrivateTmp = true;
DynamicUser = !rootRequired;
LimitMEMLOCK = toString (1024*1024);
};
};
};
imports = [
(mkRemovedOptionModule ["services" "xmr-stak" "configText"] ''
This option was removed in favour of `services.xmr-stak.configFiles`
because the new config file `pools.txt` was introduced. You are
now able to define all other config files like cpu.txt or amd.txt.
'')
];
}
nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix
+21 -1
View File
@@ -7,7 +7,27 @@ in {
port = 9117;
extraOpts = {
settings = mkOption {
type = types.attrs;
type = types.submodule {
options = {
consul = mkOption {
default = null;
type = types.nullOr (types.attrsOf types.anything);
description = ''
Consul integration options. For more information see the [example config](https://github.com/martin-helmich/prometheus-nginxlog-exporter#configuration-file).
This is disabled by default.
'';
};
namespaces = mkOption {
default = [];
type = types.listOf (types.attrsOf types.anything);
description = ''
Namespaces to collect the metrics for. For more information see the [example config](https://github.com/martin-helmich/prometheus-nginxlog-exporter#configuration-file).
'';
};
};
};
default = {};
description = ''
All settings of nginxlog expressed as an Nix attrset.
nixos/modules/virtualisation/amazon-image.nix
+2 -3
View File
@@ -6,9 +6,8 @@
{ config, lib, pkgs, ... }:
with lib;
let
inherit (lib) mkDefault mkIf;
cfg = config.ec2;
in
@@ -107,5 +106,5 @@ in
# (e.g. it depends on GTK).
services.udisks2.enable = false;
};
meta.maintainers = with maintainers; [ arianvp ];
meta.maintainers = with lib.maintainers; [ arianvp ];
}
nixos/tests/installed-tests/flatpak-builder.nix
+5 -2
View File
@@ -5,8 +5,11 @@ makeInstalledTest {
testConfig = {
services.flatpak.enable = true;
xdg.portal.enable = true;
xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
xdg.portal = {
enable = true;
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
config.common.default = "gtk";
};
environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies;
virtualisation.diskSize = 2048;
};
pkgs/applications/editors/vim/plugins/generated.nix
+12
View File
@@ -532,6 +532,18 @@ final: prev:
meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/";
};
advanced-git-search-nvim = buildVimPlugin {
pname = "advanced-git-search.nvim";
version = "2024-05-13";
src = fetchFromGitHub {
owner = "aaronhallaert";
repo = "advanced-git-search.nvim";
rev = "d11e1360b7cdb9270673b7852bbc1e91e1af25da";
sha256 = "12ymb4n81z8brzc6n19h5mfb1pnfxwrnvgnss6wqjilzqa1cmjzw";
};
meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/";
};
adwaita-nvim = buildVimPlugin {
pname = "adwaita.nvim";
version = "2024-04-28";
pkgs/applications/editors/vim/plugins/overrides.nix
+4
View File
@@ -135,6 +135,10 @@
nvimRequireCheck = "alpha";
};
advanced-git-search-nvim = super.autosave-nvim.overrideAttrs {
dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ];
};
autosave-nvim = super.autosave-nvim.overrideAttrs {
dependencies = with super; [ plenary-nvim ];
};
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -43,6 +43,7 @@ https://github.com/vim-scripts/a.vim/,,
https://github.com/mileszs/ack.vim/,,
https://github.com/eikenb/acp/,,
https://github.com/aznhe21/actions-preview.nvim/,,
https://github.com/aaronhallaert/advanced-git-search.nvim/,HEAD,
https://github.com/Mofiqul/adwaita.nvim/,HEAD,
https://github.com/stevearc/aerial.nvim/,,
https://github.com/Numkil/ag.nvim/,,
pkgs/applications/graphics/ImageMagick/default.nix
+2 -2
View File
@@ -51,13 +51,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-34";
version = "7.1.1-35";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-rECU/dp8HQKFs1PW6QeTZIMxCIzzh1w7CckapnxdzxU=";
hash = "sha256-ac0xvCwwH/qsdewBAO6POcPY74kBPkcnW6ywVvnegKw=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
pkgs/applications/misc/xmr-stak/default.nix
-50
View File
@@ -1,50 +0,0 @@
{ stdenv, lib, fetchpatch
, fetchFromGitHub, cmake, libmicrohttpd, openssl
, opencl-headers, ocl-icd, hwloc
, devDonationLevel ? "0.0"
, openclSupport ? true
}:
stdenv.mkDerivation rec {
pname = "xmr-stak";
version = "2.10.8";
src = fetchFromGitHub {
owner = "fireice-uk";
repo = "xmr-stak";
rev = version;
sha256 = "0ilx5mhh91ks7dwvykfyynh53l6vkkignjpwkkss8ss6b2k8gdbj";
};
env.NIX_CFLAGS_COMPILE = "-O3";
patches = [ (fetchpatch {
name = "fix-libmicrohttpd-0-9-71.patch";
url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch";
excludes = [ "CMakeLists.txt.user" ];
hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0=";
}) ];
cmakeFlags = [ "-DCUDA_ENABLE=OFF" ]
++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
nativeBuildInputs = [ cmake ];
buildInputs = [ libmicrohttpd openssl hwloc ]
++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
postPatch = ''
substituteInPlace xmrstak/donate-level.hpp \
--replace 'fDevDonationLevel = 2.0' 'fDevDonationLevel = ${devDonationLevel}'
'';
meta = with lib; {
# Does not build against gcc-13. No development activity upstream
# for past few years.
broken = true;
description = "Unified All-in-one Monero miner";
homepage = "https://github.com/fireice-uk/xmr-stak";
license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ bfortz ];
};
}
pkgs/applications/networking/instant-messengers/keet/default.nix
+18 -11
View File
@@ -1,23 +1,30 @@
{ lib, appimageTools, fetchurl }:
{ lib, appimageTools, fetchzip }:
let
pname = "keet";
version = "1.2.1";
version = "2.2.0";
src = fetchurl {
url = "https://keet.io/downloads/${version}/Keet.AppImage";
sha256 = "1f76ccfa16719a24f6d84b88e5ca49fab1c372de309ce74393461903c5c49d98";
src = fetchzip {
url = "https://keet.io/downloads/${version}/Keet-x64.tar.gz";
hash = "sha256-Sd2aCUvgxdbCb8MtWMcznX2efmL1h9wLT29GG7t3Gzc=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
appimageContents = appimageTools.extract {
inherit pname version;
src = "${src}/Keet.AppImage";
};
in appimageTools.wrapType2 {
inherit src pname version;
inherit pname version;
src = "${src}/Keet.AppImage";
extraPkgs = pkgs: with pkgs; [
gtk4
];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
install -m 444 -D ${appimageContents}/Keet.desktop -t $out/share/applications
cp -r ${appimageContents}/*.png $out/share
'';
meta = with lib; {
pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
appimageTools.wrapType2 rec {
pname = "tutanota-desktop";
version = "232.240626.0";
version = "235.240712.0";
src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
hash = "sha256-LsLhsWrH+hRcx7hjx2GbtDMEf1oAygSwtsCxpmnZOfE=";
hash = "sha256-IhGfpHzK853b21oqhlfvXVrS1gl/4xgrZeWvBCIL1qg=";
};
extraPkgs = pkgs: [ pkgs.libsecret ];
pkgs/applications/office/appflowy/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.6.2";
version = "0.6.3";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz";
hash = "sha256-vwhFFSdKlt2Ddikhdr3uyILjTVdgCjMtAW9HeLmT5qU=";
hash = "sha256-u8Y676sBLDI57z7Zpe72ELaibe83EFwB0oq+ondRIcU=";
stripRoot = false;
};
pkgs/applications/office/libreoffice/default.nix
+1 -1
View File
@@ -98,7 +98,7 @@
, libetonyek
, liborcus
, libpng
, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ]
, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
, qtbase ? null
pkgs/applications/office/tryton/default.nix
+2 -2
View File
@@ -21,13 +21,13 @@ with lib;
python3Packages.buildPythonApplication rec {
pname = "tryton";
version = "7.2.2";
version = "7.2.3";
disabled = !python3Packages.isPy3k;
src = fetchPypi {
inherit pname version;
hash = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk=";
hash = "sha256-W5DXOLUr4c9w9Zcp9i5esNjSSIMewe+NJGh+h3PiD30=";
};
nativeBuildInputs = [
pkgs/applications/radio/chirp/default.nix
+5 -4
View File
@@ -10,13 +10,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "chirp";
version = "0.4.0-unstable-2024-05-24";
version = "0.4.0-unstable-2024-07-05";
src = fetchFromGitHub {
owner = "kk7ds";
repo = "chirp";
rev = "e17c021ba4fc39eea8a2a1de37ef04a0d1253090";
hash = "sha256-YvIRo7g9fxnlf8og5CM2JLf8DeADVkcHdvb4ppS1veE=";
rev = "f28814fff0566dcf6f93ac5b7a79d6d594202757";
hash = "sha256-SQ0j9DGJc48TsaUaesixJT/pMBm9NGw22qapSokj9r8=";
};
buildInputs = [
glib
@@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec {
pyserial
requests
six
suds
wxpython
yattag
];
@@ -47,7 +48,7 @@ python3.pkgs.buildPythonApplication rec {
description = "Free, open-source tool for programming your amateur radio";
homepage = "https://chirp.danplanet.com/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.emantor ];
maintainers = with maintainers; [ emantor wrmilling ];
platforms = platforms.linux;
};
}
pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix
+8 -1
View File
@@ -1,4 +1,4 @@
{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }:
{ lib, rel, buildKodiAddon, fetchzip, fetchpatch, addonUpdateScript }:
buildKodiAddon rec {
pname = "inputstreamhelper";
namespace = "script.module.inputstreamhelper";
@@ -9,6 +9,13 @@ buildKodiAddon rec {
sha256 = "sha256-v5fRikswmP+KVbxYibD0NbCK8leUnFbya5EtF1FmS0I=";
};
patches = [
(fetchpatch {
url = "https://github.com/emilsvennesson/script.module.inputstreamhelper/commit/af6adc16a0bee4921a827946b004ee070406ae37.patch";
hash = "sha256-901EyVeZUb0EMvxsEza95qFjTOZ7PDYyqHMRawPM5Zs=";
})
];
passthru = {
pythonPath = "lib";
updateScript = addonUpdateScript {
pkgs/applications/video/kodi/addons/sendtokodi/default.nix
+8 -5
View File
@@ -13,7 +13,10 @@ buildKodiAddon rec {
};
patches = [
./use-packaged-deps.patch
# Unconditionally depend on packaged yt-dlp. This removes the ability to
# use youtube_dl, which is unmaintained and considered vulnerable (see
# CVE-2024-38519).
./use-packaged-yt-dlp.patch
];
propagatedBuildInputs = [
@@ -26,14 +29,14 @@ buildKodiAddon rec {
'';
passthru = {
# Instead of the vendored libraries, we propagate youtube-dl and yt-dlp via
# the Python path.
pythonPath = with kodi.pythonPackages; makePythonPath [ youtube-dl yt-dlp ];
# Instead of the vendored libraries, we propagate yt-dlp via the Python
# path.
pythonPath = with kodi.pythonPackages; makePythonPath [ yt-dlp ];
};
meta = with lib; {
homepage = "https://github.com/firsttris/plugin.video.sendtokodi";
description = "Plays various stream sites on Kodi using youtube-dl";
description = "Plays various stream sites on Kodi using yt-dlp";
license = licenses.mit;
maintainers = teams.kodi.members ++ [ maintainers.pks ];
};
pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch → pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-yt-dlp.patch
+9 -7
View File
@@ -1,16 +1,18 @@
diff --git a/service.py b/service.py
index 1d7b6e4..9782993 100644
index 024ad9a..6ef71dd 100644
--- a/service.py
+++ b/service.py
@@ -241,9 +241,9 @@ def playlistIndex(url, playlist):
@@ -243,11 +243,8 @@ def playlistIndex(url, playlist):
# Use the chosen resolver while forcing to use youtube_dl on legacy python 2 systems (dlp is python 3.6+)
if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2:
-if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2:
- from lib.youtube_dl import YoutubeDL
+ from youtube_dl import YoutubeDL
else:
-else:
- from lib.yt_dlp import YoutubeDL
+ from yt_dlp import YoutubeDL
-
+from yt_dlp import YoutubeDL
+
# patch broken strptime (see above)
patch_strptime()
pkgs/applications/video/vdr/softhddevice/default.nix
+2 -2
View File
@@ -14,12 +14,12 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-softhddevice";
version = "2.3.4";
version = "2.3.5";
src = fetchFromGitHub {
owner = "ua0lnj";
repo = "vdr-plugin-softhddevice";
sha256 = "sha256-pwA0LBQZ0jYXgBHhboAhyPM/kM7sboGw0O+3OIg5Nz4=";
sha256 = "sha256-i/lxR/iSarmhJvqjcu8+HscTYoVExwCcweSNo206BYU=";
rev = "v${version}";
};
pkgs/by-name/bi/bitwarden-cli/package.nix
+3 -3
View File
@@ -11,18 +11,18 @@
buildNpmPackage rec {
pname = "bitwarden-cli";
version = "2024.6.1";
version = "2024.7.0";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "cli-v${version}";
hash = "sha256-LKeJKA4/Vd80y48RdZTUh10bY38AoQ5G5oK6S77fSJI=";
hash = "sha256-FH7++E+kc86lksHjTbVFU0mP0ZB2xb6ZCojdyNm1iWU=";
};
nodejs = nodejs_20;
npmDepsHash = "sha256-rwzyKaCW3LAOqw6BEu8DLS0Ad5hB6cH1OnjWzbSEgVI=";
npmDepsHash = "sha256-F2iqTWgK+5ts2wd5NLsuyMZp1FnsbJmSjT3lJzV9PUo=";
nativeBuildInputs = [
python311
pkgs/by-name/ch/chawan/mancha-augment-path.diff
+11 -13
View File
@@ -1,15 +1,13 @@
Add the -m option to man's command line to augment the list of paths
searched by man. The string "OUT" must be substituted with chawan's $out
path after patching.
Add the -m option to man's command line to augment the list of paths searched by man.
The required -m option is only available in the mandoc implementation.
--- a/adapter/protocol/man
+++ b/adapter/protocol/man
@@ -75,7 +75,7 @@ EOF
--- a/adapter/protocol/man.nim
+++ b/adapter/protocol/man.nim
@@ -264,7 +264,7 @@ proc myOpen(cmd: string): tuple[ofile, efile: File] =
$section =~ s:([^-\w\200-\377.,])::g;
$man =~ s:([^-\w\200-\377.,])::g;
- open(F, "GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 $MAN $section $man 2> /dev/null |");
+ open(F, "GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 $MAN -m OUT/share/man $section $man 2> /dev/null |");
}
$ok = 0;
proc doMan(man, keyword, section: string) =
let sectionOpt = if section == "": "" else: ' ' & quoteShellPosix(section)
let cmd = "MANCOLOR=1 GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 " &
- man & sectionOpt & ' ' & quoteShellPosix(keyword)
+ man & sectionOpt & " -m @out@ " & quoteShellPosix(keyword)
let (ofile, efile) = myOpen(cmd)
if ofile == nil:
pkgs/by-name/ch/chawan/package.nix
+18 -10
View File
@@ -7,33 +7,37 @@
, ncurses
, nim
, pandoc
, perl
, pkg-config
, zlib
, unstableGitUpdater
, libseccomp
, substituteAll
}:
stdenv.mkDerivation {
pname = "chawan";
version = "0-unstable-2024-03-01";
version = "0-unstable-2024-07-14";
src = fetchFromSourcehut {
owner = "~bptato";
repo = "chawan";
rev = "87ba9a87be15abbe06837f1519cfb76f4bf759f3";
hash = "sha256-Xs+Mxe5/uoxPMf4FuelpO+bRJ1KdfASVI7rWqtboJZw=";
rev = "0e3d67f31df2c2d53aa0e578439852731e5f5af9";
hash = "sha256-eVoZisQyaebWO58a0a0KR7fwsL1kTmPX1SayqdnmSuk=";
fetchSubmodules = true;
};
patches = [
# Include chawan's man pages in mancha's search path
./mancha-augment-path.diff
(substituteAll {
src = ./mancha-augment-path.diff;
out = placeholder "out";
})
];
env.NIX_CFLAGS_COMPILE = toString (
lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration"
);
buildInputs = [ curlMinimal ncurses perl zlib ];
nativeBuildInputs = [
makeBinaryWrapper
nim
@@ -41,10 +45,12 @@ stdenv.mkDerivation {
pkg-config
];
postPatch = ''
substituteInPlace adapter/protocol/man \
--replace-fail "OUT" $out
'';
buildInputs = [
curlMinimal
libseccomp
ncurses
zlib
];
buildFlags = [ "all" "manpage" ];
installFlags = [
@@ -64,6 +70,8 @@ stdenv.mkDerivation {
wrapProgram $out/bin/mancha ${makeWrapperArgs}
'';
passthru.updateScript = unstableGitUpdater { };
meta = {
description = "Lightweight and featureful terminal web browser";
homepage = "https://sr.ht/~bptato/chawan/";
pkgs/by-name/do/downonspot/Cargo.lock.patch
+16 -16
View File
@@ -1,8 +1,8 @@
diff --git a/Cargo.lock b/Cargo.lock
index e6f1267..3bf16a5 100644
index cccafd9..75d2a85 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1632,7 +1632,8 @@ dependencies = [
@@ -1655,7 +1655,8 @@ dependencies = [
[[package]]
name = "librespot"
version = "0.4.2"
@@ -12,7 +12,7 @@ index e6f1267..3bf16a5 100644
dependencies = [
"base64 0.13.1",
"env_logger",
@@ -1658,7 +1659,8 @@ dependencies = [
@@ -1681,7 +1682,8 @@ dependencies = [
[[package]]
name = "librespot-audio"
version = "0.4.2"
@@ -22,7 +22,7 @@ index e6f1267..3bf16a5 100644
dependencies = [
"aes-ctr",
"byteorder",
@@ -1673,7 +1675,8 @@ dependencies = [
@@ -1696,7 +1698,8 @@ dependencies = [
[[package]]
name = "librespot-connect"
version = "0.4.2"
@@ -32,7 +32,7 @@ index e6f1267..3bf16a5 100644
dependencies = [
"form_urlencoded",
"futures-util",
@@ -1693,7 +1696,8 @@ dependencies = [
@@ -1716,7 +1719,8 @@ dependencies = [
[[package]]
name = "librespot-core"
version = "0.4.2"
@@ -42,7 +42,7 @@ index e6f1267..3bf16a5 100644
dependencies = [
"aes",
"base64 0.13.1",
@@ -1733,7 +1737,8 @@ dependencies = [
@@ -1756,7 +1760,8 @@ dependencies = [
[[package]]
name = "librespot-discovery"
version = "0.4.2"
@@ -52,7 +52,7 @@ index e6f1267..3bf16a5 100644
dependencies = [
"aes-ctr",
"base64 0.13.1",
@@ -1754,7 +1759,8 @@ dependencies = [
@@ -1777,7 +1782,8 @@ dependencies = [
[[package]]
name = "librespot-metadata"
version = "0.4.2"
@@ -62,7 +62,7 @@ index e6f1267..3bf16a5 100644
dependencies = [
"async-trait",
"byteorder",
@@ -1767,7 +1773,8 @@ dependencies = [
@@ -1790,7 +1796,8 @@ dependencies = [
[[package]]
name = "librespot-playback"
version = "0.4.2"
@@ -72,7 +72,7 @@ index e6f1267..3bf16a5 100644
dependencies = [
"byteorder",
"cpal",
@@ -1792,7 +1799,8 @@ dependencies = [
@@ -1815,7 +1822,8 @@ dependencies = [
[[package]]
name = "librespot-protocol"
version = "0.4.2"
@@ -83,15 +83,15 @@ index e6f1267..3bf16a5 100644
"glob",
"protobuf 2.28.0",
diff --git a/Cargo.toml b/Cargo.toml
index 40ca2c1..734a3fb 100644
index c7e2fe2..28e895a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ reqwest = "0.11"
@@ -30,7 +30,7 @@ reqwest = "0"
colored = "2"
lame = "0.1"
aspotify = "0.7.1"
lame = "0"
aspotify = "0"
-librespot = { git = "ssh://git@github.com/oSumAtrIX/free-librespot.git" }
+librespot = "0.4.2"
async-std = { version = "1.12", features = ["attributes", "tokio1"] }
serde_json = "1.0"
async-stream = "0.3"
async-std = { version = "1", features = ["attributes", "tokio1"] }
serde_json = "1"
async-stream = "0"
pkgs/by-name/do/downonspot/package.nix
+4 -4
View File
@@ -10,19 +10,19 @@
rustPlatform.buildRustPackage rec {
pname = "downonspot";
version = "unstable-2024-04-30";
version = "0.5.0";
src = fetchFromGitHub {
owner = "oSumAtrIX";
repo = "DownOnSpot";
rev = "669dbb18e105129fff4886ba3710596d54a5f33a";
hash = "sha256-sUptn+tmQoI2i9WBpJU23MkdQ9h+Lmx590+2+0XXC7w=";
rev = "refs/tags/v${version}";
hash = "sha256-PA11R/hVAmismayE8uU03P0eeNnrgpD2HxbMW0vlk3k=";
};
# Use official public librespot version
cargoPatches = [ ./Cargo.lock.patch ];
cargoHash = "sha256-GHhijwgTge7jzdkn0qynQIBNYeqtY26C5BaLpQ/UWgQ=";
cargoHash = "sha256-jdscYr4Emm2+mWXbxfhU1rp855tsGY5hrdJsDEfXeUo=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/fo/font-manager/package.nix
+6 -11
View File
@@ -13,11 +13,11 @@
, yelp-tools
, vala
, gsettings-desktop-schemas
, gtk3
, gtk4
, adwaita-icon-theme
, desktop-file-utils
, nix-update-script
, wrapGAppsHook3
, wrapGAppsHook4
, gobject-introspection
# withWebkit enables the "webkit" feature, also known as Google Fonts
, withWebkit ? true, glib-networking, libsoup, webkitgtk
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "font-manager";
version = "0.8.9";
version = "0.9.0";
src = fetchFromGitHub {
owner = "FontManager";
repo = "font-manager";
rev = version;
hash = "sha256-LsQry6CjvVcJFRutKOaqA4lLP7Ek09Q/D/TPnSvx59Q=";
hash = "sha256-nUFxjqUiL8zLfPJrLM1aQ/SZ2x6CYFKFJI1W/eXlrV8=";
};
nativeBuildInputs = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
desktop-file-utils
vala
yelp-tools
wrapGAppsHook3
wrapGAppsHook4
# For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build
gobject-introspection
];
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
json-glib
sqlite
gsettings-desktop-schemas # for font settings
gtk3
gtk4
adwaita-icon-theme
] ++ lib.optionals withWebkit [
glib-networking # for SSL so that Google Fonts can load
@@ -67,11 +67,6 @@ stdenv.mkDerivation rec {
(lib.mesonBool "webkit" withWebkit)
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
pkgs/by-name/gr/grype/package.nix
+3 -3
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "grype";
version = "0.79.2";
version = "0.79.3";
src = fetchFromGitHub {
owner = "anchore";
repo = "grype";
rev = "refs/tags/v${version}";
hash = "sha256-8GO5vMUl6b1qjQ9+FdieLkSvkMQuJBwrfhJJies/37U=";
hash = "sha256-EAolb8r4n0r9SC7eh4wogHIM3iYgf9lKRFHryD4hhGc=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -30,7 +30,7 @@ buildGoModule rec {
proxyVendor = true;
vendorHash = "sha256-nws+/haDtyVC80f3S0wM7zI8ZB7c7KalqV96mp2D4C8=";
vendorHash = "sha256-/SbEc2YEXwBqR8PPnPj8Q3lDGMp/Kpib8E4lUzFGGV8=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ig/ignite-cli/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "ignite-cli";
version = "28.4.0";
version = "28.5.0";
src = fetchFromGitHub {
repo = "cli";
owner = "ignite";
rev = "v${version}";
hash = "sha256-FxTOtowoGXJvGt+qnVOogOnxAurFPe9ihQpBhxhwEkI=";
hash = "sha256-s8RKlqIL1AjsqO+sOrWnAfHCpP1G7BFxnr5aHVe7Np4=";
};
vendorHash = "sha256-ZqyZTvJ7IeEbQ/jRjaEiWT8xNnZdiaY3qJKeQtaHzXc=";
vendorHash = "sha256-NEjva9KDPz7rykqcKcTOwSKBR3n4oFSYARX/BQzhgqY=";
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/kr/kryptor/deps.nix
Generated
+9
View File
@@ -0,0 +1,9 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "Geralt"; version = "3.0.1"; hash = "sha256-jNiRhjqY4juSR68zHfkW+IKnnq2qXlXi3hXZrPyRlps="; })
(fetchNuGet { pname = "libsodium"; version = "1.0.19"; hash = "sha256-EXeaeLf3kpeFw5ecr/D/hZbOdSH+t518pV6HwOxc8ec="; })
(fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "4.1.0"; hash = "sha256-lPAL8r1/y6WmWpgKqYHzIa3iEz1+Soqkud4XnbpN/N4="; })
(fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.6"; hash = "sha256-Red8XiAF5Td7yt7jSOgUSlgzSUV5F1Be1yv+WEzNjmo="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.6"; hash = "sha256-6OQ+R8PUmZO6FjW4AmLdVFrwpzUQ/o8m8bZ2pYuISJg="; })
(fetchNuGet { pname = "Monocypher"; version = "0.3.0"; hash = "sha256-InbhO6d2wZ96Zl69b+KIUVM6XRU1X1op6e15afx6hps="; })
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; })
]
pkgs/by-name/kr/kryptor/package.nix
+33
View File
@@ -0,0 +1,33 @@
{ lib
, buildDotnetModule
, fetchFromGitHub
}:
buildDotnetModule rec {
pname = "kryptor";
version = "4.1.0";
src = fetchFromGitHub {
owner = "samuel-lucas6";
repo = "Kryptor";
rev = "v${version}";
hash = "sha256-BxUmDzmfvRelQDHb5uLcQ2YPL7ClxZNFGm/gQoDK8t8=";
};
projectFile = "src/Kryptor.sln";
nugetDeps = ./deps.nix;
executables = ["kryptor"];
dotnetFlags = ["-p:IncludeNativeLibrariesForSelfExtract=true"];
meta = {
changelog = "https://github.com/samuel-lucas6/Kryptor/releases/tag/v${version}";
description = "Simple, modern, and secure encryption and signing tool that aims to be a better version of age and Minisign";
homepage = "https://github.com/samuel-lucas6/Kryptor";
license = lib.licenses.gpl3Only;
mainProgram = "kryptor";
maintainers = with lib.maintainers; [ arthsmn ];
platforms = lib.platforms.all;
};
}
pkgs/by-name/la/lan-mouse/Cargo.lock
Generated
-2669
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/la/lan-mouse/package.nix
+1 -3
View File
@@ -38,9 +38,7 @@ rustPlatform.buildRustPackage rec {
]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreGraphics;
cargoLock = {
lockFile = ./Cargo.lock;
};
cargoHash = "sha256-rmiirWNS5Eldq0NyOyYielTPDdKbhtRqRS7RnGZ7H3g=";
meta = {
description = "Software KVM switch for sharing a mouse and keyboard with multiple hosts through the network";
pkgs/by-name/li/lib25519/environment-variable-tools.patch
+48
View File
@@ -0,0 +1,48 @@
diff --git a/configure b/configure
index 04042b2..30d1ea9 100755
--- a/configure
+++ b/configure
@@ -210,6 +210,17 @@ for arch in sorted(os.listdir('compilers')):
with open('compilers/%s' % arch) as f:
for c in f.readlines():
c = c.strip()
+ if env_cc := os.getenv('CC'):
+ c_as_list= c.split()
+ # check if the compiler we're testing has the name inside the last
+ # part of the CC env var
+ # i.e. gcc == x86_64-linux-unknown-gnu-gcc
+ # or gcc == gcc
+ if c_as_list[0] == env_cc.split("-")[-1]:
+ c_as_list[0] = env_cc
+ c = ' '.join(c_as_list)
+ log('patched command as %s' % c)
+
cv = compilerversion(c)
if cv == None:
log('skipping %s compiler %s' % (arch,c))
diff --git a/scripts-build/checknamespace b/scripts-build/checknamespace
index ae11bed..bd9cb85 100755
--- a/scripts-build/checknamespace
+++ b/scripts-build/checknamespace
@@ -36,7 +36,7 @@ def doit(d):
obj2U = {}
try:
- p = subprocess.Popen(['nm','-ApP']+objs,stdout=subprocess.PIPE,stderr=subprocess.STDOUT,universal_newlines=True)
+ p = subprocess.Popen([os.getenv('NM', 'nm'),'-ApP']+objs,stdout=subprocess.PIPE,stderr=subprocess.STDOUT,universal_newlines=True)
out,err = p.communicate()
except Exception as e:
warn('nm failure: %s' % e)
diff --git a/scripts-build/staticlib b/scripts-build/staticlib
index 7683233..0445bc3 100755
--- a/scripts-build/staticlib
+++ b/scripts-build/staticlib
@@ -3,6 +3,6 @@
lib="$1"
rm -f package/lib/"$lib".a
-ar cr package/lib/"$lib".a ofiles/*.o
-ranlib package/lib/"$lib".a || :
+${AR:-ar} cr package/lib/"$lib".a ofiles/*.o
+${RANLIB:-ranlib} package/lib/"$lib".a || :
chmod 644 package/lib/"$lib".a
pkgs/by-name/li/lib25519/package.nix
+75
View File
@@ -0,0 +1,75 @@
{
stdenv,
lib,
python3,
fetchzip,
librandombytes,
libcpucycles,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "lib25519";
version = "20240321";
src = fetchzip {
url = "https://lib25519.cr.yp.to/lib25519-${finalAttrs.version}.tar.gz";
hash = "sha256-R10Q803vCjIZCS4Z/uErsx547RaXfAELGQm9NuNhw+I=";
};
patches = [ ./environment-variable-tools.patch ];
postPatch = ''
patchShebangs configure
patchShebangs scripts-build
'';
# NOTE: lib25519 uses a custom Python `./configure`: it does not expect standard
# autoconfig --build --host etc. arguments: disable
# Pass the hostPlatform string
configurePhase = ''
runHook preConfigure
./configure --host=${stdenv.buildPlatform.system} --prefix=$out
runHook postConfigure
'';
nativeBuildInputs = [ python3 ];
buildInputs = [
librandombytes
libcpucycles
];
preFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -id "$out/lib/lib25519.1.dylib" "$out/lib/lib25519.1.dylib"
for f in $out/bin/*; do
install_name_tool -change "lib25519.1.dylib" "$out/lib/lib25519.1.dylib" "$f"
done
'';
# failure: crypto_pow does not handle p=q overlap
doInstallCheck = !stdenv.isDarwin;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/lib25519-test
runHook postInstallCheck
'';
meta = {
homepage = "https://randombytes.cr.yp.to/";
description = "A simple API for applications generating fresh randomness";
changelog = "https://randombytes.cr.yp.to/download.html";
license = with lib.licenses; [
# Upstream specifies the public domain licenses with the terms here https://cr.yp.to/spdx.html
publicDomain
cc0
bsd0
mit
mit0
];
maintainers = with lib.maintainers; [
kiike
imadnyc
jleightcap
];
# This supports whatever platforms libcpucycles supports
inherit (libcpucycles.meta) platforms;
};
})
pkgs/by-name/li/libcpucycles/environment-variable-tools.patch
+59
View File
@@ -0,0 +1,59 @@
diff --git a/configure b/configure
index 87d5c14..5e2a1a4 100755
--- a/configure
+++ b/configure
@@ -112,21 +112,26 @@ def compilerversion(c):
except:
pass
-firstcompiler = None
-
-with open('compilers/default') as f:
- for c in f.readlines():
- c = c.strip()
- cv = compilerversion(c)
- if cv == None:
- print('skipping default compiler %s' % c)
- continue
- print('using default compiler %s' % c)
- firstcompiler = c
- break
-
-if firstcompiler is None:
- raise ValueError('did not find a working compiler')
+if c := os.getenv("CC"):
+ firstcompiler = c
+ print('using default compiler %s' % c)
+else:
+ firstcompiler = None
+
+ with open('compilers/default') as f:
+ for c in f.readlines():
+ c = c.strip()
+ cv = compilerversion(c)
+ if cv == None:
+ print('skipping default compiler %s' % c)
+ continue
+ print('using default compiler %s' % c)
+ firstcompiler = c
+ break
+
+ if firstcompiler is None:
+ raise ValueError('did not find a working compiler')
+
with open('build/%s/scripts/compiledefault' % host,'w') as f:
f.write('#!/bin/sh\n')
diff --git a/scripts-build/staticlib b/scripts-build/staticlib
index bb23658..111ab13 100755
--- a/scripts-build/staticlib
+++ b/scripts-build/staticlib
@@ -1,6 +1,6 @@
#!/bin/sh
rm -f package/lib/libcpucycles.a
-ar cr package/lib/libcpucycles.a "$@"
-ranlib package/lib/libcpucycles.a || :
+${AR:-ar} cr package/lib/libcpucycles.a "$@"
+${RANLIB:-ranlib} package/lib/libcpucycles.a || :
chmod 644 package/lib/libcpucycles.a
pkgs/by-name/li/libcpucycles/package.nix
+53
View File
@@ -0,0 +1,53 @@
{
lib,
stdenv,
fetchzip,
python3,
librandombytes,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libcpucycles";
version = "20240318";
src = fetchzip {
url = "https://cpucycles.cr.yp.to/libcpucycles-${finalAttrs.version}.tar.gz";
hash = "sha256-Fb73EOHGgEehZJwTCtCG12xwyiqtDXFs9eFDsHBQiDo=";
};
patches = [ ./environment-variable-tools.patch ];
postPatch = ''
patchShebangs configure
patchShebangs scripts-build
'';
nativeBuildInputs = [ python3 ];
inherit (librandombytes) hardeningDisable configurePlatforms env;
preFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -id "$out/lib/libcpucycles.1.dylib" "$out/lib/libcpucycles.1.dylib"
install_name_tool -change "libcpucycles.1.dylib" "$out/lib/libcpucycles.1.dylib" "$out/bin/cpucycles-info"
'';
meta = {
homepage = "https://cpucycles.cr.yp.to/";
description = "Microlibrary for counting CPU cycles";
changelog = "https://cpucycles.cr.yp.to/download.html";
license = with lib.licenses; [
# Upstream specifies the public domain licenses with the terms here https://cr.yp.to/spdx.html
publicDomain
cc0
bsd0
mit
mit0
];
maintainers = with lib.maintainers; [
kiike
imadnyc
jleightcap
];
inherit (librandombytes.meta) platforms;
};
})
pkgs/by-name/li/librandombytes/package.nix
+7
View File
@@ -21,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: {
patchShebangs scripts-build
'';
__structuredAttrs = true;
# NOTE: librandombytes uses a custom Python `./configure`: it does not expect standard
# autoconfig --build --host etc. arguments: disable
configurePlatforms = [ ];
@@ -44,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ openssl ];
preFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -id "$out/lib/librandombytes-kernel.1.dylib" "$out/lib/librandombytes-kernel.1.dylib"
install_name_tool -change "librandombytes-kernel.1.dylib" "$out/lib/librandombytes-kernel.1.dylib" "$out/bin/randombytes-info"
'';
meta = {
homepage = "https://randombytes.cr.yp.to/";
description = "A simple API for applications generating fresh randomness";
pkgs/by-name/li/lime3ds/package.nix
+19 -17
View File
@@ -39,18 +39,20 @@
, enableCubeb ? true , cubeb
, useDiscordRichPresence ? false , rapidjson
}: let
inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath;
compat-list = fetchurl {
name = "lime3ds-compat-list";
url = "https://raw.githubusercontent.com/Lime3DS/compatibility-list/b0c8b6b80d716db6b957ba103c7a9e17ead24d55/compatibility_list.json";
hash = "sha256-2wNqtorcQo3o09tisikW+cj6cVLLQEiJ1Zcai5ptGEU=";
url = "https://raw.githubusercontent.com/Lime3DS/compatibility-list/fa9d49d22e698df2f238e53f2b34acda08b947f6/compatibility_list.json";
hash = "sha256-dNZuU8uFXJ5gw/rmtF6bAjtrvVBXP8aUNXVdBY1dT34=";
};
in stdenv.mkDerivation (finalAttrs: {
pname = "lime3ds";
version = "2114";
version = "2115";
src = fetchzip {
url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz";
hash = "sha256-PGrKh10dBFAWn37G8m/2/ymqcgtAuxB+5Xib0FI+IMQ=";
hash = "sha256-sYdYuMl+22vZRU+qX7E/TZO2sTJELkqKS56RoU/6oME=";
};
nativeBuildInputs = [
@@ -88,14 +90,14 @@ in stdenv.mkDerivation (finalAttrs: {
xorg.libX11
xorg.libXext
zstd
] ++ lib.optionals enableQt (with kdePackages; [
] ++ optionals enableQt (with kdePackages; [
qtbase
qtmultimedia
qttools
qtwayland
]) ++ lib.optionals enableQtTranslations [kdePackages.qttools]
++ lib.optionals enableCubeb [cubeb]
++ lib.optional useDiscordRichPresence rapidjson;
]) ++ optionals enableQtTranslations [kdePackages.qttools]
++ optionals enableCubeb [cubeb]
++ optional useDiscordRichPresence rapidjson;
postPatch = ''
# Fix file not found when looking in var/empty instead of opt
@@ -112,24 +114,24 @@ in stdenv.mkDerivation (finalAttrs: {
# Add gamemode
substituteInPlace externals/gamemode/include/gamemode_client.h \
--replace-fail "libgamemode.so.0" "${lib.getLib gamemode}/lib/libgamemode.so.0"
--replace-fail "libgamemode.so.0" "${getLib gamemode}/lib/libgamemode.so.0"
'';
postInstall = let
libs = lib.makeLibraryPath [ vulkan-loader ];
in lib.optionalString enableSdl2Frontend ''
libs = makeLibraryPath [ vulkan-loader ];
in optionalString enableSdl2Frontend ''
for binfile in lime3ds-gui lime3ds-cli lime3ds-room
do
wrapProgram "$out/bin/$binfile" \
--prefix LD_LIBRARY_PATH : ${libs}
'' + lib.optionalString enableQt ''
'' + optionalString enableQt ''
qtWrapperArgs+=(
--prefix LD_LIBRARY_PATH : ${libs}
)
done
'';
cmakeFlags = with lib; [
cmakeFlags = [
(cmakeBool "CITRA_USE_PRECOMPILED_HEADERS" false)
(cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
(cmakeBool "USE_SYSTEM_LIBS" true)
@@ -145,12 +147,12 @@ in stdenv.mkDerivation (finalAttrs: {
(cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
];
meta = with lib; {
meta = {
description = "A Nintendo 3DS emulator based on Citra";
homepage = "https://github.com/Lime3DS/Lime3DS";
license = licenses.gpl2Only;
maintainers = with maintainers; [ arthsmn ];
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ arthsmn ];
mainProgram = if enableQt then "lime3ds-gui" else "lime3ds-cli";
platforms = platforms.linux;
platforms = lib.platforms.linux;
};
})
pkgs/by-name/li/live555/package.nix
+2 -2
View File
@@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "live555";
version = "2024.05.15";
version = "2024.05.30";
src = fetchurl {
urls = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz"
"mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz"
];
hash = "sha256-Mgkf5XiFBEEDTTx+YlV12wE4zpmPPqaUPv9KcEK38D0=";
hash = "sha256-hVCwbY1UwAdfgOle9nQqncZ3/K/C27gkfwODL7mtVk8=";
};
patches = [
pkgs/tools/misc/mcfly/default.nix → pkgs/by-name/mc/mcfly/package.nix
+3 -3
View File
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "mcfly";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "cantino";
repo = "mcfly";
rev = "v${version}";
hash = "sha256-vVpZP3bixbV9K32PP0rxWoEGCnWa4xRYHFmgr8wDbS8=";
hash = "sha256-XlAzQNZ4XREp+mmvASGWUnoX2na//lQCgve7OtNcHeE=";
};
postPatch = ''
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly'
'';
cargoHash = "sha256-MTCHznGki7WALNyZByTz4bZ6NDZFpDXcaQ7iYqbMruA=";
cargoHash = "sha256-k+CNsDz3qbCFD0jiiB++1uZJlSfThuCiQkaD6QYyfsY=";
meta = with lib; {
homepage = "https://github.com/cantino/mcfly";
pkgs/by-name/my/myrescue/package.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
install -Dm755 myrescue -t $out/bin
install -Dm755 myrescue myrescue-bitmap2ppm myrescue-stat -t $out/bin
installManPage ../doc/myrescue.1
runHook postInstall
'';
pkgs/by-name/op/openjph/package.nix
+37
View File
@@ -0,0 +1,37 @@
{ lib, stdenv, fetchFromGitHub, cmake, validatePkgConfig, testers, nix-update-script }:
stdenv.mkDerivation (finalAttrs: {
pname = "openjph";
version = "0.14.2";
src = fetchFromGitHub {
owner = "aous72";
repo = "openjph";
rev = finalAttrs.version;
hash = "sha256-jksQfNcgw3LRzQlcsGpTAn6avmM3BsH6wGNTdX9khYY=";
};
nativeBuildInputs = [ cmake validatePkgConfig ];
outputs = [ "out" "dev" ];
cmakeFlags = [
(lib.cmakeBool "OJPH_ENABLE_TIFF_SUPPORT" false)
];
strictDeps = true;
passthru = {
tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
updateScript = nix-update-script { };
};
meta = {
description = "Open-source implementation of JPEG2000 Part-15 (or JPH or HTJ2K)";
homepage = "https://openjph.org/";
maintainers = with lib.maintainers; [ abustany ];
license = lib.licenses.bsd2;
platforms = lib.platforms.unix;
pkgConfigModules = [ "openjph" ];
};
})
pkgs/by-name/pa/patch2pr/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "patch2pr";
version = "0.25.0";
version = "0.26.1";
src = fetchFromGitHub {
owner = "bluekeyes";
repo = "patch2pr";
rev = "v${version}";
hash = "sha256-mS7Yz1RPeA/pms3gGQ1oEjtzH9miIOWlf6YrrIoJk94=";
hash = "sha256-7mN5tp0QUlITCPeotMU61FUl0xmr78RMxUsIlq+F3DE=";
};
vendorHash = "sha256-XJC4rJI+adqiyFfiuyTbrAoWDiTThz7vjDZQrchDEiA=";
vendorHash = "sha256-YRhB0L1kIPZahS0K94vKr2iexhXkwl3GaNsk16WiLAU=";
ldflags = [
"-X main.version=${version}"
pkgs/by-name/pi/picocrypt-cli/package.nix
+34
View File
@@ -0,0 +1,34 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "picocrypt-cli";
version = "2.04";
src = fetchFromGitHub {
owner = "Picocrypt";
repo = "CLI";
rev = version;
hash = "sha256-LWU/u+5AJgBS9IAA3fq5jQLlst+kpEqtRZvjkBSMG2E=";
};
sourceRoot = "${src.name}/picocrypt";
vendorHash = "sha256-5bdiXy/c4FYu544lyL/ac3KF/1zWIPG/bmrpdZa9YV8=";
ldflags = [
"-s"
"-w"
];
CGO_ENABLED = 1;
meta = {
description = "Command-line interface for Picocrypt";
homepage = "https://github.com/Picocrypt/CLI";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ arthsmn ];
mainProgram = "picocrypt";
};
}
pkgs/by-name/qw/qwerty-fr/package.nix
+30
View File
@@ -0,0 +1,30 @@
{
stdenvNoCC,
fetchFromGitHub,
lib,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "qwerty-fr";
version = "0.7.3";
src = fetchFromGitHub {
owner = "qwerty-fr";
repo = "qwerty-fr";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-TD67wKdaPaXzJzjKFCfRZl3WflUfdnUSQl/fnjr9TF8=";
};
installPhase = ''
mkdir -p $out/share/X11/xkb/symbols
cp $src/linux/us_qwerty-fr $out/share/X11/xkb/symbols
'';
meta = with lib; {
description = "Qwerty keyboard layout with French accents";
changelog = "https://github.com/qwerty-fr/qwerty-fr/blob/v${finalAttrs.version}/linux/debian/changelog";
homepage = "https://github.com/qwerty-fr/qwerty-fr";
license = licenses.mit;
maintainers = with maintainers; [ potb ];
};
})
pkgs/by-name/ra/rabbit/package.nix
+2 -2
View File
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "rabbit";
version = "1.0.5";
version = "2.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "natarajan-chidambaram";
repo = "RABBIT";
rev = "refs/tags/${version}";
hash = "sha256-ykvI5qW4toNYKAnrk3ADwat1gAUazbDGGKZEZAvKngQ=";
hash = "sha256-cAWLVB7KpLsfXcxAbSXkE3O6N0V1mw3z9UdMeH0IkpI=";
};
pythonRelaxDeps = true;
pkgs/by-name/re/redocly/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "redocly";
version = "1.17.0";
version = "1.18.0";
src = fetchFromGitHub {
owner = "Redocly";
repo = "redocly-cli";
rev = "@redocly/cli@${version}";
hash = "sha256-6aPNgqem3nG+rPJmxMyjqYPm5mE+93h/uXKCuiUeLxI=";
hash = "sha256-Wcnq6hOgZb/HjTL1vb70d69LwFqRsBrgWHKyjYnauEg=";
};
npmDepsHash = "sha256-J+nlY+FKZqwhj4JyuyReW/UoAMX/eouuOAZ2WCzW2VA=";
npmDepsHash = "sha256-mHwabPif4B1kzqA5Y9WBEr17c3tg0IsBGcRcWnQqGD0=";
npmBuildScript = "prepare";
pkgs/by-name/re/renovate/package.nix
+3 -3
View File
@@ -21,13 +21,13 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "renovate";
version = "37.424.3";
version = "37.431.7";
src = fetchFromGitHub {
owner = "renovatebot";
repo = "renovate";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-OOanxZte0H27U5L1MGrNUxYDWQ7ctAoNVVUukbE7v7s=";
hash = "sha256-aaqsScfi0pXfrxOJ7xjPxtV9m9EUadhivagcAddP8HY=";
};
postPatch = ''
@@ -44,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-tOe0CqRVkN5Uu7S0o9sCV7Tdtkp3JDrupyx0r0AJfs4=";
hash = "sha256-atTs7sYxiioCXO5r6C07UULztquKgWCi+A2iqq+30VQ=";
};
env.COREPACK_ENABLE_STRICT = 0;
pkgs/by-name/sc/scope-tui/Cargo.lock
Generated
-962
View File
@@ -1,962 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "ahash"
version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"once_cell",
"version_check",
"zerocopy",
]
[[package]]
name = "allocator-api2"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
[[package]]
name = "anstream"
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
[[package]]
name = "anstyle-parse"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
"windows-sys 0.52.0",
]
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
[[package]]
name = "cassowary"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
[[package]]
name = "castaway"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
dependencies = [
"rustversion",
]
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651"
dependencies = [
"clap_builder",
"clap_derive",
]
[[package]]
name = "clap_builder"
version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim",
]
[[package]]
name = "clap_derive"
version = "4.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.52",
]
[[package]]
name = "clap_lex"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "compact_str"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f"
dependencies = [
"castaway",
"cfg-if",
"itoa",
"ryu",
"static_assertions",
]
[[package]]
name = "convert_case"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
name = "crossterm"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
dependencies = [
"bitflags 2.4.2",
"crossterm_winapi",
"libc",
"mio",
"parking_lot",
"signal-hook",
"signal-hook-mio",
"winapi",
]
[[package]]
name = "crossterm_winapi"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
dependencies = [
"winapi",
]
[[package]]
name = "deranged"
version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
dependencies = [
"powerfmt",
]
[[package]]
name = "derive_more"
version = "0.99.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
dependencies = [
"convert_case",
"proc-macro2",
"quote",
"rustc_version",
"syn 1.0.109",
]
[[package]]
name = "either"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
[[package]]
name = "hashbrown"
version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
dependencies = [
"ahash",
"allocator-api2",
]
[[package]]
name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "indoc"
version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
[[package]]
name = "itertools"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
[[package]]
name = "libc"
version = "0.2.153"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "libpulse-binding"
version = "2.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed3557a2dfc380c8f061189a01c6ae7348354e0c9886038dc6c171219c08eaff"
dependencies = [
"bitflags 1.3.2",
"libc",
"libpulse-sys",
"num-derive",
"num-traits",
"winapi",
]
[[package]]
name = "libpulse-simple-binding"
version = "2.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05fd6b68f33f6a251265e6ed1212dc3107caad7c5c6fdcd847b2e65ef58c308d"
dependencies = [
"libpulse-binding",
"libpulse-simple-sys",
"libpulse-sys",
]
[[package]]
name = "libpulse-simple-sys"
version = "1.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6613b4199d8b9f0edcfb623e020cb17bbd0bee8dd21f3c7cc938de561c4152"
dependencies = [
"libpulse-sys",
"pkg-config",
]
[[package]]
name = "libpulse-sys"
version = "1.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b"
dependencies = [
"libc",
"num-derive",
"num-traits",
"pkg-config",
"winapi",
]
[[package]]
name = "lock_api"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
dependencies = [
"autocfg",
"scopeguard",
]
[[package]]
name = "log"
version = "0.4.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
[[package]]
name = "lru"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
dependencies = [
"hashbrown",
]
[[package]]
name = "mio"
version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
dependencies = [
"libc",
"log",
"wasi",
"windows-sys 0.48.0",
]
[[package]]
name = "num-complex"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
dependencies = [
"num-traits",
]
[[package]]
name = "num-conv"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]]
name = "num-derive"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "num-integer"
version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
dependencies = [
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
dependencies = [
"autocfg",
]
[[package]]
name = "num_threads"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
dependencies = [
"libc",
]
[[package]]
name = "once_cell"
version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-targets 0.48.5",
]
[[package]]
name = "paste"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "pkg-config"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]]
name = "powerfmt"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "primal-check"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0"
dependencies = [
"num-integer",
]
[[package]]
name = "proc-macro2"
version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
dependencies = [
"proc-macro2",
]
[[package]]
name = "ratatui"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8"
dependencies = [
"bitflags 2.4.2",
"cassowary",
"compact_str",
"crossterm",
"indoc",
"itertools",
"lru",
"paste",
"stability",
"strum",
"time",
"unicode-segmentation",
"unicode-width",
]
[[package]]
name = "redox_syscall"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
dependencies = [
"bitflags 1.3.2",
]
[[package]]
name = "rustc_version"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
"semver",
]
[[package]]
name = "rustfft"
version = "6.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86"
dependencies = [
"num-complex",
"num-integer",
"num-traits",
"primal-check",
"strength_reduce",
"transpose",
"version_check",
]
[[package]]
name = "rustversion"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
[[package]]
name = "ryu"
version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
[[package]]
name = "scope-tui"
version = "0.3.0"
dependencies = [
"clap",
"crossterm",
"derive_more",
"libpulse-binding",
"libpulse-simple-binding",
"ratatui",
"rustfft",
"thiserror",
]
[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "semver"
version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
[[package]]
name = "serde"
version = "1.0.197"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.197"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.52",
]
[[package]]
name = "signal-hook"
version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
dependencies = [
"libc",
"signal-hook-registry",
]
[[package]]
name = "signal-hook-mio"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
dependencies = [
"libc",
"mio",
"signal-hook",
]
[[package]]
name = "signal-hook-registry"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
dependencies = [
"libc",
]
[[package]]
name = "smallvec"
version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
[[package]]
name = "stability"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce"
dependencies = [
"quote",
"syn 1.0.109",
]
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "strength_reduce"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
[[package]]
name = "strsim"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
[[package]]
name = "strum"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
dependencies = [
"strum_macros",
]
[[package]]
name = "strum_macros"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
dependencies = [
"heck",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.52",
]
[[package]]
name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.52"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "thiserror"
version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.52",
]
[[package]]
name = "time"
version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
dependencies = [
"deranged",
"libc",
"num-conv",
"num_threads",
"powerfmt",
"serde",
"time-core",
]
[[package]]
name = "time-core"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "transpose"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e"
dependencies = [
"num-integer",
"strength_reduce",
]
[[package]]
name = "unicode-ident"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-segmentation"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
[[package]]
name = "unicode-width"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets 0.48.5",
]
[[package]]
name = "windows-sys"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets 0.52.4",
]
[[package]]
name = "windows-targets"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
"windows_aarch64_gnullvm 0.48.5",
"windows_aarch64_msvc 0.48.5",
"windows_i686_gnu 0.48.5",
"windows_i686_msvc 0.48.5",
"windows_x86_64_gnu 0.48.5",
"windows_x86_64_gnullvm 0.48.5",
"windows_x86_64_msvc 0.48.5",
]
[[package]]
name = "windows-targets"
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
dependencies = [
"windows_aarch64_gnullvm 0.52.4",
"windows_aarch64_msvc 0.52.4",
"windows_i686_gnu 0.52.4",
"windows_i686_msvc 0.52.4",
"windows_x86_64_gnu 0.52.4",
"windows_x86_64_gnullvm 0.52.4",
"windows_x86_64_msvc 0.52.4",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
[[package]]
name = "windows_i686_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
[[package]]
name = "windows_i686_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
[[package]]
name = "zerocopy"
version = "0.7.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.7.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.52",
]
pkgs/by-name/sc/scope-tui/package.nix
+24 -20
View File
@@ -1,38 +1,42 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libpulseaudio
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
libpulseaudio,
alsa-lib,
withPulseaudio ? true,
}:
rustPlatform.buildRustPackage {
pname = "scope-tui";
version = "0-unstable-2024-03-16";
version = "0.3.0-unstable-2024-05-06";
src = fetchFromGitHub {
owner = "alemidev";
repo = "scope-tui";
rev = "299efd70129eb945f8ce63ff853decb41ef5e7ef";
hash = "sha256-ELcNSjie/AGrPFT06VXR5mNxiBPwYGVzeC8I9ybN8Bc=";
rev = "c2fe70a69cfc15c4de6ea3f2a51580ec57a5c9e1";
hash = "sha256-6UPIZ2UB5wb0IkigaOXdQ/0ux9vHUGC4w5WnrjEd1bg=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
cargoHash = "sha256-9e5FOf7X+54591SjikeAq/5gsnqjUOEtVKpr6vWAHMI=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpulseaudio ];
buildInputs = [ alsa-lib ] ++ lib.optionals withPulseaudio [ libpulseaudio ];
meta = with lib; {
buildFeatures = lib.optionals withPulseaudio [ "pulseaudio" ];
doCheck = false; # no tests
meta = {
description = "Simple oscilloscope/vectorscope/spectroscope for your terminal";
homepage = "https://github.com/alemidev/scope-tui";
license = licenses.mit;
maintainers = with maintainers; [ iynaix ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
iynaix
aleksana
];
mainProgram = "scope-tui";
platforms = platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/by-name/ve/vesktop/package.nix
+2
View File
@@ -15,6 +15,7 @@
autoPatchelfHook,
pnpm_9,
nodejs,
nix-update-script,
withTTS ? true,
withMiddleClickScroll ? false,
# Enables the use of vencord from nixpkgs instead of
@@ -164,6 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
inherit (finalAttrs) pnpmDeps;
updateScript = nix-update-script { };
};
meta = {
pkgs/by-name/wc/wcurl/package.nix
+65
View File
@@ -0,0 +1,65 @@
{
stdenvNoCC,
lib,
curl,
fetchFromGitLab,
installShellFiles,
nix-update-script,
shunit2,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "wcurl";
version = "2024.07.10";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = "wcurl";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-FYkG74uoXFNYT7tszDcdCPQCEG3ePOFBUgIUYpsAzb8=";
};
strictDeps = true;
nativeBuildInputs = [ installShellFiles ];
nativeCheckInputs = [ shunit2 ];
doCheck = true;
dontBuild = true;
postPatch = ''
substituteInPlace wcurl \
--replace-fail '"curl "' '"${curl}/bin/curl "'
'';
checkPhase = ''
runHook preCheck
tests/tests.sh
runHook postCheck
'';
installPhase = ''
runHook preInstall
install -D wcurl -t $out/bin
installManPage wcurl.1
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://salsa.debian.org/debian/wcurl";
description = "Simple wrapper around curl to easily download files";
mainProgram = "wcurl";
license = lib.licenses.curl;
maintainers = with lib.maintainers; [ deejayem ];
platforms = lib.platforms.all;
};
})
pkgs/by-name/xw/xwayland-run/package.nix
+6 -6
View File
@@ -20,14 +20,14 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "xwayland-run";
version = "0.0.3";
version = "0.0.4";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "ofourdan";
repo = "xwayland-run";
rev = version;
hash = "sha256-yYULbbcFDT1zRFn1UWS0dyuchGYnOZypDmxqc14RYF4=";
hash = "sha256-FP/2KNPehZEGKXr+fKdVj4DXzRMpfc3x7K6vH6ZsGdo=";
};
pyproject = false;
@@ -48,12 +48,12 @@ python3.pkgs.buildPythonApplication rec {
--prefix PATH : ${lib.makeBinPath (compositors ++ [ xwayland xorg.xauth ])}
'';
meta = with lib; {
meta = {
changelog = "https://gitlab.freedesktop.org/ofourdan/xwayland-run/-/releases/${src.rev}";
description = "Set of small utilities revolving around running Xwayland and various Wayland compositor headless";
homepage = "https://gitlab.freedesktop.org/ofourdan/xwayland-run";
license = licenses.gpl2Only;
maintainers = with maintainers; [ arthsmn ];
platforms = platforms.linux;
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ arthsmn ];
platforms = lib.platforms.linux;
};
}
pkgs/desktops/xfce/applications/xfburn/default.nix
+30 -5
View File
@@ -1,15 +1,40 @@
{ lib, mkXfceDerivation, docbook_xsl, exo, gtk3, libburn, libisofs, libxfce4ui, libxslt }:
{
mkXfceDerivation,
lib,
docbook_xsl,
exo,
gst_all_1,
gtk3,
libburn,
libgudev,
libisofs,
libxfce4ui,
libxslt,
}:
mkXfceDerivation {
category = "apps";
pname = "xfburn";
version = "0.7.0";
version = "0.7.1";
odd-unstable = false;
sha256 = "sha256-/CuV2tqja5fa2H2mmU9BP6tZHoCZZML5d2LL/CG3rno=";
sha256 = "sha256-wKJ9O4V1b2SoqC4dDKKLg7u8IK9TcjVEa4ZxQv3UOOI=";
nativeBuildInputs = [ libxslt docbook_xsl ];
buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ];
nativeBuildInputs = [
libxslt
docbook_xsl
];
buildInputs = [
exo
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gtk3
libburn
libgudev
libisofs
libxfce4ui
];
meta = with lib; {
description = "Disc burner and project creator for Xfce";
pkgs/development/coq-modules/multinomials/default.nix
+1 -1
View File
@@ -41,7 +41,7 @@
"1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
};
useDuneifVersion = v: lib.versions.isGe "1.5.3" v || v == "dev";
useDuneifVersion = lib.versions.range "1.5.3" "2.2.0";
preConfigure = ''
patchShebangs configure || true
pkgs/development/embedded/rshell/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
buildPythonApplication rec {
pname = "rshell";
version = "0.0.32";
version = "0.0.33";
src = fetchPypi {
inherit pname version;
hash = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8=";
hash = "sha256-yD4F4xZpHaID5aXZ5tbCZB24a/+FtyobmAOV5GOJMMU=";
};
propagatedBuildInputs = [
pkgs/development/libraries/science/math/or-tools/default.nix
+42 -22
View File
@@ -6,7 +6,7 @@
, eigen
, ensureNewerSourcesForZipFilesHook
, fetchFromGitHub
, fetchpatch
, substituteAll
, glpk
, lib
, pkg-config
@@ -19,53 +19,57 @@
, zlib
}:
let
pybind11_protobuf = fetchFromGitHub {
owner = "pybind";
repo = "pybind11_protobuf";
rev = "b713501f1da56d9b76c42f89efd00b97c26c9eac";
hash = "sha256-f6pzRWextH+7lm1xzyhx98wCIWH3lbhn59gSCcjsBVw=";
};
in
stdenv.mkDerivation rec {
pname = "or-tools";
version = "9.4";
version = "9.7";
src = fetchFromGitHub {
owner = "google";
repo = "or-tools";
rev = "v${version}";
sha256 = "sha256-joWonJGuxlgHhXLznRhC1MDltQulXzpo4Do9dec1bLY=";
hash = "sha256-eHukf6TbY2dx7iEf8WfwfWsjDEubPtRO02ju0kHtASo=";
};
patches = [
# Disable test that requires external input: https://github.com/google/or-tools/issues/3429
(fetchpatch {
url = "https://github.com/google/or-tools/commit/7072ae92ec204afcbfce17d5360a5884c136ce90.patch";
hash = "sha256-iWE+atp308q7pC1L1FD6sK8LvWchZ3ofxvXssguozbM=";
(substituteAll {
src = ./offline.patch;
pybind11_protobuf = "../../pybind11_protobuf";
})
# Fix test that broke in parallel builds: https://github.com/google/or-tools/issues/3461
(fetchpatch {
url = "https://github.com/google/or-tools/commit/a26602f24781e7bfcc39612568aa9f4010bb9736.patch";
hash = "sha256-gM0rW0xRXMYaCwltPK0ih5mdo3HtX6mKltJDHe4gbLc=";
})
# Backport fix in cmake test configuration where pip installs newer version from PyPi over local build,
# breaking checkPhase: https://github.com/google/or-tools/issues/3260
(fetchpatch {
url = "https://github.com/google/or-tools/commit/edd1544375bd55f79168db315151a48faa548fa0.patch";
hash = "sha256-S//1YM3IoRCp3Ghg8zMF0XXgIpVmaw4gH8cVb9eUbqM=";
})
# Don't use non-existent member of string_view. Partial patch from commit
# https://github.com/google/or-tools/commit/c5a2fa1eb673bf652cb9ad4f5049d054b8166e17.patch
./fix-stringview-compile.patch
];
# or-tools normally attempts to build Protobuf for the build platform when
# cross-compiling. Instead, just tell it where to find protoc.
postPatch = ''
echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake
cp -R ${pybind11_protobuf} pybind11_protobuf
chmod -R u+w pybind11_protobuf
'';
cmakeFlags = [
"-DBUILD_DEPS=OFF"
"-DBUILD_PYTHON=ON"
"-DBUILD_pybind11=OFF"
"-DBUILD_pybind11_protobuf=ON"
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DFETCH_PYTHON_DEPS=OFF"
"-DUSE_GLPK=ON"
"-DUSE_SCIP=OFF"
"-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}"
] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ];
strictDeps = true;
nativeBuildInputs = [
cmake
ensureNewerSourcesForZipFilesHook
@@ -78,14 +82,18 @@ stdenv.mkDerivation rec {
] ++ (with python.pythonOnBuildForHost.pkgs; [
pip
mypy-protobuf
mypy
]);
buildInputs = [
abseil-cpp
bzip2
cbc
eigen
glpk
python.pkgs.absl-py
python.pkgs.pybind11
python.pkgs.pytest
python.pkgs.scipy
python.pkgs.setuptools
python.pkgs.wheel
re2
@@ -103,7 +111,19 @@ stdenv.mkDerivation rec {
python.pkgs.virtualenv
];
doCheck = true;
env.NIX_CFLAGS_COMPILE = toString [
# fatal error: 'python/google/protobuf/proto_api.h' file not found
"-I${protobuf.src}"
# fatal error: 'pybind11_protobuf/native_proto_caster.h' file not found
"-I${pybind11_protobuf}"
];
# some tests fail on linux and hang on darwin
doCheck = false;
preCheck = ''
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib
'';
# This extra configure step prevents the installer from littering
# $out/bin with sample programs that only really function as tests,
pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch
-36
View File
@@ -1,36 +0,0 @@
diff --git a/ortools/lp_data/lp_parser.cc b/ortools/lp_data/lp_parser.cc
index 58286306e5..bd26c019ab 100644
--- a/ortools/lp_data/lp_parser.cc
+++ b/ortools/lp_data/lp_parser.cc
@@ -185,7 +185,7 @@ bool LPParser::ParseIntegerVariablesList(StringPiece line) {
bool LPParser::ParseConstraint(StringPiece constraint) {
const StatusOr<ParsedConstraint> parsed_constraint_or_status =
- ::operations_research::glop::ParseConstraint(constraint.as_string());
+ ::operations_research::glop::ParseConstraint(constraint);
if (!parsed_constraint_or_status.ok()) return false;
const ParsedConstraint& parsed_constraint =
parsed_constraint_or_status.value();
@@ -342,10 +342,9 @@ TokenType LPParser::ConsumeToken(StringPiece* sp) {
} // namespace
-StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) {
+StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint) {
ParsedConstraint parsed_constraint;
// Get the name, if present.
- StringPiece constraint{constraint_view};
StringPiece constraint_copy{constraint};
std::string consumed_name;
Fractional consumed_coeff;
@@ -413,8 +412,8 @@ StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) {
right_bound = consumed_coeff;
if (ConsumeToken(&constraint, &consumed_name, &consumed_coeff) !=
TokenType::END) {
- return absl::InvalidArgumentError(absl::StrCat(
- "End of input was expected, found: ", constraint.as_string()));
+ return absl::InvalidArgumentError(
+ absl::StrCat("End of input was expected, found: ", constraint));
}
}
pkgs/development/libraries/science/math/or-tools/offline.patch
+16
View File
@@ -0,0 +1,16 @@
diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
index af3a28c113..ba92c3c55e 100644
--- a/cmake/dependencies/CMakeLists.txt
+++ b/cmake/dependencies/CMakeLists.txt
@@ -177,9 +177,8 @@ if(BUILD_PYTHON AND BUILD_pybind11_protobuf)
list(APPEND CMAKE_MESSAGE_INDENT " ")
FetchContent_Declare(
pybind11_protobuf
- GIT_REPOSITORY "https://github.com/pybind/pybind11_protobuf.git"
- GIT_TAG "main"
- PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch"
+ SOURCE_DIR @pybind11_protobuf@
+ PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch"
)
FetchContent_MakeAvailable(pybind11_protobuf)
list(POP_BACK CMAKE_MESSAGE_INDENT)
pkgs/development/python-modules/apkinspector/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "apkinspector";
version = "1.2.4";
version = "1.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "erev0s";
repo = "apkInspector";
rev = "refs/tags/v${version}";
hash = "sha256-WVqaRWOLo8/Xav+AtaxE3EKR9lZe+Z+ep/K88FGbASg=";
hash = "sha256-frcggMsDpPfIqL0J7FNOht+aXeg79xnZryZZwI4wWGw=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/beancount-black/default.nix
+3 -3
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "beancount-black";
version = "1.0.2";
version = "1.0.4";
disabled = pythonOlder "3.9";
format = "pyproject";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "LaunchPlatform";
repo = "beancount-black";
rev = version;
hash = "sha256-SoAic9UYKE9lhMpl44VosJmmjKJjDrKOyMeUO931Ztg=";
rev = "refs/tags/${version}";
hash = "sha256-GrdQCxVsAzCusxxfQHF48doWG8OVrqBayCFof9RHTkE=";
};
buildInputs = [ poetry-core ];
pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
+3 -3
View File
@@ -18,7 +18,7 @@
let
pname = "chacha20poly1305-reuseable";
version = "0.12.1";
version = "0.12.2";
in
buildPythonPackage {
@@ -30,8 +30,8 @@ buildPythonPackage {
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
hash = "sha256-jgbtDpl2hXmfzmsiIIG6+B3QoekuAjBJGMxQJPX4ynA=";
rev = "refs/tags/v${version}";
hash = "sha256-RESSkMWkmlmYarLOI8pX5mwgcr8xAigbp1mrAQP/QNU=";
};
nativeBuildInputs = [
pkgs/development/python-modules/dnslib/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "dnslib";
version = "0.9.24";
version = "0.9.25";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-7xZ4aKMNTOfJC5ISedfs+5hr6OvFMPPmBQouy2hwfHY=";
hash = "sha256-aH3yCG4oCGyzK5R9r6TApOYT8UKbqjvmHYuU5pQYtO8=";
};
checkPhase = ''
pkgs/development/python-modules/expiringdict/default.nix
+3 -2
View File
@@ -6,7 +6,7 @@
dill,
mock,
pytestCheckHook,
setuptools
setuptools,
}:
buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
# the package is not included into the PyPI tarball
src = fetchFromGitHub {
owner = "mailgun";
repo = pname;
repo = "expiringdict";
rev = "refs/tags/v${version}";
hash = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I=";
};
@@ -48,6 +48,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "expiringdict" ];
meta = with lib; {
changelog = "https://github.com/mailgun/expiringdict/blob/${src.rev}/CHANGELOG.rst";
description = "Dictionary with auto-expiring values for caching purposes";
homepage = "https://github.com/mailgun/expiringdict";
license = licenses.asl20;
pkgs/development/python-modules/google-cloud-dlp/default.nix
+4 -4
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-dlp";
version = "3.18.0";
version = "3.18.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-R0CMx16DmMfc6Tw/YqPthYKyDxJcyODdMxAVrj62L34=";
hash = "sha256-KYqhwSa9Z+1s41Ve+GGbnR0BfSZE5UwAqgmqEWfxOC0=";
};
nativeBuildInputs = [ setuptools ];
@@ -53,8 +53,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Cloud Data Loss Prevention (DLP) API API client library";
homepage = "https://github.com/googleapis/python-dlp";
changelog = "https://github.com/googleapis/python-dlp/blob/v${version}/CHANGELOG.md";
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dlp";
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dlp-v${version}/packages/google-cloud-dlp/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
pkgs/development/python-modules/google-cloud-redis/default.nix
+4 -4
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
version = "2.15.3";
version = "2.15.4";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-5qIx5FEHA4z+SY360fba0sp73KOpMTI3ML4Dq3oACo8=";
hash = "sha256-vG8+mL1A5j9Cuwzmz+aYbjmYXWlGCzriDNtQoLbwmoU=";
};
nativeBuildInputs = [ setuptools ];
@@ -44,8 +44,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Google Cloud Memorystore for Redis API client library";
homepage = "https://github.com/googleapis/python-redis";
changelog = "https://github.com/googleapis/python-redis/blob/v${version}/CHANGELOG.md";
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-redis";
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-redis-v${version}/packages/google-cloud-redis/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
pkgs/development/python-modules/govee-ble/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "govee-ble";
version = "0.31.3";
version = "0.33.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "govee-ble";
rev = "refs/tags/v${version}";
hash = "sha256-Gb9k2MieRKSJeKpmltL9HYA7pYKTSTWLGDgo52mY6xA=";
hash = "sha256-nGTf8QjnoEQCSya2mPlUB+cDD3ewGYiihIV2S6HRr9o=";
};
postPatch = ''
pkgs/development/python-modules/kafka-python-ng/default.nix
+56
View File
@@ -0,0 +1,56 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
setuptools-scm,
crc32c,
lz4,
python-snappy,
zstandard,
botocore,
pytest-mock,
pytestCheckHook,
xxhash,
}:
buildPythonPackage rec {
version = "2.2.2";
pname = "kafka-python-ng";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "wbarnha";
repo = "kafka-python-ng";
rev = "refs/tags/v${version}";
hash = "sha256-ELJvcj91MQ2RTjT1dwgnTGSSG5lP6B6/45dFgtNY2Cc=";
};
build-system = [ setuptools-scm ];
passthru.optional-dependencies = {
crc32c = [ crc32c ];
lz4 = [ lz4 ];
snappy = [ python-snappy ];
zstd = [ zstandard ];
boto = [ botocore ];
};
pythonImportsCheck = [ "kafka" ];
nativeCheckInputs = [
pytest-mock
pytestCheckHook
xxhash
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
meta = {
changelog = "https://github.com/wbarnha/kafka-python-ng/releases/tag/v${version}";
description = "Pure Python client for Apache Kafka";
homepage = "https://github.com/wbarnha/kafka-python-ng";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
pkgs/development/python-modules/manifestoo-core/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "manifestoo-core";
version = "1.6";
version = "1.7";
format = "pyproject";
src = fetchPypi {
inherit version;
pname = "manifestoo_core";
hash = "sha256-gOWu01Z1lxhMJELyxvU5A5AskVEqCoLV/auydM5/QCE=";
hash = "sha256-CLYySNkMysd81ZBA2yfHGSvBuuf8vEvVXkzVsTeEoNM=";
};
nativeBuildInputs = [ hatch-vcs ];
pkgs/development/python-modules/model-checker/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "model-checker";
version = "0.4.9";
version = "0.4.12";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "model_checker";
inherit version;
hash = "sha256-BUkbCllM2qN5yKTvte2iwnmBXQAzu2N8LTGRfvOTKUQ=";
hash = "sha256-bgVtOpWx5jytVxSz/WKLqLm+hVKbwIy+Fy5nEj/Nwt4=";
};
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
pkgs/development/python-modules/msgraph-core/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "msgraph-core";
version = "1.1.0";
version = "1.1.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "microsoftgraph";
repo = "msgraph-sdk-python-core";
rev = "refs/tags/v${version}";
hash = "sha256-bQW1piSypfj3YAfzuEk/AkrB1x0lrHoIDyZv+KeCYgE=";
hash = "sha256-MrZGlp0rvKBNrIOYCWJfnRmD983/OjuQv1DoRVNngKU=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/parsedmarc/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@
google-auth-oauthlib,
hatchling,
imapclient,
kafka-python,
kafka-python-ng,
lxml,
mailsuite,
msgraph-core,
@@ -77,7 +77,7 @@ buildPythonPackage rec {
google-auth-httplib2
google-auth-oauthlib
imapclient
kafka-python
kafka-python-ng
lxml
mailsuite
msgraph-core
pkgs/development/python-modules/solaredge/default.nix
-38
View File
@@ -1,38 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
python-dateutil,
pythonOlder,
pytz,
requests,
}:
buildPythonPackage rec {
pname = "solaredge";
version = "0.0.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "0q4gib0l3qnlpncg84ki027vr1apjlr47vd6845rpk7zkm8lqgfz";
};
propagatedBuildInputs = [
python-dateutil
pytz
requests
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "solaredge" ];
meta = with lib; {
description = "Python wrapper for Solaredge monitoring service";
homepage = "https://github.com/bertouttier/solaredge";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/suds/default.nix
+36
View File
@@ -0,0 +1,36 @@
{
lib,
buildPythonPackage,
fetchPypi,
pytestCheckHook,
setuptools,
six,
}:
buildPythonPackage rec {
pname = "suds";
version = "1.1.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-HVz6dBFxk7JEpCM/JGxIPZ9BGYtEjF8UqLrRHE9knys=";
};
build-system = [ setuptools ];
nativeCheckInputs = [
pytestCheckHook
six
];
pythonImportsCheck = [ "suds" ];
meta = {
changelog = "https://github.com/suds-community/suds/blob/v${version}/CHANGELOG.md";
description = "Lightweight SOAP python client for consuming Web Services";
homepage = "https://github.com/suds-community/suds";
license = lib.licenses.lgpl3Plus;
maintainers = with lib.maintainers; [ wrmilling ];
};
}
pkgs/development/tools/earthly/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "earthly";
version = "0.8.14";
version = "0.8.15";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
hash = "sha256-G9AvJMrgb71KxOaYScYOVuYSwubLlSd6a9KhzA8DKlA=";
hash = "sha256-7yw2SmwWsPBCH0LOaZSruYeZ5qL+njGuExy8+11Ni78=";
};
vendorHash = "sha256-Uy/h6TBmDYHSewq3TbchLe+AtdvO2xNSp9pVDglRKVc=";
vendorHash = "sha256-bwNuQPGjAQ9Afa2GuPWrW8ytfIvhsOYFKPt0zyfdZhU=";
subPackages = [ "cmd/earthly" "cmd/debugger" ];
CGO_ENABLED = 0;
pkgs/development/tools/espup/default.nix
+3 -3
View File
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "espup";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "esp-rs";
repo = "espup";
rev = "v${version}";
hash = "sha256-ofC9pBKZEKGNNirshhfcCkzWN4CvD7IfArZaikkfnmI=";
hash = "sha256-cbBfzx195zk98IbSNSx99CF1RqH+ySpy6SQk5y8rvq4=";
};
cargoHash = "sha256-fM1If/RnPzLDYjUImNkMViWkjXBc5YRIJHthypcJfmc=";
cargoHash = "sha256-N1TpBN5wULY+brBxUfwFrBTLKrVI8Cq3OX8fJqLHwAI=";
nativeBuildInputs = [
pkg-config
pkgs/development/tools/flatpak-builder/default.nix
+7 -8
View File
@@ -41,19 +41,16 @@
, attr
}:
let
installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
in stdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "flatpak-builder";
version = "1.4.2";
version = "1.4.4";
outputs = [ "out" "doc" "man" "installedTests" ];
# fetchFromGitHub fetches an archive which does not contain the full source (https://github.com/flatpak/flatpak-builder/issues/558)
src = fetchurl {
# TODO: remove the '-fixed-libglnx' in the next release
url = "https://github.com/flatpak/flatpak-builder/releases/download/${finalAttrs.version}/flatpak-builder-${finalAttrs.version}-fixed-libglnx.tar.xz";
hash = "sha256-wEG5dOA6LC082oig7+Hs9p+a30KhdY6sNB1VXnedBZY=";
url = "https://github.com/flatpak/flatpak-builder/releases/download/${finalAttrs.version}/flatpak-builder-${finalAttrs.version}.tar.xz";
hash = "sha256-3CcVk5S6qiy1I/Uvh0Ry/1DRYZgyMyZMoqIuhQdB7Ho=";
};
patches = [
@@ -124,7 +121,9 @@ in stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
# Installed tests
postFixup = ''
postFixup = let
installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
in ''
for file in ${installed_testdir}/{test-builder.sh,test-builder-python.sh,test-builder-deprecated.sh}; do
patchShebangs $file
done
pkgs/development/tools/misc/polylith/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "polylith";
version = "0.2.19";
version = "0.2.20";
src = fetchurl {
url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar";
sha256 = "sha256-tJV3kkB7dydnrJ0Es7DoOtCS+TwJG3SMONB2dsyHxx4=";
sha256 = "sha256-c/EFacN8isuxghnxaMn/uqDK1r7w1qn/suV8xbnmvOo=";
};
dontUnpack = true;
pkgs/development/tools/zed/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "zed";
version = "1.16.0";
version = "1.17.0";
src = fetchFromGitHub {
owner = "brimdata";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xjE/9Sl4lpgUg1+giUw/14E3MehhFqJI5cYXaw/qVPE=";
sha256 = "sha256-bafX3i6jEMqYB4YCpIX4z4SgQbJjryGmZ6pvqtVrk3A=";
};
vendorHash = "sha256-X1rE6/sgpB6jeTjLZJL/a7ghjRJYTXSQDHB4PmEFUmU=";
pkgs/development/web/bun/default.nix
+5 -5
View File
@@ -12,7 +12,7 @@
}:
stdenvNoCC.mkDerivation rec {
version = "1.1.18";
version = "1.1.20";
pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
hash = "sha256-USN4hMdTjoij1JQ3lWztk9ue4pB+kqaYvD7AuxWz4is=";
hash = "sha256-ErutjiXBjC9GDvb0F39AgbbsSo6zhRzpDEvDor/xRbI=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
hash = "sha256-JIaprZk36YW+oUe6DLWba0OIK69LuhVsq8cjnQ9o72A=";
hash = "sha256-vqL/H5t0elgT9fSk0Op7Td69eP9WPY2XVo1a8sraTwM=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip";
hash = "sha256-LSAfEQIXb0aQjVLaJ/4sDasVVAIxjUIMRQlMAzBlXEk=";
hash = "sha256-5PLk8q3di5TW8HUfo7P3xrPWLhleAiSv9jp2XeL47Kk=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
hash = "sha256-n/HcFSSNtnmzEa4nBuzn8LuJ/IQ3/QUlTt3OO5T/ACQ=";
hash = "sha256-bLcK0DSaLOzJSrIRPNHQeld5qud8ccqxzyDIgawMB3U=";
};
};
updateScript = writeShellScript "update-bun" ''
pkgs/tools/admin/drawterm/default.nix
+3 -3
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation {
pname = "drawterm";
version = "0-unstable-2024-06-10";
version = "0-unstable-2024-07-03";
src = fetchFrom9Front {
owner = "plan9front";
repo = "drawterm";
rev = "19f4185f3967a5c00053236015da22c0da2af41d";
hash = "sha256-aIoWhjzVmfXv5fcwIBwjUFVjdx316JivKMS+odnEB/I=";
rev = "f11139d4c918802a87730bc14d094670ee4ce572";
hash = "sha256-vkBXzIezC9DWlGpk6klUvtmq4F4D5LJWwjEllMIr8D0=";
};
enableParallelBuilding = true;
pkgs/tools/networking/dnsproxy/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.71.2";
version = "0.72.0";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = "dnsproxy";
rev = "v${version}";
hash = "sha256-fsJWyb3YFmTeLf1qbO42RTldiEv3MeXyrySywGmIg5A=";
hash = "sha256-lhMHGB+/p4+pXZrLwf+NwyNF5TbMhNrJW0tCjRV+U9Q=";
};
vendorHash = "sha256-oINdRXLtfoCOpZ+n4HAkPtXyKen4m9VaDz1ggiEzehc=";
vendorHash = "sha256-vGIw0Hj0l8SI6zYnTknzc7Lb5volW37yE/KnWZHydQE=";
ldflags = [ "-s" "-w" "-X" "github.com/AdguardTeam/dnsproxy/internal/version.version=${version}" ];
pkgs/tools/security/kubescape/default.nix
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "kubescape";
version = "3.0.13";
version = "3.0.14";
src = fetchFromGitHub {
owner = "kubescape";
repo = "kubescape";
rev = "refs/tags/v${version}";
hash = "sha256-s0BaPIGMP8PbVv14e0U+tWKUFUVohAndaI5pLoMdALM=";
hash = "sha256-vTbNnQwHU1ALjNrZHE7nNw53DIe4lEifYOqkIeZohVE=";
fetchSubmodules = true;
};
pkgs/tools/security/pinentry-rofi/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "pinentry-rofi";
version = "2.1.1";
version = "2.2.0";
src = fetchFromGitHub {
owner = "plattfot";
repo = pname;
rev = version;
sha256 = "sha256-e7dpMivZrTHmRuAzBzDVRoUgvBt6NpZ43FRQtX2omHA=";
sha256 = "sha256-E904PLYuIvlew2WHVEwU2bXp6Tc6+lTSVB/m9b9v+z8=";
};
nativeBuildInputs = [
pkgs/tools/text/uni2ascii/default.nix
+9 -2
View File
@@ -2,13 +2,20 @@
stdenv.mkDerivation rec {
pname = "uni2ascii";
version = "4.18";
version = "4.20";
src = fetchurl {
url = "https://billposer.org/Software/Downloads/uni2ascii-${version}.tar.gz";
sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y";
hash = "sha256-7tjYOpwdLb0NfKTFJRmYg9cxfWiLQhtXjQmKJ7b/cFY=";
};
patches = [
(fetchurl {
url = "https://github.com/Homebrew/formula-patches/raw/bb92449ad6b3878b4d6f472237152df28080df86/uni2ascii/uni2ascii-4.20.patch";
hash = "sha256-JQpSntoTbQ7fnmO5Km/pX071360/lOb9jYdxOK2oV/g=";
})
];
meta = {
license = lib.licenses.gpl3;
homepage = "http://billposer.org/Software/uni2ascii.html";
pkgs/top-level/aliases.nix
+1
View File
@@ -1497,6 +1497,7 @@ mapAliases ({
xineLib = xine-lib; # Added 2021-04-27
xineUI = xine-ui; # Added 2021-04-27
xmlada = gnatPackages.xmlada; # Added 2024-02-25
xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15
xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25
xulrunner = firefox-unwrapped; # Added 2023-11-03
pkgs/top-level/all-packages.nix
+6 -8
View File
@@ -9695,8 +9695,6 @@ with pkgs;
mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };
mcfly = callPackage ../tools/misc/mcfly { };
m2r = with python3Packages; toPythonApplication m2r;
md2gemini = with python3.pkgs; toPythonApplication md2gemini;
@@ -29682,7 +29680,9 @@ with pkgs;
chatty = callPackage ../applications/networking/instant-messengers/chatty { };
chirp = callPackage ../applications/radio/chirp { };
chirp = callPackage ../applications/radio/chirp {
python3 = python311;
};
browsh = callPackage ../applications/networking/browsers/browsh { };
@@ -30355,7 +30355,7 @@ with pkgs;
font-manager = callPackage ../by-name/fo/font-manager/package.nix {
libsoup = libsoup_3;
webkitgtk = webkitgtk_4_1;
webkitgtk = webkitgtk_6_0;
};
fontfinder = callPackage ../applications/misc/fontfinder { };
@@ -32398,8 +32398,6 @@ with pkgs;
monitorcontrol = callPackage ../applications/misc/monitorcontrol { };
xmr-stak = callPackage ../applications/misc/xmr-stak { };
xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { };
xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { };
@@ -37725,10 +37723,10 @@ with pkgs;
inherit (darwin) DarwinTools;
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
python = python3;
protobuf = protobuf_21;
protobuf = protobuf_23;
# or-tools builds with -std=c++20, so abseil-cpp must
# also be built that way
abseil-cpp = abseil-cpp.override {
abseil-cpp = abseil-cpp_202301.override {
static = true;
cxxStandard = "20";
};
pkgs/top-level/python-aliases.nix
+1
View File
@@ -521,6 +521,7 @@ mapAliases ({
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
smpp_pdu = smpp-pdu; # added 2024-03-05
somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01
solaredge = throw "solaredge was removed because Home Assistant switched to aiosolaredge"; # added 2024-07-15
sorl_thumbnail = sorl-thumbnail; # added 2023-11-12
spacy_models = spacy-models; # added 2024-04-21
SPARQLWrapper = sparqlwrapper;
pkgs/top-level/python-packages.nix
+4 -2
View File
@@ -6446,6 +6446,8 @@ self: super: with self; {
kafka-python = callPackage ../development/python-modules/kafka-python { };
kafka-python-ng = callPackage ../development/python-modules/kafka-python-ng { };
kaggle = callPackage ../development/python-modules/kaggle { };
kaitaistruct = callPackage ../development/python-modules/kaitaistruct { };
@@ -14403,8 +14405,6 @@ self: super: with self; {
softlayer = callPackage ../development/python-modules/softlayer { };
solaredge = callPackage ../development/python-modules/solaredge { };
solax = callPackage ../development/python-modules/solax { };
solc-select = callPackage ../development/python-modules/solc-select { };
@@ -14917,6 +14917,8 @@ self: super: with self; {
sudachipy = callPackage ../development/python-modules/sudachipy { };
suds = callPackage ../development/python-modules/suds { };
sumo = callPackage ../development/python-modules/sumo { };
sumtypes = callPackage ../development/python-modules/sumtypes { };