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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-07-20 18:01:52 +00:00
committed by GitHub
parent dfefabb70a e533bfc8da
commit f4da8aac64
279 changed files with 1759 additions and 1048 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/CODEOWNERS
-1
View File
@@ -371,7 +371,6 @@ nixos/tests/lxd/ @adamcstephens
pkgs/by-name/in/incus/ @adamcstephens
pkgs/by-name/lx/lxc* @adamcstephens
pkgs/by-name/lx/lxd* @adamcstephens
pkgs/os-specific/linux/lxc/ @adamcstephens
# ExpidusOS, Flutter
/pkgs/development/compilers/flutter @RossComputerGuy
doc/languages-frameworks/coq.section.md
+1 -1
View File
@@ -84,7 +84,7 @@ mkCoqDerivation {
[ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ];
meta = {
description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
description = "Coq/SSReflect Library for Monoidal Rings and Multinomials";
license = lib.licenses.cecill-c;
};
}
doc/languages-frameworks/javascript.section.md
+1 -1
View File
@@ -206,7 +206,7 @@ buildNpmPackage rec {
NODE_OPTIONS = "--openssl-legacy-provider";
meta = {
description = "A modern web UI for various torrent clients with a Node.js backend and React frontend";
description = "Modern web UI for various torrent clients with a Node.js backend and React frontend";
homepage = "https://flood.js.org";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ winter ];
doc/languages-frameworks/ocaml.section.md
+1 -1
View File
@@ -113,7 +113,7 @@ buildDunePackage rec {
meta = {
homepage = "https://github.com/flowtype/ocaml-wtf8";
description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.eqyiel ];
};
doc/languages-frameworks/perl.section.md
+1 -1
View File
@@ -158,7 +158,7 @@ $ nix-generate-from-cpan XML::Simple
};
propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ];
meta = {
description = "An API for simple XML files";
description = "API for simple XML files";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
doc/languages-frameworks/python.section.md
+2 -2
View File
@@ -993,7 +993,7 @@ buildPythonPackage rec {
meta = {
changelog = "https://github.com/blaze/datashape/releases/tag/${version}";
homepage = "https://github.com/ContinuumIO/datashape";
description = "A data description language";
description = "Data description language";
license = lib.licenses.bsd2;
};
}
@@ -1118,7 +1118,7 @@ buildPythonPackage rec {
meta = {
changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}";
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
homepage = "http://hgomersall.github.com/pyFFTW";
license = with lib.licenses; [ bsd2 bsd3 ];
};
doc/languages-frameworks/rust.section.md
+2 -2
View File
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-jtBw4ahSl88L0iuCXxQgZVm1EcboWRJMNtjxLVTtzts=";
meta = {
description = "A fast line-oriented regex search tool, similar to ag and ack";
description = "Fast line-oriented regex search tool, similar to ag and ack";
homepage = "https://github.com/BurntSushi/ripgrep";
license = lib.licenses.unlicense;
maintainers = [];
@@ -997,7 +997,7 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
meta = {
description = "A fast line-oriented regex search tool, similar to ag and ack";
description = "Fast line-oriented regex search tool, similar to ag and ack";
homepage = "https://github.com/BurntSushi/ripgrep";
license = with lib.licenses; [ mit unlicense ];
maintainers = with lib.maintainers; [];
doc/languages-frameworks/texlive.section.md
+1 -1
View File
@@ -183,7 +183,7 @@ let
'';
meta = {
description = "A LaTeX2e class for overhead transparencies";
description = "LaTeX2e class for overhead transparencies";
license = lib.licenses.unfreeRedistributable;
maintainers = with lib.maintainers; [ veprbl ];
platforms = lib.platforms.all;
doc/stdenv/meta.chapter.md
+1 -1
View File
@@ -5,7 +5,7 @@ Nix packages can declare *meta-attributes* that contain information about a pack
```nix
{
meta = {
description = "A program that produces a familiar, friendly greeting";
description = "Program that produces a familiar, friendly greeting";
longDescription = ''
GNU Hello is a program that prints "Hello, world!" when you run it.
It is fully customizable.
maintainers/maintainer-list.nix
+1 -1
View File
@@ -485,7 +485,7 @@
};
adamcstephens = {
email = "happy.plan4249@valkor.net";
matrix = "@adam:valkor.net";
matrix = "@adam:robins.wtf";
github = "adamcstephens";
githubId = 2071575;
name = "Adam C. Stephens";
nixos/doc/manual/release-notes/rl-2411.section.md
+2
View File
@@ -18,6 +18,8 @@
## New Services {#sec-release-24.11-new-services}
- [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service.
- [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI
for LLMs. Available as [services.open-webui](#opt-services.open-webui.enable)
service.
nixos/modules/module-list.nix
+1
View File
@@ -732,6 +732,7 @@
./services/misc/etesync-dav.nix
./services/misc/evdevremapkeys.nix
./services/misc/felix.nix
./services/misc/flaresolverr.nix
./services/misc/forgejo.nix
./services/misc/freeswitch.nix
./services/misc/fstrim.nix
nixos/modules/security/wrappers/default.nix
+11 -5
View File
@@ -255,11 +255,6 @@ in
umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
};
boot.specialFileSystems.${parentWrapperDir} = {
fsType = "tmpfs";
options = [ "nodev" "mode=755" "size=${config.security.wrapperDirSize}" ];
};
# Make sure our wrapperDir exports to the PATH env variable when
# initializing the shell
environment.extraInit = ''
@@ -275,6 +270,17 @@ in
mrpx ${wrap.source},
'') wrappers;
systemd.mounts = [{
where = parentWrapperDir;
what = "tmpfs";
type = "tmpfs";
options = lib.concatStringsSep "," ([
"nodev"
"mode=755"
"size=${config.security.wrapperDirSize}"
]);
}];
systemd.services.suid-sgid-wrappers = {
description = "Create SUID/SGID Wrappers";
wantedBy = [ "sysinit.target" ];
nixos/modules/services/desktop-managers/lomiri.nix
+1 -1
View File
@@ -63,7 +63,7 @@ in {
fonts.packages = with pkgs; [
# Applications tend to default to Ubuntu font
ubuntu_font_family
ubuntu-classic
];
# Copy-pasted basic stuff
nixos/modules/services/misc/flaresolverr.nix
+58
View File
@@ -0,0 +1,58 @@
{
config,
pkgs,
lib,
...
}:
let
cfg = config.services.flaresolverr;
in
{
options = {
services.flaresolverr = {
enable = lib.mkEnableOption "FlareSolverr, a proxy server to bypass Cloudflare protection";
package = lib.mkPackageOption pkgs "flaresolverr" { };
openFirewall = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Open the port in the firewall for FlareSolverr.";
};
port = lib.mkOption {
type = lib.types.port;
default = 8191;
description = "The port on which FlareSolverr will listen for incoming HTTP traffic.";
};
};
};
config = lib.mkIf cfg.enable {
systemd.services.flaresolverr = {
description = "FlareSolverr";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = {
HOME = "/run/flaresolverr";
PORT = toString cfg.port;
};
serviceConfig = {
SyslogIdentifier = "flaresolverr";
Restart = "always";
RestartSec = 5;
Type = "simple";
DynamicUser = true;
RuntimeDirectory = "flaresolverr";
WorkingDirectory = "/run/flaresolverr";
ExecStart = lib.getExe cfg.package;
TimeoutStopSec = 30;
};
};
networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
};
}
nixos/modules/virtualisation/includes-to-excludes.py
-86
View File
@@ -1,86 +0,0 @@
# Convert a list of strings to a regex that matches everything but those strings
# ... and it had to be a POSIX regex; no negative lookahead :(
# This is a workaround for erofs supporting only exclude regex, not an include list
import sys
import re
from collections import defaultdict
# We can configure this script to match in different ways if we need to.
# The regex got too long for the argument list, so we had to truncate the
# hashes and use MATCH_STRING_PREFIX. That's less accurate, and might pick up some
# garbage like .lock files, but only if the sandbox doesn't hide those. Even
# then it should be harmless.
# Produce the negation of ^a$
MATCH_EXACTLY = ".+"
# Produce the negation of ^a
MATCH_STRING_PREFIX = "//X" # //X should be epsilon regex instead. Not supported??
# Produce the negation of ^a/?
MATCH_SUBPATHS = "[^/].*$"
# match_end = MATCH_SUBPATHS
match_end = MATCH_STRING_PREFIX
# match_end = MATCH_EXACTLY
def chars_to_inverted_class(letters):
assert len(letters) > 0
letters = list(letters)
s = "[^"
if "]" in letters:
s += "]"
letters.remove("]")
final = ""
if "-" in letters:
final = "-"
letters.remove("-")
s += "".join(letters)
s += final
s += "]"
return s
# There's probably at least one bug in here, but it seems to works well enough
# for filtering store paths.
def strings_to_inverted_regex(strings):
s = "("
# Match anything that starts with the wrong character
chars = defaultdict(list)
for item in strings:
if item != "":
chars[item[0]].append(item[1:])
if len(chars) == 0:
s += match_end
else:
s += chars_to_inverted_class(chars)
# Now match anything that starts with the right char, but then goes wrong
for char, sub in chars.items():
s += "|(" + re.escape(char) + strings_to_inverted_regex(sub) + ")"
s += ")"
return s
if __name__ == "__main__":
stdin_lines = []
for line in sys.stdin:
if line.strip() != "":
stdin_lines.append(line.strip())
print("^" + strings_to_inverted_regex(stdin_lines))
# Test:
# (echo foo; echo fo/; echo foo/; echo foo/ba/r; echo b; echo az; echo az/; echo az/a; echo ab; echo ab/a; echo ab/; echo abc; echo abcde; echo abb; echo ac; echo b) | grep -vE "$((echo ab; echo az; echo foo;) | python includes-to-excludes.py | tee /dev/stderr )"
# should print ab, az, foo and their subpaths
nixos/modules/virtualisation/proxmox-lxc.nix
+8
View File
@@ -70,6 +70,14 @@ with lib;
hostName = mkIf (!cfg.manageHostName) (mkForce "");
};
# unprivileged LXCs can't set net.ipv4.ping_group_range
security.wrappers.ping = mkIf (!cfg.privileged) {
owner = "root";
group = "root";
capabilities = "cap_net_raw+p";
source = "${pkgs.iputils.out}/bin/ping";
};
services.openssh = {
enable = mkDefault true;
startWhenNeeded = mkDefault true;
nixos/modules/virtualisation/qemu-vm.nix
+30 -67
View File
@@ -134,32 +134,25 @@ let
TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir)
fi
${lib.optionalString (cfg.useNixStoreImage)
(if cfg.writableStore
then ''
# Create a writable copy/snapshot of the store image.
${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${storeImage}/nixos.qcow2 "$TMPDIR"/store.img
''
else ''
(
cd ${builtins.storeDir}
${hostPkgs.erofs-utils}/bin/mkfs.erofs \
--force-uid=0 \
--force-gid=0 \
-L ${nixStoreFilesystemLabel} \
-U eb176051-bd15-49b7-9e6b-462e0b467019 \
-T 0 \
--exclude-regex="$(
<${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \
sed -e 's^.*/^^g' \
| cut -c -10 \
| ${hostPkgs.python3}/bin/python ${./includes-to-excludes.py} )" \
"$TMPDIR"/store.img \
. \
</dev/null >/dev/null
)
''
)
${lib.optionalString (cfg.useNixStoreImage) ''
echo "Creating Nix store image..."
${hostPkgs.gnutar}/bin/tar --create \
--absolute-names \
--verbatim-files-from \
--transform 'flags=rSh;s|/nix/store/||' \
--files-from ${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \
| ${hostPkgs.erofs-utils}/bin/mkfs.erofs \
--force-uid=0 \
--force-gid=0 \
-L ${nixStoreFilesystemLabel} \
-U eb176051-bd15-49b7-9e6b-462e0b467019 \
-T 0 \
--tar=f \
"$TMPDIR"/store.img
echo "Created Nix store image."
''
}
# Create a directory for exchanging data with the VM.
@@ -298,21 +291,6 @@ let
OVMF = cfg.efi.OVMF;
};
storeImage = import ../../lib/make-disk-image.nix {
name = "nix-store-image";
inherit pkgs config lib;
additionalPaths = [ regInfo ];
format = "qcow2";
onlyNixStore = true;
label = nixStoreFilesystemLabel;
partitionTableType = "none";
installBootLoader = false;
touchEFIVars = false;
diskSize = "auto";
additionalSpace = "0M";
copyChannel = false;
};
in
{
@@ -788,10 +766,14 @@ in
this can drastically improve performance, but at the cost of
disk space and image build time.
As an alternative, you can use a bootloader which will provide you
with a full NixOS system image containing a Nix store and
avoid mounting the host nix store through
{option}`virtualisation.mountHostNixStore`.
The Nix store image is built just-in-time right before the VM is
started. Because it does not produce another derivation, the image is
not cached between invocations and never lands in the store or binary
cache.
If you want a full disk image with a partition table and a root
filesystem instead of only a store image, enable
{option}`virtualisation.useBootLoader` instead.
'';
};
@@ -1019,25 +1001,7 @@ in
];
warnings =
optional (
cfg.writableStore &&
cfg.useNixStoreImage &&
opt.writableStore.highestPrio > lib.modules.defaultOverridePriority)
''
You have enabled ${opt.useNixStoreImage} = true,
without setting ${opt.writableStore} = false.
This causes a store image to be written to the store, which is
costly, especially for the binary cache, and because of the need
for more frequent garbage collection.
If you really need this combination, you can set ${opt.writableStore}
explicitly to true, incur the cost and make this warning go away.
Otherwise, we recommend
${opt.writableStore} = false;
''
++ optional (cfg.directBoot.enable && cfg.useBootLoader)
optional (cfg.directBoot.enable && cfg.useBootLoader)
''
You enabled direct boot and a bootloader, QEMU will not boot your bootloader, rendering
`useBootLoader` useless. You might want to disable one of those options.
@@ -1050,8 +1014,6 @@ in
boot.loader.grub.device = mkVMOverride (if cfg.useEFIBoot then "nodev" else cfg.bootLoaderDevice);
boot.loader.grub.gfxmodeBios = with cfg.resolution; "${toString x}x${toString y}";
boot.initrd.kernelModules = optionals (cfg.useNixStoreImage && !cfg.writableStore) [ "erofs" ];
boot.loader.supportsInitrdSecrets = mkIf (!cfg.useBootLoader) (mkVMOverride false);
# After booting, register the closure of the paths in
@@ -1171,7 +1133,7 @@ in
name = "nix-store";
file = ''"$TMPDIR"/store.img'';
deviceExtraOpts.bootindex = "2";
driveExtraOpts.format = if cfg.writableStore then "qcow2" else "raw";
driveExtraOpts.format = "raw";
}])
(imap0 (idx: _: {
file = "$(pwd)/empty${toString idx}.qcow2";
@@ -1226,6 +1188,7 @@ in
});
"/nix/.ro-store" = lib.mkIf cfg.useNixStoreImage {
device = "/dev/disk/by-label/${nixStoreFilesystemLabel}";
fsType = "erofs";
neededForBoot = true;
options = [ "ro" ];
};
nixos/tests/all-tests.nix
+1
View File
@@ -332,6 +332,7 @@ in {
firewall-nftables = handleTest ./firewall.nix { nftables = true; };
fish = handleTest ./fish.nix {};
flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
flaresolverr = handleTest ./flaresolverr.nix {};
flood = handleTest ./flood.nix {};
floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; };
fluentd = handleTest ./fluentd.nix {};
nixos/tests/flaresolverr.nix
+22
View File
@@ -0,0 +1,22 @@
import ./make-test-python.nix (
{ lib, ... }:
{
name = "flaresolverr";
meta.maintainers = with lib.maintainers; [ paveloom ];
nodes.machine =
{ pkgs, ... }:
{
services.flaresolverr = {
enable = true;
port = 8888;
};
};
testScript = ''
machine.wait_for_unit("flaresolverr.service")
machine.wait_for_open_port(8888)
machine.succeed("curl --fail http://localhost:8888/")
'';
}
)
nixos/tests/lomiri-calculator-app.nix
+1 -1
View File
@@ -24,7 +24,7 @@
fonts.packages = with pkgs; [
# Intended font & helps with OCR
ubuntu_font_family
ubuntu-classic
];
};
nixos/tests/lomiri-clock-app.nix
+1 -1
View File
@@ -24,7 +24,7 @@
fonts.packages = with pkgs; [
# Intended font & helps with OCR
ubuntu_font_family
ubuntu-classic
];
};
nixos/tests/lomiri-filemanager-app.nix
+1 -1
View File
@@ -24,7 +24,7 @@
fonts.packages = with pkgs; [
# Intended font & helps with OCR
ubuntu_font_family
ubuntu-classic
];
};
nixos/tests/lomiri-system-settings.nix
+1 -1
View File
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
fonts.packages = with pkgs; [
# Intended font & helps with OCR
ubuntu_font_family
ubuntu-classic
];
services.upower.enable = true;
nixos/tests/morph-browser.nix
+1 -1
View File
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
fonts.packages = with pkgs; [
# Intended font & helps with OCR
ubuntu_font_family
ubuntu-classic
];
};
nixos/tests/teleports.nix
+1 -1
View File
@@ -24,7 +24,7 @@
fonts.packages = with pkgs; [
# Intended font & helps with OCR
ubuntu_font_family
ubuntu-classic
];
};
pkgs/applications/audio/jmusicbot/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "JMusicBot";
version = "0.4.1";
version = "0.4.2";
src = fetchurl {
url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar";
sha256 = "sha256-+0814w4zKNr2TxZ9CS8FxeuTLa71jM+DhrfFvLMFlw0=";
sha256 = "sha256-Jg6/ju3ADBd7fc3njRzoEDVjIL4SzAzlTc02I4Q9hz4=";
};
dontUnpack = true;
pkgs/applications/audio/ncspot/default.nix
+3 -3
View File
@@ -20,16 +20,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
hash = "sha256-Sl4i9HFl+Dth9jmW6hPZzgh0Y35pRo1Xi9LRxCuSIP4=";
hash = "sha256-Lt2IuoiXYgSVPi4u8y16u9m5ya4HdpQme6snvNJrwso=";
};
cargoHash = "sha256-INgDavtBI75h+qVlxTncYu3su+SH/D7HTlThRHJzwkY=";
cargoHash = "sha256-JJTnaq0JLWHQxAbDpzDRPi5B+ePlQNlDOAsugPah7j4=";
nativeBuildInputs = [ pkg-config ]
++ lib.optional withClipboard python3;
pkgs/applications/audio/non/default.nix
+7
View File
@@ -17,6 +17,13 @@ stdenv.mkDerivation {
ladspaH liblo libsigcxx lrdf
];
# NOTE: non provides its own waf script that is incompatible with new
# python versions. If the script is not present, wafHook will install
# a compatible version from nixpkgs.
prePatch = ''
rm waf
'';
env.CXXFLAGS = "-std=c++14";
meta = {
pkgs/applications/audio/radiotray-ng/default.nix
+1 -1
View File
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
description = "Internet radio player for linux";
homepage = "https://github.com/ebruck/radiotray-ng";
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/blockchains/erigon/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
let
pname = "erigon";
version = "2.60.2";
version = "2.60.4";
in
buildGoModule {
inherit pname version;
@@ -11,7 +11,7 @@ buildGoModule {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
hash = "sha256-+KUe+wpcE59Y6ktDRpoMXQYSML9sfN4OaDV8+sKfzQQ=";
hash = "sha256-qcBKWwF9/i9ipE70+5AG5cuhYYqDBXAlY2OWxIh4KfU=";
fetchSubmodules = true;
};
pkgs/applications/editors/android-studio/default.nix
+6 -6
View File
@@ -9,16 +9,16 @@ let
inherit tiling_wm;
};
stableVersion = {
version = "2024.1.1.11"; # "Android Studio Koala | 2024.1.1"
sha256Hash = "sha256-2PqOz+QVtEUTNQkBUB4qD0KcoDPPGAUFSxyBbEpwRWU=";
version = "2024.1.1.12"; # "Android Studio Koala | 2024.1.1 Patch 1"
sha256Hash = "sha256-Qvi/Mc4NEk3dERlfZiowBk2Pmqsgbl5mg56HamvG7aI=";
};
betaVersion = {
version = "2024.1.1.10"; # "Android Studio Koala | 2024.1.1 RC 2"
sha256Hash = "sha256-84CpZfoAvJHUCO3ZBJqDbuz9xuGE/5xJfXoetJDXju8=";
version = "2024.1.2.9"; # "Android Studio Koala Feature Drop | 2024.1.2 Beta 1"
sha256Hash = "sha256-eTnpU9KrquW4nMRqde9PUmVQ05kf6kFy1yr+Ima9M50=";
};
latestVersion = {
version = "2024.1.2.8"; # "Android Studio Koala Feature Drop | 2024.1.2 Canary 8"
sha256Hash = "sha256-2wqZV0UqZHprfUFvhWh0IdA9TQcwlZtWECZVwZ47ICc=";
version = "2024.1.3.1"; # "Android Studio Ladybug | 2024.1.3 Canary 1"
sha256Hash = "sha256-BSrcPdkK4dU5/bV29NGKcCR10XYMJrPvC91fcJs5Vq8=";
};
in {
# Attributes are named by their corresponding release channels
pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix
+12 -9
View File
@@ -1,11 +1,12 @@
{ lib
, trivialBuild
, fetchFromGitHub
, emacs
{
lib,
melpaBuild,
fetchFromGitHub,
}:
trivialBuild {
melpaBuild {
pname = "isearch-plus";
ename = "isearch+";
version = "3434-unstable-2021-08-23";
src = fetchFromGitHub {
@@ -15,11 +16,13 @@ trivialBuild {
hash = "sha256-kD+Fyps3fc5YK6ATU1nrkKHazGMYJnU2gRcpQZf6A1E=";
};
meta = with lib; {
meta = {
homepage = "https://www.emacswiki.org/emacs/IsearchPlus";
description = "Extensions to isearch";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ leungbk AndersonTorres ];
inherit (emacs.meta) platforms;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [
leungbk
AndersonTorres
];
};
}
pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix
+8 -9
View File
@@ -1,10 +1,10 @@
{ lib
, fetchFromGitHub
, trivialBuild
, emacs
{
lib,
fetchFromGitHub,
melpaBuild,
}:
trivialBuild {
melpaBuild {
pname = "isearch-prop";
version = "0-unstable-2019-05-01";
@@ -15,11 +15,10 @@ trivialBuild {
hash = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk=";
};
meta = with lib; {
meta = {
homepage = "https://www.emacswiki.org/emacs/IsearchPlus";
description = "Search text- or overlay-property contexts";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ leungbk ];
inherit (emacs.meta) platforms;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ leungbk ];
};
}
pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix
+11 -8
View File
@@ -1,19 +1,22 @@
{ trivialBuild
, ott
, haskellPackages
}:
{ melpaBuild, ott }:
trivialBuild {
melpaBuild {
pname = "ott-mode";
inherit (ott) src version;
postUnpack = ''
mv $sourceRoot/emacs/ott-mode.el $sourceRoot
files = ''("emacs/*.el")'';
postPatch = ''
pushd emacs
echo ";;; ott-mode.el ---" > tmp.el
cat ott-mode.el >> tmp.el
mv tmp.el ott-mode.el
popd
'';
meta = {
description = "Emacs ott mode (from ott sources)";
inherit (haskellPackages.Agda.meta) homepage license;
inherit (ott.meta) homepage license;
};
}
pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix
+9 -10
View File
@@ -1,24 +1,23 @@
{ lib
, trivialBuild
, fetchFromGitHub
, emacs
}:
{
lib,
melpaBuild,
fetchFromGitHub,
}:
trivialBuild rec {
melpaBuild rec {
pname = "rect-mark";
version = "1.4";
src = fetchFromGitHub {
owner = "emacsmirror";
repo = pname;
repo = "rect-mark";
rev = version;
hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
};
meta = with lib; {
meta = {
homepage = "http://emacswiki.org/emacs/RectangleMark";
description = "Mark a rectangle of text with highlighting";
license = licenses.gpl2Plus;
inherit (emacs.meta) platforms;
license = lib.licenses.gpl2Plus;
};
}
pkgs/applications/editors/vscode/extensions/default.nix
+6 -6
View File
@@ -90,8 +90,8 @@ let
mktplcRef = {
publisher = "42Crunch";
name = "vscode-openapi";
version = "4.25.3";
hash = "sha256-1kz/M2od2gLSFgqW6LsPHgtm+BwXA+0+7z3HyqNmsOg=";
version = "4.27.0";
hash = "sha256-urXGyHpIDWQ0Bc+8LODC0DcEo6jQ5tA/QptyxCej9yU=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog";
@@ -3568,8 +3568,8 @@ let
mktplcRef = {
name = "vscode-just-syntax";
publisher = "nefrob";
version = "0.3.0";
hash = "sha256-WBoqH9TNco9lyjOJfP54DynjmYZmPUY+YrZ1rQlC518=";
version = "0.5.1";
hash = "sha256-DacDGK8gqlt8u0ZKcVxZ7jiUFFEX3ixv3P7RKWJVluA=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog";
@@ -4354,8 +4354,8 @@ let
mktplcRef = {
name = "code-spell-checker";
publisher = "streetsidesoftware";
version = "4.0.3";
hash = "sha256-CEGwbw5RpFsfB/g2inScIqWB7/3oxgxz7Yuc6V3OiHg=";
version = "4.0.4";
hash = "sha256-WbEhTIuPqH77IuEDgjPUz9chHM/aYjMdpCI9Kf0KS2Q=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
pkgs/applications/editors/vscode/vscodium.nix
+6 -6
View File
@@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "01riva442l78d8dyh0wb9iqhjfa1bd48bpc7zfvd4zpz6fwhlkqr";
x86_64-darwin = "1pmvjxagbfrp25i4s66j892xiskrld5z25mkvlsdkddqlvnhanc9";
aarch64-linux = "1lk1p45ibph3arbb5vgkgxlip2jafgmpq40ldpfrh55k6v83zd2q";
aarch64-darwin = "17cd0grmplvk8s5wrcd1v172irrddjcc9drfp7qpvszd3kiy09a7";
armv7l-linux = "1636i9b4fxh2jvakjag38ij6kmj1cf0nlfzyk5rfl06i06gfd6jr";
x86_64-linux = "0am2g0vpb2fgqqs9m5v9dx8w47l2xnjy7bf3rr0bjr4yv4qn7g0n";
x86_64-darwin = "0520kpdfa2k1qlgnmnzisbbq0n4h119nfgnaljymsviw1ix02v7k";
aarch64-linux = "0r6sqyfcj3qs2iqpfhdjcd8jfazkmyxx0f92qpxlc6a5gllm3hlj";
aarch64-darwin = "03b0akbkmqp1fm6i61dx09lln8m3598xigi4wr0rkdsy0yq2vpl8";
armv7l-linux = "1sdml7bhrrn2qskhzs4ymibq7cw4nhjimxi8fmaj94dk5yri4wd3";
}.${system} or throwSystem;
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
@@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.90.2.24171";
version = "1.91.1.24193";
pname = "vscodium";
executableName = "codium";
pkgs/applications/misc/gramps/default.nix
+2 -2
View File
@@ -23,7 +23,7 @@ let
inherit (pythonPackages) buildPythonApplication pythonOlder;
in
buildPythonApplication rec {
version = "5.2.2";
version = "5.2.3";
pname = "gramps";
pyproject = true;
@@ -33,7 +33,7 @@ buildPythonApplication rec {
owner = "gramps-project";
repo = "gramps";
rev = "refs/tags/v${version}";
hash = "sha256-umyc5G4p0GSEQEtq6sPUgtq1waNL1OW7iLxnf5dGcLc=";
hash = "sha256-DfKKB+rgMGQ8HTqhCp11UTYLj3Fdd0B0v4a922GJ8L8=";
};
patches = [
pkgs/applications/misc/heimer/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ mkDerivation rec {
homepage = "https://github.com/juzzlin/Heimer";
changelog = "https://github.com/juzzlin/Heimer/blob/${version}/CHANGELOG";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/misc/minder/default.nix
+1 -1
View File
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/phase1geo/Minder";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
maintainers = with maintainers; [ ] ++ teams.pantheon.members;
mainProgram = "com.github.phase1geo.minder";
};
}
pkgs/applications/misc/notable/default.nix
+1 -1
View File
@@ -40,6 +40,6 @@ appimageTools.wrapType2 rec {
homepage = "https://github.com/notable/notable";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/applications/misc/safeeyes/default.nix
+1
View File
@@ -47,6 +47,7 @@ buildPythonApplication rec {
pygobject3
dbus-python
croniter
setuptools
];
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
pkgs/applications/misc/vit/default.nix
+1 -1
View File
@@ -34,7 +34,7 @@ buildPythonApplication rec {
homepage = "https://github.com/scottkosty/vit";
description = "Visual Interactive Taskwarrior";
mainProgram = "vit";
maintainers = with maintainers; [ dtzWill arcnmx ];
maintainers = with maintainers; [ arcnmx ];
platforms = platforms.all;
license = licenses.mit;
};
pkgs/applications/networking/browsers/brave/default.nix
+6 -6
View File
@@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
if stdenv.isAarch64 then
{
pname = "brave";
version = "1.67.123";
url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_arm64.deb";
hash = "sha256-YcTwa1sTKpLn9O4/M11nrjgItD6ktug1GFw0tNcZplg=";
version = "1.67.134";
url = "https://github.com/brave/brave-browser/releases/download/v1.67.134/brave-browser_1.67.134_arm64.deb";
hash = "sha256-5wa4y+3PlcrT+U7xiPjkXqhpFz1rC+wyH6q9blmjaCI=";
platform = "aarch64-linux";
}
else if stdenv.isx86_64 then
{
pname = "brave";
version = "1.67.123";
url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_amd64.deb";
hash = "sha256-L9Jcug6HQxJ4E2C9p8BdwxkD75F2j+HaEmgjdrU9oEo=";
version = "1.67.134";
url = "https://github.com/brave/brave-browser/releases/download/v1.67.134/brave-browser_1.67.134_amd64.deb";
hash = "sha256-OJYPV3yJkqGh4OdX4lFZNrOxv33ysFQSTwYmlToXOq8=";
platform = "x86_64-linux";
}
else
pkgs/applications/networking/browsers/chromium/upstream-info.nix
+10 -10
View File
@@ -1,11 +1,11 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-154JPXP5qCM94zQRkRSvPKk6RGIhani7FUwOXgIwUZ0=";
hash_darwin = "sha256-YdQgrcTgyGtSfT6wBedSfBt40DaK3fG+uvB0yanvROU=";
hash_darwin_aarch64 =
"sha256-HButB8+2DRiaazyBiT3643sBLaauRAZ1rvmEtt8Whac=";
hash_linux = "sha256-6P9K6XTByonHaZYvOP+jTGizkmVdS8Ryn8UwV4BMGdQ=";
version = "126.0.6478.126";
"sha256-ht7LoA4ibEcWuXOk+JimCN0sjjPomHBcO8IZFNnMauk=";
hash_linux = "sha256-VeCNeBKsKZ2bEM6Z9lJJaBVRjS1pW2gK2DMvmghfNEA=";
version = "126.0.6478.182";
};
deps = {
gn = {
@@ -15,8 +15,8 @@
version = "2024-05-13";
};
};
hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0=";
version = "126.0.6478.126";
hash = "sha256-vZ7P8+vHTMCo6lXkV84ENqRZVG3/fDEwl+BTNJTGMn4=";
version = "126.0.6478.182";
};
ungoogled-chromium = {
deps = {
@@ -27,11 +27,11 @@
version = "2024-05-13";
};
ungoogled-patches = {
hash = "sha256-DLxtXcm4gPVzBeGxjD4harmdQWoH8LKn6GBlhtq/MVM=";
rev = "126.0.6478.126-1";
hash = "sha256-jDWL4gXcWF6GMlFJ/sua4dfVURs9vWYXRMjnYNqESWc=";
rev = "126.0.6478.182-1";
};
};
hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0=";
version = "126.0.6478.126";
hash = "sha256-vZ7P8+vHTMCo6lXkV84ENqRZVG3/fDEwl+BTNJTGMn4=";
version = "126.0.6478.182";
};
}
pkgs/applications/networking/browsers/palemoon/bin.nix
+3 -3
View File
@@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "palemoon-bin";
version = "33.2.0";
version = "33.2.1";
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
@@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: {
in {
gtk3 = fetchzip {
urls = urlRegionVariants "gtk3";
hash = "sha256-h6ohLm9I6esvVa9bek/j2s/jiIcEOwjd8/dCyUvqyLw=";
hash = "sha256-GUizOnsjEq2UuRaBgjmsQLHuqnCt/MHFBb8lTHcwJOM=";
};
gtk2 = fetchzip {
urls = urlRegionVariants "gtk2";
hash = "sha256-To/41og5hxFL6efJhNfRNJw/fOXZA5Le16DZsSJrXfc=";
hash = "sha256-RBEqBJNttuyMpeaC5scSY8Q2meZjgdeS2pppQ1n53uY=";
};
};
pkgs/applications/networking/cluster/hubble/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hubble";
version = "0.13.5";
version = "0.13.6";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0NApMqLjeYOMxEI8tY2zLxccuSD5nHUGNsya+26ghDY=";
sha256 = "sha256-evtXuVcaKKuAW+04S+IADKf+wJ1MrnGpHLNUbxWd9ZM=";
};
vendorHash = null;
pkgs/applications/networking/cluster/kubeseal/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubeseal";
version = "0.27.0";
version = "0.27.1";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
sha256 = "sha256-Ja+z+QmdU37RC9WIczlmzJWN6enhks3jDJLQMV+kfCY=";
sha256 = "sha256-JMYTtEq+I2B1WqEvYQcuUXLtu62KDdR2AtrGS3EupiI=";
};
vendorHash = "sha256-QSF6/8FLXJrM5LAWW0NgDP6U0om2lXsOGP9qDasz+2c=";
vendorHash = "sha256-1Oh+x21RohydebrgKmv5sCDVTJiF/d5A7KWiptEGSiE=";
subPackages = [ "cmd/kubeseal" ];
pkgs/applications/networking/cluster/kubeshark/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeshark";
version = "52.3.68";
version = "52.3.69";
src = fetchFromGitHub {
owner = "kubeshark";
repo = "kubeshark";
rev = "v${version}";
hash = "sha256-GDK+GR3MUYUgfY3cgaxWIYSE3uiEscp9DeeY36/zOYo=";
hash = "sha256-ZjpuzR+psdZAH7t9uV4jXN6Im1u+JDCDARAxAuBN4nk=";
};
vendorHash = "sha256-0WRmAqslZj63m+kCFKIBgoRX47ZyRuU7ZihmF6wmZy4=";
pkgs/applications/networking/deck/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "deck";
version = "1.39.2";
version = "1.39.3";
src = fetchFromGitHub {
owner = "Kong";
repo = "deck";
rev = "v${version}";
hash = "sha256-8Z2JBxVUoJKzxdMvyZg5SxHyIFW9lyA71GU7R6S27Rs=";
hash = "sha256-Oi/2sIsnJp1wK9PCS4GMCnFPLIAwNZeP7Qnnum3a118=";
};
nativeBuildInputs = [ installShellFiles ];
pkgs/applications/networking/gnmic/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "gnmic";
version = "0.37.0";
version = "0.38.0";
src = fetchFromGitHub {
owner = "openconfig";
repo = pname;
rev = "v${version}";
hash = "sha256-PktDdwtdCHLgLVpCRLi+Rna7dO2JeAAT6myFesIhpYc=";
hash = "sha256-sFjr43rHFnhTpOutwgt7yg5wJtpSe2+ShUggb1QVCWE=";
};
vendorHash = "sha256-gxtVvh39VqJgS5VetnLpUyKJE8DcUZgn4MA8zdD/ccU=";
vendorHash = "sha256-+TrSvGbpQSTanf5rm955WE8jj/RlZGtacbBo6JsOW4Y=";
ldflags = [
"-s" "-w"
pkgs/applications/networking/instant-messengers/fractal/default.nix
+1 -1
View File
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/GNOME/fractal";
changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}";
license = licenses.gpl3Plus;
maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler dtzWill ]);
maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]);
platforms = platforms.linux;
mainProgram = "fractal";
};
pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
+1 -1
View File
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
description = "Native Google Chat support for pidgin";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/applications/networking/instant-messengers/slack-term/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ buildGoModule rec {
description = "Slack client for your terminal";
homepage = "https://github.com/erroneousboat/slack-term";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
mainProgram = "slack-term";
};
}
pkgs/applications/networking/juju/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "juju";
version = "3.5.1";
version = "3.5.2";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "v${version}";
hash = "sha256-VOGkAv42dus2uxoffffIn6dwC18idwF2tycEHLd6I4s=";
hash = "sha256-HdV6bRAMQ7LynEGjrFOX36g7+1Zb9AiFtF6O4yu7+NU=";
};
vendorHash = "sha256-2JNEN8fmxflEyP5lHAv75Bjt9sbKoWL5O+87hxK89vU=";
vendorHash = "sha256-FCN+0Wx2fYQcj5CRgPubAWbGGyVQcSSfu/Om6SUB6TQ=";
subPackages = [
"cmd/juju"
pkgs/applications/networking/netmaker/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "netmaker";
version = "0.24.2";
version = "0.24.3";
src = fetchFromGitHub {
owner = "gravitl";
repo = pname;
rev = "v${version}";
hash = "sha256-UR5hUV7HTDaEbltQikgKfQypPXVee46PLP5bBEDFSsg=";
hash = "sha256-gZeIZTEO/5jKUEGRl91Px44tVTerIm1o4kIGj5Y9pb8=";
};
vendorHash = "sha256-roEw8A7TFLoUR7BY4r53HNB1b7IbKwgg7x0e63UGpu8=";
vendorHash = "sha256-ZaHgB9nxOYOVE/kjb62f3Kyow9mpXFUc1Gtvsnu28k8=";
inherit subPackages;
pkgs/applications/networking/pjsip/default.nix
+92 -73
View File
@@ -1,17 +1,18 @@
{ lib
, testers
, stdenv
, fetchFromGitHub
, openssl
, libsamplerate
, swig
, alsa-lib
, AppKit
, CoreFoundation
, Security
, python3
, pythonSupport ? true
, runCommand
{
lib,
testers,
stdenv,
fetchFromGitHub,
openssl,
libsamplerate,
swig,
alsa-lib,
AppKit,
CoreFoundation,
Security,
python3,
pythonSupport ? true,
runCommand,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pjsip";
@@ -24,22 +25,41 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY=";
};
patches = [
./fix-aarch64.patch
patches = [ ./fix-aarch64.patch ];
postPatch = ''
substituteInPlace \
pjsip-apps/src/py_pjsua/setup.py \
pjsip-apps/src/swig/python/setup.py \
pjsip-apps/src/python/setup.py \
pjsip-apps/src/python/setup-vc.py \
--replace-fail "distutils.core" "setuptools"
'';
nativeBuildInputs = lib.optionals pythonSupport [
swig
python3
python3.pkgs.build
python3.pkgs.installer
python3.pkgs.setuptools
python3.pkgs.wheel
];
nativeBuildInputs =
lib.optionals pythonSupport [ swig python3 ];
buildInputs = [ openssl libsamplerate ]
buildInputs =
[
openssl
libsamplerate
]
++ lib.optional stdenv.isLinux alsa-lib
++ lib.optionals stdenv.isDarwin [ AppKit CoreFoundation Security ];
++ lib.optionals stdenv.isDarwin [
AppKit
CoreFoundation
Security
];
env = lib.optionalAttrs stdenv.cc.isClang {
CXXFLAGS = "-std=c++11";
} // lib.optionalAttrs stdenv.isDarwin {
NIX_CFLAGS_LINK = "-headerpad_max_install_names";
};
env =
lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }
// lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; };
preConfigure = ''
export LD=$CC
@@ -51,52 +71,55 @@ stdenv.mkDerivation (finalAttrs: {
configureFlags = [ "--enable-shared" ];
outputs = [ "out" ]
++ lib.optional pythonSupport "py";
outputs = [ "out" ] ++ lib.optional pythonSupport "py";
postInstall = ''
mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
'' + lib.optionalString pythonSupport ''
(cd pjsip-apps/src/swig/python && \
python setup.py install --prefix=$py
)
'' + lib.optionalString stdenv.isDarwin ''
# On MacOS relative paths are used to refer to libraries. All libraries use
# a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to
# rewrite these to use absolute ones.
postInstall =
''
mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
''
+ lib.optionalString pythonSupport ''
(cd pjsip-apps/src/swig/python && \
python -m build --no-isolation --outdir dist/ --wheel
python -m installer --prefix $py dist/*.whl
)
''
+ lib.optionalString stdenv.isDarwin ''
# On MacOS relative paths are used to refer to libraries. All libraries use
# a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to
# rewrite these to use absolute ones.
# First, find all libraries (and their symlinks) in our outputs to define
# the install_name_tool -change arguments we should pass.
readarray -t libraries < <(
for outputName in $(getAllOutputNames); do
find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \)
# First, find all libraries (and their symlinks) in our outputs to define
# the install_name_tool -change arguments we should pass.
readarray -t libraries < <(
for outputName in $(getAllOutputNames); do
find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \)
done
)
# Determine the install_name_tool -change arguments that are going to be
# applied to all libraries.
change_args=()
for lib in "''${libraries[@]}"; do
lib_name="$(basename $lib)"
change_args+=(-change ../lib/$lib_name $lib)
change_args+=(-change ../../lib/$lib_name $lib)
done
)
# Determine the install_name_tool -change arguments that are going to be
# applied to all libraries.
change_args=()
for lib in "''${libraries[@]}"; do
lib_name="$(basename $lib)"
change_args+=(-change ../lib/$lib_name $lib)
change_args+=(-change ../../lib/$lib_name $lib)
done
# Rewrite id and library refences for all non-symlinked libraries.
for lib in "''${libraries[@]}"; do
if [ -f "$lib" ]; then
install_name_tool -id $lib "''${change_args[@]}" $lib
fi
done
# Rewrite id and library refences for all non-symlinked libraries.
for lib in "''${libraries[@]}"; do
if [ -f "$lib" ]; then
install_name_tool -id $lib "''${change_args[@]}" $lib
fi
done
# Rewrite library references for all executables.
find "$out" -executable -type f | while read executable; do
install_name_tool "''${change_args[@]}" "$executable"
done
'';
# Rewrite library references for all executables.
find "$out" -executable -type f | while read executable; do
install_name_tool "''${change_args[@]}" "$executable"
done
'';
# We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
dontPatchELF = true;
@@ -106,9 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
command = "pjsua --version";
};
passthru.tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
};
passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } ''
${(python3.withPackages (pkgs: [ pkgs.pjsua2 ])).interpreter} -c "import pjsua2" > $out
@@ -121,8 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ olynch ];
mainProgram = "pjsua";
platforms = platforms.linux ++ platforms.darwin;
pkgConfigModules = [
"libpjproject"
];
pkgConfigModules = [ "libpjproject" ];
};
})
pkgs/applications/office/ktimetracker/default.nix
+1 -1
View File
@@ -28,6 +28,6 @@ kio knotifications kwindowsystem kxmlgui ktextwidgets
mainProgram = "ktimetracker";
license = licenses.gpl2;
homepage = "https://userbase.kde.org/KTimeTracker";
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/applications/office/mendeley/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ in appimageTools.wrapType2 {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ dtzWill atila ];
maintainers = with maintainers; [ atila ];
mainProgram = "mendeley-reference-manager";
};
pkgs/applications/office/planify/default.nix
+1 -1
View File
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
description = "Task manager with Todoist support designed for GNU/Linux";
homepage = "https://github.com/alainm23/planify";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
maintainers = with maintainers; [ ] ++ teams.pantheon.members;
platforms = platforms.linux;
mainProgram = "io.github.alainm23.planify";
};
pkgs/applications/science/electronics/nanovna-saver/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "nanovna-saver";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "NanoVNA-Saver";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-lL6n3hcsIbLmrRKPi/ckWW2XUAtmBqvMSplkWOF4VKQ=";
sha256 = "sha256-fAVsjknhLhsrGdHu2Q6JWLoFoxZoc+wDCNja+ySCsR4=";
};
nativeBuildInputs = [
pkgs/applications/science/math/nota/default.nix
+1 -1
View File
@@ -36,6 +36,6 @@ mkDerivation rec {
description = "Most beautiful command line calculator";
homepage = "https://kary.us/nota";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ dtzWill ];
maintainers = with lib.maintainers; [ ];
mainProgram = "nota";
}
pkgs/applications/system/qjournalctl/default.nix
+1 -1
View File
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/pentix/qjournalctl";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ dtzWill srgom romildo ];
maintainers = with maintainers; [ srgom romildo ];
};
}
pkgs/applications/version-management/lab/default.nix
+1 -1
View File
@@ -36,7 +36,7 @@ buildGoModule rec {
description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
homepage = "https://zaquestion.github.io/lab";
license = licenses.cc0;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
mainProgram = "lab";
};
}
pkgs/applications/version-management/legit-web/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "legit";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
repo = "legit";
owner = "icyphox";
rev = "v${version}";
hash = "sha256-TBq1ILBhojMIxnLj108L0zLmFsZD/ET9w5cSbqk8+XM=";
hash = "sha256-C6PzZFYGjQs1BbYuEwcTpLQ3bNVb1rXTd0zXosF1kaE=";
};
vendorHash = "sha256-IeWgmUNkBU3W6ayfRkzMO/0XHNqm5zy5lLUNePzv+ug=";
vendorHash = "sha256-G4Wij0UCiXyVtb+66yU3FY2WbpPfqo0SA7OOcywnKU0=";
postInstall = ''
mkdir -p $out/lib/legit/templates
pkgs/applications/video/catt/default.nix
+1 -1
View File
@@ -63,7 +63,7 @@ python.pkgs.buildPythonApplication rec {
description = "Tool to send media from online sources to Chromecast devices";
homepage = "https://github.com/skorokithakis/catt";
license = licenses.bsd2;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
mainProgram = "catt";
};
}
pkgs/applications/video/mpv/scripts/videoclip.nix
+3 -3
View File
@@ -10,13 +10,13 @@
}:
buildLua {
pname = "videoclip";
version = "0-unstable-2024-05-26";
version = "0-unstable-2024-07-18";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "videoclip";
rev = "4fd40d66c95905ed828ca77b7120732014b93ac5";
hash = "sha256-Q40a7BBY4c7I5g9HkeV6Twv/PDPBDKTlnxkILw99pxU=";
rev = "fe731767ca481678b4a166fbce6b30d3eaf8a6ce";
hash = "sha256-Z63kccjl8jd6C0dvpK7SQnPpmDCgH3/Kzm1oRXJ0NqI=";
};
patchPhase =
pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch
+4 -7
View File
@@ -12,12 +12,12 @@ security model.
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp
index ab1181e..c775283 100644
index 09b3017..1094340 100644
--- a/plugins/obs-browser/obs-browser-source.cpp
+++ b/plugins/obs-browser/obs-browser-source.cpp
@@ -179,9 +179,12 @@ bool BrowserSource::CreateBrowser()
@@ -239,9 +239,12 @@ bool BrowserSource::CreateBrowser()
#if ENABLE_LOCAL_FILE_URL_SCHEME
#if ENABLE_LOCAL_FILE_URL_SCHEME && CHROME_VERSION_BUILD < 4430
if (is_local) {
- /* Disable web security for file:// URLs to allow
- * local content access to remote APIs */
@@ -30,7 +30,4 @@ index ab1181e..c775283 100644
+ STATE_ENABLED;
}
#endif
--
2.31.1
auto browser = CefBrowserHost::CreateBrowserSync(
pkgs/applications/video/obs-studio/default.nix
+7 -4
View File
@@ -1,6 +1,8 @@
{ config
, uthash
, lib
, stdenv
, nv-codec-headers-12
, fetchFromGitHub
, fetchpatch
, addDriverRunpath
@@ -39,7 +41,6 @@
, withFdk ? true
, pipewire
, libdrm
, libajantv2
, librist
, libva
, srt
@@ -62,13 +63,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "obs-studio";
version = "30.1.2";
version = "30.2.0";
src = fetchFromGitHub {
owner = "obsproject";
repo = "obs-studio";
rev = finalAttrs.version;
hash = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo=";
hash = "sha256-mwh2KLSz+I/8f3i/wST/2vKL/hWTCTaq53sinIEX75M=";
fetchSubmodules = true;
};
@@ -113,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
libvlc
mbedtls
pciutils
libajantv2
librist
libva
srt
@@ -124,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
libdatachannel
libvpl
qrcodegencpp
uthash
nv-codec-headers-12
]
++ optionals scriptingSupport [ luajit python3 ]
++ optional alsaSupport alsa-lib
@@ -155,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "ENABLE_ALSA" alsaSupport)
(lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport)
(lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport)
(lib.cmakeBool "ENABLE_AJA" false) # TODO: fix linking against libajantv2
];
env.NIX_CFLAGS_COMPILE = toString [
pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch
+6 -6
View File
@@ -1,9 +1,9 @@
diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake
index d1e58a083..a03c6b98e 100644
index fe8d72364..1c590fcdb 100644
--- a/cmake/Modules/ObsDefaults_Linux.cmake
+++ b/cmake/Modules/ObsDefaults_Linux.cmake
@@ -76,7 +76,7 @@ macro(setup_obs_project)
set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}")
- set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}")
@@ -12,15 +12,15 @@ index d1e58a083..a03c6b98e 100644
else()
set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit")
diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c
index b006a5598..531655eb3 100644
index 77c36be5e..fe8a04813 100644
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
@@ -56,7 +56,7 @@ const char *get_module_extension(void)
#define FLATPAK_PLUGIN_PATH "/app/plugins"
@@ -51,7 +51,7 @@ const char *get_module_extension(void)
static const char *module_bin[] = {
"../../obs-plugins/64bit",
- OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION,
+ OBS_PLUGIN_DESTINATION,
"../../obs-plugins/" BIT_STRING,
FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION,
};
pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "obs-move-transition";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-move-transition";
rev = version;
sha256 = "sha256-LZL9f/pX74rKW+wnNHGKwGuuISOTcFVr6W9h/JEK0U4=";
sha256 = "sha256-Vwm0Eyb8MevZtS3PTqnFQAbCj7JuTw9Ju0lS9CZ6rf8=";
};
nativeBuildInputs = [ cmake ];
pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
+2 -2
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "obs-vkcapture";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "nowrep";
repo = "obs-vkcapture";
rev = "v${finalAttrs.version}";
hash = "sha256-hYPQ1N4k4eb+bvGWZqaQJ/C8C5Lh8ooZ03raGF5ORgE=";
hash = "sha256-RIDsT6eL6bUfqPiyPlecnZHu5OorcJb3Xal8pjdOpAA=";
};
cmakeFlags = lib.optionals stdenv.isi686 [
pkgs/applications/virtualization/ecs-agent/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "amazon-ecs-agent";
version = "1.84.0";
version = "1.85.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aws";
repo = pname;
hash = "sha256-6Les4qio+ad10b172Xw5bwU2OZiLOjZZhaoNW0MYFzk=";
hash = "sha256-IP1kZ2hSe1IJBNVYybZa+PYav3gHQayNyin3aOQCJS8=";
};
vendorHash = null;
pkgs/applications/virtualization/qemu/default.nix
+2 -2
View File
@@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString hostCpuOnly "-host-cpu-only"
+ lib.optionalString nixosTestRunner "-for-vm-tests"
+ lib.optionalString toolsOnly "-utils";
version = "9.0.1";
version = "9.0.2";
src = fetchurl {
url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
hash = "sha256-0PTbD70VHAzxb4SusqUA9ulQCXMlRvRNr6uNIEm7uAU=";
hash = "sha256-qMP1lq7Olto7AMr7dLqvoNFFFer7jtHuP39cLQ6/ArY=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ]
pkgs/by-name/ad/adafruit-nrfutil/package.nix
+6 -8
View File
@@ -32,11 +32,9 @@ python3Packages.buildPythonApplication rec {
})
];
nativeBuildInputs = with python3Packages; [
setuptools
];
build-system = [ python3Packages.setuptools ];
propagatedBuildInputs = with python3Packages; [
dependencies = with python3Packages; [
click
ecdsa
pyserial
@@ -44,7 +42,6 @@ python3Packages.buildPythonApplication rec {
nativeCheckInputs = with python3Packages; [
behave
nose
pytestCheckHook
];
@@ -56,11 +53,12 @@ python3Packages.buildPythonApplication rec {
"nordicsemi"
];
meta = with lib; {
meta = {
homepage = "https://github.com/adafruit/Adafruit_nRF52_nrfutil";
description = "Modified version of Nordic's nrfutil 0.5.x for use with the Adafruit Feather nRF52";
mainProgram = "adafruit-nrfutil";
license = licenses.bsd3;
maintainers = with maintainers; [ stargate01 ];
# https://github.com/adafruit/Adafruit_nRF52_nrfutil/issues/41
license = lib.licenses.unfreeRedistributable;
maintainers = with lib.maintainers; [ stargate01 ];
};
}
pkgs/by-name/ae/aerc/package.nix
+3 -3
View File
@@ -12,17 +12,17 @@
buildGoModule rec {
pname = "aerc";
version = "0.18.0";
version = "0.18.1";
src = fetchFromSourcehut {
owner = "~rjarry";
repo = "aerc";
rev = version;
hash = "sha256-azIgf9kv4Pg8BW1j56D2Ta1DIQNHC9Mql3tebp+MLSY=";
hash = "sha256-yyVK87EIoW0Chz9xUOtoKHKIQUs2QDKtpsApvDuqSL4=";
};
proxyVendor = true;
vendorHash = "sha256-BQ36LJFo9bQNQdwb/vygksk3ih/tVaMwfWT1f31bsbY=";
vendorHash = "sha256-kOBkwkFv86lbK/J0NGTgZadL26kvqmGLeWVYm+ie1HQ=";
nativeBuildInputs = [
scdoc
pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/src/alpaca.in b/src/alpaca.in
index cb883c8..a9822cc 100755
--- a/src/alpaca.in
+++ b/src/alpaca.in
@@ -35,7 +35,21 @@ locale.bindtextdomain('alpaca', localedir)
locale.textdomain('alpaca')
gettext.install('alpaca', localedir)
+# Use the right XDG paths outside flatpak
+def set_xdg_path(env, default):
+ app_id = "com.jeffser.Alpaca"
+ base = os.getenv(env) or os.path.expanduser(default)
+ path = os.path.join(base, app_id)
+ if not os.path.exists(path):
+ os.makedirs(path)
+ os.environ[env] = path
+ return
+
if __name__ == '__main__':
+ set_xdg_path("XDG_CONFIG_HOME", "~/.config")
+ set_xdg_path("XDG_DATA_HOME", "~/.local/share")
+ set_xdg_path("XDG_CACHE_HOME", "~/.cache")
+
import gi
from gi.repository import Gio
pkgs/by-name/al/alpaca/package.nix
+95
View File
@@ -0,0 +1,95 @@
{
lib,
python3Packages,
fetchFromGitHub,
fetchpatch,
appstream,
meson,
ninja,
pkg-config,
gobject-introspection,
wrapGAppsHook4,
desktop-file-utils,
libadwaita,
gtksourceview5,
xdg-utils,
ollama,
}:
python3Packages.buildPythonApplication rec {
pname = "alpaca";
version = "0.9.6.1";
pyproject = false; # Built with meson
src = fetchFromGitHub {
owner = "Jeffser";
repo = "Alpaca";
rev = version;
hash = "sha256-EbaEjKqfotJBceaYEyz3LHilK3GnnwEpfMR7Teq96hI=";
};
patches = [
# Change the way XDG paths are handled so it makes sense outside of flatpak
./fix_xdg_path_flatpak.patch
# Let ollama instance stop gracefully so we don't have model instance left behind
(fetchpatch {
url = "https://github.com/Jeffser/Alpaca/commit/e81d918675896c1670cf5aa5a55e1b706be5ed51.patch";
hash = "sha256-gYYFvaoBI/Qn0g2qgS1cB0B4F08swznrSd5KCb51vh0=";
})
];
postPatch = ''
substituteInPlace src/local_instance.py \
--replace-fail '/app/bin/ollama' 'ollama'
'';
nativeBuildInputs = [
appstream
meson
ninja
pkg-config
gobject-introspection
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
libadwaita
gtksourceview5
];
dependencies = with python3Packages; [
pygobject3
requests
pillow
pypdf
];
dontWrapGApps = true;
makeWrapperArgs = [
"\${gappsWrapperArgs[@]}"
"--prefix PATH : ${lib.makeBinPath [ xdg-utils ollama ]}"
# Declared but not used in src/window.py, for later reference
# https://github.com/flatpak/flatpak/issues/3229
"--set FLATPAK_DEST ${placeholder "out"}"
];
meta = {
description = "Ollama client made with GTK4 and Adwaita";
longDescription = ''
To run Alpaca with GPU acceleration enabled, simply override it:
```nix
pkgs.alpaca.override {
ollama = pkgs.ollama-cuda;
}
```
'';
homepage = "https://jeffser.com/alpaca";
license = lib.licenses.gpl3Plus;
mainProgram = "alpaca";
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/aw/awscli2/package.nix
+2 -2
View File
@@ -59,14 +59,14 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "awscli2";
version = "2.17.5"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.17.13"; # N.B: if you change this, check if overrides are still up-to-date
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = "refs/tags/${version}";
hash = "sha256-Y8qXAKEDW82dZSNx88X2PSPY88VkBgwK67Ya0hHk3tU=";
hash = "sha256-hnD+2NE7gqbe99UQmRlHoPGdWZj0o2Buvk3kRR15tgI=";
};
postPatch = ''
pkgs/by-name/bu/bustle/package.nix
+15
View File
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, buildPackages
, cargo
, meson
, ninja
@@ -9,9 +10,12 @@
, rustPlatform
, rustc
, wrapGAppsHook4
, darwin
, gettext
, glib
, gtk4
, libadwaita
, libiconv
}:
stdenv.mkDerivation (finalAttrs: {
@@ -32,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-r29Z+6P+yuCpOBUE3vkESd15lcGXs5+ZTBiQ9nW6DJ4=";
};
env = lib.optionalAttrs stdenv.isDarwin {
# Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one.
# The vendored gettext does not build with clang 16.
GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin";
GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include";
GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib";
};
nativeBuildInputs = [
cargo
meson
@@ -48,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
glib
gtk4
libadwaita
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation
libiconv
];
meta = with lib; {
pkgs/by-name/c2/c2patool/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "c2patool";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "contentauth";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GS3R1qqL9h7kVQQXl0GBsdWUI8rwtJvRW4Cfqp+VYNU=";
sha256 = "sha256-VmaU8cUtjF5xWOJqK1DB8AAPr1Q7nxOvZVPYsle67Pw=";
};
cargoHash = "sha256-sdlHCPqLsgM1XG3lNfy+ET1xKCKVcdtRcvShxpBW8MQ=";
cargoHash = "sha256-L79hWws9ub02K+3gL6bD5rtEiQGtq0BykxFmsml2EuI=";
# use the non-vendored openssl
OPENSSL_NO_VENDOR = 1;
pkgs/by-name/ca/cargo-make/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.37.13";
version = "0.37.14";
src = fetchFromGitHub {
owner = "sagiegurari";
repo = "cargo-make";
rev = version;
hash = "sha256-5A0J3NtxXlhIhr0+GZoctCA5EwTnBt+9aL4I8HUiJqY=";
hash = "sha256-YyZF45Oi8sqTC/YM8F2dNBUI1rB0mPNeWMT7dYFWB5Q=";
};
cargoHash = "sha256-7UA9EOUF/A1FhWBErZdPrzL+rDukjbtC2KIK10cLDXI=";
cargoHash = "sha256-tidV2mZgrJCokeUVKYQKlYENm7v362sGsi2Eb0vLNJ8=";
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/ce/cewler/package.nix
+46
View File
@@ -0,0 +1,46 @@
{ lib
, python3
, fetchFromGitHub
, gitUpdater
}:
python3.pkgs.buildPythonApplication rec {
pname = "cewler";
version = "1.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "roys";
repo = "cewler";
rev = "v${version}";
hash = "sha256-nlF+B7Z1GRo3ZrGhG58c0vLcJAW+PvXT2tfFoyElw7w=";
};
nativeBuildInputs = with python3.pkgs; [
setuptools
wheel
pythonRelaxDepsHook
];
propagatedBuildInputs = with python3.pkgs; [
pypdf
rich
scrapy
tld
twisted
];
pythonRelaxDeps = true;
# Tests require network access
doCheck = false;
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = with lib; {
description = "Custom Word List generator Redefined";
mainProgram = "cewler";
homepage = "https://github.com/roys/cewler";
license = licenses.cc-by-nc-40;
maintainers = with maintainers; [ emilytrau ];
};
}
pkgs/by-name/cl/clever-tools/package.nix
+1
View File
@@ -30,6 +30,7 @@ buildNpmPackage rec {
installShellCompletion --cmd clever \
--bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \
--zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever)
'' + ''
rm $out/bin/install-clever-completion
rm $out/bin/uninstall-clever-completion
'';
pkgs/by-name/co/consul/package.nix
+3 -3
View File
@@ -8,7 +8,7 @@
buildGoModule rec {
pname = "consul";
version = "1.19.0";
version = "1.19.1";
# Note: Currently only release tags are supported, because they have the Consul UI
# vendored. See
@@ -22,7 +22,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-GO2BfdozsAo1r4iSyQdAEG8Tm6OkJhSUrH3bZ9lWuO8=";
hash = "sha256-UMKXI16QQHV9I+kH62KRbZCEcQLXkBwB6o/lqtCZa78=";
};
# This corresponds to paths with package main - normally unneeded but consul
@@ -32,7 +32,7 @@ buildGoModule rec {
"connect/certgen"
];
vendorHash = "sha256-h3eTCj/0FPiY/Dj4cMj9VqKBs28ArnTPjRIC3LT06j0=";
vendorHash = "sha256-l1+KVygh0TuvN45UmU/bXksjHBTZZ6jt54nZtR9f+II=";
doCheck = false;
pkgs/by-name/fa/fac/package.nix
+1 -1
View File
@@ -38,6 +38,6 @@ buildGoModule rec {
homepage = "https://github.com/mkchoi212/fac";
license = lib.licenses.mit;
mainProgram = "fac";
maintainers = with lib.maintainers; [ dtzWill ];
maintainers = with lib.maintainers; [ ];
};
}
pkgs/by-name/fi/files-cli/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "files-cli";
version = "2.13.85";
version = "2.13.96";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
hash = "sha256-rsEromVixVLtBLvhLWQ5ykjHq3/FScPSpuL9FqIOjZ8=";
hash = "sha256-TGaOTHtStmKHG/W/a/qWhZVt2IGcEdWD5mtZ2x4ozjI=";
};
vendorHash = "sha256-pobAFcmFsE340+Jboqnd88L3UHEquZ63eWwSXzgOWyc=";
vendorHash = "sha256-jeVEWicv2jYqhJt3aZAxx4fWmJXIVIryiS+ahqpdxsY=";
ldflags = [
"-s"
pkgs/by-name/fl/flaresolverr/package.nix
+82
View File
@@ -0,0 +1,82 @@
{
lib,
stdenv,
fetchFromGitHub,
makeWrapper,
chromium,
python3,
undetected-chromedriver,
xorg,
nixosTests,
}:
let
python = python3.withPackages (
ps: with ps; [
bottle
func-timeout
prometheus-client
selenium
waitress
xvfbwrapper
# For `undetected_chromedriver`
looseversion
requests
websockets
]
);
in
stdenv.mkDerivation (finalAttrs: {
pname = "flaresolverr";
version = "3.3.21";
src = fetchFromGitHub {
owner = "FlareSolverr";
repo = "FlareSolverr";
rev = "v${finalAttrs.version}";
hash = "sha256-M/snpYKZK3pgzlhYjRYEiAPlK9DUKYRiiu43KcrAy9g=";
};
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
substituteInPlace src/undetected_chromedriver/patcher.py \
--replace-fail \
"from distutils.version import LooseVersion" \
"from looseversion import LooseVersion"
substituteInPlace src/utils.py \
--replace-fail \
'CHROME_EXE_PATH = None' \
'CHROME_EXE_PATH = "${lib.getExe chromium}"' \
--replace-fail \
'PATCHED_DRIVER_PATH = None' \
'PATCHED_DRIVER_PATH = "${lib.getExe undetected-chromedriver}"'
'';
installPhase = ''
mkdir -p $out/{bin,share/${finalAttrs.pname}-${finalAttrs.version}}
cp -r * $out/share/${finalAttrs.pname}-${finalAttrs.version}/.
makeWrapper ${python}/bin/python $out/bin/flaresolverr \
--add-flags "$out/share/${finalAttrs.pname}-${finalAttrs.version}/src/flaresolverr.py" \
--prefix PATH : "${lib.makeBinPath [ xorg.xvfb ]}"
'';
passthru = {
tests.smoke-test = nixosTests.flaresolverr;
};
meta = with lib; {
description = "Proxy server to bypass Cloudflare protection";
homepage = "https://github.com/FlareSolverr/FlareSolverr";
license = licenses.mit;
mainProgram = "flaresolverr";
maintainers = with maintainers; [ paveloom ];
inherit (undetected-chromedriver.meta) platforms;
};
})
pkgs/applications/networking/flexget/default.nix → pkgs/by-name/fl/flexget/package.nix
+39 -14
View File
@@ -1,11 +1,18 @@
{ lib
, python3
, python311
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
let
python = if (builtins.tryEval python3.pkgs.nose.outPath).success
then python3
else python311;
in
python.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.11.39";
version = "3.11.41";
pyproject = true;
# Fetch from GitHub in order to use `requirements.in`
@@ -13,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-saNxs+Xdf6OTRRcMTceU8/ITcYzwtP8VqRKxsWyas+o=";
hash = "sha256-ZSqkD53fdDnKulVPgM9NWXVFXDR0sZ94mRyV1iKS87o=";
};
postPatch = ''
@@ -21,30 +28,24 @@ python3.pkgs.buildPythonApplication rec {
sed 's/[~<>=][^;]*//' -i requirements.txt
'';
build-system = with python3.pkgs; [
build-system = with python.pkgs; [
setuptools
wheel
];
dependencies = with python3.pkgs; [
# See https://github.com/Flexget/Flexget/blob/master/requirements.txt
dependencies = with python.pkgs; [
# See https://github.com/Flexget/Flexget/blob/master/pyproject.toml
apscheduler
beautifulsoup4
click
colorama
commonmark
feedparser
guessit
html5lib
jinja2
jsonschema
loguru
more-itertools
packaging
pendulum
psutil
pynzb
pyrsistent
pyrss2gen
python-dateutil
pyyaml
@@ -53,27 +54,51 @@ python3.pkgs.buildPythonApplication rec {
rich
rpyc
sqlalchemy
typing-extensions
# WebUI requirements
cherrypy
flask-compress
flask-cors
flask-login
flask-restful
flask-restx
flask
packaging
pyparsing
werkzeug
zxcvbn
pendulum
# Plugins requirements
transmission-rpc
qbittorrent-api
deluge-client
cloudscraper
python-telegram-bot
];
pythonImportsCheck = [
"flexget"
"flexget.api.core.authentication"
"flexget.api.core.database"
"flexget.api.core.plugins"
"flexget.api.core.schema"
"flexget.api.core.server"
"flexget.api.core.tasks"
"flexget.api.core.user"
"flexget.components.thetvdb.api"
"flexget.components.tmdb.api"
"flexget.components.trakt.api"
"flexget.components.tvmaze.api"
"flexget.plugins.clients.aria2"
"flexget.plugins.clients.deluge"
"flexget.plugins.clients.nzbget"
"flexget.plugins.clients.pyload"
"flexget.plugins.clients.qbittorrent"
"flexget.plugins.clients.rtorrent"
"flexget.plugins.clients.transmission"
"flexget.plugins.services.kodi_library"
"flexget.plugins.services.myepisodes"
"flexget.plugins.services.pogcal_acquired"
];
# ~400 failures
pkgs/by-name/gn/gnome-font-viewer/package.nix
+9
View File
@@ -1,5 +1,6 @@
{ lib
, stdenv
, fetchpatch2
, meson
, ninja
, gettext
@@ -25,6 +26,14 @@ stdenv.mkDerivation rec {
hash = "sha256-WS9AHkhdAswETUh7tcjgTJYdpoViFnaKWfH/mL0tU3w=";
};
patches = lib.optionals stdenv.cc.isClang [
# Fixes an incompatible function pointer error when building with clang 16
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/commit/565d795731471c27542bb9ee60820a2d0d15534e.diff";
hash = "sha256-8dgOVTx6ZbvXROlIWTZU2xNWJ11LlJykRs699cgZqow=";
})
];
doCheck = true;
nativeBuildInputs = [
pkgs/by-name/ig/igir/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "igir";
version = "2.9.0";
version = "2.9.2";
src = fetchFromGitHub {
owner = "emmercm";
repo = "igir";
rev = "v${version}";
hash = "sha256-AdoY1STLldud9agh6j68CkCeZ2F0OYuu5cEpCTyPCGs=";
hash = "sha256-3lEU3uK/Wp09TOhVJVNslOCx9vTVp0gBTbkQXB13i9Y=";
};
npmDepsHash = "sha256-6V5ROCJF2msd0rt6GFXYAhkFtjSEquteCQMscPR8XIw=";
npmDepsHash = "sha256-gJvJwostQgEq14zDmMOatfWmkEYNAqGCL9MJPrv5kwk=";
# I have no clue why I have to do this
postPatch = ''
pkgs/by-name/ju/just/package.nix
+4 -4
View File
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "1.31.0";
version = "1.32.0";
outputs = [ "out" "man" "doc" ];
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ljn51K3/reWxUy26XAUXNNRqiFgKMXTA5jX/kuKukqI=";
hash = "sha256-4W0Ft4wM2iLeepqg9XnHV/uejJEE9gIBOwm7axnC8bo=";
};
cargoHash = "sha256-cIoAYJw+wVwmBXy6ltcc3ImRCiRRv84C1iA/Bdf3tzE=";
cargoHash = "sha256-kjvc87HKMoKWImeAMiESb7xHuA+znX5z6MsWu6ThrhE=";
nativeBuildInputs = [ installShellFiles mdbook ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
@@ -99,7 +99,7 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md";
description = "Handy way to save and run project-specific commands";
license = licenses.cc0;
maintainers = with maintainers; [ xrelkd jk adamcstephens ];
maintainers = with maintainers; [ xrelkd jk ];
mainProgram = "just";
};
}
pkgs/by-name/ko/koboldcpp/package.nix
+32 -15
View File
@@ -5,6 +5,7 @@
makeWrapper,
gitUpdater,
python3Packages,
python311Packages ? null, # Ignored. Kept for compatibility with the release
tk,
addDriverRunpath,
@@ -21,7 +22,7 @@
cublasSupport ? config.cudaSupport,
# You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
# For example if you're on an GTX 1080 that means you're using "Pascal" and you need to pass "sm_60"
arches ? cudaPackages.cudaFlags.arches or [ ],
cudaArches ? cudaPackages.cudaFlags.arches or [ ],
clblastSupport ? stdenv.isLinux,
clblast,
@@ -31,15 +32,23 @@
vulkan-loader,
metalSupport ? stdenv.isDarwin && stdenv.isAarch64,
march ? "",
mtune ? "",
}:
let
makeBool = option: bool: (if bool then "${option}=1" else "");
makeWrapperArgs = lib.optionalString config.cudaSupport ''
libraryPathWrapperArgs = lib.optionalString config.cudaSupport ''
--prefix LD_LIBRARY_PATH: "${lib.makeLibraryPath [ addDriverRunpath.driverLink ]}"
'';
darwinFrameworks =
if (stdenv.isDarwin && stdenv.isx86_64) then
darwin.apple_sdk.frameworks
else
darwin.apple_sdk_11_0.frameworks;
effectiveStdenv = if cublasSupport then cudaPackages.backendStdenv else stdenv;
in
effectiveStdenv.mkDerivation (finalAttrs: {
@@ -66,15 +75,15 @@ effectiveStdenv.mkDerivation (finalAttrs: {
[ tk ]
++ finalAttrs.pythonInputs
++ lib.optionals effectiveStdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.Accelerate
darwin.apple_sdk_11_0.frameworks.CoreVideo
darwin.apple_sdk_11_0.frameworks.CoreGraphics
darwin.apple_sdk_11_0.frameworks.CoreServices
darwinFrameworks.Accelerate
darwinFrameworks.CoreVideo
darwinFrameworks.CoreGraphics
darwinFrameworks.CoreServices
]
++ lib.optionals metalSupport [
darwin.apple_sdk_11_0.frameworks.MetalKit
darwin.apple_sdk_11_0.frameworks.Foundation
darwin.apple_sdk_11_0.frameworks.MetalPerformanceShaders
darwinFrameworks.MetalKit
darwinFrameworks.Foundation
darwinFrameworks.MetalPerformanceShaders
]
++ lib.optionals openblasSupport [ openblas ]
++ lib.optionals cublasSupport [
@@ -92,27 +101,35 @@ effectiveStdenv.mkDerivation (finalAttrs: {
pythonPath = finalAttrs.pythonInputs;
darwinLdFlags = lib.optionals stdenv.isDarwin [
"-F${darwin.apple_sdk_11_0.frameworks.CoreServices}/Library/Frameworks"
"-F${darwin.apple_sdk_11_0.frameworks.Accelerate}/Library/Frameworks"
"-F${darwinFrameworks.CoreServices}/Library/Frameworks"
"-F${darwinFrameworks.Accelerate}/Library/Frameworks"
"-framework CoreServices"
"-framework Accelerate"
];
metalLdFlags = lib.optionals metalSupport [
"-F${darwin.apple_sdk_11_0.frameworks.Foundation}/Library/Frameworks"
"-F${darwin.apple_sdk_11_0.frameworks.Metal}/Library/Frameworks"
"-F${darwinFrameworks.Foundation}/Library/Frameworks"
"-F${darwinFrameworks.Metal}/Library/Frameworks"
"-framework Foundation"
"-framework Metal"
];
env.NIX_LDFLAGS = lib.concatStringsSep " " (finalAttrs.darwinLdFlags ++ finalAttrs.metalLdFlags);
env.NIX_CFLAGS_COMPILE =
lib.optionalString (march != "") (
lib.warn "koboldcpp: the march argument is only kept for compatibility; use overrideAttrs intead" "-march=${march}"
)
+ lib.optionalString (mtune != "") (
lib.warn "koboldcpp: the mtune argument is only kept for compatibility; use overrideAttrs intead" "-mtune=${mtune}"
);
makeFlags = [
(makeBool "LLAMA_OPENBLAS" openblasSupport)
(makeBool "LLAMA_CUBLAS" cublasSupport)
(makeBool "LLAMA_CLBLAST" clblastSupport)
(makeBool "LLAMA_VULKAN" vulkanSupport)
(makeBool "LLAMA_METAL" metalSupport)
(lib.optionalString cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head arches}")
(lib.optionals cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head cudaArches}")
];
installPhase = ''
@@ -141,7 +158,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
postFixup = ''
wrapPythonProgramsIn "$out/bin" "$pythonPath"
makeWrapper "$out/bin/koboldcpp.unwrapped" "$out/bin/koboldcpp" \
--prefix PATH ${lib.makeBinPath [ tk ]} ${makeWrapperArgs}
--prefix PATH ${lib.makeBinPath [ tk ]} ${libraryPathWrapperArgs}
'';
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
pkgs/by-name/lb/lbreakouthd/package.nix
+2 -2
View File
@@ -10,11 +10,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lbreakouthd";
version = "1.1.8";
version = "1.1.9";
src = fetchurl {
url = "mirror://sourceforge/lgames/lbreakouthd-${finalAttrs.version}.tar.gz";
hash = "sha256-3WZ77KVDNitdIcXPFf0CMXtjDvEXi91Jr7mpeV09Wt4=";
hash = "sha256-HIzZcH/yGBRX/9UyFuRyusAkzgzhREkMRNaP+6vQC+E=";
};
buildInputs = [
pkgs/by-name/li/linuxhw-edid-fetcher/package.nix
+1 -1
View File
@@ -20,7 +20,7 @@
# "${edids}/lib/firmware/edid/PG278Q_2014.bin";
stdenv.mkDerivation rec {
pname = "linuxhw-edid-fetcher";
version = "unstable-2023-05-08";
version = "0-unstable-2023-05-08";
src = fetchFromGitHub {
owner = "linuxhw";
pkgs/by-name/ma/maa-assistant-arknights/pin.json
+4 -4
View File
@@ -1,10 +1,10 @@
{
"stable": {
"version": "5.3.1",
"hash": "sha256-4Bz9r4UcaUI5v1upwdD0HclXIUBcNpfnA2iWwofk1zw="
"version": "5.4.1",
"hash": "sha256-okVDQyVN+5z7udwSsVVyvg1oTJslpJl2o1qm3HGRqnE="
},
"beta": {
"version": "5.3.1",
"hash": "sha256-4Bz9r4UcaUI5v1upwdD0HclXIUBcNpfnA2iWwofk1zw="
"version": "5.5.0-beta.1",
"hash": "sha256-q+Iz/yQn71PSm/kW81PMM/2lykZAUgN/DLR9r29ETmI="
}
}
pkgs/by-name/ma/malwoverview/package.nix
+2 -2
View File
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "malwoverview";
version = "5.4.5";
version = "6.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "alexandreborges";
repo = "malwoverview";
rev = "refs/tags/v${version}";
hash = "sha256-8miPlWBQSOf153l70C4Ya7gWF6D/gTArzJ5FyR0nVwA=";
hash = "sha256-qwNWYwMkxnRczqc4QvniuqwDVgpSlNTVOpzbzYcoMFg=";
};
pythonRemoveDeps = [
pkgs/by-name/ne/netclient/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "netclient";
version = "0.24.2";
version = "0.24.3";
src = fetchFromGitHub {
owner = "gravitl";
repo = "netclient";
rev = "v${version}";
hash = "sha256-7+r2fuFNVvOC0Zl1kqAiAh9C3qqhg7KGrbnOp4Jk+Is=";
hash = "sha256-EwkjU4MICkCuJJ7a39dKPTuugELprHQUIyXqwmJpev8=";
};
vendorHash = "sha256-eTiNBs8xcfrth/E44URhD8uSgdoXZT1+MD3H24dzI1A=";
vendorHash = "sha256-R/aHXZ0BM2gWouUIezYf63SMqT8vjH2ZhOItgu6RBb4=";
buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa
++ lib.optional stdenv.isLinux libX11;
pkgs/by-name/nh/nh/package.nix
+3 -3
View File
@@ -10,7 +10,7 @@
, nix-output-monitor
}:
let
version = "3.5.18";
version = "3.5.19";
runtimeDeps = [ nvd nix-output-monitor ];
in
rustPlatform.buildRustPackage {
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
owner = "viperML";
repo = "nh";
rev = "refs/tags/v${version}";
hash = "sha256-G5iteuo2gobI0Y5jHNEBc6UN9ixjwj6zopPKi7bJBE4=";
hash = "sha256-m6LmfrUMpt1ZUX3eqB7Gp+ZV6sAWPqkATwZNvA7Bj9U=";
};
strictDeps = true;
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
--prefix PATH : ${lib.makeBinPath runtimeDeps}
'';
cargoHash = "sha256-jd8GOuI5E+l3u8klAKdwUdEP9N0Nao6MfTdHkSjym0M=";
cargoHash = "sha256-fyHyuZGjTsKynihlD3H3tSZeo8s9Trbe4NZ3Zv2MHmQ=";
passthru.updateScript = nix-update-script { };

Some files were not shown because too many files have changed in this diff Show More