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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-05 12:06:05 +00:00
committed by GitHub
parent 77b4697ac6 c1a390f74b
commit a08508d113
52 changed files with 2232 additions and 6555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/profiles/minimal.nix
-2
View File
@@ -29,8 +29,6 @@ with lib;
programs.command-not-found.enable = mkDefault false;
programs.ssh.setXAuthLocation = mkDefault false;
services.logrotate.enable = mkDefault false;
services.udisks2.enable = mkDefault false;
pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock
Generated
-1778
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/avante-nvim/default.nix
-75
View File
@@ -1,75 +0,0 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
stdenv,
vimUtils,
darwin,
}:
let
version = "2024-10-18";
src = fetchFromGitHub {
owner = "yetone";
repo = "avante.nvim";
rev = "36b23cef16c2c624c34bea213f01c06782d2ca40";
hash = "sha256-QUFcJMbfr5BAS04ig1IHLCMLACeQhFVH9ZCH/VD8i8Y=";
};
meta = with lib; {
description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE";
homepage = "https://github.com/yetone/avante.nvim";
license = licenses.asl20;
maintainers = with lib.maintainers; [
ttrei
aarnphm
];
};
avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib";
inherit version src meta;
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"mlua-0.10.0-beta.1" = "sha256-ZEZFATVldwj0pmlmi0s5VT0eABA15qKhgjmganrhGBY=";
};
};
nativeBuildInputs = [
pkg-config
];
buildInputs =
[
openssl
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
];
buildFeatures = [ "luajit" ];
};
in
vimUtils.buildVimPlugin {
pname = "avante.nvim";
inherit version src meta;
postInstall =
let
ext = stdenv.hostPlatform.extensions.sharedLibrary;
in
''
mkdir -p $out/build
ln -s ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext}
ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext}
ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext}
'';
doInstallCheck = true;
nvimRequireCheck = "avante";
}
pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
vimUtils,
}:
let
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
rev = "refs/tags/v${version}";
hash = "sha256-DmHMySR1K4j/z5+bZDJHIuqo5BqRP9XaOMEdCb78chk=";
hash = "sha256-LWA3rPvqq+zeK+8zS1kM1BaQ+uaBmlHJy4o7IaT1zsg=";
};
libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
blink-fuzzy-lib = rustPlatform.buildRustPackage {
pkgs/applications/editors/vim/plugins/generated.nix
+12
View File
@@ -18851,4 +18851,16 @@ final: prev:
};
meta.homepage = "https://github.com/jghauser/follow-md-links.nvim/";
};
avante-nvim = buildVimPlugin {
pname = "avante.nvim";
version = "2024-11-04";
src = fetchFromGitHub {
owner = "yetone";
repo = "avante.nvim";
rev = "5db2a0f92ff0ac4cfde27266cbc91eabdc2bb7f5";
sha256 = "sha256-bLHKJfmn8a57U3WRrvib7yWUgO8PI1V0H77Q+xsGlfM=";
};
meta.homepage = "https://github.com/yetone/avante.nvim";
};
}
pkgs/applications/editors/vim/plugins/overrides.nix
+60 -8
View File
@@ -166,14 +166,66 @@ in
nvimRequireCheck = "autosave";
};
avante-nvim = (callPackage ./avante-nvim { }).overrideAttrs {
dependencies = with self; [
dressing-nvim
nui-nvim
nvim-treesitter
plenary-nvim
];
};
avante-nvim = super.avante-nvim.overrideAttrs (
oldAttrs:
let
avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib";
inherit (oldAttrs) version src;
cargoHash = "sha256-Hh7qAmGtxfWtkBBsNq0iVTruUSe0duE4tXaajDIt8zQ=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
];
buildFeatures = [ "luajit" ];
checkFlags = [
# Disabled because they access the network.
"--skip=test_hf"
"--skip=test_public_url"
"--skip=test_roundtrip"
];
};
in
{
dependencies = with self; [
dressing-nvim
nui-nvim
nvim-treesitter
plenary-nvim
];
postInstall =
let
ext = stdenv.hostPlatform.extensions.sharedLibrary;
in
''
mkdir -p $out/build
ln -s ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext}
ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext}
ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext}
'';
doInstallCheck = true;
nvimRequireCheck = "avante";
meta = {
description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE";
homepage = "https://github.com/yetone/avante.nvim";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
ttrei
aarnphm
];
};
}
);
barbecue-nvim = super.barbecue-nvim.overrideAttrs {
dependencies = with self; [
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -85,6 +85,7 @@ https://github.com/m4xshen/autoclose.nvim/,HEAD,
https://github.com/gaoDean/autolist.nvim/,,
https://github.com/vim-scripts/autoload_cscope.vim/,,
https://github.com/nullishamy/autosave.nvim/,HEAD,
https://github.com/yetone/avante.nvim/,HEAD,
https://github.com/rafi/awesome-vim-colorschemes/,,
https://github.com/AhmedAbdulrahman/aylin.vim/,,
https://github.com/ayu-theme/ayu-vim/,,
pkgs/applications/emulators/86box/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{
stdenv,
darwin,
apple-sdk_11,
lib,
fetchFromGitHub,
cmake,
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
++ lib.optional enableWayland wayland
++ lib.optional enableVncRenderer libvncserver
++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.libs.xpc;
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
cmakeFlags =
lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"
pkgs/applications/science/chemistry/openmolcas/default.nix
+4 -3
View File
@@ -159,9 +159,10 @@ stdenv.mkDerivation rec {
noAuditTmpdir = true;
postFixup = ''
# Wrong store path in shebang (no Python pkgs), force re-patching
sed -i "1s:/.*:/usr/bin/env python:" $out/bin/pymolcas
patchShebangs $out/bin
# Wrong store path in shebang (bare Python, no Python pkgs), force manual re-patching
for exe in $(find $out/bin/ -type f -name "*.py"); do
sed -i "1s:.*:#!${python}/bin/python:" "$exe"
done
wrapProgram $out/bin/pymolcas --set MOLCAS $out
'';
pkgs/applications/science/logic/tamarin-prover/default.nix
+10 -17
View File
@@ -1,20 +1,15 @@
{ haskellPackages, mkDerivation, fetchFromGitHub, applyPatches, lib, stdenv
{ haskellPackages, mkDerivation, fetchFromGitHub, lib, stdenv
# the following are non-haskell dependencies
, makeWrapper, which, maude, graphviz, glibcLocales
}:
let
version = "1.8.0";
src = applyPatches {
src = fetchFromGitHub {
owner = "tamarin-prover";
repo = "tamarin-prover";
rev = version;
sha256 = "sha256-ujnaUdbjqajmkphOS4Fs4QBCRGX4JZkQ2p1X2jripww=";
};
patches = [
./tamarin-prover-1.8.0-ghc-9.6.patch
];
version = "1.10.0";
src = fetchFromGitHub {
owner = "tamarin-prover";
repo = "tamarin-prover";
rev = version;
hash = "sha256-v1BruU2p/Sg/g7b9a+QRza46bD7PkMtsGq82qFaNhpI=";
};
@@ -41,7 +36,7 @@ let
postPatch = replaceSymlinks;
libraryHaskellDepends = with haskellPackages; [
base64-bytestring blaze-builder list-t
dlist exceptions fclabels safe SHA syb
dlist exceptions fclabels haskellPackages.graphviz safe SHA split syb
];
});
@@ -84,9 +79,7 @@ let
tamarin-prover-export = mkDerivation (common "tamarin-prover-export" (src + "/lib/export") // {
postPatch = "cp --remove-destination ${src}/LICENSE .";
doHaddock = false; # broken
libraryHaskellDepends = (with haskellPackages; [
HStringTemplate
]) ++ [
libraryHaskellDepends = [
tamarin-prover-utils
tamarin-prover-term
tamarin-prover-theory
@@ -125,7 +118,7 @@ mkDerivation (common "tamarin-prover" src // {
executableHaskellDepends = (with haskellPackages; [
binary-instances binary-orphans blaze-html conduit file-embed
gitrev http-types lifted-base monad-control
gitrev http-types
resourcet shakespeare threads wai warp yesod-core yesod-static
]) ++ [ tamarin-prover-utils
tamarin-prover-sapic
pkgs/applications/science/logic/tamarin-prover/tamarin-prover-1.8.0-ghc-9.6.patch
-237
View File
@@ -1,237 +0,0 @@
commit 084bd5474d9ac687656c2a3a6b2e1d507febaa98
Author: Artur Cygan <arczicygan@gmail.com>
Date: Mon Feb 26 10:04:48 2024 +0100
Update to GHC 9.6 (#618)
Cherry-picked from b3e18f61e45d701d42d794bc91ccbb4c0e3834ec.
Removing Control.Monad.List
diff --git a/lib/sapic/src/Sapic/Exceptions.hs b/lib/sapic/src/Sapic/Exceptions.hs
index 146b721e..b9962478 100644
--- a/lib/sapic/src/Sapic/Exceptions.hs
+++ b/lib/sapic/src/Sapic/Exceptions.hs
@@ -23,7 +23,6 @@ import Theory.Sapic
import Data.Label
import qualified Data.Maybe
import Theory.Text.Pretty
-import Sapic.Annotation --toAnProcess
import Theory.Sapic.Print (prettySapic)
import qualified Theory.Text.Pretty as Pretty
@@ -67,14 +66,14 @@ data ExportException = UnsupportedBuiltinMS
| UnsupportedTypes [String]
instance Show ExportException where
-
+
show (UnsupportedTypes incorrectFunctionUsages) = do
let functionsString = List.intercalate ", " incorrectFunctionUsages
(case length functionsString of
1 -> "The function " ++ functionsString ++ ", which is declared with a user-defined type, appears in a rewrite rule. "
_ -> "The functions " ++ functionsString ++ ", which are declared with a user-defined type, appear in a rewrite rule. ")
++ "However, the translation of rules only works with bitstrings at the moment."
- show unsuppBuiltin =
+ show unsuppBuiltin =
"The builtins bilinear-pairing and multiset are not supported for export. However, your model uses " ++
(case unsuppBuiltin of
UnsupportedBuiltinBP -> "bilinear-pairing."
@@ -93,7 +92,7 @@ instance Show (SapicException an) where
show (InvalidPosition p) = "Invalid position:" ++ prettyPosition p
show (NotImplementedError s) = "This feature is not implemented yet. Sorry! " ++ s
show (ImplementationError s) = "You've encountered an error in the implementation: " ++ s
- show a@(ProcessNotWellformed e p) = "Process not well-formed: " ++ Pretty.render (text (show e) $-$ nest 2 (maybe emptyDoc prettySapic p))
+ show (ProcessNotWellformed e p) = "Process not well-formed: " ++ Pretty.render (text (show e) $-$ nest 2 (maybe emptyDoc prettySapic p))
show ReliableTransmissionButNoProcess = "The builtin support for reliable channels currently only affects the process calculus, but you have not specified a top-level process. Please remove \"builtins: reliable-channel\" to proceed."
show (CannotExpandPredicate facttag rstr) = "Undefined predicate "
++ showFactTagArity facttag
@@ -135,7 +134,7 @@ instance Show WFerror where
++ prettySapicFunType t2
++ "."
show (FunctionNotDefined sym ) = "Function not defined " ++ show sym
-
+
instance Exception WFerror
instance (Typeable an) => Exception (SapicException an)
diff --git a/lib/term/src/Term/Narrowing/Narrow.hs b/lib/term/src/Term/Narrowing/Narrow.hs
index 56f145d9..88f89aa1 100644
--- a/lib/term/src/Term/Narrowing/Narrow.hs
+++ b/lib/term/src/Term/Narrowing/Narrow.hs
@@ -12,6 +12,7 @@ module Term.Narrowing.Narrow (
import Term.Unification
import Term.Positions
+import Control.Monad
import Control.Monad.Reader
import Extension.Prelude
diff --git a/lib/term/src/Term/Unification.hs b/lib/term/src/Term/Unification.hs
index b5c107cd..fcf52128 100644
--- a/lib/term/src/Term/Unification.hs
+++ b/lib/term/src/Term/Unification.hs
@@ -61,7 +61,7 @@ module Term.Unification (
, pairDestMaudeSig
, symEncDestMaudeSig
, asymEncDestMaudeSig
- , signatureDestMaudeSig
+ , signatureDestMaudeSig
, locationReportMaudeSig
, revealSignatureMaudeSig
, hashMaudeSig
@@ -80,7 +80,7 @@ module Term.Unification (
, module Term.Rewriting.Definitions
) where
--- import Control.Applicative
+import Control.Monad
import Control.Monad.RWS
import Control.Monad.Except
import Control.Monad.State
diff --git a/lib/theory/src/Theory/Constraint/System/Guarded.hs b/lib/theory/src/Theory/Constraint/System/Guarded.hs
index 99f985a8..3f0cd8d8 100644
--- a/lib/theory/src/Theory/Constraint/System/Guarded.hs
+++ b/lib/theory/src/Theory/Constraint/System/Guarded.hs
@@ -88,6 +88,7 @@ module Theory.Constraint.System.Guarded (
import Control.Arrow
import Control.DeepSeq
+import Control.Monad
import Control.Monad.Except
import Control.Monad.Fresh (MonadFresh, scopeFreshness)
import qualified Control.Monad.Trans.PreciseFresh as Precise (Fresh, evalFresh, evalFreshT)
diff --git a/lib/utils/src/Control/Monad/Trans/Disj.hs b/lib/utils/src/Control/Monad/Trans/Disj.hs
index 96dae742..b3b63825 100644
--- a/lib/utils/src/Control/Monad/Trans/Disj.hs
+++ b/lib/utils/src/Control/Monad/Trans/Disj.hs
@@ -18,10 +18,10 @@ module Control.Monad.Trans.Disj (
, runDisjT
) where
--- import Control.Applicative
-import Control.Monad.List
-import Control.Monad.Reader
+import Control.Monad
import Control.Monad.Disj.Class
+import Control.Monad.Reader
+import ListT
------------------------------------------------------------------------------
@@ -33,12 +33,12 @@ newtype DisjT m a = DisjT { unDisjT :: ListT m a }
deriving (Functor, Applicative, MonadTrans )
-- | Construct a 'DisjT' action.
-disjT :: m [a] -> DisjT m a
-disjT = DisjT . ListT
+disjT :: (Monad m, Foldable m) => m a -> DisjT m a
+disjT = DisjT . fromFoldable
-- | Run a 'DisjT' action.
-runDisjT :: DisjT m a -> m [a]
-runDisjT = runListT . unDisjT
+runDisjT :: Monad m => DisjT m a -> m [a]
+runDisjT = toList . unDisjT
@@ -47,8 +47,6 @@ runDisjT = runListT . unDisjT
------------
instance Monad m => Monad (DisjT m) where
- {-# INLINE return #-}
- return = DisjT . return
{-# INLINE (>>=) #-}
m >>= f = DisjT $ (unDisjT . f) =<< unDisjT m
diff --git a/lib/utils/tamarin-prover-utils.cabal b/lib/utils/tamarin-prover-utils.cabal
index 75ed2b46..bb54d1e5 100644
--- a/lib/utils/tamarin-prover-utils.cabal
+++ b/lib/utils/tamarin-prover-utils.cabal
@@ -47,6 +47,7 @@ library
, deepseq
, dlist
, fclabels
+ , list-t
, mtl
, pretty
, safe
diff --git a/src/Main/Mode/Batch.hs b/src/Main/Mode/Batch.hs
index e7710682..d370da85 100644
--- a/src/Main/Mode/Batch.hs
+++ b/src/Main/Mode/Batch.hs
@@ -32,7 +32,8 @@ import Main.TheoryLoader
import Main.Utils
import Theory.Module
-import Control.Monad.Except (MonadIO(liftIO), runExceptT)
+import Control.Monad.Except (runExceptT)
+import Control.Monad.IO.Class (MonadIO(liftIO))
import System.Exit (die)
import Theory.Tools.Wellformedness (prettyWfErrorReport)
import Text.Printf (printf)
diff --git a/src/Main/TheoryLoader.hs b/src/Main/TheoryLoader.hs
index 7fffb85b..71fba2b9 100644
--- a/src/Main/TheoryLoader.hs
+++ b/src/Main/TheoryLoader.hs
@@ -42,8 +42,6 @@ module Main.TheoryLoader (
) where
--- import Debug.Trace
-
import Prelude hiding (id, (.))
import Data.Char (toLower)
@@ -58,8 +56,10 @@ import Data.Bifunctor (Bifunctor(bimap))
import Data.Bitraversable (Bitraversable(bitraverse))
import Control.Category
-import Control.Exception (evaluate)
import Control.DeepSeq (force)
+import Control.Exception (evaluate)
+import Control.Monad
+import Control.Monad.IO.Class (MonadIO(liftIO))
import System.Console.CmdArgs.Explicit
import System.Timeout (timeout)
@@ -387,10 +387,10 @@ closeTheory version thyOpts sign srcThy = do
deducThy <- bitraverse (return . addMessageDeductionRuleVariants)
(return . addMessageDeductionRuleVariantsDiff) transThy
- derivCheckSignature <- Control.Monad.Except.liftIO $ toSignatureWithMaude (get oMaudePath thyOpts) $ maudePublicSig (toSignaturePure sign)
+ derivCheckSignature <- liftIO $ toSignatureWithMaude (get oMaudePath thyOpts) $ maudePublicSig (toSignaturePure sign)
variableReport <- case compare derivChecks 0 of
EQ -> pure $ Just []
- _ -> Control.Monad.Except.liftIO $ timeout (1000000 * derivChecks) $ evaluate . force $ (either (\t -> checkVariableDeducability t derivCheckSignature autoSources defaultProver)
+ _ -> liftIO $ timeout (1000000 * derivChecks) $ evaluate . force $ (either (\t -> checkVariableDeducability t derivCheckSignature autoSources defaultProver)
(\t-> diffCheckVariableDeducability t derivCheckSignature autoSources defaultProver defaultDiffProver) deducThy)
let report = wellformednessReport ++ (fromMaybe [(underlineTopic "Derivation Checks", Pretty.text "Derivation checks timed out. Use --derivcheck-timeout=INT to configure timeout, 0 to deactivate.")] variableReport)
diff --git a/stack.yaml b/stack.yaml
index 7267ba17..b53f6ff8 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -7,7 +7,7 @@ packages:
- lib/sapic/
- lib/export/
- lib/accountability/
-resolver: lts-20.26
+resolver: lts-22.11
ghc-options:
"$everything": -Wall
nix:
diff --git a/tamarin-prover.cabal b/tamarin-prover.cabal
index 89a7e3a8..986274ea 100644
--- a/tamarin-prover.cabal
+++ b/tamarin-prover.cabal
@@ -106,7 +106,7 @@ executable tamarin-prover
default-language: Haskell2010
if flag(threaded)
- ghc-options: -threaded -eventlog
+ ghc-options: -threaded
-- -XFlexibleInstances
pkgs/applications/science/math/cemu-ti/default.nix
+5
View File
@@ -21,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/gui/qt/";
patches = [
# This is resolved upstream, but I can't apply the patch because the
# sourceRoot isn't set to the base of the Git repo.
./resolve-ambiguous-constexpr.patch
];
nativeBuildInputs = [
cmake
pkgs/applications/science/math/cemu-ti/resolve-ambiguous-constexpr.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/mainwindow.cpp b/mainwindow.cpp
index f03a743e..70c29a45 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -970,7 +970,7 @@ void MainWindow::showEvent(QShowEvent *e) {
DockWidget *MainWindow::redistributeFindDock(const QPoint &pos) {
QWidget *child = childAt(pos);
if (QTabBar *tabBar = findSelfOrParent<QTabBar *>(child)) {
- child = childAt({pos.x(), tabBar->mapTo(this, QPoint{}).y() - 1});
+ child = childAt(QPoint({pos.x(), tabBar->mapTo(this, QPoint{}).y() - 1}));
}
return findSelfOrParent<DockWidget *>(child);
}
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+2 -2
View File
@@ -45,8 +45,8 @@ let
}
else
{
version = "2024.3";
hash = "sha256-u9oFbuWTkL59WNhME6nsDU42NWF63y63RwNJIsuh8Ck=";
version = "2024.4";
hash = "sha256-rGGOzi5Yr6hrU2xaLE/Lk38HYDGPEtGPEDRra969hqg=";
};
in stdenv.mkDerivation rec {
pkgs/applications/terminal-emulators/rio/default.nix
+102 -84
View File
@@ -1,57 +1,56 @@
{ lib
, stdenv
, darwin
, fetchFromGitHub
, rustPlatform
, nixosTests
, nix-update-script
{
lib,
stdenv,
darwin,
fetchFromGitHub,
rustPlatform,
nixosTests,
nix-update-script,
, autoPatchelfHook
, cmake
, ncurses
, pkg-config
autoPatchelfHook,
cmake,
ncurses,
pkg-config,
, gcc-unwrapped
, fontconfig
, libGL
, vulkan-loader
, libxkbcommon
gcc-unwrapped,
fontconfig,
libGL,
vulkan-loader,
libxkbcommon,
apple-sdk_11,
, withX11 ? !stdenv.hostPlatform.isDarwin
, libX11
, libXcursor
, libXi
, libXrandr
, libxcb
withX11 ? !stdenv.hostPlatform.isDarwin,
libX11,
libXcursor,
libXi,
libXrandr,
libxcb,
, withWayland ? !stdenv.hostPlatform.isDarwin
, wayland
withWayland ? !stdenv.hostPlatform.isDarwin,
wayland,
, testers
, rio
testers,
rio,
}:
let
rlinkLibs = if stdenv.hostPlatform.isDarwin then [
darwin.libobjc
darwin.apple_sdk_11_0.frameworks.AppKit
darwin.apple_sdk_11_0.frameworks.AVFoundation
darwin.apple_sdk_11_0.frameworks.MetalKit
darwin.apple_sdk_11_0.frameworks.Vision
] else [
(lib.getLib gcc-unwrapped)
fontconfig
libGL
libxkbcommon
vulkan-loader
] ++ lib.optionals withX11 [
libX11
libXcursor
libXi
libXrandr
libxcb
] ++ lib.optionals withWayland [
wayland
];
rlinkLibs =
lib.optionals stdenv.hostPlatform.isLinux [
(lib.getLib gcc-unwrapped)
fontconfig
libGL
libxkbcommon
vulkan-loader
]
++ lib.optionals withX11 [
libX11
libXcursor
libXi
libXrandr
libxcb
]
++ lib.optionals withWayland [
wayland
];
in
rustPlatform.buildRustPackage rec {
pname = "rio";
@@ -66,67 +65,86 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-yGOvY5+ThSey/k8ilTTC0CzaOIJtc4hDYmdrHJC3HyE=";
nativeBuildInputs = [
ncurses
] ++ lib.optionals stdenv.hostPlatform.isLinux [
cmake
pkg-config
autoPatchelfHook
];
nativeBuildInputs =
[
ncurses
]
++ lib.optionals stdenv.hostPlatform.isLinux [
cmake
pkg-config
autoPatchelfHook
];
runtimeDependencies = rlinkLibs;
buildInputs = rlinkLibs;
buildInputs =
rlinkLibs
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.libutil
apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK
];
outputs = [ "out" "terminfo" ];
outputs = [
"out"
"terminfo"
];
buildNoDefaultFeatures = true;
buildFeatures = [ ]
++ lib.optional withX11 "x11"
++ lib.optional withWayland "wayland";
buildFeatures = [ ] ++ lib.optional withX11 "x11" ++ lib.optional withWayland "wayland";
checkFlags = [
# Fail to run in sandbox environment.
"--skip=sys::unix::eventedfd::EventedFd"
];
postInstall = ''
install -D -m 644 misc/rio.desktop -t $out/share/applications
install -D -m 644 misc/logo.svg \
$out/share/icons/hicolor/scalable/apps/rio.svg
postInstall =
''
install -D -m 644 misc/rio.desktop -t $out/share/applications
install -D -m 644 misc/logo.svg \
$out/share/icons/hicolor/scalable/apps/rio.svg
install -dm 755 "$terminfo/share/terminfo/r/"
tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo
mkdir -p $out/nix-support
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir $out/Applications/
mv misc/osx/Rio.app/ $out/Applications/
mkdir $out/Applications/Rio.app/Contents/MacOS/
ln -s $out/bin/rio $out/Applications/Rio.app/Contents/MacOS/
'';
install -dm 755 "$terminfo/share/terminfo/r/"
tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo
mkdir -p $out/nix-support
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir $out/Applications/
mv misc/osx/Rio.app/ $out/Applications/
mkdir $out/Applications/Rio.app/Contents/MacOS/
ln -s $out/bin/rio $out/Applications/Rio.app/Contents/MacOS/
'';
passthru = {
updateScript = nix-update-script {
extraArgs = [ "--version-regex" "v([0-9.]+)" ];
extraArgs = [
"--version-regex"
"v([0-9.]+)"
];
};
tests = {
version = testers.testVersion { package = rio; };
} // lib.optionalAttrs stdenv.buildPlatform.isLinux {
# FIXME: Restrict test execution inside nixosTests for Linux devices as ofborg
# 'passthru.tests' nixosTests are failing on Darwin architectures.
#
# Ref: https://github.com/NixOS/nixpkgs/issues/345825
test = nixosTests.terminal-emulators.rio;
};
tests =
{
version = testers.testVersion { package = rio; };
}
// lib.optionalAttrs stdenv.buildPlatform.isLinux {
# FIXME: Restrict test execution inside nixosTests for Linux devices as ofborg
# 'passthru.tests' nixosTests are failing on Darwin architectures.
#
# Ref: https://github.com/NixOS/nixpkgs/issues/345825
test = nixosTests.terminal-emulators.rio;
};
};
meta = {
description = "Hardware-accelerated GPU terminal emulator powered by WebGPU";
homepage = "https://raphamorim.io/rio";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tornax otavio oluceps ];
maintainers = with lib.maintainers; [
tornax
otavio
oluceps
];
platforms = lib.platforms.unix;
changelog = "https://github.com/raphamorim/rio/blob/v${version}/docs/docs/releases.md";
mainProgram = "rio";
pkgs/by-name/al/alsa-plugins/package.nix
+20 -6
View File
@@ -1,4 +1,15 @@
{ stdenv, fetchurl, lib, pkg-config, alsa-lib, libogg, libpulseaudio ? null, libjack2 ? null }:
{
stdenv,
fetchurl,
lib,
pkg-config,
alsa-lib,
ffmpeg,
libjack2,
libogg,
libpulseaudio,
speexdsp,
}:
stdenv.mkDerivation rec {
pname = "alsa-plugins";
@@ -11,11 +22,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
# ToDo: a52, etc.?
buildInputs =
[ alsa-lib libogg ]
++ lib.optional (libpulseaudio != null) libpulseaudio
++ lib.optional (libjack2 != null) libjack2;
buildInputs = [
alsa-lib
ffmpeg
libjack2
libogg
libpulseaudio
speexdsp
];
meta = with lib; {
description = "Various plugins for ALSA";
pkgs/by-name/ba/bacon/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "bacon";
version = "3.0.0";
version = "3.2.0";
src = fetchFromGitHub {
owner = "Canop";
repo = "bacon";
rev = "refs/tags/v${version}";
hash = "sha256-fSlakjZbY8jrFkCqVxPr3UKwf1Oq4yPhLmVbzsksSeg=";
hash = "sha256-WbTxy8ijXez1x2G7NGGVMcyjgE7J7MDsGgGRpb4jKXQ=";
};
cargoHash = "sha256-WT0uXmchhapss3AU4+e2wA3nBVjzikfRNRyAvQnpJfY=";
cargoHash = "sha256-rlWNrkzUDs3rbQ5ZV4fKU/EKEy4fVbxEP0+wNwXi7Ag=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
pkgs/by-name/fi/fish-lsp/package.nix
+83
View File
@@ -0,0 +1,83 @@
{
fetchFromGitHub,
fetchYarnDeps,
fish,
installShellFiles,
lib,
makeWrapper,
nix-update-script,
nodejs,
npmHooks,
stdenv,
which,
yarnBuildHook,
yarnConfigHook,
}:
stdenv.mkDerivation rec {
pname = "fish-lsp";
version = "1.0.8-1";
src = fetchFromGitHub {
owner = "ndonfris";
repo = "fish-lsp";
rev = "refs/tags/v${version}";
hash = "sha256-u125EZXQEouVbmJuoW3KNDNqLB5cS/TzblXraClcw6Q=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-hHw7DbeqaCapqx4dK5Y3sPut94ist9JOU8g9dd6gBdo=";
};
nativeBuildInputs = [
yarnBuildHook
yarnConfigHook
npmHooks.npmInstallHook
nodejs
installShellFiles
makeWrapper
fish
];
yarnBuildScript = "setup";
postBuild = ''
yarn --offline compile
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/fish-lsp
cp -r . $out/share/fish-lsp
makeWrapper ${lib.getExe nodejs} "$out/bin/fish-lsp" \
--add-flags "$out/share/fish-lsp/out/cli.js" \
--prefix PATH : "${
lib.makeBinPath [
fish
which
]
}"
${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd fish-lsp \
--fish <($out/bin/fish-lsp complete --fish)
''}
runHook postInstall
'';
doDist = false;
passthru.updateScript = nix-update-script { };
meta = {
description = "LSP implementation for the fish shell language";
homepage = "https://github.com/ndonfris/fish-lsp";
license = lib.licenses.mit;
mainProgram = "fish-lsp";
maintainers = with lib.maintainers; [ petertriho ];
platforms = lib.platforms.unix;
};
}
pkgs/by-name/fr/fritz-exporter/package.nix
+1
View File
@@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec {
pythonRelaxDeps = [
"defusedxml"
"attrs"
];
nativeBuildInputs = with python3.pkgs; [
pkgs/by-name/go/gossip/Cargo.lock
Generated
+1547 -866
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/go/gossip/package.nix
+9 -11
View File
@@ -2,7 +2,7 @@
cmake,
darwin,
fetchFromGitHub,
ffmpeg,
ffmpeg_6,
fontconfig,
git,
lib,
@@ -20,28 +20,26 @@
rustPlatform.buildRustPackage rec {
pname = "gossip";
version = "0.11.3";
version = "0.12.0";
src = fetchFromGitHub {
owner = "mikedilger";
repo = "gossip";
rev = "refs/tags/v${version}";
hash = "sha256-ZDpPoGLcI6ModRq0JEcibHerOrPOA3je1uE5yXsLeeg=";
hash = "sha256-mPM5HYPEUQ+cGrJ3G/0pmSN4ZQ9SvSNACJRTkgqTAeY=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"ecolor-0.26.2" = "sha256-Ih1JbiuUZwK6rYWRSQcP1AJA8NesJJp+EeBtG0azlw0=";
"egui-video-0.1.0" = "sha256-X75gtYMfD/Ogepe0uEulzxAOY1YpkBW6OPhgovv/uCQ=";
"ffmpeg-next-7.0.2" = "sha256-LVdaCbPHHEolcrXk9tPxUJiPNCma7qRl53TPKFijhFA=";
"gossip-relay-picker-0.2.0-unstable" = "sha256-FUhB6ql+H+E6UffWmpwRFzP8N6x+dOX4vdtYdKItjz4=";
"egui-video-0.1.0" = "sha256-mks5wYl9s8AjaEtYx3hjOPoV7g+SbK2sC/cnqsc6sM4=";
"nostr-types-0.8.0-unstable" = "sha256-ewwOmJaGGRZ25xIM+8fGtB3m46MDQ2WpP0fGF6F5yR4=";
"ecolor-0.28.1" = "sha256-X0cUCNBCsWpeoiqbEp8o9QVl29DzIVe9jjNEq9SQ7kM=";
"ffmpeg-next-7.0.4" = "sha256-ED7zY944YLVR9dgRvXuCC2n7szKkPMH8DJX4jVBNRIQ=";
"watcher-0.1.0" = "sha256-SdwmbP8JrhkBbHEzSFALf0dF2T2xHigORizRRoPVblA=";
"lightning-0.0.123-beta" = "sha256-gngH0mOC9USzwUGP4bjb1foZAvg6QHuzODv7LG49MsA=";
"musig2-0.1.0" = "sha256-++1x7uHHR7KEhl8LF3VywooULiTzKeDu3e+0/c/8p9Y=";
"nip44-0.1.0" = "sha256-u2ALoHQrPVNoX0wjJmQ+BYRzIKsi0G5xPbYjgsNZZ7A=";
"nostr-types-0.8.0-unstable" = "sha256-HGXPJrI6+HT/oyAV3bELA0LPu4O0DmmJVr0mDtDVfr4=";
"qrcode-0.12.0" = "sha256-onnoQuMf7faDa9wTGWo688xWbmujgE9RraBialyhyPw=";
"sdl2-0.36.0" = "sha256-dfXrD9LLBGeYyOLE3PruuGGBZ3WaPBfWlwBqP2pp+NY=";
};
};
@@ -67,7 +65,7 @@ rustPlatform.buildRustPackage rec {
buildInputs =
[
ffmpeg
ffmpeg_6
fontconfig
libGL
libxkbcommon
pkgs/by-name/la/lavalauncher/package.nix
+42 -24
View File
@@ -1,30 +1,42 @@
{ lib
, stdenv
, fetchgit
, meson
, ninja
, pkg-config
, scdoc
, wayland-scanner
, cairo
, librsvg
, libxkbcommon
, wayland
, wayland-protocols
{
lib,
cairo,
fetchFromSourcehut,
librsvg,
libxkbcommon,
meson,
ninja,
pkg-config,
scdoc,
stdenv,
wayland,
wayland-protocols,
wayland-scanner,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "lavalauncher";
version = "2.1.1";
src = fetchgit {
url = "https://git.sr.ht/~leon_plickat/lavalauncher";
rev = "v${version}";
sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM=";
src = fetchFromSourcehut {
pname = "lavalauncher-source";
inherit (finalAttrs) version;
owner = "~leon_plickat";
repo = "lavalauncher";
rev = "v${finalAttrs.version}";
hash = "sha256-hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM=";
};
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
nativeBuildInputs = [
meson
ninja
pkg-config
scdoc
wayland-scanner
];
buildInputs = [
cairo
librsvg
@@ -33,7 +45,9 @@ stdenv.mkDerivation rec {
wayland-protocols
];
meta = with lib; {
strictDeps = true;
meta = {
homepage = "https://git.sr.ht/~leon_plickat/lavalauncher";
description = "Simple launcher panel for Wayland desktops";
longDescription = ''
@@ -52,9 +66,13 @@ stdenv.mkDerivation rec {
The Wayland compositor must implement the Layer-Shell and XDG-Output for
LavaLauncher to work.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
changelog = "https://git.sr.ht/~leon_plickat/lavalauncher/refs/${finalAttrs.src.rev}";
license = lib.licenses.gpl3Plus;
mainProgram = "lavalauncher";
maintainers = with lib.maintainers; [ AndersonTorres ];
inherit (wayland.meta) platforms;
# meson.build:52:23: ERROR: C shared or static library 'rt' not found
# https://logs.ofborg.org/?key=nixos/nixpkgs.340239&attempt_id=1f05cada-67d2-4cfe-b6a8-4bf4571b9375
broken = stdenv.hostPlatform.isDarwin;
};
}
})
pkgs/by-name/la/lazysql/package.nix
+11
View File
@@ -2,6 +2,8 @@
, stdenv
, buildGoModule
, fetchFromGitHub
, testers
, lazysql
, xorg ? null
, darwin ? null
}:
@@ -19,8 +21,17 @@ buildGoModule rec {
vendorHash = "sha256-SKNFViwoMzZ1hKKZSvTm0/kKro1IaUVsC+0Pbv7FoAU=";
ldflags = [
"-X main.version=${version}"
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
passthru.tests.version = testers.testVersion {
package = lazysql;
command = "lazysql version";
};
meta = with lib; {
description = "A cross-platform TUI database management tool written in Go";
homepage = "https://github.com/jorgerojas26/lazysql";
pkgs/by-name/mi/mimir/package.nix
+2 -2
View File
@@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }:
buildGoModule rec {
pname = "mimir";
version = "2.14.0";
version = "2.14.1";
src = fetchFromGitHub {
rev = "${pname}-${version}";
owner = "grafana";
repo = pname;
hash = "sha256-XALr755tFYaMnI913NCjwFPieedS00RXv4KhjXfOPfw=";
hash = "sha256-AcD3ebbPGzmu90TxmOBG0wptOZBG61wBXAIdJwZNMT4=";
};
vendorHash = null;
pkgs/by-name/pp/ppsspp/package.nix
+2 -2
View File
@@ -38,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString enableQt "-qt"
+ lib.optionalString (!enableQt) "-sdl"
+ lib.optionalString forceWayland "-wayland";
version = "1.17.1";
version = "1.18";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-I84zJqEE1X/eo/ukeGA2iZe3lWKvilk+RNGUzl2wZXY=";
hash = "sha256-ssZthilRMukgJm6Rnv79Yu6Rc/pTIX9E12rXY6Ct6bc=";
};
patches = lib.optionals useSystemFfmpeg [
pkgs/by-name/ri/rime-japanese/package.nix
+35
View File
@@ -0,0 +1,35 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation {
pname = "rime-japanese";
version = "0-unstable-2023-08-02";
src = fetchFromGitHub {
owner = "gkovacs";
repo = "rime-japanese";
rev = "4c1e65135459175136f380e90ba52acb40fdfb2d";
hash = "sha256-/mIIyCu8V95ArKo/vIS3qAiD8InUmk8fAF/wejxRxGw=";
};
installPhase = ''
runHook preInstall
install -D japanese.*.yaml -t $out/share/rime-data/
runHook postInstall
'';
meta = {
description = "Layout for typing in Japanese with RIME";
homepage = "https://github.com/gkovacs/rime-japanese";
# Awaiting upstream response (gkovacs/rime-japanese#6)
# Packages are assumed unfree unless explicitly indicated otherwise
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ pluiedev ];
platforms = lib.platforms.all;
};
}
pkgs/by-name/rq/rqbit/Cargo.lock
Generated
-3310
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/rq/rqbit/package.nix
+60 -14
View File
@@ -1,27 +1,70 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, darwin }:
rustPlatform.buildRustPackage rec {
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
darwin,
buildNpmPackage,
nodejs_20,
}:
let
pname = "rqbit";
version = "6.0.0";
version = "7.0.1";
src = fetchFromGitHub {
owner = "ikatson";
repo = "rqbit";
rev = "v${version}";
hash = "sha256-YOjFCX1Ckk0M2QOGoYKoY80TFnHs00aVJJAWv2RIp4A=";
hash = "sha256-Lt3HxK8fB1Xn2422wGkJ90muJjZ7r9ZHngGD/2tkaMM=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"network-interface-1.1.1" = "sha256-9fWdR5nr73oFP9FzHhDsbA4ifQf3LkzBygspxI9/ufs=";
};
rqbit-webui = buildNpmPackage {
pname = "rqbit-webui";
nodejs = nodejs_20;
inherit version src;
sourceRoot = "${src.name}/crates/librqbit/webui";
npmDepsHash = "sha256-VYPZXZx9rKLKZm5+d2wSVkoPLCQCffaeZVSi7mKRH/M=";
installPhase = ''
runHook preInstall
mkdir -p $out/dist
cp -r dist/** $out/dist
runHook postInstall
'';
};
in
rustPlatform.buildRustPackage {
inherit pname version src;
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
cargoHash = "sha256-esDUzzVm5J8fKftBfk5StJzN1YzLa1p0t7BsoxzrowI=";
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
nativeBuildInputs = lib.optionals stdenv.isLinux [
pkg-config
];
buildInputs =
lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
preConfigure = ''
mkdir -p crates/librqbit/webui/dist
cp -R ${rqbit-webui}/dist/** crates/librqbit/webui/dist
'';
postPatch = ''
# This script fascilitates the build of the webui,
# we've already built that
rm crates/librqbit/build.rs
'';
doCheck = false;
@@ -30,7 +73,10 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/ikatson/rqbit";
changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ cafkafk toasteruwu ];
maintainers = with maintainers; [
cafkafk
toasteruwu
];
mainProgram = "rqbit";
};
}
pkgs/by-name/sc/schemamap/package.nix
+3 -3
View File
@@ -9,7 +9,7 @@
}:
let
version = "0.4.0";
version = "0.4.3";
in
rustPlatform.buildRustPackage rec {
pname = "schemamap";
@@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec {
owner = "schemamap";
repo = "schemamap";
rev = "v${version}";
hash = "sha256-L5p7Kh5sQAlDHrXgWUuiYZb3sV0Mp2ODEOMQsaB0iMs=";
hash = "sha256-YR7Ucd8/Z1hOUNokmfSVP2ZxDL7qLb6SZ86/S7V/GKk=";
};
sourceRoot = "${src.name}/rust";
cargoHash = "sha256-rwAujQC/zV5nH5YQdjPRyf1L7SYSbdS3FJ5SAVMlhRE=";
cargoHash = "sha256-iq1/8oWVgiqdYfmJKzrIe9gkCz7fDw08QcaQgfd7vuo=";
buildInputs =
[ openssl ]
pkgs/by-name/tp/tpm-fido/package.nix
+37
View File
@@ -0,0 +1,37 @@
{
lib,
fetchFromGitHub,
buildGoModule,
pinentry-tty,
}:
buildGoModule {
pname = "tpm-fido";
version = "0-unstable-2024-10-30";
src = fetchFromGitHub {
owner = "psanford";
repo = "tpm-fido";
rev = "5f8828b82b58f9badeed65718fca72bc31358c5c";
hash = "sha256-Yfr5B4AfcBscD31QOsukamKtEDWC9Cx2ee4L6HM2554=";
};
vendorHash = "sha256-qm/iDc9tnphQ4qooufpzzX7s4dbnUbR9J5L770qXw8Y=";
buildInputs = [
pinentry-tty
];
ldFlags = [
"-s "
"-w"
];
meta = {
description = "WebAuthn/U2F token protected by a TPM";
homepage = "https://github.com/psanford/tpm-fido";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "tpm-fido";
};
}
pkgs/by-name/ve/veryl/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "veryl";
version = "0.13.1";
version = "0.13.2";
src = fetchFromGitHub {
owner = "veryl-lang";
repo = "veryl";
rev = "v${version}";
hash = "sha256-YcYP7JO27Fv/LTrxbQ0vNqwBE6anGjeTFS31MAp2ip4=";
hash = "sha256-LSQ3ZM7BWXiwBqlw6usImpt+w+wC2EvkoAMblTb0pvg=";
fetchSubmodules = true;
};
cargoHash = "sha256-HvT56jBmFTWUdzHjyPVaJ3wuMD01omCFEIEJ53JrKY4=";
cargoHash = "sha256-w7mB0cAN5aRO1pw21BDIFUtnYUJUoYjW+7nXFCBfYgM=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/we/weblate/package.nix
+2
View File
@@ -49,6 +49,8 @@ python.pkgs.buildPythonApplication rec {
"qrcode"
# https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7
"rapidfuzz"
# https://github.com/WeblateOrg/weblate/commit/3e34566fd7c151e1983586586bd7651cefe79585
"redis"
];
patches = [
pkgs/by-name/ze/zed-editor/Cargo.lock
Generated
+1 -1
View File
@@ -14997,7 +14997,7 @@ dependencies = [
[[package]]
name = "zed"
version = "0.159.7"
version = "0.159.10"
dependencies = [
"activity_indicator",
"anyhow",
pkgs/by-name/ze/zed-editor/package.nix
+2 -2
View File
@@ -88,13 +88,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "zed-editor";
version = "0.159.7";
version = "0.159.10";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
rev = "refs/tags/v${version}";
hash = "sha256-gqovQkg3Zypi5YV/wIzTFfJQt5Zwb8IF+drQKvRCgEM=";
hash = "sha256-D3hKOJYkPquqBGTrAPS6dIcGafLYERmmwXj2PZh3Xfs=";
};
patches =
pkgs/by-name/zi/zizmor/package.nix
+40
View File
@@ -0,0 +1,40 @@
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
openssl,
testers,
zizmor,
}:
rustPlatform.buildRustPackage rec {
pname = "zizmor";
version = "0.1.4";
src = fetchFromGitHub {
owner = "woodruffw";
repo = "zizmor";
rev = "v${version}";
hash = "sha256-S2B4GQAqx4t9AZf3QDUhzku68j0buZdW0cLhmOiRssk=";
};
cargoHash = "sha256-hoZXR+zYuK/r4/r3QwIhTmMTCs5M0lMACH4QPEq07ZU=";
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];
passthru.tests.version = testers.testVersion {
package = zizmor;
};
meta = {
description = "Tool for finding security issues in GitHub Actions setups";
homepage = "https://woodruffw.github.io/zizmor/";
changelog = "https://github.com/woodruffw/zizmor/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ lesuisse ];
mainProgram = "zizmor";
};
}
pkgs/development/libraries/aribb25/default.nix
+31 -27
View File
@@ -1,12 +1,12 @@
{ stdenv
, lib
, fetchFromGitLab
, fetchpatch
, autoreconfHook
, pkg-config
, pcsclite
, PCSC
, xcbuild
{
stdenv,
lib,
fetchFromGitLab,
fetchpatch,
autoreconfHook,
pkg-config,
pcsclite,
PCSC,
}:
stdenv.mkDerivation rec {
@@ -26,26 +26,30 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
pkg-config
] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
buildInputs = if stdenv.hostPlatform.isDarwin then [ PCSC ] else [ pcsclite ];
patches = let
url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff";
in [
(fetchpatch {
name = "make-cli-pipes-work-1.patch";
url = url "0425184dbf3fdaf59854af5f530da88b2196a57b";
sha256 = "0ysm2jivpnqxz71vw1102616qxww2gx005i0c5lhi6jbajqsa1cd";
})
(fetchpatch {
name = "make-cli-pipes-work-2.patch";
url = url "cebabeab2bda065dca1c9f033b42d391be866d86";
sha256 = "1283kqv1r4rbaba0sv2hphkhcxgjkmh8ndlcd24fhx43nn63hd28";
})
];
buildFlags =
lib.optional stdenv.hostPlatform.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers";
buildInputs =
lib.optionals stdenv.hostPlatform.isDarwin [ PCSC ]
++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-deprecated-non-prototype";
patches =
let
url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff";
in
[
(fetchpatch {
name = "make-cli-pipes-work-1.patch";
url = url "0425184dbf3fdaf59854af5f530da88b2196a57b";
sha256 = "0ysm2jivpnqxz71vw1102616qxww2gx005i0c5lhi6jbajqsa1cd";
})
(fetchpatch {
name = "make-cli-pipes-work-2.patch";
url = url "cebabeab2bda065dca1c9f033b42d391be866d86";
sha256 = "1283kqv1r4rbaba0sv2hphkhcxgjkmh8ndlcd24fhx43nn63hd28";
})
];
meta = with lib; {
description = "Sample implementation of the ARIB STD-B25 standard";
pkgs/development/python-modules/appimage/default.nix
+37
View File
@@ -0,0 +1,37 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
hatchling,
pythonOlder,
}:
buildPythonPackage rec {
pname = "appimage";
version = "1.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ssh-mitm";
repo = "appimage";
rev = "refs/tags/${version}";
hash = "sha256-d8LwZ4iZ+fwFaBP/IFoKImI/TsYtVD0rllbYN9XP/es=";
};
build-system = [ hatchling ];
# Module has no test
doCheck = false;
pythonImportsCheck = [ "appimage" ];
meta = {
description = "AppImage start scripts";
homepage = "https://github.com/ssh-mitm/appimage";
changelog = "https://github.com/ssh-mitm/appimage/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fab ];
};
}
pkgs/development/python-modules/cgal/default.nix
+2 -2
View File
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "cgal";
version = "6.0.post202410011635";
version = "6.0.1.post202410241521";
pyproject = true;
src = fetchFromGitHub {
owner = "CGAL";
repo = "cgal-swig-bindings";
rev = "refs/tags/v${version}";
hash = "sha256-KXcXykL/m+A5dCDc+f8j7GgVeQahAOaZ/+LLKHyqbS4=";
hash = "sha256-MnUsl4ozMamKcQ13TV6mtoG7VKq8BuiDSIVq1RPn2rs=";
};
dontUseCmakeConfigure = true;
pkgs/development/tools/buildkit/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "buildkit";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "moby";
repo = "buildkit";
rev = "v${version}";
hash = "sha256-rAl2lPcm4JSRO9xVrZctGpWoi/JNZ5uUHDIZKd70+M8=";
hash = "sha256-+FwbYG7PCj9+WG9CnR/MjmujnhfqWYtu99raT1tO+m4=";
};
vendorHash = null;
pkgs/games/augustus/default.nix
+2 -1
View File
@@ -7,6 +7,7 @@
SDL2_mixer,
libpng,
darwin,
apple-sdk_11,
libicns,
imagemagick,
}:
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
SDL2
SDL2_mixer
libpng
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
runHook preInstall
pkgs/games/corsix-th/default.nix
+2 -11
View File
@@ -13,10 +13,7 @@
, timidity
# Darwin dependencies
, libiconv
, Cocoa
, CoreVideo
, CoreMedia
, VideoToolbox
, apple-sdk_11
# Update
, nix-update-script
}:
@@ -49,13 +46,7 @@ stdenv.mkDerivation(finalAttrs: {
SDL2
SDL2_mixer
timidity
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
Cocoa
CoreVideo
CoreMedia
VideoToolbox
];
] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
cmakeFlags = [ "-Wno-dev" ];
pkgs/games/julius/default.nix
+2 -3
View File
@@ -6,6 +6,7 @@
, cmake
, libpng
, darwin
, apple-sdk_11
, libicns
, imagemagick
}:
@@ -38,9 +39,7 @@ stdenv.mkDerivation rec {
SDL2
SDL2_mixer
libpng
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Cocoa
];
] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
runHook preInstall
pkgs/games/shipwright/default.nix
+2 -12
View File
@@ -25,12 +25,9 @@
, zenity
, makeWrapper
, darwin
, apple-sdk_11
, libicns
}:
let
inherit (darwin.apple_sdk_11_0.frameworks)
IOSurface Metal QuartzCore Cocoa AVFoundation;
in
stdenv.mkDerivation (finalAttrs: {
pname = "shipwright";
version = "8.0.6";
@@ -85,14 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
libXext
libpulseaudio
zenity
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
IOSurface
Metal
QuartzCore
Cocoa
AVFoundation
darwin.apple_sdk_11_0.libs.simd
];
] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
cmakeFlags = [
(lib.cmakeBool "NON_PORTABLE" true)
pkgs/os-specific/linux/nvidia-x11/default.nix
+6 -8
View File
@@ -115,14 +115,12 @@ rec {
# Last one without the bug reported here:
# https://bbs.archlinux.org/viewtopic.php?pid=2155426#p2155426
legacy_535 = generic {
version = "535.154.05";
sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg=";
sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k=";
openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo=";
settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10=";
persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
patches = [ rcu_patch ];
version = "535.216.01";
sha256_64bit = "sha256-Xd6hFHgQAS4zlnwxgTQbzWYkvT1lTGP4Rd+DO07Oavc=";
sha256_aarch64 = "sha256-SGmuA0W1iSsqUK7VZsgibT4HgT0RkKpGb+ul6eIbM7k=";
openSha256 = "sha256-ey96oMbY32ahcHSOj1+MykvJrep6mhHPVl+V8+B2ZDk=";
settingsSha256 = "sha256-9PgaYJbP1s7hmKCYmkuLQ58nkTruhFdHAs4W84KQVME=";
persistencedSha256 = "sha256-ckF/BgDA6xSFqFk07rn3HqXuR0iGfwA4PRxpP38QZgw=";
};
# Last one supporting Kepler architecture
pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix
+3 -3
View File
@@ -5,18 +5,18 @@
buildNpmPackage rec {
pname = "universal-remote-card";
version = "4.1.2";
version = "4.1.3";
src = fetchFromGitHub {
owner = "Nerwyn";
repo = "android-tv-card";
rev = version;
hash = "sha256-2bDVeqp6g5tkzdZqbHpTjsVlCTjwLK7ZSOFPtso1LKM=";
hash = "sha256-/O+VOrUKhljhrvQ3WiygtZmdf0HTRFaeeU7bP35U3go=";
};
patches = [ ./dont-call-git.patch ];
npmDepsHash = "sha256-84IO1JT/mrU2w5IqPNB31ai19QbMmwOGurK8n6wO4Hg=";
npmDepsHash = "sha256-J0aE1wY7VAi8qSzjUyubsSagCsalqrHox2HHAhZoUIE=";
installPhase = ''
runHook preInstall
pkgs/tools/admin/berglas/default.nix
+1 -1
View File
@@ -41,7 +41,7 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X=github.com/GoogleCloudPlatform/berglas/internal/version.Version=${version}"
"-X github.com/GoogleCloudPlatform/berglas/v2/internal/version.version=${version}"
];
postPatch = skipTestsCommand;
pkgs/tools/misc/vector/default.nix
+11 -7
View File
@@ -22,6 +22,7 @@
git,
nixosTests,
nix-update-script,
darwin,
}:
let
@@ -51,13 +52,16 @@ rustPlatform.buildRustPackage {
};
};
nativeBuildInputs = [
pkg-config
cmake
perl
git
rustPlatform.bindgenHook
];
nativeBuildInputs =
[
pkg-config
cmake
perl
git
rustPlatform.bindgenHook
]
# Provides the mig command used by the build scripts
++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds;
buildInputs =
[
oniguruma
pkgs/tools/security/ssh-mitm/default.nix
+6 -13
View File
@@ -12,19 +12,11 @@ let
self = py;
packageOverrides = self: super: {
paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec {
version = "3.3.1";
version = "3.4.1";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-ajd3qWGshtvvN1xfW41QAUoaltD9fwVKQ7yIATSw/3c=";
hash = "sha256-ixUwKHCvf2ZS8uA4l1wdKXPwYEbLXX1lNVZos+y+zgw=";
};
patches = [
(fetchpatch {
name = "Use-pytest-s-setup_method-in-pytest-8-the-nose-method-setup-is-deprecated.patch";
url = "https://github.com/paramiko/paramiko/pull/2349.diff";
hash = "sha256-4CTIZ9BmzRdh+HOwxSzfM9wkUGJOnndctK5swqqsIvU=";
})
];
dependencies = oldAttrs.dependencies ++ [ python3.pkgs.icecream ];
});
};
@@ -35,14 +27,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "ssh-mitm";
version = "4.1.1";
version = "5.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "ssh-mitm";
repo = "ssh-mitm";
rev = "refs/tags/${version}";
hash = "sha256-Uf1B7oEZyNWj4TjrLvEfFdxsvsGeMLXFsSdxGLUV4ZU=";
hash = "sha256-jRheKLAXbbMyxdtDSJ4QSN4PoUM2YoK7nmU5xqPq7DY=";
};
build-system = [
@@ -50,7 +42,8 @@ buildPythonApplication rec {
hatch-requirements-txt
];
propagatedBuildInputs = [
dependencies = [
appimage
argcomplete
colored
packaging
pkgs/tools/security/zeekscript/default.nix
+2
View File
@@ -36,5 +36,7 @@ python3.pkgs.buildPythonApplication rec {
changelog = "https://github.com/zeek/zeekscript/blob/v${version}/CHANGES";
license = licenses.bsd3;
maintainers = with maintainers; [ fab tobim ];
# Incompatible with tree-sitter > 0.21.
broken = true;
};
}
pkgs/tools/text/reckon/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper }:
{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, file }:
stdenv.mkDerivation rec {
pname = "reckon";
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
in ''
runHook preInstall
mkdir -p $out/bin
makeWrapper ${env}/bin/reckon $out/bin/reckon
makeWrapper ${env}/bin/reckon $out/bin/reckon \
--prefix PATH : ${lib.makeBinPath [ file ]}
runHook postInstall
'';
pkgs/top-level/all-packages.nix
+2 -6
View File
@@ -33925,9 +33925,7 @@ with pkgs;
colobot = callPackage ../games/colobot { };
corsix-th = callPackage ../games/corsix-th {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreVideo CoreMedia VideoToolbox;
};
corsix-th = callPackage ../games/corsix-th { };
enigma = callPackage ../games/enigma { };
@@ -33965,9 +33963,7 @@ with pkgs;
keeperrl = callPackage ../games/keeperrl { };
shipwright = callPackage ../games/shipwright {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
shipwright = callPackage ../games/shipwright { };
wipeout-rewrite = callPackage ../games/wipeout-rewrite {
inherit (darwin.apple_sdk.frameworks) Foundation;
pkgs/top-level/python-packages.nix
+2
View File
@@ -702,6 +702,8 @@ self: super: with self; {
appdirs = callPackage ../development/python-modules/appdirs { };
appimage = callPackage ../development/python-modules/appimage { };
apple-weatherkit = callPackage ../development/python-modules/apple-weatherkit { };
applicationinsights = callPackage ../development/python-modules/applicationinsights { };