mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-11 16:23:26 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
51e600a3e5
@ -15,7 +15,7 @@ assignees: ''
|
||||
|
||||
<!-- make sure this issue is not redundant or obsolete -->
|
||||
|
||||
- [ ] checked [latest Nixpkgs manual] \([source][nixpkgs-source]) and [latest NixOS manual]] \[source][nixos-source])
|
||||
- [ ] checked [latest Nixpkgs manual] \([source][nixpkgs-source]) and [latest NixOS manual]] \([source][nixos-source])
|
||||
- [ ] checked [open documentation issues] for possible duplicates
|
||||
- [ ] checked [open documentation pull requests] for possible solutions
|
||||
|
||||
|
||||
@ -160,6 +160,8 @@
|
||||
|
||||
urweb-mode = callPackage ./urweb-mode { };
|
||||
|
||||
voicemacs = callPackage ./voicemacs { };
|
||||
|
||||
# Packages made the classical callPackage way
|
||||
|
||||
ebuild-mode = callPackage ./ebuild-mode { };
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
From eb9fefe7eddee0b22c7c1104eb9133ed595c55f9 Mon Sep 17 00:00:00 2001
|
||||
From: adisbladis <adisbladis@gmail.com>
|
||||
Date: Fri, 23 Sep 2022 14:52:34 +1200
|
||||
Subject: [PATCH] Add missing (require)'s
|
||||
|
||||
---
|
||||
voicemacs-server.el | 2 ++
|
||||
voicemacs.el | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/voicemacs-server.el b/voicemacs-server.el
|
||||
index edfe74c..04ffdf2 100644
|
||||
--- a/voicemacs-server.el
|
||||
+++ b/voicemacs-server.el
|
||||
@@ -1,5 +1,7 @@
|
||||
(require 'cl-lib)
|
||||
(require 'json-rpc-server)
|
||||
+(require 'f)
|
||||
+(require 'porthole)
|
||||
|
||||
|
||||
(defvar voicemacs--update-response-timeout 3
|
||||
diff --git a/voicemacs.el b/voicemacs.el
|
||||
index b93e80b..d790636 100644
|
||||
--- a/voicemacs.el
|
||||
+++ b/voicemacs.el
|
||||
@@ -18,6 +18,8 @@
|
||||
(require 'voicemacs-extend-company))
|
||||
|
||||
|
||||
+(require 'yasnippet)
|
||||
+
|
||||
(voicemacs-define-sync voicemacs
|
||||
:update t
|
||||
:enable nil
|
||||
--
|
||||
2.37.2
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
{ trivialBuild
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, avy
|
||||
, json-rpc-server
|
||||
, f
|
||||
, nav-flash
|
||||
, helm
|
||||
, cl-lib
|
||||
, porthole
|
||||
, default-text-scale
|
||||
, bind-key
|
||||
, yasnippet
|
||||
, company
|
||||
, company-quickhelp
|
||||
}:
|
||||
|
||||
trivialBuild {
|
||||
pname = "voicemacs";
|
||||
version = "unstable-2022-02-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcaw";
|
||||
repo = "voicemacs";
|
||||
rev = "d91de2a31c68ab083172ade2451419d6bd7bb389";
|
||||
sha256 = "sha256-/MBB2R9/V0aYZp15e0vx+67ijCPp2iPlgxe262ldmtc=";
|
||||
};
|
||||
|
||||
patches = [ ./add-missing-require.patch ];
|
||||
|
||||
packageRequires = [
|
||||
avy
|
||||
json-rpc-server
|
||||
f
|
||||
nav-flash
|
||||
helm
|
||||
cl-lib
|
||||
porthole
|
||||
default-text-scale
|
||||
bind-key
|
||||
yasnippet
|
||||
company-quickhelp
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Voicemacs is a set of utilities for controlling Emacs by voice";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -5,35 +5,35 @@
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, libhandy
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, libxml2
|
||||
, openssl
|
||||
, sqlite
|
||||
, webkitgtk
|
||||
, glib-networking
|
||||
, librsvg
|
||||
, gst_all_1
|
||||
, xdg-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "newsflash";
|
||||
version = "1.5.1";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "news-flash";
|
||||
repo = "news_flash_gtk";
|
||||
rev = version;
|
||||
hash = "sha256-fLG7oYt+gdl3Lwnu6c7VLJWSHCFY5LyNeDKoUNGg3Yw=";
|
||||
rev = "refs/tags/v.${finalAttrs.version}";
|
||||
sha256 = "sha256-QDGoA22olhafL2geLf1Jxriqc4++3yxGN/ZnNyEAqjA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-dQlbK3SfY6p1xinroXz5wcaBbq2LuDM9sMlfJ6ueTTg=";
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
src = finalAttrs.src;
|
||||
sha256 = "sha256-21v/4VAgolk/12mj7CTu8d5CKMCovE1FQuGyMar8idY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -46,14 +46,14 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
patchShebangs build-aux/cargo.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
|
||||
# Provides setup hook to fix "Unrecognized image file format"
|
||||
gdk-pixbuf
|
||||
@ -67,8 +67,9 @@ stdenv.mkDerivation rec {
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libhandy
|
||||
gtk4
|
||||
libadwaita
|
||||
libxml2
|
||||
openssl
|
||||
sqlite
|
||||
webkitgtk
|
||||
@ -86,18 +87,12 @@ stdenv.mkDerivation rec {
|
||||
gst-plugins-bad
|
||||
]);
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--suffix PATH : "${lib.makeBinPath [
|
||||
# Open links in browser
|
||||
xdg-utils
|
||||
]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern feed reader designed for the GNOME desktop";
|
||||
homepage = "https://gitlab.com/news-flash/news_flash_gtk";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kira-bruneau stunkymonkey ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "com.gitlab.newsflash";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -16,32 +16,18 @@
|
||||
, termcolor
|
||||
, tomlkit
|
||||
, typing-extensions
|
||||
, chardet
|
||||
|
||||
, argcomplete, fetchPypi
|
||||
, argcomplete
|
||||
}:
|
||||
|
||||
let
|
||||
# NOTE: Upstream requires argcomplete <2, so we make it here.
|
||||
argcomplete_1 = argcomplete.overrideAttrs (old: rec {
|
||||
version = "1.12.3";
|
||||
src = fetchPypi {
|
||||
inherit (old) pname;
|
||||
inherit version;
|
||||
sha256 = "sha256-LH2//YwEXqU0kh5jsL5v5l6IWZmQ2NxAisjFQrcqVEU=";
|
||||
};
|
||||
});
|
||||
in
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "commitizen";
|
||||
version = "2.29.2";
|
||||
version = "2.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "commitizen-tools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4mK+GA1rfctJkMv4ZMfXE/qih/9fF0kwT6bIcLVB/Bk=";
|
||||
hash = "sha256-9ek6m5k01sGVHwqWXjWYDsPmIeAgK+H23D9sF5hjrf0=";
|
||||
deepClone = true;
|
||||
};
|
||||
|
||||
@ -50,7 +36,6 @@ buildPythonApplication rec {
|
||||
nativeBuildInputs = [ poetry ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
chardet
|
||||
termcolor
|
||||
questionary
|
||||
colorama
|
||||
@ -58,82 +43,47 @@ buildPythonApplication rec {
|
||||
tomlkit
|
||||
jinja2
|
||||
pyyaml
|
||||
argcomplete_1
|
||||
argcomplete
|
||||
typing-extensions
|
||||
packaging
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-freezegun
|
||||
pytest-mock
|
||||
pytest-regressions
|
||||
argcomplete_1
|
||||
argcomplete
|
||||
git
|
||||
];
|
||||
|
||||
# NB: These require full git history
|
||||
# the tests require a functional git installation
|
||||
# which requires a valid HOME directory.
|
||||
preCheck = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
|
||||
git config --global user.name "Nix Builder"
|
||||
git config --global user.email "nix-builder@nixos.org"
|
||||
git init .
|
||||
'';
|
||||
|
||||
# NB: These tests require complex GnuPG setup
|
||||
disabledTests = [
|
||||
"test_breaking_change_content_v1"
|
||||
"test_breaking_change_content_v1_beta"
|
||||
"test_breaking_change_content_v1_multiline"
|
||||
"test_bump_command_increment_option"
|
||||
"test_bump_command_prelease"
|
||||
"test_bump_dry_run"
|
||||
"test_bump_files_only"
|
||||
"test_bump_local_version"
|
||||
"test_bump_major_increment"
|
||||
"test_bump_minor_increment"
|
||||
"test_bump_on_git_with_hooks_no_verify_disabled"
|
||||
"test_bump_minor_increment_signed"
|
||||
"test_bump_minor_increment_signed_config_file"
|
||||
"test_bump_on_git_with_hooks_no_verify_enabled"
|
||||
"test_bump_patch_increment"
|
||||
"test_bump_on_git_with_hooks_no_verify_disabled"
|
||||
"test_bump_pre_commit_changelog"
|
||||
"test_bump_pre_commit_changelog_fails_always"
|
||||
"test_bump_tag_exists_raises_exception"
|
||||
"test_bump_when_bumpping_is_not_support"
|
||||
"test_bump_when_version_inconsistent_in_version_files"
|
||||
"test_bump_with_changelog_arg"
|
||||
"test_bump_with_changelog_config"
|
||||
"test_bump_with_changelog_to_stdout_arg"
|
||||
"test_bump_with_changelog_to_stdout_dry_run_arg"
|
||||
"test_changelog_config_flag_increment"
|
||||
"test_changelog_config_start_rev_option"
|
||||
"test_changelog_from_rev_first_version_from_arg"
|
||||
"test_changelog_from_rev_latest_version_dry_run"
|
||||
"test_changelog_from_rev_latest_version_from_arg"
|
||||
"test_changelog_from_rev_range_version_not_found"
|
||||
"test_changelog_from_rev_single_version_not_found"
|
||||
"test_changelog_from_rev_version_range_from_arg"
|
||||
"test_changelog_from_rev_version_range_including_first_tag"
|
||||
"test_changelog_from_rev_version_with_big_range_from_arg"
|
||||
"test_changelog_from_start"
|
||||
"test_changelog_from_version_zero_point_two"
|
||||
"test_changelog_hook"
|
||||
"test_changelog_incremental_angular_sample"
|
||||
"test_changelog_incremental_keep_a_changelog_sample"
|
||||
"test_changelog_incremental_keep_a_changelog_sample_with_annotated_tag"
|
||||
"test_changelog_incremental_newline_separates_new_content_from_old"
|
||||
"test_changelog_incremental_with_release_candidate_version"
|
||||
"test_changelog_is_persisted_using_incremental"
|
||||
"test_changelog_multiple_incremental_do_not_add_new_lines"
|
||||
"test_changelog_replacing_unreleased_using_incremental"
|
||||
"test_changelog_with_different_cz"
|
||||
"test_changelog_with_filename_as_empty_string"
|
||||
"test_get_commits"
|
||||
"test_get_commits_author_and_email"
|
||||
"test_get_commits_with_signature"
|
||||
"test_get_latest_tag_name"
|
||||
"test_invalid_subject_is_skipped"
|
||||
"test_is_staging_clean_when_updating_file"
|
||||
"test_none_increment_should_not_call_git_tag_and_error_code_is_not_zero"
|
||||
"test_prevent_prerelease_when_no_increment_detected"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs";
|
||||
homepage = "https://github.com/commitizen-tools/commitizen";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
maintainers = with maintainers; [ lovesegfault anthonyroussel ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,4 +3,5 @@
|
||||
mkDerivation {
|
||||
version = "21.3.8.24";
|
||||
sha256 = "sha256-FNs+M4KFFKzfb4EG513HtyQ9eRRtxSPMpYq0bmRgY3g=";
|
||||
meta.knownVulnerabilities = [ "CVE-2022-37026" ];
|
||||
}
|
||||
|
||||
@ -3,4 +3,5 @@
|
||||
mkDerivation {
|
||||
version = "22.3.4.24";
|
||||
sha256 = "0c9713xa8sjw7nr55hysgcnbvj7gzbrpzdl94y1nqn7vw4ni8is3";
|
||||
meta.knownVulnerabilities = [ "CVE-2022-37026" ];
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "23.3.4.10";
|
||||
sha256 = "0sfz7n748hvhmcygnvb6h31ag35p59aaa9h8gdpqsh6p4hnjh1mf";
|
||||
version = "23.3.4.17";
|
||||
sha256 = "sha256-GJicQqQbtD/eG/1t9C/l3hVsRV8fJOgaSCU0/kSHZLY=";
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "24.2";
|
||||
sha256 = "10s57v2i2qqyg3gddm85n3crzrkikl4zfwgzqmxjzdynsyb4xg68";
|
||||
version = "24.3.4.5";
|
||||
sha256 = "sha256-MGmuge79Dh/HXF+tkvubM979K0At5v1B1RhM5Koy8oY=";
|
||||
}
|
||||
|
||||
@ -130,5 +130,7 @@ in {")
|
||||
(:symbol "pkgs")))
|
||||
(remove "asdf"
|
||||
(str:split-omit-nulls #\, deps)
|
||||
:test #'string=))))))))))
|
||||
:test #'string=))))
|
||||
,@(when (find #\/ name)
|
||||
'(("meta" (:attrs ("broken" (:symbol "true"))))))))))))
|
||||
(format f "~%}~%"))))
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
(make-instance
|
||||
'quicklisp-repository
|
||||
:dist-url
|
||||
"https://beta.quicklisp.org/dist/quicklisp/2021-12-30/"))
|
||||
"https://beta.quicklisp.org/dist/quicklisp/2022-07-08/"))
|
||||
|
||||
(defun run-importers ()
|
||||
(import-lisp-packages *quicklisp* *sqlite*)
|
||||
|
||||
13189
pkgs/development/lisp-modules-new/imported.nix
vendored
13189
pkgs/development/lisp-modules-new/imported.nix
vendored
File diff suppressed because it is too large
Load Diff
@ -42,6 +42,8 @@ let
|
||||
optionalString
|
||||
makeLibraryPath
|
||||
makeSearchPath
|
||||
recurseIntoAttrs
|
||||
dontRecurseIntoAttrs
|
||||
;
|
||||
|
||||
inherit (builtins)
|
||||
@ -55,11 +57,13 @@ let
|
||||
# This is probably causing performance problems...
|
||||
flattenedDeps = lispLibs:
|
||||
let
|
||||
toSet = list: builtins.listToAttrs (map (d: { name = d.pname; value = d; }) list);
|
||||
toList = attrValues;
|
||||
walk = acc: node:
|
||||
if length node.lispLibs == 0
|
||||
then acc
|
||||
else foldl walk (acc ++ node.lispLibs) node.lispLibs;
|
||||
in unique (walk [] { inherit lispLibs; });
|
||||
else builtins.foldl' walk (acc // toSet node.lispLibs) node.lispLibs;
|
||||
in toList (walk {} { inherit lispLibs; });
|
||||
|
||||
# Stolen from python-packages.nix
|
||||
# Actually no idea how this works
|
||||
@ -207,11 +211,12 @@ let
|
||||
# from storeDir. Otherwise it could try to recompile lisp deps.
|
||||
export ASDF_OUTPUT_TRANSLATIONS="${src}:$(pwd):${storeDir}:${storeDir}"
|
||||
|
||||
# Make Nix track the dependencies so that graphs can be generated with
|
||||
# nix-store -q --graph
|
||||
echo "$lispLibs" >> nix-drvs
|
||||
echo "$nativeLibs" >> nix-drvs
|
||||
echo "$javaLibs" >> nix-drvs
|
||||
# track lisp dependencies for graph generation
|
||||
# TODO: Do the propagation like for lisp, native and java like this:
|
||||
# https://github.com/teu5us/nix-lisp-overlay/blob/e30dafafa5c1b9a5b0ccc9aaaef9d285d9f0c46b/pkgs/development/lisp-modules/setup-hook.sh
|
||||
# Then remove the "echo >> nix-drvs" from buildScript
|
||||
echo $lispLibs >> __nix-drvs
|
||||
|
||||
|
||||
# Finally, compile the systems
|
||||
${lisp} $buildScript
|
||||
@ -389,19 +394,6 @@ let
|
||||
lispPackagesFor
|
||||
lispWithPackages;
|
||||
|
||||
# Uncomment for debugging/development
|
||||
# inherit
|
||||
# flattenedDeps
|
||||
# concatMap
|
||||
# attrNames
|
||||
# getAttr
|
||||
# filterAttrs
|
||||
# filter
|
||||
# elem
|
||||
# unique
|
||||
# makeAttrName
|
||||
# length;
|
||||
|
||||
# TODO: uncomment clasp when clasp 1.0.0 is packaged
|
||||
|
||||
# There's got to be a better way than this...
|
||||
@ -416,10 +408,10 @@ let
|
||||
|
||||
# Manually defined packages shadow the ones imported from quicklisp
|
||||
|
||||
sbclPackages = lispPackagesFor sbcl;
|
||||
eclPackages = lispPackagesFor ecl;
|
||||
abclPackages = lispPackagesFor abcl;
|
||||
cclPackages = lispPackagesFor ccl;
|
||||
sbclPackages = recurseIntoAttrs (lispPackagesFor sbcl);
|
||||
eclPackages = dontRecurseIntoAttrs (lispPackagesFor ecl);
|
||||
abclPackages = dontRecurseIntoAttrs (lispPackagesFor abcl);
|
||||
cclPackages = dontRecurseIntoAttrs (lispPackagesFor ccl);
|
||||
# claspPackages = lispPackagesFor clasp;
|
||||
|
||||
sbclWithPackages = lispWithPackages sbcl;
|
||||
|
||||
@ -110,34 +110,6 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
quri = build-asdf-system {
|
||||
src = pkgs.stdenv.mkDerivation {
|
||||
pname = "patched";
|
||||
version = "source";
|
||||
src = pkgs.fetchzip {
|
||||
url = "http://beta.quicklisp.org/archive/quri/2021-04-11/quri-20210411-git.tgz";
|
||||
sha256 = "1pkvpiwwhx2fcknr7x47h7036ypkg8xzsskqbl5z315ipfmi8s2m";
|
||||
};
|
||||
|
||||
# fix build with ABCL
|
||||
buildPhase = ''
|
||||
sed -i "s,[#][.](asdf.*,#P\"$out/data/effective_tld_names.dat\")," src/etld.lisp
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -pv $out
|
||||
cp -r * $out
|
||||
'';
|
||||
};
|
||||
version = "20210411";
|
||||
pname = "quri";
|
||||
lispLibs = with ql; [
|
||||
alexandria
|
||||
babel
|
||||
cl-utilities
|
||||
split-sequence
|
||||
];
|
||||
};
|
||||
|
||||
jzon = build-asdf-system {
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/Zulu-Inuoe/jzon/archive/6b201d4208ac3f9721c461105b282c94139bed29.tar.gz";
|
||||
@ -166,6 +138,15 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
cl-liballegro-nuklear = build-with-compile-into-pwd {
|
||||
inherit (ql.cl-liballegro-nuklear) pname version src;
|
||||
nativeBuildInputs = [ pkgs.allegro5 ];
|
||||
nativeLibs = [ pkgs.allegro5 ];
|
||||
lispLibs = ql.cl-liballegro-nuklear.lispLibs ++ [ ql.cl-liballegro ];
|
||||
patches = [ ./patches/cl-liballegro-nuklear-missing-dll.patch ];
|
||||
};
|
||||
|
||||
|
||||
tuple = build-asdf-system {
|
||||
pname = "tuple";
|
||||
version = "b74bd067d";
|
||||
@ -229,6 +210,35 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
lessp = build-asdf-system {
|
||||
pname = "lessp";
|
||||
version = "0.2-f8a9e4664";
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/facts-db/cl-lessp/archive/632217602b85b679e8d420654a0aa39e798ca3b5.tar.gz";
|
||||
sha256 = "0i3ia14dzqwjpygd0zn785ff5vqnnmkn75psfpyx0ni3jr71lkq9";
|
||||
};
|
||||
};
|
||||
|
||||
rollback = build-asdf-system {
|
||||
pname = "rollback";
|
||||
version = "0.1-5d3f21fda";
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/facts-db/cl-rollback/archive/5d3f21fda8f04f35c5e9d20ee3b87db767915d15.tar.gz";
|
||||
sha256 = "12dpxsbm2al633y87i8p784k2dn4bbskz6sl40v9f5ljjmjqjzxf";
|
||||
};
|
||||
};
|
||||
|
||||
facts = build-asdf-system {
|
||||
pname = "facts";
|
||||
version = "0.1-632217602";
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/facts-db/cl-lessp/archive/632217602b85b679e8d420654a0aa39e798ca3b5.tar.gz";
|
||||
sha256 = "09z1vwzjm7hlb529jl3hcjnfd11gh128lmdg51im7ar4jv4746iw";
|
||||
};
|
||||
lispLibs = [ lessp rollback ] ++ [ ql.local-time ];
|
||||
};
|
||||
|
||||
|
||||
cl-fuse = build-with-compile-into-pwd {
|
||||
inherit (ql.cl-fuse) pname version src lispLibs;
|
||||
nativeBuildInputs = [ pkgs.fuse ];
|
||||
@ -262,35 +272,6 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
mgl = build-asdf-system {
|
||||
pname = "mgl";
|
||||
version = "2021-10-07";
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/melisgl/mgl/archive/e697791a9bcad3b6e7b3845246a2aa55238cfef7.tar.gz";
|
||||
sha256 = "09sf7nq7nmf9q7bh3a5ygl2i2n0nhrx5fk2kv5ili0ckv7g9x72s";
|
||||
};
|
||||
lispLibs = with ql; [
|
||||
alexandria closer-mop array-operations lla cl-reexport mgl-pax
|
||||
named-readtables pythonic-string-reader
|
||||
] ++ [ mgl-mat ];
|
||||
systems = [ "mgl" "mgl/test" ];
|
||||
};
|
||||
|
||||
mgl-mat = build-asdf-system {
|
||||
pname = "mgl-mat";
|
||||
version = "2021-10-11";
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/melisgl/mgl-mat/archive/3710858bc876b1b86e50f1db2abe719e92d810e7.tar.gz";
|
||||
sha256 = "1aa2382mi55rp8pd31dz4d94yhfzh30vkggcvmvdfrr4ngffj0dx";
|
||||
};
|
||||
lispLibs = with ql; [
|
||||
alexandria bordeaux-threads cffi cffi-grovel cl-cuda
|
||||
flexi-streams ieee-floats lla mgl-pax static-vectors
|
||||
trivial-garbage cl-fad
|
||||
];
|
||||
systems = [ "mgl-mat" "mgl-mat/test" ];
|
||||
};
|
||||
|
||||
mathkit = build-asdf-system {
|
||||
inherit (ql.mathkit) pname version src asds lisp;
|
||||
lispLibs = ql.mathkit.lispLibs ++ [ ql.sb-cga ];
|
||||
@ -351,18 +332,6 @@ let
|
||||
version = "f19162e76";
|
||||
});
|
||||
|
||||
s-sql_slash_tests = ql.s-sql_slash_tests.overrideLispAttrs (o: {
|
||||
lispLibs = o.lispLibs ++ [
|
||||
ql.cl-postgres_slash_tests
|
||||
];
|
||||
});
|
||||
|
||||
simple-date_slash_postgres-glue = ql.simple-date_slash_postgres-glue.overrideLispAttrs (o: {
|
||||
lispLibs = o.lispLibs ++ [
|
||||
ql.cl-postgres_slash_tests
|
||||
];
|
||||
});
|
||||
|
||||
};
|
||||
|
||||
in packages
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
Fix system not loading due to:
|
||||
|
||||
Unhandled CFFI:LOAD-FOREIGN-LIBRARY-ERROR
|
||||
Unable to load foreign library (LIBALLEGRO-NUKLEAR).
|
||||
Error opening shared object "/build/source/src/liballegro_nuklear.so":
|
||||
/build/source/src/liballegro_nuklear.so: undefined symbol: al_draw_ellipse.
|
||||
--- a/cl-liballegro-nuklear.asd
|
||||
+++ b/cl-liballegro-nuklear.asd
|
||||
@@ -12,7 +12,7 @@
|
||||
:description "CFFI wrapper for the Nuklear IM GUI library with liballegro backend, to be used with cl-liballegro."
|
||||
:author "Andrew Kravchuk <awkravchuk@gmail.com>"
|
||||
:license "MIT"
|
||||
- :depends-on (:cffi :cffi-libffi :trivial-features)
|
||||
+ :depends-on (:cl-liballegro :cffi :cffi-libffi :trivial-features)
|
||||
:pathname "src"
|
||||
:serial t
|
||||
:components ((:makefile "Makefile")
|
||||
@ -11,7 +11,7 @@ let
|
||||
|
||||
extras = {
|
||||
"cl+ssl" = pkg: {
|
||||
nativeLibs = [ openssl ];
|
||||
nativeLibs = [ openssl_1_1 ];
|
||||
};
|
||||
cl-cffi-gtk-glib = pkg: {
|
||||
nativeLibs = [ glib ];
|
||||
@ -72,6 +72,16 @@ let
|
||||
# weird...
|
||||
nativeLibs = [ allegro5 ];
|
||||
};
|
||||
cl-ode = pkg: {
|
||||
nativeLibs = let
|
||||
ode' = ode.overrideAttrs (o: {
|
||||
configureFlags = [
|
||||
"--enable-shared"
|
||||
"--enable-double-precision"
|
||||
];
|
||||
});
|
||||
in [ ode' ];
|
||||
};
|
||||
classimp = pkg: {
|
||||
nativeLibs = [ assimp ];
|
||||
};
|
||||
@ -107,7 +117,7 @@ let
|
||||
nativeLibs = [ rdkafka ];
|
||||
};
|
||||
cl-async-ssl = pkg: {
|
||||
nativeLibs = [ openssl ];
|
||||
nativeLibs = [ openssl_1_1 ];
|
||||
};
|
||||
osicat = pkg: {
|
||||
LD_LIBRARY_PATH = "${pkg}/posix/";
|
||||
@ -121,7 +131,6 @@ let
|
||||
|
||||
qlpkgs =
|
||||
if builtins.pathExists ./imported.nix
|
||||
# then filterAttrs (n: v: all (check: !(check n v)) broken) (import ./imported.nix { inherit pkgs; })
|
||||
then import ./imported.nix { inherit (pkgs) runCommand fetchzip; pkgs = builtQlpkgs; }
|
||||
else {};
|
||||
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "10.14.0";
|
||||
version = "11.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-ASFErnWUNcq/30AOYM596w+j0FOYGuQ3Tj4OdczWanM=";
|
||||
sha256 = "sha256-HHVA/eH6Ucn1shQy6QzcxvHWRQqjv/OEgHgq0ITS23Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -80,6 +80,15 @@ buildPythonPackage rec {
|
||||
requests
|
||||
];
|
||||
|
||||
preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
# https://github.com/python/cpython/issues/74570#issuecomment-1093748531
|
||||
export no_proxy='*';
|
||||
'';
|
||||
|
||||
postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
unset no_proxy
|
||||
'';
|
||||
|
||||
# Override default arguments in pytest.ini
|
||||
pytestFlagsArray = [
|
||||
"--timeout=0"
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, fetchPypi
|
||||
, joblib
|
||||
, six
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -28,7 +29,8 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
pythonRemoveDeps = [ "cython" ];
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook cython ];
|
||||
propagatedBuildInputs = [ numpy scipy scikit-learn joblib six ];
|
||||
preCheck = ''
|
||||
cd hdbscan/tests
|
||||
@ -42,6 +44,9 @@ buildPythonPackage rec {
|
||||
"test_approx_predict_diff_clusters"
|
||||
# another flaky test https://github.com/scikit-learn-contrib/hdbscan/issues/421
|
||||
"test_hdbscan_boruvka_balltree_matches"
|
||||
# more flaky tests https://github.com/scikit-learn-contrib/hdbscan/issues/570
|
||||
"test_hdbscan_boruvka_balltree"
|
||||
"test_hdbscan_best_balltree_metric"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "hdbscan" ];
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, substituteAll
|
||||
|
||||
# runtime
|
||||
, ffmpeg
|
||||
|
||||
# propagates
|
||||
, numpy
|
||||
@ -16,21 +20,22 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "whisper";
|
||||
version = "unstable-2022-09-23";
|
||||
version = "unstable-2022-09-30";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = pname;
|
||||
rev = "8cf36f3508c9acd341a45eb2364239a3d81458b9";
|
||||
hash = "sha256-2RH8eM/SezqFJltelv5AjQEGpqXm980u57vrlkTEUvQ=";
|
||||
rev = "60132ade70e00b843d93542fcb37b58c0d8bf9e7";
|
||||
hash = "sha256-4mhlCvewA0bVo5bq2sbSEKHq99TQ6jUauiCUkdRSdas=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Rely on the ffmpeg path already patched into the ffmpeg-python library
|
||||
substituteInPlace whisper/audio.py \
|
||||
--replace 'run(cmd="ffmpeg",' 'run('
|
||||
'';
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./ffmpeg-path.patch;
|
||||
inherit ffmpeg;
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/whisper/audio.py b/whisper/audio.py
|
||||
index a6074e8..da18350 100644
|
||||
--- a/whisper/audio.py
|
||||
+++ b/whisper/audio.py
|
||||
@@ -41,7 +41,7 @@ def load_audio(file: str, sr: int = SAMPLE_RATE):
|
||||
out, _ = (
|
||||
ffmpeg.input(file, threads=0)
|
||||
.output("-", format="s16le", acodec="pcm_s16le", ac=1, ar=sr)
|
||||
- .run(cmd=["ffmpeg", "-nostdin"], capture_stdout=True, capture_stderr=True)
|
||||
+ .run(cmd=["@ffmpeg@/bin/ffmpeg", "-nostdin"], capture_stdout=True, capture_stderr=True)
|
||||
)
|
||||
except ffmpeg.Error as e:
|
||||
raise RuntimeError(f"Failed to load audio: {e.stderr.decode()}") from e
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-setuptools";
|
||||
version = "65.3.0";
|
||||
version = "65.4.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-wmd5y7o5R4I8JgNUraq06RyowYiIqit0D1A4RLiPGBM=";
|
||||
sha256 = "sha256-2QIdanBpCzTnvSlH56sQFnxkb78GJQjLVlgb4uKhYV4=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-task";
|
||||
version = "3.15.2";
|
||||
version = "3.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "task";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UeKb+v9mHKCwQAGzaYQ0aRi7oCZOOIP1dal0ro3iwzI=";
|
||||
sha256 = "sha256-CHltaS2OJJTwsX6kvgyeQwR1bus03XnMOWSpJ0EDCJ0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xp1s1aixPyXq9oVD8IZYSlUiL8UkIx5c8gYJRpIRD7I=";
|
||||
|
||||
27
pkgs/development/tools/jqp/default.nix
Normal file
27
pkgs/development/tools/jqp/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jqp";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noahgorstein";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dVarasXLJrB/akMUvjZn313+bqM39Ji4l91PAxwmfG0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KlnKWeLbmLH6M5+oD/BYuqkTyrV9Xo7ibrNjukFe7ss=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TUI playground to experiment with jq";
|
||||
homepage = "https://github.com/noahgorstein/jqp";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
24
pkgs/servers/microbin/default.nix
Normal file
24
pkgs/servers/microbin/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "microbin";
|
||||
version = "1.1.0";
|
||||
|
||||
# GitHub sources do not have Cargo.lock
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gfEO7Rrzc4KSnSXFrMmGLrTXuZIUCdumt2N429nHPi8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-k/5CG8bf5RuO6K9mEj6seqV6AuWMqatBRDaSS0guhi0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tiny, self-contained, configurable paste bin and URL shortener written in Rust";
|
||||
homepage = "https://github.com/szabodanika/microbin";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
@ -1,42 +1,31 @@
|
||||
{ lib, go, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, prometheus-pushgateway }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "pushgateway";
|
||||
version = "1.4.0";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/prometheus/pushgateway";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "prometheus";
|
||||
repo = "pushgateway";
|
||||
sha256 = "sha256-230JgG+TtAuopkkcUda+0hl8E6WXOtTUygWoyorLiEU=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fSp173/ubeXw44IHVnuyYAYnTCrHcsq7GRwPlH05kJY=";
|
||||
};
|
||||
|
||||
buildUser = "nix@nixpkgs";
|
||||
buildDate = "19700101-00:00:00";
|
||||
vendorSha256 = "sha256-abl2L8+QY2khLnsjXWWnzs9ewbFWctiJgHE29BRR2gU=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version}"
|
||||
"-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev}"
|
||||
"-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev}"
|
||||
"-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser}"
|
||||
"-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate}"
|
||||
"-X main.goVersion=${lib.getVersion go}"
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/prometheus/common/version.Version=${version}"
|
||||
"-X github.com/prometheus/common/version.Revision=${version}"
|
||||
"-X github.com/prometheus/common/version.Branch=${version}"
|
||||
"-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
|
||||
"-X github.com/prometheus/common/version.BuildDate=19700101-00:00:00"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
|
||||
pushgateway --help
|
||||
|
||||
# Make sure our -X options were included in the build
|
||||
for s in ${version} ${rev} ${buildUser} ${buildDate}; do
|
||||
pushgateway --version 2>&1 | fgrep -q -- "$s" || { echo "pushgateway --version output missing $s"; exit 1; }
|
||||
done
|
||||
'';
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = prometheus-pushgateway;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allows ephemeral and batch jobs to expose metrics to Prometheus";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nats-server";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OYfyLY15v6P5srliEM7kTfa1pKFh3RR6zMWrKH2h7d4=";
|
||||
sha256 = "sha256-FifLZ6kQgNMyL+0Axc7lqvCk3eHc8pxKpm045jboSoQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wqS9EwjcsJgdAurwxmZBgjbLKpMQEOaQkReuu0VlnGc=";
|
||||
vendorSha256 = "sha256-yVTAgG3j2zrPEFGAcV4LSihws9XUoYrZ81fp/MYv8Eo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
25
pkgs/tools/misc/hunt/default.nix
Normal file
25
pkgs/tools/misc/hunt/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hunt";
|
||||
version = "1.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LyonSyonII";
|
||||
repo = "hunt-rs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mNQY2vp4wNDhVqrFNVS/RBXVi9EMbTZ6pE0Z79dLUeM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-hjvJ9E5U6zGSWUXNDdu0GwUcd7uZeconfjiCSaEzZXU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simplified Find command made with Rust";
|
||||
homepage = "https://github.com/LyonSyonII/hunt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +1,11 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, boost, zlib, openssl
|
||||
, upnpSupport ? true, miniupnpc ? null
|
||||
, upnpSupport ? true, miniupnpc
|
||||
, aesniSupport ? stdenv.hostPlatform.aesSupport
|
||||
, avxSupport ? stdenv.hostPlatform.avxSupport
|
||||
}:
|
||||
|
||||
assert upnpSupport -> miniupnpc != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "i2pd";
|
||||
version = "2.43.0";
|
||||
@ -19,8 +17,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-JIO1Zm7me/SX0W7sVHOesERnqvC7jy0Fu1vfKFePFd0=";
|
||||
};
|
||||
|
||||
buildInputs = with lib; [ boost zlib openssl ]
|
||||
++ optional upnpSupport miniupnpc;
|
||||
buildInputs = [ boost zlib openssl ]
|
||||
++ lib.optional upnpSupport miniupnpc;
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, autoconf, automake, libtool, pkg-config
|
||||
, bzip2, libpcap, flex, bison }:
|
||||
|
||||
let version = "1.6.23"; in
|
||||
let version = "1.7.0.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "nfdump";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||
owner = "phaag";
|
||||
repo = "nfdump";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aM7U+JD8EtxEusvObsRgqS0aqfTfF3vYxCqvw0bgX20=";
|
||||
sha256 = "sha256-yD/NFGw38ishqQmKhlnHYodXmJuezI09hxNsyObZ1QE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ];
|
||||
|
||||
@ -4165,6 +4165,8 @@ with pkgs;
|
||||
|
||||
huniq = callPackage ../tools/text/huniq { };
|
||||
|
||||
hunt = callPackage ../tools/misc/hunt { };
|
||||
|
||||
hyprland = callPackage ../applications/window-managers/hyprland {
|
||||
wlroots = wlroots.overrideAttrs (_: {
|
||||
version = "unstable-2022-06-07";
|
||||
@ -8006,6 +8008,8 @@ with pkgs;
|
||||
|
||||
jql = callPackage ../development/tools/jql { };
|
||||
|
||||
jqp = callPackage ../development/tools/jqp { };
|
||||
|
||||
jo = callPackage ../development/tools/jo { };
|
||||
|
||||
jrnl = callPackage ../applications/misc/jrnl { };
|
||||
@ -9000,6 +9004,8 @@ with pkgs;
|
||||
|
||||
mfoc = callPackage ../tools/security/mfoc { };
|
||||
|
||||
microbin = callPackage ../servers/microbin { };
|
||||
|
||||
microdnf = callPackage ../tools/package-management/microdnf { };
|
||||
|
||||
microplane = callPackage ../tools/misc/microplane { };
|
||||
@ -22741,7 +22747,8 @@ with pkgs;
|
||||
quicklispPackages = quicklispPackagesSBCL;
|
||||
|
||||
# Alternative lisp-modules implementation
|
||||
lispPackages_new = callPackage ../development/lisp-modules-new/lisp-packages.nix {};
|
||||
lispPackages_new = recurseIntoAttrs (callPackage ../development/lisp-modules-new/lisp-packages.nix {});
|
||||
|
||||
|
||||
### DEVELOPMENT / PERL MODULES
|
||||
|
||||
@ -30055,7 +30062,9 @@ with pkgs;
|
||||
|
||||
nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { };
|
||||
|
||||
newsflash = callPackage ../applications/networking/feedreaders/newsflash { };
|
||||
newsflash = callPackage ../applications/networking/feedreaders/newsflash {
|
||||
webkitgtk = webkitgtk_5_0;
|
||||
};
|
||||
|
||||
nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user