mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
23ad7292c8
@ -13814,6 +13814,12 @@
|
||||
githubId = 133448;
|
||||
name = "Mikołaj Siedlarek";
|
||||
};
|
||||
msladecek = {
|
||||
email = "martin.sladecek+nixpkgs@gmail.com";
|
||||
name = "Martin Sladecek";
|
||||
github = "msladecek";
|
||||
githubId = 7304317;
|
||||
};
|
||||
mslingsby = {
|
||||
email = "morten.slingsby@eviny.no";
|
||||
github = "MortenSlingsby";
|
||||
@ -15441,6 +15447,12 @@
|
||||
githubId = 72527881;
|
||||
name = "PassiveLemon";
|
||||
};
|
||||
pathob = {
|
||||
email = "patrick@hobusch.net";
|
||||
github = "pathob";
|
||||
githubId = 4580157;
|
||||
name = "Patrick Hobusch";
|
||||
};
|
||||
patka = {
|
||||
email = "patka@patka.dev";
|
||||
github = "patka-123";
|
||||
@ -17807,6 +17819,12 @@
|
||||
fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E";
|
||||
}];
|
||||
};
|
||||
sailord = {
|
||||
name = "Sailord";
|
||||
email = "sailord328@gmail.com";
|
||||
github = "Sail0rd";
|
||||
githubId = 55802415;
|
||||
};
|
||||
samalws = {
|
||||
email = "sam@samalws.com";
|
||||
name = "Sam Alws";
|
||||
@ -20680,6 +20698,11 @@
|
||||
githubId = 9870613;
|
||||
name = "Hubert Mühlhans";
|
||||
};
|
||||
trishtzy = {
|
||||
github = "trishtzy";
|
||||
githubId = 5356506;
|
||||
name = "Tricia Tan";
|
||||
};
|
||||
trobert = {
|
||||
email = "thibaut.robert@gmail.com";
|
||||
github = "trobert";
|
||||
@ -21880,6 +21903,12 @@
|
||||
github = "wr0belj";
|
||||
githubId = 40501814;
|
||||
};
|
||||
wr7 = {
|
||||
name = "wr7";
|
||||
email = "d-wr7@outlook.com";
|
||||
github = "wr7";
|
||||
githubId = 53203261;
|
||||
};
|
||||
wraithm = {
|
||||
name = "Matthew Wraith";
|
||||
email = "wraithm@gmail.com";
|
||||
@ -22109,6 +22138,12 @@
|
||||
githubId = 2242427;
|
||||
name = "Yoann Ono";
|
||||
};
|
||||
yah = {
|
||||
email = "yah@singularpoint.cc";
|
||||
github = "wangxiaoerYah";
|
||||
githubId = 48443038;
|
||||
name = "Yah";
|
||||
};
|
||||
yajo = {
|
||||
email = "yajo.sk8@gmail.com";
|
||||
github = "yajo";
|
||||
|
||||
@ -28,6 +28,7 @@ OK_MISSING_BY_PACKAGE = {
|
||||
"discover": {
|
||||
"rpm-ostree-1", # we don't have rpm-ostree (duh)
|
||||
"Snapd", # we don't have snaps and probably never will
|
||||
"packagekitqt6", # intentionally disabled
|
||||
},
|
||||
"elisa": {
|
||||
"UPNPQT", # upstream says it's broken
|
||||
@ -36,6 +37,9 @@ OK_MISSING_BY_PACKAGE = {
|
||||
"Sphinx", # only used for docs, bloats closure size
|
||||
"QCollectionGenerator"
|
||||
},
|
||||
"gwenview": {
|
||||
"Tiff", # duplicate?
|
||||
},
|
||||
"kio-extras-kf5": {
|
||||
"KDSoapWSDiscoveryClient", # actually vendored on KF5 version
|
||||
},
|
||||
|
||||
@ -82,8 +82,8 @@ in
|
||||
|
||||
apiServer = mkOption {
|
||||
type = types.str;
|
||||
example = "localhost:8080";
|
||||
description = "host:port to connect to the API. Ignored unless mode is set to 'api'";
|
||||
example = "http://localhost:8080";
|
||||
description = "URI to connect to the API. Ignored unless mode is set to 'api'";
|
||||
};
|
||||
|
||||
extraArguments = mkOption {
|
||||
|
||||
@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix compile error regarding packed attribute in 3rd party juice library
|
||||
./juice-cxx-packing-fix.diff
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
diff --git a/thirdparty/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h b/thirdparty/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h
|
||||
index 69a66e4..3e50635 100644
|
||||
--- a/thirdparty/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h
|
||||
+++ b/thirdparty/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h
|
||||
@@ -111,18 +111,10 @@ public:
|
||||
forcedinline uint8 getGreen() const noexcept { return components.g; }
|
||||
forcedinline uint8 getBlue() const noexcept { return components.b; }
|
||||
|
||||
- #if JUCE_GCC
|
||||
- // NB these are here as a workaround because GCC refuses to bind to packed values.
|
||||
- forcedinline uint8& getAlpha() noexcept { return comps [indexA]; }
|
||||
- forcedinline uint8& getRed() noexcept { return comps [indexR]; }
|
||||
- forcedinline uint8& getGreen() noexcept { return comps [indexG]; }
|
||||
- forcedinline uint8& getBlue() noexcept { return comps [indexB]; }
|
||||
- #else
|
||||
forcedinline uint8& getAlpha() noexcept { return components.a; }
|
||||
forcedinline uint8& getRed() noexcept { return components.r; }
|
||||
forcedinline uint8& getGreen() noexcept { return components.g; }
|
||||
forcedinline uint8& getBlue() noexcept { return components.b; }
|
||||
- #endif
|
||||
|
||||
//==============================================================================
|
||||
/** Copies another pixel colour over this one.
|
||||
@@ -336,21 +328,22 @@ private:
|
||||
uint8 b, g, r, a;
|
||||
#endif
|
||||
#endif
|
||||
- } JUCE_PACKED;
|
||||
+ };
|
||||
+
|
||||
+ // structure must be packed but using the packed attribute causes compile
|
||||
+ // failures with newer c++ compilers. Verify default packing produces same layout
|
||||
+ static_assert(sizeof(Components) == 4, "Components struct is not packed");
|
||||
|
||||
union
|
||||
{
|
||||
uint32 internal;
|
||||
Components components;
|
||||
- #if JUCE_GCC
|
||||
- uint8 comps[4]; // helper struct needed because gcc does not allow references to packed union members
|
||||
- #endif
|
||||
};
|
||||
-}
|
||||
-#ifndef DOXYGEN
|
||||
- JUCE_PACKED
|
||||
-#endif
|
||||
-;
|
||||
+};
|
||||
+
|
||||
+// class must be packed but using the packed attribute causes compile
|
||||
+// failures with newer c++ compilers. Verify default packing produces same layout
|
||||
+static_assert(sizeof(PixelARGB) == 4, "PixelARGB class is not packed");
|
||||
|
||||
|
||||
//==============================================================================
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.82";
|
||||
version = "1.83";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qEwPKrgmWYMIwIdgKozG9kghCYp4aoYTX28GqKbuDu4=";
|
||||
hash = "sha256-JMHLB/a86rfxTxl3GXU+lhYtliR8WOAzWilbWei0K2A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -20,16 +20,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ncspot";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrkfdn";
|
||||
repo = "ncspot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RgA3jV/vD6qgIVQCZ0Sm+9CST4SlqN4MUurVM3nIdh0=";
|
||||
hash = "sha256-Sl4i9HFl+Dth9jmW6hPZzgh0Y35pRo1Xi9LRxCuSIP4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8ZUgm1O4NmZpxgNRKnh1MNhiFNoBWQHo22kyP3hWJwI=";
|
||||
cargoHash = "sha256-INgDavtBI75h+qVlxTncYu3su+SH/D7HTlThRHJzwkY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional withClipboard python3;
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.9.3.4";
|
||||
version = "0.9.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coderholic";
|
||||
repo = "pyradio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QifBzQsvYU5kP5mnidOgWGBh3h2MvJm8Wo0i1v6j/cU=";
|
||||
hash = "sha256-As4xjwJtEKlnFuBigC7nN0kAPe0+99rE9KZ0F6i7qIQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exodus";
|
||||
version = "24.17.5";
|
||||
version = "24.19.3";
|
||||
|
||||
src = fetchurl {
|
||||
name = "exodus-linux-x64-${finalAttrs.version}.zip";
|
||||
url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip";
|
||||
curlOptsList = [ "--user-agent" "Mozilla/5.0" ];
|
||||
hash = "sha256-HlyscqoxGucoQoFgSWN3vEjAnkdAmtBLOhjhWbScPFc=";
|
||||
hash = "sha256-zqi1En22H3b2pD95C747gF9TtyMCX4TzXC10mP7iUoM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "75b1431c1e0f6c221dbfdb0ecd0f62f183b02254";
|
||||
rev = "b8768c4a76525d82360d124c829774acd26634c3";
|
||||
python = python3.withPackages (ps: with ps; [
|
||||
epc
|
||||
orjson
|
||||
@ -28,13 +28,13 @@ let
|
||||
in
|
||||
melpaBuild {
|
||||
pname = "lsp-bridge";
|
||||
version = "20240502.2306";
|
||||
version = "20240510.1618";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manateelazycat";
|
||||
repo = "lsp-bridge";
|
||||
inherit rev;
|
||||
hash = "sha256-8MqGwHVBE+87IQfsUA6b3ffrVWjypiH3shwELBCUBDQ=";
|
||||
hash = "sha256-f+JnzW4XrDC3QP9iuhKAmy+T2adoFx+0q03GI7VO0/s=";
|
||||
};
|
||||
|
||||
commit = rev;
|
||||
|
||||
@ -17,7 +17,8 @@ let
|
||||
};
|
||||
# I think questa_fse/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf`
|
||||
in buildFHSEnv rec {
|
||||
name = "quartus-prime-lite"; # wrapped
|
||||
pname = "quartus-prime-lite"; # wrapped
|
||||
inherit (unwrapped) version;
|
||||
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
(runCommand "ld-lsb-compat" {} (''
|
||||
@ -80,7 +81,7 @@ in buildFHSEnv rec {
|
||||
"${unwrapped}"/questa_fse/linux_x86_64/lmutil
|
||||
)
|
||||
|
||||
wrapper=$out/bin/${name}
|
||||
wrapper=$out/bin/${pname}
|
||||
progs_wrapped=()
|
||||
for prog in ''${progs_to_wrap[@]}; do
|
||||
relname="''${prog#"${unwrapped}/"}"
|
||||
@ -93,7 +94,7 @@ in buildFHSEnv rec {
|
||||
echo "export NIXPKGS_IS_QUESTA_WRAPPER=1" >> "$wrapped"
|
||||
;;
|
||||
esac
|
||||
echo "$wrapper $prog \"\$@\"" >> "$wrapped"
|
||||
echo "exec $wrapper $prog \"\$@\"" >> "$wrapped"
|
||||
done
|
||||
|
||||
cd $out
|
||||
@ -160,4 +161,6 @@ in buildFHSEnv rec {
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
inherit (unwrapped) meta;
|
||||
}
|
||||
|
||||
@ -408,21 +408,21 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame",
|
||||
"rev": "3272473e69880675756547fc5896d0869ba14255",
|
||||
"hash": "sha256-DWDPQM4YWuH4oH+03VmFs6yXN2dAKxc5zXSV42YbMyg=",
|
||||
"rev": "1c6d288bf15705ab93c66a11af40eaf9d2a515a2",
|
||||
"hash": "sha256-h5hMfCwoECTyH/VU7IheQg5Jx9skpYrZlA9Xh+4lotQ=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-05-04"
|
||||
"version": "unstable-2024-05-09"
|
||||
},
|
||||
"mame2000": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2000-libretro",
|
||||
"rev": "1472da3a39ab14fff8325b1f51a1dfdb8eabb5c8",
|
||||
"hash": "sha256-Nd5OqkoMJZ8TzEZGqDT0YX6lHK/H3I5EqJ841PteLi8="
|
||||
"rev": "905808fbcc3adf8c610c1c60f0e41ce4b35db1c5",
|
||||
"hash": "sha256-2J3QGlSb4YhDZND4T0wmt9zzDjOuNiscsMxn9zA1TtI="
|
||||
},
|
||||
"version": "unstable-2023-10-31"
|
||||
"version": "unstable-2024-05-07"
|
||||
},
|
||||
"mame2003": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -652,11 +652,11 @@
|
||||
"src": {
|
||||
"owner": "jpd002",
|
||||
"repo": "Play-",
|
||||
"rev": "9f8d623f5d7e6a9bb6fa7ff30ce4d5b1fdf72a1e",
|
||||
"hash": "sha256-DtPIAQGHXR3urmKeFXNfKIdqQVU3HrrH6M28Ctwj3eI=",
|
||||
"rev": "700a44a1548d099705c901203414724518c90d43",
|
||||
"hash": "sha256-OZO8vVA2B/SdckC2Rm/v35cdJDzkpdU9lJhFYEyyl1U=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-05-01"
|
||||
"version": "unstable-2024-05-05"
|
||||
},
|
||||
"ppsspp": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
||||
@ -12,10 +12,9 @@
|
||||
with import ./util.nix { inherit lib; };
|
||||
|
||||
let
|
||||
patches' = patches;
|
||||
prevName = pname;
|
||||
prevPlatforms = platforms;
|
||||
prevConfigFlags = configureFlags;
|
||||
|
||||
setupHookDarwin = makeSetupHook {
|
||||
name = "darwin-mingw-hook";
|
||||
substitutions = {
|
||||
@ -23,30 +22,37 @@ let
|
||||
mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs;
|
||||
};
|
||||
} ./setup-hook-darwin.sh;
|
||||
darwinUnsupportedFlags = [ "alsaSupport" "cairoSupport" "dbusSupport" "fontconfigSupport" "gtkSupport" "netapiSupport" "pulseaudioSupport" "udevSupport" "v4lSupport" "vaSupport" "waylandSupport" "x11Support" "xineramaSupport" ];
|
||||
darwinUnsupported = builtins.any (name: builtins.getAttr name supportFlags) darwinUnsupportedFlags;
|
||||
|
||||
darwinFrameworks = lib.optionals stdenv.isDarwin (
|
||||
toBuildInputs pkgArches (pkgs: with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
|
||||
CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security
|
||||
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon
|
||||
])
|
||||
);
|
||||
# Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures
|
||||
# because they will put Darwin in `meta.badPlatforms`.
|
||||
darwinUnsupportedFlags = [
|
||||
"alsaSupport" "cairoSupport" "dbusSupport" "fontconfigSupport" "gtkSupport" "netapiSupport" "pulseaudioSupport"
|
||||
"udevSupport" "v4lSupport" "vaSupport" "waylandSupport" "x11Support" "xineramaSupport"
|
||||
];
|
||||
|
||||
badPlatforms = lib.optional (!supportFlags.mingwSupport || lib.any (flag: supportFlags.${flag}) darwinUnsupportedFlags) "x86_64-darwin";
|
||||
in
|
||||
stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||
builder = buildScript;
|
||||
}) // (lib.optionalAttrs stdenv.isDarwin {
|
||||
postConfigure = ''
|
||||
# dynamic fallback, so this shouldn’t cause problems for older versions of macOS and will
|
||||
# provide additional functionality on newer ones. This can be removed once the x86_64-darwin
|
||||
# SDK is updated.
|
||||
sed 's|/\* #undef HAVE_MTLDEVICE_REGISTRYID \*/|#define HAVE_MTLDEVICE_REGISTRYID 1|' \
|
||||
-i include/config.h
|
||||
'';
|
||||
postBuild = ''
|
||||
# The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link
|
||||
# to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and
|
||||
# rebuild it with empty NIX_LDFLAGS.
|
||||
for preloader in wine-preloader wine64-preloader; do
|
||||
rm loader/$preloader &> /dev/null \
|
||||
&& ( echo "Relinking loader/$preloader"; make loader/$preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ) \
|
||||
|| echo "loader/$preloader not built, skipping relink."
|
||||
done
|
||||
'';
|
||||
}) // rec {
|
||||
stdenv.mkDerivation (finalAttrs:
|
||||
lib.optionalAttrs (buildScript != null) { builder = buildScript; }
|
||||
// lib.optionalAttrs stdenv.isDarwin {
|
||||
postBuild = ''
|
||||
# The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link
|
||||
# to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and
|
||||
# rebuild it with empty NIX_LDFLAGS.
|
||||
for preloader in wine-preloader wine64-preloader; do
|
||||
rm loader/$preloader &> /dev/null \
|
||||
&& ( echo "Relinking loader/$preloader"; make loader/$preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ) \
|
||||
|| echo "loader/$preloader not built, skipping relink."
|
||||
done
|
||||
'';
|
||||
}
|
||||
// {
|
||||
inherit version src;
|
||||
|
||||
pname = prevName + lib.optionalString (wineRelease != "stable" && wineRelease != "unstable") "-${wineRelease}";
|
||||
@ -95,10 +101,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
|
||||
++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]
|
||||
++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
|
||||
++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
|
||||
CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security
|
||||
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon
|
||||
])
|
||||
++ lib.optionals stdenv.isDarwin darwinFrameworks
|
||||
++ lib.optionals (x11Support) (with pkgs.xorg; [
|
||||
libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm
|
||||
])
|
||||
@ -107,29 +110,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||
mesa # for libgbm
|
||||
])));
|
||||
|
||||
patches = [ ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
# Wine uses `MTLDevice.registryID` in `winemac.drv`, but that property is not available in
|
||||
# the 10.12 SDK (current SDK on x86_64-darwin). That can be worked around by using selector
|
||||
# syntax. As of Wine 8.12, the logic has changed and uses selector syntax, but it still
|
||||
# uses property syntax in one place. The first patch is necessary only with older
|
||||
# versions of Wine. The second is needed on all versions of Wine.
|
||||
(lib.optional (lib.versionOlder version "8.12") ./darwin-metal-compat-pre8.12.patch)
|
||||
(lib.optional (lib.versionOlder version "8.18") ./darwin-metal-compat-pre8.18.patch)
|
||||
(lib.optional (lib.versionAtLeast version "8.18") ./darwin-metal-compat.patch)
|
||||
# Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs.
|
||||
./darwin-qos.patch
|
||||
]
|
||||
++ patches';
|
||||
|
||||
# Because the 10.12 SDK doesn’t define `registryID`, clang assumes the undefined selector returns
|
||||
# `id`, which is a pointer. This causes implicit pointer to integer errors in clang 15+.
|
||||
# The following post-processing step adds a cast to `uint64_t` before the selector invocation to
|
||||
# silence these errors.
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
sed -e 's|\(\[[A-Za-z_][][A-Za-z_0-9]* registryID\]\)|(uint64_t)\1|' \
|
||||
-i dlls/winemac.drv/cocoa_display.m
|
||||
'';
|
||||
inherit patches;
|
||||
|
||||
configureFlags = prevConfigFlags
|
||||
++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ]
|
||||
@ -140,7 +121,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||
# them to the RPATH so that the user doesn't have to set them in
|
||||
# LD_LIBRARY_PATH.
|
||||
NIX_LDFLAGS = toString (map (path: "-rpath " + path) (
|
||||
map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs)
|
||||
map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ]
|
||||
# Avoid adding rpath references to non-existent framework `lib` paths.
|
||||
++ lib.subtractLists darwinFrameworks finalAttrs.buildInputs)
|
||||
# libpulsecommon.so is linked but not found otherwise
|
||||
++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio")
|
||||
(toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
|
||||
@ -210,9 +193,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||
fromSource
|
||||
binaryNativeCode # mono, gecko
|
||||
];
|
||||
broken = stdenv.isDarwin && !supportFlags.mingwSupport;
|
||||
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
|
||||
platforms = if darwinUnsupported then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms;
|
||||
inherit badPlatforms platforms;
|
||||
maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira reckenrode ];
|
||||
inherit mainProgram;
|
||||
};
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
|
||||
--- a/dlls/winemac.drv/cocoa_display.m
|
||||
+++ b/dlls/winemac.drv/cocoa_display.m
|
||||
@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
|
||||
* the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps
|
||||
* using the integrated GPU. This is the behavior of Windows on a Mac. */
|
||||
primary_device = [MTLCreateSystemDefaultDevice() autorelease];
|
||||
- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID))
|
||||
+ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, [primary_device registryID]))
|
||||
goto done;
|
||||
|
||||
/* Hide the integrated GPU if the system default device is a dedicated GPU */
|
||||
@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
|
||||
|
||||
for (i = 0; i < devices.count; i++)
|
||||
{
|
||||
- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID))
|
||||
+ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], [devices[i] registryID]))
|
||||
goto done;
|
||||
|
||||
if (hide_integrated && devices[i].isLowPower)
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
|
||||
--- a/dlls/winemac.drv/cocoa_display.m
|
||||
+++ b/dlls/winemac.drv/cocoa_display.m
|
||||
@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp
|
||||
|
||||
device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease];
|
||||
if (device && [device respondsToSelector:@selector(registryID)])
|
||||
- ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID);
|
||||
+ ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]);
|
||||
|
||||
done:
|
||||
[pool release];
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
|
||||
index fbbe16efcbf..2db375ff3d5 100644
|
||||
--- a/dlls/winemac.drv/cocoa_display.m
|
||||
+++ b/dlls/winemac.drv/cocoa_display.m
|
||||
@@ -387,7 +387,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp
|
||||
|
||||
device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease];
|
||||
if (device && [device respondsToSelector:@selector(registryID)])
|
||||
- return macdrv_get_gpu_info_from_registry_id(gpu, device.registryID);
|
||||
+ return macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]);
|
||||
else
|
||||
return -1;
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
|
||||
index cde37c48b0d..be237bc0ad3 100644
|
||||
--- a/dlls/ntdll/unix/loader.c
|
||||
+++ b/dlls/ntdll/unix/loader.c
|
||||
@@ -65,6 +65,7 @@
|
||||
# undef LoadResource
|
||||
# undef GetCurrentThread
|
||||
# include <pthread.h>
|
||||
+# include <pthread/qos.h>
|
||||
# include <mach/mach.h>
|
||||
# include <mach/mach_error.h>
|
||||
# include <mach-o/getsect.h>
|
||||
@ -69,9 +69,9 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the hash for staging as well.
|
||||
version = "9.7";
|
||||
version = "9.8";
|
||||
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
|
||||
hash = "sha256-2fPDM2VuiL1M71Mx80sci2nJZKUnWe73RdjdrlGhU1M=";
|
||||
hash = "sha256-hpQ8g47aj62aeUDUCZcDOUvx0b6aEBQ0L+2HnH3DuZM=";
|
||||
inherit (stable) patches;
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
@ -117,7 +117,7 @@ in rec {
|
||||
staging = fetchFromGitLab rec {
|
||||
# https://gitlab.winehq.org/wine/wine-staging
|
||||
inherit (unstable) version;
|
||||
hash = "sha256-KU6i1P81Fr+4aZH/SJ+YibaIfX88SZMPdPcGS2mT2CE=";
|
||||
hash = "sha256-c69E+jr5DKdD8JJxQhM3ILJgvmGvOe54FqMghcVPkpg=";
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = "wine-staging";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, callPackage, autoconf, hexdump, perl, python3, wineUnstable }:
|
||||
{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable }:
|
||||
|
||||
with callPackage ./util.nix {};
|
||||
|
||||
@ -7,8 +7,8 @@ let patch = (callPackage ./sources.nix {}).staging;
|
||||
(mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
|
||||
in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version;
|
||||
|
||||
(lib.overrideDerivation (wineUnstable.override { wineRelease = "staging"; }) (self: {
|
||||
buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;
|
||||
(wineUnstable.override { wineRelease = "staging"; }).overrideAttrs (self: {
|
||||
buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.isLinux "util-linux") self.buildInputs;
|
||||
nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs;
|
||||
|
||||
prePatch = self.prePatch or "" + ''
|
||||
@ -18,7 +18,7 @@ in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMino
|
||||
patchShebangs ./patches/gitapply.sh
|
||||
python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
|
||||
'';
|
||||
})) // {
|
||||
}) // {
|
||||
meta = wineUnstable.meta // {
|
||||
description = wineUnstable.meta.description + " (with staging patches)";
|
||||
};
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightburn";
|
||||
version = "1.5.06";
|
||||
version = "1.6.00";
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
|
||||
sha256 = "sha256-VJMfvZHqdgUQXLyBBZLEV3nyP0qzibuXLnZyBhBBg9E=";
|
||||
sha256 = "sha256-R9DBlmqvV23QXzC45Z4GN0t+ysv4WM63POJGU5N7jbw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -22,16 +22,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oculante";
|
||||
version = "0.8.19";
|
||||
version = "0.8.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woelper";
|
||||
repo = "oculante";
|
||||
rev = version;
|
||||
hash = "sha256-oCgnz1WMg7YypIT8Tjk2m+f/43Aj88rDVCxQ92aL3RY=";
|
||||
hash = "sha256-2QX7cD9SjhLb82O8T90BTQGsy3/gDaNwoX4Mbe2H6s4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vlU7egAht+kgA5Vx0HAwQOIax9qD4FLRo1ZUNx4RieY=";
|
||||
cargoHash = "sha256-VAWLs15xsjoT0VSJjS/j0wd5P7OjQGrvyUSHp4B8hHI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "snapshot";
|
||||
version = "46.2";
|
||||
version = "46.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Ef55oSuzQFHionnajB9FRYfQEaFPwkI35FTGT0S6z00=";
|
||||
hash = "sha256-RZV6BBX0VNY1MUkaoEeVzuDO1O3d1dj6DQAPXvBzW2c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "exercism";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exercism";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Mtb5c1/k8kp7bETOSE0X969BV176jpoprr1/mQ3E4Vg=";
|
||||
hash = "sha256-+Tg9b7JZtriF5b+mnLgOeTTLiswH/dSGg3Mj1TBt4Wk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fnsSvbuVGRAndU88su2Ck7mV8QBDhxozdmwI3XGtxcA=";
|
||||
vendorHash = "sha256-xY3C3emqtPIKyxIN9aEkrLXhTxWNmo0EJXNZVtbtIvs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "fluidd";
|
||||
version = "1.29.1";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "fluidd-v${version}.zip";
|
||||
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
|
||||
sha256 = "sha256-Zh/H1XAUcFl20yPLt9uIqBLDvUH8ATL9g6oFwvyhkzw=";
|
||||
sha256 = "sha256-+nPVnKuZtYGFtqC48XNISSjay3lDAYR3l50kq026H3Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -14,11 +14,14 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-WPePzqZ2iGeJ7kzTj8eg7q1JEjw91WY7gViJJ46SLRY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9Z49aPfcIdMfYCFAXsxFxcfhaLjtPod+nMFHDmvgDY0=";
|
||||
cargoHash = "sha256-CQnM7pFnk4LcstKllhbeohbrggKV6MBQy03oq7DEkP4=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
perl
|
||||
];
|
||||
# FIXME: remove patch when upstream version of rustc-serialize is updated
|
||||
# https://github.com/NixOS/nixpkgs/pull/310673
|
||||
cargoPatches = [ ./rustc-serialize-fix.patch ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
16
pkgs/applications/misc/hmm/rustc-serialize-fix.patch
Normal file
16
pkgs/applications/misc/hmm/rustc-serialize-fix.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index b1cc23695b30..ffdeb1c90618 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -996,9 +996,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustc-serialize"
|
||||
-version = "0.3.24"
|
||||
+version = "0.3.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
|
||||
+checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ttdl";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VladimirMarkelov";
|
||||
repo = "ttdl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fspqUzF3QqFpd16J1dbcNMdqjcR3PIiRu/s+VB4KgwQ=";
|
||||
sha256 = "sha256-5v3Eu85x3xNvTRgfxhlDz4hiJ4UO010pZPY7UPHk7mQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dvzm9lbVGGM4t6KZcHSlqwo55jssxi8HyFREMaj5I0Q=";
|
||||
cargoHash = "sha256-+jYl/oUeJaABgDX/OBTyeo/B7RYc2MUTreU1ySLG0XQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI tool to manage todo lists in todo.txt format";
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wmenu";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -24,17 +24,9 @@ stdenv.mkDerivation rec {
|
||||
owner = "~adnano";
|
||||
repo = "wmenu";
|
||||
rev = version;
|
||||
hash = "sha256-9do7zL7yaZuqVjastySwjsByo5ja+KUP3590VjIyVnI=";
|
||||
hash = "sha256-gVoqRHQ5bcY58LTgKxpPM1PnZJrLRoSOJUiYYqc/vRI=";
|
||||
};
|
||||
|
||||
# Upstream patch needed to fix NULL deref
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://git.sr.ht/~adnano/wmenu/commit/2856dddcac861ddf248143e66ba164d7aa05a0bb.patch";
|
||||
hash = "sha256-P7SEjMssA8unNAlrgrTHm0uW5pefjpupPb4s/u2fTAM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ];
|
||||
buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ];
|
||||
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "avalanchego";
|
||||
version = "1.11.4";
|
||||
version = "1.11.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0YS+q1gy7YmTx/DwxaElBG1tzosXReXqPu6RpR3hTjw=";
|
||||
hash = "sha256-IZ4Q67b+VsmBN/NEBPDzN2PYO8cVfLpHBU0tCo+v3Xc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-et1PVLJQ/vBsg5438s6d9MA2oV40zahp9YKQOE0RX58=";
|
||||
vendorHash = "sha256-z6MF/Kb///BSirdRycNs+7SMThv+yS7WmcrIcgiwBNg=";
|
||||
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@ -51,11 +51,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opera";
|
||||
version = "109.0.5097.38";
|
||||
version = "109.0.5097.80";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
hash = "sha256-eljVXaHN7gPqpoL3z+Fz/BH6b+1qxSHtFln6NCxl9tc=";
|
||||
hash = "sha256-3NSinITYisulR5rNhSnwQC3D9pKWj4SdBtFt/9OgCvo=";
|
||||
};
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atmos";
|
||||
version = "1.71.0";
|
||||
version = "1.72.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudposse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RnBMVVbZQrJ85uPVLniNjpcledYnOyu5zxIYsvV63qk=";
|
||||
sha256 = "sha256-d4TgVSXTqrzgTdpGl1uXIdEvwb0EIgzqiEjOaWYAZgk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dcQWD6UrsSPJZzasovBSXUKaXvL9mZF6cLp458Ia8O4=";
|
||||
vendorHash = "sha256-T3FvJfyGseW5vwN/mMCFEjpcpW90MG8QPkmaXJafD4s=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];
|
||||
|
||||
|
||||
@ -2,20 +2,22 @@
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, testers
|
||||
, k0sctl
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k0sctl";
|
||||
version = "0.17.5";
|
||||
version = "0.17.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0sproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NHfS1iJtpt0t2iIqXBETiD4rpA2XzA8eOg5mP4N8El4=";
|
||||
hash = "sha256-QHTVNrPglNDT9CUQWwc6oD7ttwEUBq8WIX49DiAXf8s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MPTdOcNoveBnHMJ2YHqHuvOHHe6IdisZLc05qViA1YQ=";
|
||||
vendorHash = "sha256-6Kj1kHKXbbPMr9thkDTmGYbZvCSW7CvSzASpk6agEpI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@ -34,6 +36,13 @@ buildGoModule rec {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = k0sctl;
|
||||
command = "k0sctl version";
|
||||
# See https://github.com/carlmjohnson/versioninfo/discussions/12
|
||||
version = "version: (devel)\ncommit: v${version}\n";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A bootstrapping and management tool for k0s clusters.";
|
||||
homepage = "https://k0sproject.io/";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubefirst";
|
||||
version = "2.4.6";
|
||||
version = "2.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubefirst";
|
||||
repo = "kubefirst";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PjqTtu9n9AqHaYnc/2yVQeIWLiQrQcFNdumDSigY7dY=";
|
||||
hash = "sha256-r5y1eWjcw0HP/E9AQodEdCgWgKikGrwV6TvZ2mVcuoE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZcZl4knlyKAwTsiyZvlkN5e2ox30B5aNzutI/2UEE9U=";
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nerdctl";
|
||||
version = "1.7.5";
|
||||
version = "1.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eGDshnJ26rrRuM9lWwcdRg8udA4uE5ee6c+SYES7qt4=";
|
||||
hash = "sha256-z83c8Ji0zSM1QDwjB4FwhHW6XCqG0Hb5crM3jjK46jk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GsI695T7nkwwAt78l7mc5JCD9wXAUcTxwsiLLFcANBI=";
|
||||
vendorHash = "sha256-KqWmwwQRrWoyRehuSJBnlyPQgwk5hUGk2/d0Ue/reVc=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
@ -48,13 +48,13 @@ buildGoModule rec {
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/containerd/nerdctl/";
|
||||
changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}";
|
||||
description = "A Docker-compatible CLI for containerd";
|
||||
mainProgram = "nerdctl";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jk developer-guy ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ developer-guy jk ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,19 +6,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "coreth";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-G3Ovu/tF7gCeddmE91nht/yyqJJtgMyIi7YbTtUFyKo=";
|
||||
hash = "sha256-XVACkk/DUI4AIPRSQgu0g9WHmedjqscZbcz84HIi7jY=";
|
||||
};
|
||||
|
||||
# go mod vendor has a bug, see: golang/go#57529
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-IJFRtoDd0GO8mIx8mmGixaYK5JDQeSpUfk0MPPX6cX8=";
|
||||
vendorHash = "sha256-zqvo0hZIOyF5Bzig1hi4KRUDETNiiy1Ll/FFO9hRmYU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "datovka";
|
||||
version = "4.23.6";
|
||||
version = "4.23.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
|
||||
sha256 = "sha256-g6IMUAE8z5uoLSUpoT+GradQRgwyIXNANt7g4JPOCxg=";
|
||||
sha256 = "sha256-mGuTxOqudDhoJKZ9517H+A4PZxBqAOD+PfBHunhPXGw=";
|
||||
};
|
||||
|
||||
buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ];
|
||||
|
||||
@ -4,16 +4,17 @@
|
||||
}:
|
||||
|
||||
{ lib
|
||||
, python3
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, pkgsStatic
|
||||
, stdenv
|
||||
, nixosTests
|
||||
, testers
|
||||
, util-linux
|
||||
, gns3-server
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "gns3-server";
|
||||
inherit version;
|
||||
|
||||
@ -29,7 +30,7 @@ python3.pkgs.buildPythonApplication {
|
||||
cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
aiofiles
|
||||
aiohttp
|
||||
aiohttp-cors
|
||||
@ -55,6 +56,9 @@ python3.pkgs.buildPythonApplication {
|
||||
rm $out/bin/gns3loopback
|
||||
'';
|
||||
|
||||
# util-linux (script program) is required for Docker support
|
||||
makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ util-linux ]}" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Otherwise tests will fail to create directory
|
||||
@ -63,7 +67,7 @@ python3.pkgs.buildPythonApplication {
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
checkInputs = with python3Packages; [
|
||||
pytest-aiohttp
|
||||
pytest-rerunfailures
|
||||
(pytestCheckHook.override { pytest = pytest_7; })
|
||||
|
||||
@ -33,11 +33,11 @@
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "suricata";
|
||||
version = "7.0.4";
|
||||
version = "7.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-ZABgEgAkvnDb6B9uxu/HLkYlD8s2IZ3/Z+ZBciD/Ibc=";
|
||||
hash = "sha256-H/tWgVjyZcCFVEZL+4VOZWjvaDvwMxKSO1HyjFB5Ck4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "9.9.1";
|
||||
version = "9.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
|
||||
hash = "sha256-GZLIVpXQ22W4JykdLJ7pTogOFhDaiukgsLa2E7giiaU=";
|
||||
hash = "sha256-k58v8l/LE0lWQFbQ6p2XGiRjMMwzArW3KVbIxlKC1SA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "220.240321.0";
|
||||
version = "227.240502.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
|
||||
hash = "sha256-LbvldnhvKHvBEaOwkxA2acuUKMcYi16ceYPuMW73qLs=";
|
||||
hash = "sha256-D7qWwIFuCJmBvfdgf4Dsd2/jvi39tbAttaHOwLND4DY=";
|
||||
};
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pan";
|
||||
version = "0.157";
|
||||
version = "0.158";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+zzAnppP6ICIhhlqXGVF4h/yIDa6oE1lxenmzcr2BQo=";
|
||||
hash = "sha256-gcs3TsUzZAW8PhNPMzyOfwu+2SNynjRgfxdGIfAHrpA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ];
|
||||
|
||||
@ -5,18 +5,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "storj-uplink";
|
||||
version = "1.102.4";
|
||||
version = "1.104.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ryOWnVcJOUs9kToXtwjUTk7nwuAW0NCDn5Npn27hKXU=";
|
||||
hash = "sha256-wB8SK91eJp+8Jjc/bfMqDQQC3FYtSLEjpqVdxEq9P3c=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
||||
vendorHash = "sha256-atIb/SmOShLIhvEsTcegX7+xoDXN+SI5a7TQrXpqdUg=";
|
||||
vendorHash = "sha256-Eo6JHcTcfC8zmKZh9sXrZ90RhIgdEBgTldIUnvNm8ms=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
let
|
||||
pname = "mendeley";
|
||||
version = "2.111.0";
|
||||
version = "2.114.0";
|
||||
|
||||
executableName = "${pname}-reference-manager";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
|
||||
hash = "sha256-tN76RKHETTMkJ239I6+a36RPTuWqYlCSs+tEP+BcB+M=";
|
||||
hash = "sha256-1eLxk+nlgHoe0Gmo/DXlTOnWssrN9cAubvqpV6SqQS8=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "planify";
|
||||
version = "4.7";
|
||||
version = "4.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planify";
|
||||
rev = version;
|
||||
hash = "sha256-5hiVTU1w3Rk/BdxYwDB0Y+EZFnSAaEWtx19IB1ak1yY=";
|
||||
hash = "sha256-G0A3U0TUGL4RT1wpIXw/cIwDDlaLCPpo5QG6bJfoIYc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "quisk";
|
||||
version = "4.2.32";
|
||||
version = "4.2.33";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-zzcygf7oVICO2/wfgyej1GD78fQB1xNRGHq19w6K4uY=";
|
||||
sha256 = "sha256-41eyqYxRg0crtN6qp239eHWSFPt7XuJneTAndZuS3EY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tqsl";
|
||||
version = "2.7.2";
|
||||
version = "2.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-T4NBCUTYHT6ugSg1gSfjQBOBndqwSwyWLr/qlDPQGKI=";
|
||||
sha256 = "sha256-Ca9PsytjPvrU4u+b/x6pIbQc8CDNWI6hNM6jF60Bds8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapGAppsHook3 ];
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, perl
|
||||
, pkg-config
|
||||
, sage-setup
|
||||
, pythonRelaxDepsHook
|
||||
, gd
|
||||
, iml
|
||||
, libpng
|
||||
@ -102,6 +103,11 @@ buildPythonPackage rec {
|
||||
pip # needed to query installed packages
|
||||
pkg-config
|
||||
sage-setup
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"networkx"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "8.11.2";
|
||||
version = "8.11.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rIA757FIIkb6h/QNzyVbIbipkZTwysNonHrPHLqFOyI=";
|
||||
hash = "sha256-wNs5OW8bM5LU0Ik77VU47dEq2PlrsfNNtl6Zedocnm4=";
|
||||
# https://github.com/python-versioneer/python-versioneer/issues/217
|
||||
postFetch = ''
|
||||
sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, gtk3
|
||||
, gobject-introspection
|
||||
, libnotify
|
||||
, makeBinaryWrapper
|
||||
, wrapGAppsHook3
|
||||
, vte
|
||||
, nixosTests
|
||||
@ -27,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
file
|
||||
intltool
|
||||
gobject-introspection
|
||||
makeBinaryWrapper
|
||||
wrapGAppsHook3
|
||||
python3.pkgs.pytest-runner
|
||||
];
|
||||
@ -55,8 +57,15 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# HACK: 'wrapPythonPrograms' will add things to the $PATH in the wrapper. This bleeds into the
|
||||
# terminal session produced by terminator. To avoid this, we force wrapPythonPrograms to only
|
||||
# use gappsWrapperArgs by redefining wrapProgram to ignore its arguments and only apply the
|
||||
# wrapper arguments we want it to use.
|
||||
# TODO: Adjust wrapPythonPrograms to respect an argument that tells it to leave $PATH alone.
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
wrapProgram() {
|
||||
wrapProgramBinary "$1" "''${gappsWrapperArgs[@]}"
|
||||
}
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.terminator;
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tig";
|
||||
version = "2.5.9";
|
||||
version = "2.5.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonas";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-RASZgQUlt/5ivImowM+sNw8Oe8aVkuUNErfgddmFjic=";
|
||||
sha256 = "sha256-WTrw7WaSqC2fp76fPvfogWTibev0Hg0LW2x4umc3+1Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ];
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haruna";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "multimedia";
|
||||
repo = "haruna";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-L/mTFPJPHl8A6FqkWUwICh+Yl4uIE5KnTkZVnC4kCZ8=";
|
||||
hash = "sha256-403ZqllSSaOdTS1GSf8EIQk9gHOxMsWogbK9qh+MhpY=";
|
||||
domain = "invent.kde.org";
|
||||
};
|
||||
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rtabmap";
|
||||
version = "0.21.4";
|
||||
version = "0.21.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "introlab";
|
||||
repo = "rtabmap";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HrIATYRuhFfTlO4oTRZo7CM30LFVyatZJON31Fe4HTQ=";
|
||||
hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook3 ];
|
||||
|
||||
@ -14,12 +14,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vdr-softhddevice";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ua0lnj";
|
||||
repo = "vdr-plugin-softhddevice";
|
||||
sha256 = "sha256-1yCDNfUdQLgJ0WWyx0q3Hi0yxb6zxaK7wMzLD9jXweI=";
|
||||
sha256 = "sha256-qyl4XDLJ99QXQY0XXYMteja0oWZ+vkFa4RwEo1Hv3bo=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "podman-tui";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sJaiZJeT0oUAnSg9Kv8uMp1XoumumC3LB77lelmwSgw=";
|
||||
hash = "sha256-t1vrUXv0ZP+vmOcUIue/yvB34DP+gduopuN0U9oixBQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "tart";
|
||||
version = "2.7.2";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz";
|
||||
hash = "sha256-Z/LZ8g1/FYT7Jh943tFxN8L5HeNf0CVz1VEJj+2fCd8=";
|
||||
hash = "sha256-9spBDqNm47nUZEGCCOfISjNpGx/22OtPPheB7iJTq1A=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
|
||||
@ -251,7 +251,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
mkdir -p "$out/share/virtualbox"
|
||||
cp -rv src/VBox/Main/UnattendedTemplates "$out/share/virtualbox"
|
||||
ln -s "${virtualboxGuestAdditionsIso}/VBoxGuestAdditions_${version}.iso" "$out/share/virtualbox/VBoxGuestAdditions.iso"
|
||||
ln -s "${virtualboxGuestAdditionsIso}" "$out/share/virtualbox/VBoxGuestAdditions.iso"
|
||||
'';
|
||||
|
||||
preFixup = optionalString (!headless) ''
|
||||
|
||||
@ -1,22 +1,11 @@
|
||||
{ stdenv, fetchurl, lib, virtualbox}:
|
||||
{ fetchurl, lib, virtualbox}:
|
||||
|
||||
let
|
||||
inherit (virtualbox) version;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "VirtualBox-GuestAdditions-iso";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||
sha256 = "0efbcb9bf4722cb19292ae00eba29587432e918d3b1f70905deb70f7cf78e8ce";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out
|
||||
cp $src $out/
|
||||
'';
|
||||
|
||||
fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||
sha256 = "0efbcb9bf4722cb19292ae00eba29587432e918d3b1f70905deb70f7cf78e8ce";
|
||||
meta = {
|
||||
description = "Guest additions ISO for VirtualBox";
|
||||
longDescription = ''
|
||||
|
||||
@ -23,6 +23,10 @@ let
|
||||
[binaries]
|
||||
llvm-config = 'llvm-config-native'
|
||||
rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}']
|
||||
# Meson refuses to consider any CMake binary during cross compilation if it's
|
||||
# not explicitly specified here, in the cross file.
|
||||
# https://github.com/mesonbuild/meson/blob/0ed78cf6fa6d87c0738f67ae43525e661b50a8a2/mesonbuild/cmake/executor.py#L72
|
||||
cmake = 'cmake'
|
||||
'';
|
||||
|
||||
crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ];
|
||||
|
||||
@ -15,6 +15,9 @@ def load_file(path: str) -> dict[str, Any]:
|
||||
return tomli.load(f)
|
||||
|
||||
|
||||
# This replicates the dependency merging logic from Cargo.
|
||||
# See `inner_dependency_inherit_with`:
|
||||
# https://github.com/rust-lang/cargo/blob/4de0094ac78743d2c8ff682489e35c8a7cafe8e4/src/cargo/util/toml/mod.rs#L982
|
||||
def replace_key(
|
||||
workspace_manifest: dict[str, Any], table: dict[str, Any], section: str, key: str
|
||||
) -> bool:
|
||||
@ -25,28 +28,37 @@ def replace_key(
|
||||
):
|
||||
print("replacing " + key)
|
||||
|
||||
replaced = table[key]
|
||||
del replaced["workspace"]
|
||||
local_dep = table[key]
|
||||
del local_dep["workspace"]
|
||||
|
||||
workspace_copy = workspace_manifest[section][key]
|
||||
workspace_dep = workspace_manifest[section][key]
|
||||
|
||||
if section == "dependencies":
|
||||
crate_features = replaced.get("features")
|
||||
if isinstance(workspace_dep, str):
|
||||
workspace_dep = {"version": workspace_dep}
|
||||
|
||||
if type(workspace_copy) is str:
|
||||
replaced["version"] = workspace_copy
|
||||
else:
|
||||
replaced.update(workspace_copy)
|
||||
final: dict[str, Any] = workspace_dep.copy()
|
||||
|
||||
merged_features = (crate_features or []) + (
|
||||
workspace_copy.get("features") or []
|
||||
)
|
||||
merged_features = local_dep.pop("features", []) + workspace_dep.get("features", [])
|
||||
if merged_features:
|
||||
final["features"] = merged_features
|
||||
|
||||
if len(merged_features) > 0:
|
||||
# Dictionaries are guaranteed to be ordered (https://stackoverflow.com/a/7961425)
|
||||
replaced["features"] = list(dict.fromkeys(merged_features))
|
||||
local_default_features = local_dep.pop("default-features", None)
|
||||
workspace_default_features = workspace_dep.get("default-features")
|
||||
|
||||
if not workspace_default_features and local_default_features:
|
||||
final["default-features"] = True
|
||||
|
||||
optional = local_dep.pop("optional", False)
|
||||
if optional:
|
||||
final["optional"] = True
|
||||
|
||||
if local_dep:
|
||||
raise Exception(f"Unhandled keys in inherited dependency {key}: {local_dep}")
|
||||
|
||||
table[key] = final
|
||||
elif section == "package":
|
||||
table[key] = replaced = workspace_copy
|
||||
table[key] = workspace_dep
|
||||
|
||||
return True
|
||||
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
alephone.makeWrapper rec {
|
||||
pname = "durandal";
|
||||
desktopName = "Marathon-Durandal";
|
||||
version = "20240119";
|
||||
version = "20240510";
|
||||
icon = alephone.icons + "/marathon2.png";
|
||||
|
||||
zip = fetchurl {
|
||||
url =
|
||||
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip";
|
||||
sha256 = "sha256-Tp9EWMIY0moK6RLIpxB7rMzLOQ7zPfV58oeAyQsTbnM=";
|
||||
sha256 = "sha256-uoBl1/7XlXmMLqpk3tvme9w18q4Yh0WCrmqSzjGxNz0=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
alephone.makeWrapper rec {
|
||||
pname = "marathon-infinity";
|
||||
desktopName = "Marathon-Infinity";
|
||||
version = "20240119";
|
||||
version = "20240510";
|
||||
icon = alephone.icons + "/marathon-infinity.png";
|
||||
|
||||
zip = fetchurl {
|
||||
url =
|
||||
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip";
|
||||
sha256 = "sha256-KfFu+cboaZMfjnu3W84/Qbcrc9kbkIZ2Y0GM1fXeXh8=";
|
||||
sha256 = "sha256-+FPym4Avqzyo4cZtfYPHXCS+q21+g9AIdKOImkd/UjU=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
alephone.makeWrapper rec {
|
||||
pname = "marathon";
|
||||
desktopName = "Marathon";
|
||||
version = "20240119";
|
||||
version = "20240510";
|
||||
icon = alephone.icons + "/marathon.png";
|
||||
|
||||
zip = fetchurl {
|
||||
url =
|
||||
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip";
|
||||
sha256 = "sha256-60+dvXyzHe5PDepyKHcEIdWoRiGMvx5zYehubWKqaB0=";
|
||||
sha256 = "sha256-shZ82e7veaaT/petxDQ8Fd7YtJPmTgxSCStf0kGfrFs=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -20,6 +20,7 @@ appimageTools.wrapType2 {
|
||||
extraInstallCommands = ''
|
||||
install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/
|
||||
install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/
|
||||
substituteInPlace $out/share/applications/${pname}.desktop --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
|
||||
'';
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [ libsecret ];
|
||||
|
||||
@ -27,20 +27,20 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "bruno";
|
||||
version = "1.16.1";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rP3PHS6kuJCgbCQy4h+bJksmJAJvHDBMSysLM5FxQjk=";
|
||||
hash = "sha256-z4KL6CX1jtuC4lxqYA6Mg1zPSc9/OpRb530jPIQK3Is=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-p4rBEOK9zKGO1q3SCKpfdX3EPMkYHRvn9UnGBhsksSE=";
|
||||
npmDepsHash = "sha256-NIf7aMDAeE39+putw/7GTYODIdVmjJIvIwnL5O+sBmI=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
104
pkgs/by-name/bu/bugstalker/package.nix
Normal file
104
pkgs/by-name/bu/bugstalker/package.nix
Normal file
@ -0,0 +1,104 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libunwind
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bugstalker";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godzie44";
|
||||
repo = "BugStalker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-16bmvz6/t8H8Sx/32l+fp3QqP5lwi0o1Q9KqDHqF22U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kp0GZ0cM57BMpH/8lhxevnBuJhUSH0rtxP4B/9fXYiU=";
|
||||
|
||||
buildInputs = [ libunwind ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
# Tests which require access to example source code fail in the sandbox. I
|
||||
# haven't managed to figure out how to fix this.
|
||||
checkFlags = [
|
||||
"--skip=breakpoints::test_breakpoint_at_fn_with_monomorphization"
|
||||
"--skip=breakpoints::test_breakpoint_at_line_with_monomorphization"
|
||||
"--skip=breakpoints::test_brkpt_on_function"
|
||||
"--skip=breakpoints::test_brkpt_on_function_name_collision"
|
||||
"--skip=breakpoints::test_brkpt_on_line"
|
||||
"--skip=breakpoints::test_brkpt_on_line2"
|
||||
"--skip=breakpoints::test_brkpt_on_line_collision"
|
||||
"--skip=breakpoints::test_debugee_run"
|
||||
"--skip=breakpoints::test_deferred_breakpoint"
|
||||
"--skip=breakpoints::test_multiple_brkpt_on_addr"
|
||||
"--skip=breakpoints::test_set_breakpoint_idempotence"
|
||||
"--skip=io::test_backtrace"
|
||||
"--skip=io::test_read_register_write"
|
||||
"--skip=io::test_read_value_u64"
|
||||
"--skip=multithreaded::test_multithreaded_app_running"
|
||||
"--skip=multithreaded::test_multithreaded_backtrace"
|
||||
"--skip=multithreaded::test_multithreaded_breakpoints"
|
||||
"--skip=multithreaded::test_multithreaded_trace"
|
||||
"--skip=signal::test_signal_stop_multi_thread"
|
||||
"--skip=signal::test_signal_stop_multi_thread_multiple_signal"
|
||||
"--skip=signal::test_signal_stop_single_thread"
|
||||
"--skip=signal::test_transparent_signals"
|
||||
"--skip=steps::test_step_into"
|
||||
"--skip=steps::test_step_into_recursion"
|
||||
"--skip=steps::test_step_out"
|
||||
"--skip=steps::test_step_over"
|
||||
"--skip=steps::test_step_over_inline_code"
|
||||
"--skip=steps::test_step_over_on_fn_decl"
|
||||
"--skip=symbol::test_symbol"
|
||||
"--skip=test_debugger_disassembler"
|
||||
"--skip=test_debugger_graceful_shutdown"
|
||||
"--skip=test_debugger_graceful_shutdown_multithread"
|
||||
"--skip=test_frame_cfa"
|
||||
"--skip=test_registers"
|
||||
"--skip=variables::test_arguments"
|
||||
"--skip=variables::test_btree_map"
|
||||
"--skip=variables::test_cast_pointers"
|
||||
"--skip=variables::test_cell"
|
||||
"--skip=variables::test_circular_ref_types"
|
||||
"--skip=variables::test_lexical_blocks"
|
||||
"--skip=variables::test_read_array"
|
||||
"--skip=variables::test_read_atomic"
|
||||
"--skip=variables::test_read_btree_set"
|
||||
"--skip=variables::test_read_closures"
|
||||
"--skip=variables::test_read_enum"
|
||||
"--skip=variables::test_read_hashmap"
|
||||
"--skip=variables::test_read_hashset"
|
||||
"--skip=variables::test_read_only_local_variables"
|
||||
"--skip=variables::test_read_pointers"
|
||||
"--skip=variables::test_read_scalar_variables"
|
||||
"--skip=variables::test_read_scalar_variables_at_place"
|
||||
"--skip=variables::test_read_static_in_fn_variable"
|
||||
"--skip=variables::test_read_static_variables"
|
||||
"--skip=variables::test_read_static_variables_different_modules"
|
||||
"--skip=variables::test_read_strings"
|
||||
"--skip=variables::test_read_struct"
|
||||
"--skip=variables::test_read_tls_variables"
|
||||
"--skip=variables::test_read_type_alias"
|
||||
"--skip=variables::test_read_union"
|
||||
"--skip=variables::test_read_uuid"
|
||||
"--skip=variables::test_read_vec_and_slice"
|
||||
"--skip=variables::test_read_vec_deque"
|
||||
"--skip=variables::test_shared_ptr"
|
||||
"--skip=variables::test_slice_operator"
|
||||
"--skip=variables::test_type_parameters"
|
||||
"--skip=variables::test_zst_types"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Rust debugger for Linux x86-64";
|
||||
homepage = "https://github.com/godzie44/BugStalker";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ jacg ];
|
||||
mainProgram = "bs";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -5,6 +5,7 @@
|
||||
, caddy
|
||||
, testers
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
}:
|
||||
let
|
||||
version = "2.7.6";
|
||||
@ -40,8 +41,13 @@ buildGoModule {
|
||||
postInstall = ''
|
||||
install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
|
||||
|
||||
substituteInPlace $out/lib/systemd/system/caddy.service --replace "/usr/bin/caddy" "$out/bin/caddy"
|
||||
substituteInPlace $out/lib/systemd/system/caddy-api.service --replace "/usr/bin/caddy" "$out/bin/caddy"
|
||||
substituteInPlace $out/lib/systemd/system/caddy.service \
|
||||
--replace-fail "/usr/bin/caddy" "$out/bin/caddy"
|
||||
substituteInPlace $out/lib/systemd/system/caddy-api.service \
|
||||
--replace-fail "/usr/bin/caddy" "$out/bin/caddy"
|
||||
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
# Generating man pages and completions fail on cross-compilation
|
||||
# https://github.com/NixOS/nixpkgs/issues/308283
|
||||
|
||||
$out/bin/caddy manpage --directory manpages
|
||||
installManPage manpages/*
|
||||
42
pkgs/by-name/ca/caligula/package.nix
Normal file
42
pkgs/by-name/ca/caligula/package.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "caligula";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ifd3f";
|
||||
repo = "caligula";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9+aLpxmMP76CsLFFmr1mhKgbaT7Zz0lx4D2jQCUA9VY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VwtmU5jTQPn3hpNuLckPQl6joEFPfuax1gRVG0/nceg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks; [
|
||||
Cocoa
|
||||
IOKit
|
||||
Foundation
|
||||
DiskArbitration
|
||||
]
|
||||
);
|
||||
|
||||
RUSTFLAGS = "--cfg tracing_unstable";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A user-friendly, lightweight TUI for disk imaging";
|
||||
homepage = "https://github.com/ifd3f/caligula/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ sodiboo ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
# https://github.com/ifd3f/caligula/issues/105
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
mainProgram = "caligula";
|
||||
};
|
||||
}
|
||||
12
pkgs/by-name/ca/cargo-geiger/allow-warnings.patch
Normal file
12
pkgs/by-name/ca/cargo-geiger/allow-warnings.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/cargo-geiger/src/lib.rs b/cargo-geiger/src/lib.rs
|
||||
index cc08146..d220ad9 100644
|
||||
--- a/cargo-geiger/src/lib.rs
|
||||
+++ b/cargo-geiger/src/lib.rs
|
||||
@@ -5,7 +5,6 @@
|
||||
#![deny(clippy::cargo)]
|
||||
#![deny(clippy::doc_markdown)]
|
||||
#![forbid(unsafe_code)]
|
||||
-#![deny(warnings)]
|
||||
|
||||
/// Argument parsing
|
||||
pub mod args;
|
||||
@ -12,15 +12,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-geiger";
|
||||
version = "0.11.6";
|
||||
version = "0.11.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-secure-code";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-rGZJyCWGk2RUr52ICp4dVER3JMBrnLdOMusRm/GG2PE=";
|
||||
rev = "cargo-geiger@v${version}";
|
||||
hash = "sha256-/5yuayqneZV6aVQ6YFgqNS2XY3W6yETRQ0kE5ovc7p8=";
|
||||
};
|
||||
cargoHash = "sha256-B6Ka35y2fJEDVd891P60TNppr5HGFnzVjLhhfoFCYUA=";
|
||||
cargoHash = "sha256-lhojo3dhsM9y1SxpVMH93yv+JeNfTL7VLsbTp9ErgIQ=";
|
||||
|
||||
patches = [
|
||||
./allow-warnings.patch
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security libiconv curl ]);
|
||||
@ -30,12 +34,18 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
# skip tests with networking or other failures
|
||||
checkFlags = [
|
||||
"--skip serialize_test1_quick_report"
|
||||
"--skip serialize_test2_quick_report"
|
||||
"--skip serialize_test3_quick_report"
|
||||
"--skip serialize_test4_quick_report"
|
||||
"--skip serialize_test6_quick_report"
|
||||
"--skip serialize_test7_quick_report"
|
||||
"--skip serialize_test1_report"
|
||||
"--skip serialize_test2_report"
|
||||
"--skip serialize_test3_report"
|
||||
"--skip serialize_test4_report"
|
||||
"--skip serialize_test6_report"
|
||||
"--skip serialize_test7_report"
|
||||
# multiple test cases that time-out or cause memory leaks
|
||||
"--skip test_package"
|
||||
"--skip test_package_update_readme::case_2"
|
||||
@ -45,7 +55,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rust-secure-code/cargo-geiger";
|
||||
changelog = "https://github.com/rust-secure-code/cargo-geiger/blob/${pname}-${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/rust-secure-code/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md";
|
||||
description = "Detects usage of unsafe Rust in a Rust crate and its dependencies";
|
||||
mainProgram = "cargo-geiger";
|
||||
longDescription = ''
|
||||
@ -55,6 +65,6 @@ rustPlatform.buildRustPackage rec {
|
||||
code is appropriate.
|
||||
'';
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ evanjs jk matthiasbeyer ];
|
||||
maintainers = with maintainers; [ evanjs gepbird jk matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
@ -1,29 +1,34 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, boost
|
||||
, catch2
|
||||
, cmake
|
||||
, gtest
|
||||
, python3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
boost,
|
||||
catch2,
|
||||
cmake,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cli11";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CLIUtils";
|
||||
repo = "CLI11";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-x3/kBlf5LdzkTO4NYOKanZBfcU4oK+fJw9L7cf88LsY=";
|
||||
};
|
||||
|
||||
buildInputs = [ catch2 ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
nativeCheckInputs = [ boost python3 catch2 ];
|
||||
nativeCheckInputs = [
|
||||
boost
|
||||
python3
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line parser for C++11";
|
||||
@ -32,5 +37,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
||||
}
|
||||
})
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flarectl";
|
||||
version = "0.94.0";
|
||||
version = "0.95.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflare-go";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8lZJn4/IpkNT9IHK3rGvNE/Rv0CHQlVVu4F3K+J8fRA=";
|
||||
hash = "sha256-GcmFRtQ8aqicvawCpFDo+oheUSOgKewBETIizPKcyGU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/81Onrs+qyKEt79DtfX4EDDVxhzB0uqaHa3X+GbupWQ=";
|
||||
vendorHash = "sha256-Jtap4hGwNr8lpXi6huGikL4iUSP242cIiFyvGveszq8=";
|
||||
|
||||
subPackages = [ "cmd/flarectl" ];
|
||||
|
||||
|
||||
@ -1,22 +1,24 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, expat
|
||||
, fontconfig
|
||||
, freetype
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
expat,
|
||||
fontconfig,
|
||||
freetype,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fontfor";
|
||||
version = "0.4.1";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "7sDream";
|
||||
repo = "fontfor";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/UoZ+5X6Csoyqc+RSP0Hree7NtCDs7BjsqcpALxAazc=";
|
||||
hash = "sha256-gJl9SPL/KeYFzKIjwWPVR1iVy6h/W7OP7xE7krhYaY8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -29,7 +31,9 @@ rustPlatform.buildRustPackage rec {
|
||||
freetype
|
||||
];
|
||||
|
||||
cargoHash = "sha256-j1Qf0IKlAUEyiGAUoF7IlEbPIv2pGkn+YMCoFdF9oUE=";
|
||||
cargoHash = "sha256-9Ac2NuUFfluXN4NOT645gszGApBIsFxQiTZDf8PHbvo=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Find fonts which can show a specified character and preview them in browser";
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "free42";
|
||||
version = "3.1.5";
|
||||
version = "3.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomasokken";
|
||||
repo = "free42";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YFTmEyOd/r8Pbj+PzD+VYkkB0gqDJ4wteLBTdwa1qcE=";
|
||||
hash = "sha256-z1HlI2e3mCRJ/sWMdsLF7IpcvTh+Zlrk77M8gaJXMzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
39
pkgs/by-name/gl/glsl_analyzer/package.nix
Normal file
39
pkgs/by-name/gl/glsl_analyzer/package.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, fetchFromGitHub
|
||||
, zig_0_12
|
||||
, darwin
|
||||
}:
|
||||
|
||||
let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glsl_analyzer";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nolanderc";
|
||||
repo = "glsl_analyzer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-+eYBw/F1RzI5waAkLgbV0J/Td91hbNcAtHcisQaL82k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
zig_0_12.hook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build.zig \
|
||||
--replace-fail 'b.run(&.{ "git", "describe", "--tags", "--always" })' '"${finalAttrs.src.rev}"'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Language server for GLSL (OpenGL Shading Language)";
|
||||
changelog = "https://github.com/nolanderc/glsl_analyzer/releases/tag/v${finalAttrs.version}";
|
||||
homepage = "https://github.com/nolanderc/glsl_analyzer";
|
||||
mainProgram = "glsl_analyzer";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ wr7 ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
52
pkgs/by-name/go/go-passbolt-cli/package.nix
Normal file
52
pkgs/by-name/go/go-passbolt-cli/package.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ buildGoModule, fetchFromGitHub, installShellFiles, lib, stdenv }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-passbolt-cli";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "passbolt";
|
||||
repo = "go-passbolt-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-I+niNUowKTFDMa7yOnRToMFPzO/CbnjXHJr5nAhhHcg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XRHGq3Qeq7VWHzw5WWVv4x5orQu740lttGVreiu7qP4=";
|
||||
|
||||
ldflags = [
|
||||
"-X=main.version=${version}"
|
||||
"-X=main.commit=${src.rev}"
|
||||
"-X=main.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D $GOPATH/bin/go-passbolt-cli $out/bin/passbolt
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd passbolt \
|
||||
--bash <($out/bin/passbolt completion bash) \
|
||||
--fish <($out/bin/passbolt completion fish) \
|
||||
--zsh <($out/bin/passbolt completion zsh)
|
||||
|
||||
export tmpDir=$(mktemp -d)
|
||||
cd $tmpDir && mkdir man && $out/bin/passbolt gendoc --type man && installManPage man/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool to interact with Passbolt, an open source password manager for teams";
|
||||
homepage = "https://github.com/passbolt/go-passbolt-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pbek ];
|
||||
mainProgram = "passbolt";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "greenmask";
|
||||
version = "0.1.13";
|
||||
version = "0.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GreenmaskIO";
|
||||
repo = "greenmask";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-d3VMq0sW5WEmSWssOknWQ+tmG8N1w4KYKl1QT4R9SRY=";
|
||||
hash = "sha256-R/JJnHBp9MPnq/fIDwYrePIUH3/FvDPFaRpmrpwhU6o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WCsZ5DU+mZk9M1lldBY4q2PXI8DDFytPojzGJ6wqXsg=";
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.77.3";
|
||||
version = "0.77.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "grype";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-P6p8vuiJ8+KX1V4crHi5J8SwigW6cpF2C30BnUBAgpM=";
|
||||
hash = "sha256-xD6G4DGimmYVVCZHpXlvC24zaRwpRpQ0iRc4Yxac3O8=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@ -30,7 +30,7 @@ buildGoModule rec {
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-GS1TfLCQTWAdjHMfVM6vu8mnR2vclH9VpVMdNwNNU6M=";
|
||||
vendorHash = "sha256-WosgdN49MEXSfK42l4em+Cpk8iAQphf9KOhY0mgBQ7U=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
75
pkgs/by-name/ha/halloy/Cargo.lock
generated
75
pkgs/by-name/ha/halloy/Cargo.lock
generated
@ -120,6 +120,12 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
|
||||
|
||||
[[package]]
|
||||
name = "approx"
|
||||
version = "0.5.1"
|
||||
@ -245,6 +251,18 @@ dependencies = [
|
||||
"futures-lite 2.3.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-http-proxy"
|
||||
version = "1.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29faa5d4d308266048bd7505ba55484315a890102f9345b9ff4b87de64201592"
|
||||
dependencies = [
|
||||
"base64 0.13.1",
|
||||
"httparse",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-io"
|
||||
version = "1.13.0"
|
||||
@ -412,6 +430,12 @@ dependencies = [
|
||||
"rustc-demangle",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.21.7"
|
||||
@ -923,7 +947,7 @@ dependencies = [
|
||||
name = "data"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"base64 0.21.7",
|
||||
"bytes",
|
||||
"chrono",
|
||||
"dirs-next",
|
||||
@ -947,6 +971,7 @@ dependencies = [
|
||||
"tokio",
|
||||
"tokio-stream",
|
||||
"toml",
|
||||
"xdg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1270,6 +1295,20 @@ dependencies = [
|
||||
"zune-inflate",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fast-socks5"
|
||||
version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f89f36d4ee12370d30d57b16c7e190950a1a916e7dbbb5fd5a412f5ef913fe84"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
"log",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
"tokio-stream",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fast-srgb8"
|
||||
version = "1.0.0"
|
||||
@ -1924,7 +1963,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced"
|
||||
version = "0.13.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c"
|
||||
dependencies = [
|
||||
"iced_core",
|
||||
"iced_futures",
|
||||
@ -1938,7 +1977,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_core"
|
||||
version = "0.13.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"dark-light",
|
||||
@ -1957,7 +1996,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_futures"
|
||||
version = "0.13.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_core",
|
||||
@ -1971,7 +2010,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_graphics"
|
||||
version = "0.13.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bytemuck",
|
||||
@ -1992,7 +2031,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_renderer"
|
||||
version = "0.13.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c"
|
||||
dependencies = [
|
||||
"iced_graphics",
|
||||
"iced_tiny_skia",
|
||||
@ -2004,7 +2043,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_runtime"
|
||||
version = "0.13.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c"
|
||||
dependencies = [
|
||||
"iced_core",
|
||||
"iced_futures",
|
||||
@ -2015,7 +2054,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_tiny_skia"
|
||||
version = "0.13.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"cosmic-text",
|
||||
@ -2030,7 +2069,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_wgpu"
|
||||
version = "0.13.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bytemuck",
|
||||
@ -2049,7 +2088,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_widget"
|
||||
version = "0.13.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c"
|
||||
dependencies = [
|
||||
"iced_renderer",
|
||||
"iced_runtime",
|
||||
@ -2063,7 +2102,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_winit"
|
||||
version = "0.13.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21"
|
||||
source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c"
|
||||
dependencies = [
|
||||
"iced_graphics",
|
||||
"iced_runtime",
|
||||
@ -2156,7 +2195,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
|
||||
name = "irc"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"async-http-proxy",
|
||||
"bytes",
|
||||
"fast-socks5",
|
||||
"futures",
|
||||
"irc_proto",
|
||||
"rustls-native-certs",
|
||||
@ -3377,7 +3418,7 @@ version = "0.12.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"base64 0.21.7",
|
||||
"bytes",
|
||||
"encoding_rs",
|
||||
"futures-core",
|
||||
@ -3548,7 +3589,7 @@ version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"base64 0.21.7",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3557,7 +3598,7 @@ version = "2.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"base64 0.21.7",
|
||||
"rustls-pki-types",
|
||||
]
|
||||
|
||||
@ -5301,6 +5342,12 @@ version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911"
|
||||
|
||||
[[package]]
|
||||
name = "xdg"
|
||||
version = "2.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
|
||||
|
||||
[[package]]
|
||||
name = "xdg-home"
|
||||
version = "1.1.0"
|
||||
|
||||
@ -1,34 +1,35 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, darwin
|
||||
, fetchFromGitHub
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, libxkbcommon
|
||||
, openssl
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, vulkan-loader
|
||||
, wayland
|
||||
, xorg
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
darwin,
|
||||
fetchFromGitHub,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
libxkbcommon,
|
||||
openssl,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "halloy";
|
||||
version = "2024.6";
|
||||
version = "2024.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "squidowl";
|
||||
repo = "halloy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UfeGRLZ0k2hHiA6o5kTysszU1WS4JUF5AXhKmE86bDM=";
|
||||
hash = "sha256-CXuodMndUvltwjIiEdJuIazCYKqD/azROgSBTM6g87A=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"iced-0.13.0-dev" = "sha256-acGN7yxf33fDoh8J8uKvwiID+Xz1oVJ7KiiWgNWDXfo=";
|
||||
"glyphon-0.5.0" = "sha256-e1jTuaWh9eFdk2pDE4Ov/l3b/Q7GA3hqx6dPoOde1hM=";
|
||||
"iced-0.13.0-dev" = "sha256-K1B9rVkShxQC97kwebHPsqJsJmxjEsFCKpg+p2lt09U=";
|
||||
"winit-0.29.15" = "sha256-9i2i4KcEv7vIImJtcw2NALQ3uDb4EAZXjShG6tfmhkc=";
|
||||
};
|
||||
};
|
||||
@ -38,26 +39,27 @@ rustPlatform.buildRustPackage rec {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
openssl
|
||||
vulkan-loader
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
darwin.apple_sdk.frameworks.CoreGraphics
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
darwin.apple_sdk.frameworks.Metal
|
||||
darwin.apple_sdk.frameworks.QuartzCore
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
wayland
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
libxkbcommon
|
||||
openssl
|
||||
vulkan-loader
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
darwin.apple_sdk.frameworks.CoreGraphics
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
darwin.apple_sdk.frameworks.Metal
|
||||
darwin.apple_sdk.frameworks.QuartzCore
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [ wayland ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
@ -67,21 +69,35 @@ rustPlatform.buildRustPackage rec {
|
||||
icon = "org.squidowl.halloy";
|
||||
exec = pname;
|
||||
terminal = false;
|
||||
mimeTypes = [ "x-scheme-handler/irc" "x-scheme-handler/ircs" ];
|
||||
categories = [ "Network" "IRCClient" ];
|
||||
keywords = [ "IM" "Chat" ];
|
||||
mimeTypes = [
|
||||
"x-scheme-handler/irc"
|
||||
"x-scheme-handler/ircs"
|
||||
];
|
||||
categories = [
|
||||
"Network"
|
||||
"IRCClient"
|
||||
];
|
||||
keywords = [
|
||||
"IM"
|
||||
"Chat"
|
||||
];
|
||||
startupWMClass = "org.squidowl.halloy";
|
||||
})
|
||||
];
|
||||
|
||||
postFixup = lib.optional stdenv.isLinux (
|
||||
let
|
||||
rpathWayland = lib.makeLibraryPath [ wayland vulkan-loader libxkbcommon ];
|
||||
rpathWayland = lib.makeLibraryPath [
|
||||
wayland
|
||||
vulkan-loader
|
||||
libxkbcommon
|
||||
];
|
||||
in
|
||||
''
|
||||
rpath=$(patchelf --print-rpath $out/bin/halloy)
|
||||
patchelf --set-rpath "$rpath:${rpathWayland}" $out/bin/halloy
|
||||
'');
|
||||
''
|
||||
);
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \
|
||||
|
||||
72
pkgs/by-name/ha/halo/package.nix
Normal file
72
pkgs/by-name/ha/halo/package.nix
Normal file
@ -0,0 +1,72 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
# official jre size is 500MB, but temurin-jre-bin is 100MB.
|
||||
, temurin-jre-bin
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "halo";
|
||||
version = "2.15.2";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar";
|
||||
hash = "sha256-BCcIDaWtn8OkI+GWs741nWgqyO8qlE9m2hZ3e+iViUI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
temurin-jre-bin
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
cp $src halo.jar
|
||||
# Extract the jar file.
|
||||
# Because jar vs extract, jar startup time is 4s slower than extract.
|
||||
java -Djarmode=tools -jar halo.jar extract --layers --launcher
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/halo
|
||||
find halo -type d -empty -delete
|
||||
for target in halo/*; do
|
||||
cp -r $target/* $out/share/halo
|
||||
done
|
||||
|
||||
# 'HALO_WORK_DIR'
|
||||
# Set the working directory for halo, then plug-ins and other content will be stored in this directory.
|
||||
# Note: that the '/' symbol is not required at the end of the path.
|
||||
# default: /var/lib/halo
|
||||
# 'JVM_OPTS'
|
||||
# Note: 'apache.lucene' requires us to set HotspotVMOptions.
|
||||
# You can override this via environment variables.
|
||||
# default: -Xms256m -Xmx256m
|
||||
# 'SPRING_CONFIG_LOCATION'
|
||||
# Note: 'spring.config.location' is used to specify the configuration file location.
|
||||
# Warning: This variable is based on "HALO_WORK_DIR", you do not need and should not set or override it.
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${temurin-jre-bin}/bin/java $out/bin/halo \
|
||||
--chdir $out/share/halo \
|
||||
--set-default HALO_WORK_DIR "/var/lib/halo" \
|
||||
--set-default JVM_OPTS "-Xms256m -Xmx256m" \
|
||||
--set SPRING_CONFIG_LOCATION "optional:classpath:/;optional:file:\`\$HALO_WORK_DIR\`/" \
|
||||
--add-flags "-server \$JVM_OPTS" \
|
||||
--add-flags "org.springframework.boot.loader.launch.JarLauncher"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.halo.run";
|
||||
description = "Self-hosted dynamic blogging program";
|
||||
maintainers = with lib.maintainers; [ yah ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = [ "aarch64-linux" "x86_64-linux" ];
|
||||
mainProgram = "halo";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
};
|
||||
}
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hyprland-workspaces";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FieldofClay";
|
||||
repo = "hyprland-workspaces";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4QGLTimIpx74gWUyHCheUZZT1WgVzBoJRY8OlUDdOh4=";
|
||||
hash = "sha256-GhUjvFMlgjTdgtV9ASW7IqE2dBktPyOlRwg6qM1r7vc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9ndP0nyRBCdOGth4UWA263IvjbgnVW2x9PK8oTaMrxg=";
|
||||
cargoHash = "sha256-RZVQSkegX8Fa9SNY7tGNxyu312oeDjXK4U1+1/UIAyA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A multi-monitor aware Hyprland workspace widget";
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kcl-cli";
|
||||
version = "0.8.7";
|
||||
version = "0.8.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kcl-lang";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OKRMgxynKmHnO+5tcKlispFkpQehHINzB6qphH+lwHQ=";
|
||||
hash = "sha256-Bk/sCNMDupdY/YyKT+VoPIzEfjFDa5z9pevcCPnTX8U=";
|
||||
};
|
||||
vendorHash = "sha256-dF0n1/SmQVd2BUVOPmvZWWUJYTn2mMnbgZC92luSY2s=";
|
||||
vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE=";
|
||||
ldflags = [
|
||||
"-X=kcl-lang.io/cli/pkg/version.version=${version}"
|
||||
];
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "labwc";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labwc";
|
||||
repo = "labwc";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-6l+pYEMFQT8P0j40IcujSzlKgXzR5GIyuxkAJi65RiY=";
|
||||
hash = "sha256-8TSBBNg9+W65vEKmwyAWB2yEOpHqV9YRm5+ttL19ke4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -1,20 +1,21 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
, dotnetCorePackages
|
||||
, wrapGAppsHook3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildDotnetModule,
|
||||
fetchFromGitHub,
|
||||
dotnetCorePackages,
|
||||
wrapGAppsHook3,
|
||||
|
||||
, libX11
|
||||
, libICE
|
||||
, libSM
|
||||
, libXi
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXrandr
|
||||
, fontconfig
|
||||
, glew
|
||||
, gtk3
|
||||
libX11,
|
||||
libICE,
|
||||
libSM,
|
||||
libXi,
|
||||
libXcursor,
|
||||
libXext,
|
||||
libXrandr,
|
||||
fontconfig,
|
||||
glew,
|
||||
gtk3,
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
@ -61,10 +62,10 @@ buildDotnetModule rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 LoadByOS/LinuxConfigApp/libation_glass.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg
|
||||
install -Dm644 LoadByOS/LinuxConfigApp/Libation.desktop $out/share/applications/${pname}.desktop
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace "/usr/bin/libation" "${meta.mainProgram}"
|
||||
install -Dm644 LoadByOS/LinuxConfigApp/libation_glass.svg $out/share/icons/hicolor/scalable/apps/libation.svg
|
||||
install -Dm644 LoadByOS/LinuxConfigApp/Libation.desktop $out/share/applications/libation.desktop
|
||||
substituteInPlace $out/share/applications/libation.desktop \
|
||||
--replace-fail "/usr/bin/libation" "${meta.mainProgram}"
|
||||
'';
|
||||
|
||||
# wrap manually, because we need lower case excutables
|
||||
|
||||
58
pkgs/by-name/li/libsbml/package.nix
Normal file
58
pkgs/by-name/li/libsbml/package.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
libxml2,
|
||||
swig,
|
||||
}:
|
||||
stdenv.mkDerivation (attrs: {
|
||||
pname = "libsbml";
|
||||
version = "5.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbmlteam";
|
||||
repo = "libsbml";
|
||||
rev = "v${attrs.version}";
|
||||
hash = "sha256-8JT2r0zuf61VewtZaOAccaOUmDlQPnllA0fXE9rT5X8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This should be in next release, remember to remove fetchpatch
|
||||
(fetchpatch {
|
||||
name = "fix-xmlerror-conversion.patch";
|
||||
url = "https://github.com/sbmlteam/libsbml/pull/358.patch";
|
||||
hash = "sha256-uirG6XJ+w0hqBUEAGDnzhHoVtJVRdN1eqBYeneKMBao=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bzip2.dev
|
||||
libxml2
|
||||
];
|
||||
|
||||
# libSBML doesn't always make use of pkg-config
|
||||
cmakeFlags = [
|
||||
"-DLIBXML_INCLUDE_DIR=${lib.getDev libxml2}/include/libxml2"
|
||||
"-DLIBXML_LIBRARY=${lib.getLib libxml2}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
"-DPKG_CONFIG_EXECUTABLE=${lib.getBin pkg-config}/bin/pkg-config"
|
||||
"-DSWIG_EXECUTABLE=${lib.getBin swig}/bin/swig"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for manipulating Systems Biology Markup Language (SBML)";
|
||||
homepage = "https://github.com/sbmlteam/libsbml";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = [maintainers.kupac];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
43
pkgs/by-name/li/litmusctl/package.nix
Normal file
43
pkgs/by-name/li/litmusctl/package.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, kubectl
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "litmusctl";
|
||||
version = "1.5.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kubectl
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "litmuschaos";
|
||||
repo = "litmusctl";
|
||||
rev = "${version}";
|
||||
hash = "sha256-FORrvPKDTG48WV03+HbXiBJa1IHfHV7yMDhQX64kn6U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-U4dp2E2TZ3rds63PS6GzUVhb2qDSv92bf9JCkWpdLew=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd litmusctl \
|
||||
--bash <($out/bin/litmusctl completion bash) \
|
||||
--fish <($out/bin/listmusctl completion fish) \
|
||||
--zsh <($out/bin/litmusctl completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Command-Line tool to manage Litmuschaos's agent plane";
|
||||
homepage = "https://github.com/litmuschaos/litmusctl";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "litmusctl";
|
||||
maintainers = with lib.maintainers; [ vinetos sailord ];
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,7 @@
|
||||
, nix-output-monitor
|
||||
}:
|
||||
let
|
||||
version = "3.5.14";
|
||||
version = "3.5.15";
|
||||
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-4vXLHDj6TnEXjJIzEcToHQ+6Rp4EnMpOFHQ3Ypymh0s=";
|
||||
hash = "sha256-1mE4ZXGAMZl2Mufr47y+2UMDHBelqsvChaCsQDK3m70=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
|
||||
--prefix PATH : ${lib.makeBinPath runtimeDeps}
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-A2AFlm6Qs7IuR6LedapWx4RL0Ae5E7eSBJSMXjrONHE=";
|
||||
cargoHash = "sha256-5BazSJGsafSl0eE7GOWw2SrVgC3k1tlrLiIFIpC51/o=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@ -1,23 +1,26 @@
|
||||
{ lib
|
||||
, buildNimPackage
|
||||
, fetchFromSourcehut
|
||||
, nim
|
||||
, nix-prefetch
|
||||
, nix-prefetch-git
|
||||
, openssl
|
||||
, makeWrapper
|
||||
{
|
||||
lib,
|
||||
buildNimPackage,
|
||||
fetchFromSourcehut,
|
||||
nim,
|
||||
nix-prefetch,
|
||||
nix-prefetch-git,
|
||||
openssl,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
let nim' = nim.passthru.nim;
|
||||
in buildNimPackage (finalAttrs: {
|
||||
let
|
||||
nim' = nim.passthru.nim;
|
||||
in
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "nim_lk";
|
||||
version = "20240210";
|
||||
version = "20240510";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ehmry";
|
||||
repo = "nim_lk";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-LLOf8HNee0Mol+e7/dvu9hQUCmpaVBNggTxaAl/wV6Y=";
|
||||
hash = "sha256-fwoGyYkbGstWG0qw15dOq1gmr3GyIn6ZEBeBmEivHlA=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
@ -29,7 +32,13 @@ in buildNimPackage (finalAttrs: {
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/nim_lk \
|
||||
--suffix PATH : ${lib.makeBinPath [ nim' nix-prefetch nix-prefetch-git ]}
|
||||
--suffix PATH : ${
|
||||
lib.makeBinPath [
|
||||
nim'
|
||||
nix-prefetch
|
||||
nix-prefetch-git
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = finalAttrs.src.meta // {
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nrr";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ryanccn";
|
||||
repo = "nrr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-94BeBCYCxZBoOp6xo4I/uxd6ULjIfmF4nw/vUWoaEpo=";
|
||||
hash = "sha256-wof/KmoHiBkcn2aTh+M6bNH/B6Le3H6hnT8BzUCs0Pw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DTQTIAk914XC+LecQTXk1TdBc/5sMFG8KiD9lO5HLiM=";
|
||||
cargoHash = "sha256-BtYZNZxFjgY/BFd1kwGyy/F1iRezSDxoPHF4exrNzuk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nuclei-templates";
|
||||
version = "9.8.5";
|
||||
version = "9.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-j1W/Gq002Y+/Lrq51Od8iZoxbMJji20kpbUaCC7ieqE=";
|
||||
hash = "sha256-3hJfWSBciJ/UutVBIGisptcxmtWfvSfTbx55cyWxs4k=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, fuse
|
||||
, installShellFiles
|
||||
, wrapGAppsHook3
|
||||
, glib-networking
|
||||
, wrapperDir ? "/run/wrappers/bin"
|
||||
}:
|
||||
let
|
||||
@ -25,7 +26,7 @@ buildGoModule {
|
||||
vendorHash = "sha256-OOiiKtKb+BiFkoSBUQQfqm4dMfDW3Is+30Kwcdg8LNA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles wrapGAppsHook3 ];
|
||||
buildInputs = [ webkitgtk_4_1 glib fuse ];
|
||||
buildInputs = [ webkitgtk_4_1 glib fuse glib-networking ];
|
||||
|
||||
ldflags = [ "-X github.com/jstaf/onedriver/cmd/common.commit=v${version}" ];
|
||||
|
||||
|
||||
@ -1,59 +1,58 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "oterm";
|
||||
version = "0.2.7";
|
||||
version = "0.2.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggozad";
|
||||
repo = "oterm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vKVGSIneKQkFO1uoNaW/Yr6QTDhgokmIpkYFYIbm+U4=";
|
||||
hash = "sha256-6UFNsEc6bYBrBYfCbeiDfemueeRMEXHGCT8junZVFtk=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aiosqlite"
|
||||
"pillow"
|
||||
"httpx"
|
||||
"ollama"
|
||||
"packaging"
|
||||
"pillow"
|
||||
"typer"
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [ poetry-core ];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
ollama
|
||||
textual
|
||||
typer
|
||||
python-dotenv
|
||||
httpx
|
||||
aiohttp
|
||||
aiosql
|
||||
aiosqlite
|
||||
pyperclip
|
||||
httpx
|
||||
ollama
|
||||
packaging
|
||||
rich-pixels
|
||||
pillow
|
||||
aiohttp
|
||||
pyperclip
|
||||
python-dotenv
|
||||
rich-pixels
|
||||
textual
|
||||
typer
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"oterm"
|
||||
];
|
||||
pythonImportsCheck = [ "oterm" ];
|
||||
|
||||
# Tests require a HTTP connection to ollama
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
|
||||
description = "A text-based terminal client for Ollama";
|
||||
homepage = "https://github.com/ggozad/oterm";
|
||||
changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "oterm";
|
||||
maintainers = with lib.maintainers; [ suhr ];
|
||||
|
||||
86
pkgs/by-name/pr/pragtical/package.nix
Normal file
86
pkgs/by-name/pr/pragtical/package.nix
Normal file
@ -0,0 +1,86 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cacert,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
freetype,
|
||||
libgit2,
|
||||
libuchardet,
|
||||
libzip,
|
||||
lua5_4,
|
||||
luajit,
|
||||
mbedtls_2,
|
||||
pcre2,
|
||||
SDL2,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pragtical";
|
||||
version = "3.3.1";
|
||||
pluginManagerVersion = "1.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pragtical";
|
||||
repo = "pragtical";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
|
||||
# also fetch required git submodules
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
|
||||
export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
|
||||
|
||||
substituteInPlace subprojects/ppm.wrap \
|
||||
--replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}'
|
||||
|
||||
${lib.getExe meson} subprojects download \
|
||||
colors plugins ppm
|
||||
|
||||
find subprojects -type d -name .git -prune -execdir rm -r {} +
|
||||
'';
|
||||
|
||||
hash = "sha256-T0IHpfMfx4P84RyBLtaYNead6a7cID2cUYwkyNnYMgc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
freetype
|
||||
libgit2
|
||||
libuchardet
|
||||
libzip
|
||||
lua5_4
|
||||
luajit
|
||||
mbedtls_2
|
||||
pcre2
|
||||
SDL2
|
||||
zlib
|
||||
];
|
||||
|
||||
# workaround for `libmbedx509.so.1, libmbedcrypto.so.7: error adding symbols: DSO missing from command line`
|
||||
env.NIX_LDFLAGS = "-lmbedx509 -lmbedcrypto";
|
||||
|
||||
mesonFlags = [ "-Duse_system_lua=true" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/pragtical/pragtical/blob/${finalAttrs.src.rev}/changelog.md";
|
||||
description = "A practical and pragmatic code editor";
|
||||
homepage = "https://pragtical.dev";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "pragtical";
|
||||
maintainers = with lib.maintainers; [
|
||||
suhr
|
||||
tomasajt
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sbom-utility";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CycloneDX";
|
||||
repo = "sbom-utility";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tNLMrtJj1eeJ4sVhDRR24/KVI1HzZSRquiImuDTNZFI=";
|
||||
hash = "sha256-EqK2TGlv2RGfvR95lzYz3EHJkfq4q4Ty5H2zFdd9cME=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EdzI5ypwZRksQVmcfGDUgEMa4CeAPcm237ZaKqmWQDY=";
|
||||
vendorHash = "sha256-qh8kIwgrlmHkocM5ZoGnOY7ISJlct/TV7dAxvXlPw68=";
|
||||
|
||||
preCheck = ''
|
||||
cd test
|
||||
|
||||
@ -9,12 +9,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shopware-cli";
|
||||
version = "0.4.42";
|
||||
version = "0.4.43";
|
||||
src = fetchFromGitHub {
|
||||
repo = "shopware-cli";
|
||||
owner = "FriendsOfShopware";
|
||||
rev = version;
|
||||
hash = "sha256-+nSX7HUf9o43d3BoPPXebvMSdS1D2J6VVo7FWCwQcSU=";
|
||||
hash = "sha256-c8CaPxV54bF4Unlz15SIh64jiGZMZywcKOzdZ74AtaM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
32
pkgs/by-name/su/superfile/package.nix
Normal file
32
pkgs/by-name/su/superfile/package.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "1.1.2";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "superfile";
|
||||
inherit version;
|
||||
|
||||
src =
|
||||
fetchFromGitHub {
|
||||
owner = "MHNightCat";
|
||||
repo = "superfile";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Cn03oPGT+vCZQcC62p7COx8N8BGgra+qQaZyF+osVsA=";
|
||||
}
|
||||
+ "/src";
|
||||
|
||||
vendorHash = "sha256-gWrhy3qzlXG072u5mW971N2Y4Vmt0KbZkB8SFsFgSzo=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/MHNightCat/superfile/blob/v${version}/changelog.md";
|
||||
description = "Pretty fancy and modern terminal file manager";
|
||||
homepage = "https://github.com/MHNightCat/superfile";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ momeemt ];
|
||||
mainProgram = "superfile";
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "1.64.2";
|
||||
version = "1.66.0";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "tailscale-nginx-auth";
|
||||
@ -11,9 +11,9 @@ buildGoModule {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DS7C/G1Nj9gIjYwXaEeCLbtH9HbB0tRoJBDjZc/nq5g=";
|
||||
hash = "sha256-ZI9/YlVHbdvEwD0YHWfUhciU2x4wp4GzTanwDvuIpz4=";
|
||||
};
|
||||
vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA=";
|
||||
vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@ -15,15 +15,15 @@
|
||||
darwin,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "taskwarrior";
|
||||
version = "3.0.0-unstable-2024-04-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GothenburgBitFactory";
|
||||
repo = "taskwarrior";
|
||||
rev = "fd306712b85dda3ea89de4e617aebeb98b2ede80";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-vzfHq/LHfnTx6CVGFCuO6W5aSqj1jVqldMdmyciSDDk=";
|
||||
};
|
||||
pname = "taskwarrior";
|
||||
version = "3.0.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GothenburgBitFactory";
|
||||
repo = "taskwarrior";
|
||||
rev = "v3.0.2";
|
||||
hash = "sha256-vN3X6vLuD4Fw9wpEUYLf8sboA5GIcdP5EFb41KS6d5s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/commands/CmdNews.cpp \
|
||||
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}-cargo-deps";
|
||||
inherit src;
|
||||
sourceRoot = src.name;
|
||||
hash = "sha256-zQca/1tI/GUCekKhrg2iSL+h69SH6Ttsj3MqwDKj8HQ=";
|
||||
hash = "sha256-4hdM9LgDa47ZYcX30HXvixIRy0xaahG4XBqPiUM+IUM=";
|
||||
};
|
||||
cargoRoot = "./";
|
||||
preConfigure = ''
|
||||
|
||||
@ -1,23 +1,25 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchPypi
|
||||
, python3
|
||||
, makeWrapper
|
||||
, libtorrent-rasterbar-1_2_x
|
||||
, qt5
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchPypi,
|
||||
python3,
|
||||
makeWrapper,
|
||||
libtorrent-rasterbar-1_2_x,
|
||||
qt5,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tribler";
|
||||
version = "7.13.0";
|
||||
version = "7.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-${version}.tar.xz";
|
||||
hash = "sha256-j9+Kq6dOqiJCTY3vuRWGnciuwACU7L0pl73l6nkDLN4=";
|
||||
url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -28,57 +30,55 @@ stdenv.mkDerivation rec {
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python3.pkgs.python
|
||||
];
|
||||
buildInputs = [ python3.pkgs.python ];
|
||||
|
||||
pythonPath = [
|
||||
libtorrent
|
||||
] ++ (with python3.pkgs; [
|
||||
# requirements-core.txt
|
||||
aiohttp
|
||||
aiohttp-apispec
|
||||
anyio
|
||||
chardet
|
||||
configobj
|
||||
cryptography
|
||||
decorator
|
||||
faker
|
||||
libnacl
|
||||
lz4
|
||||
marshmallow
|
||||
netifaces
|
||||
networkx
|
||||
pony
|
||||
psutil
|
||||
pyasn1
|
||||
pydantic_1
|
||||
pyopenssl
|
||||
pyyaml
|
||||
sentry-sdk
|
||||
service-identity
|
||||
yappi
|
||||
yarl
|
||||
bitarray
|
||||
(pyipv8.overrideAttrs (p: rec {
|
||||
version = "2.10.0";
|
||||
src = fetchPypi {
|
||||
inherit (p) pname;
|
||||
inherit version;
|
||||
hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU=";
|
||||
};
|
||||
}))
|
||||
libtorrent
|
||||
file-read-backwards
|
||||
brotli
|
||||
human-readable
|
||||
# requirements.txt
|
||||
pillow
|
||||
pyqt5
|
||||
#pyqt5-sip
|
||||
pyqtgraph
|
||||
pyqtwebengine
|
||||
]);
|
||||
pythonPath =
|
||||
[ libtorrent ]
|
||||
++ (with python3.pkgs; [
|
||||
# requirements-core.txt
|
||||
aiohttp
|
||||
aiohttp-apispec
|
||||
anyio
|
||||
chardet
|
||||
configobj
|
||||
cryptography
|
||||
decorator
|
||||
faker
|
||||
libnacl
|
||||
lz4
|
||||
marshmallow
|
||||
netifaces
|
||||
networkx
|
||||
pony
|
||||
psutil
|
||||
pyasn1
|
||||
pydantic_1
|
||||
pyopenssl
|
||||
pyyaml
|
||||
sentry-sdk
|
||||
service-identity
|
||||
yappi
|
||||
yarl
|
||||
bitarray
|
||||
filelock
|
||||
(pyipv8.overrideAttrs (p: rec {
|
||||
version = "2.10.0";
|
||||
src = fetchPypi {
|
||||
inherit (p) pname;
|
||||
inherit version;
|
||||
hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU=";
|
||||
};
|
||||
}))
|
||||
file-read-backwards
|
||||
brotli
|
||||
human-readable
|
||||
# requirements.txt
|
||||
pillow
|
||||
pyqt5
|
||||
#pyqt5-sip
|
||||
pyqtgraph
|
||||
pyqtwebengine
|
||||
]);
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out
|
||||
@ -106,12 +106,19 @@ stdenv.mkDerivation rec {
|
||||
export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Decentralised P2P filesharing client based on the Bittorrent protocol";
|
||||
mainProgram = "tribler";
|
||||
homepage = "https://www.tribler.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ xvapx viric mkg20001 ];
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://github.com/Tribler/tribler/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
xvapx
|
||||
viric
|
||||
mkg20001
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@ -30,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ueberzugpp";
|
||||
version = "2.9.4";
|
||||
version = "2.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jstkdng";
|
||||
repo = "ueberzugpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D+7a+3Vxrt+XUq7c2F2eqi8ZGQ2eZd37aTqighWEKPs=";
|
||||
hash = "sha256-BuVInCYpogkn1CnQ2hqLaTi1KJ0mHEEfRIOrTIg9duY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user