Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -347,6 +347,7 @@ let
|
||||
toSentenceCase
|
||||
addContextFrom
|
||||
splitString
|
||||
splitStringBy
|
||||
removePrefix
|
||||
removeSuffix
|
||||
versionOlder
|
||||
|
||||
@@ -1592,6 +1592,97 @@ rec {
|
||||
in
|
||||
map (addContextFrom s) splits;
|
||||
|
||||
/**
|
||||
Splits a string into substrings based on a predicate that examines adjacent characters.
|
||||
|
||||
This function provides a flexible way to split strings by checking pairs of characters
|
||||
against a custom predicate function. Unlike simpler splitting functions, this allows
|
||||
for context-aware splitting based on character transitions and patterns.
|
||||
|
||||
# Inputs
|
||||
|
||||
`predicate`
|
||||
: Function that takes two arguments (previous character and current character)
|
||||
and returns true when the string should be split at the current position.
|
||||
For the first character, previous will be "" (empty string).
|
||||
|
||||
`keepSplit`
|
||||
: Boolean that determines whether the splitting character should be kept as
|
||||
part of the result. If true, the character will be included at the beginning
|
||||
of the next substring; if false, it will be discarded.
|
||||
|
||||
`str`
|
||||
: The input string to split.
|
||||
|
||||
# Return
|
||||
|
||||
A list of substrings from the original string, split according to the predicate.
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
splitStringBy :: (string -> string -> bool) -> bool -> string -> [string]
|
||||
```
|
||||
|
||||
# Examples
|
||||
:::{.example}
|
||||
## `lib.strings.splitStringBy` usage example
|
||||
|
||||
Split on periods and hyphens, discarding the separators:
|
||||
```nix
|
||||
splitStringBy (prev: curr: builtins.elem curr [ "." "-" ]) false "foo.bar-baz"
|
||||
=> [ "foo" "bar" "baz" ]
|
||||
```
|
||||
|
||||
Split on transitions from lowercase to uppercase, keeping the uppercase characters:
|
||||
```nix
|
||||
splitStringBy (prev: curr: builtins.match "[a-z]" prev != null && builtins.match "[A-Z]" curr != null) true "fooBarBaz"
|
||||
=> [ "foo" "Bar" "Baz" ]
|
||||
```
|
||||
|
||||
Handle leading separators correctly:
|
||||
```nix
|
||||
splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ".foo.bar.baz"
|
||||
=> [ "" "foo" "bar" "baz" ]
|
||||
```
|
||||
|
||||
Handle trailing separators correctly:
|
||||
```nix
|
||||
splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo.bar.baz."
|
||||
=> [ "foo" "bar" "baz" "" ]
|
||||
```
|
||||
:::
|
||||
*/
|
||||
splitStringBy =
|
||||
predicate: keepSplit: str:
|
||||
let
|
||||
len = stringLength str;
|
||||
|
||||
# Helper function that processes the string character by character
|
||||
go =
|
||||
pos: currentPart: result:
|
||||
# Base case: reached end of string
|
||||
if pos == len then
|
||||
result ++ [ currentPart ]
|
||||
else
|
||||
let
|
||||
currChar = substring pos 1 str;
|
||||
prevChar = if pos > 0 then substring (pos - 1) 1 str else "";
|
||||
isSplit = predicate prevChar currChar;
|
||||
in
|
||||
if isSplit then
|
||||
# Split here - add current part to results and start a new one
|
||||
let
|
||||
newResult = result ++ [ currentPart ];
|
||||
newCurrentPart = if keepSplit then currChar else "";
|
||||
in
|
||||
go (pos + 1) newCurrentPart newResult
|
||||
else
|
||||
# Keep building current part
|
||||
go (pos + 1) (currentPart + currChar) result;
|
||||
in
|
||||
if len == 0 then [ (addContextFrom str "") ] else map (addContextFrom str) (go 0 "" [ ]);
|
||||
|
||||
/**
|
||||
Return a string without the specified prefix, if the prefix matches.
|
||||
|
||||
|
||||
@@ -631,6 +631,101 @@ runTests {
|
||||
];
|
||||
};
|
||||
|
||||
testSplitStringBySimpleDelimiter = {
|
||||
expr = strings.splitStringBy (
|
||||
prev: curr:
|
||||
builtins.elem curr [
|
||||
"."
|
||||
"-"
|
||||
]
|
||||
) false "foo.bar-baz";
|
||||
expected = [
|
||||
"foo"
|
||||
"bar"
|
||||
"baz"
|
||||
];
|
||||
};
|
||||
|
||||
testSplitStringByLeadingDelimiter = {
|
||||
expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ".foo.bar.baz";
|
||||
expected = [
|
||||
""
|
||||
"foo"
|
||||
"bar"
|
||||
"baz"
|
||||
];
|
||||
};
|
||||
|
||||
testSplitStringByTrailingDelimiter = {
|
||||
expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo.bar.baz.";
|
||||
expected = [
|
||||
"foo"
|
||||
"bar"
|
||||
"baz"
|
||||
""
|
||||
];
|
||||
};
|
||||
|
||||
testSplitStringByMultipleConsecutiveDelimiters = {
|
||||
expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo...bar";
|
||||
expected = [
|
||||
"foo"
|
||||
""
|
||||
""
|
||||
"bar"
|
||||
];
|
||||
};
|
||||
|
||||
testSplitStringByKeepingSplitChar = {
|
||||
expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) true "foo.bar.baz";
|
||||
expected = [
|
||||
"foo"
|
||||
".bar"
|
||||
".baz"
|
||||
];
|
||||
};
|
||||
|
||||
testSplitStringByCaseTransition = {
|
||||
expr = strings.splitStringBy (
|
||||
prev: curr: builtins.match "[a-z]" prev != null && builtins.match "[A-Z]" curr != null
|
||||
) true "fooBarBaz";
|
||||
expected = [
|
||||
"foo"
|
||||
"Bar"
|
||||
"Baz"
|
||||
];
|
||||
};
|
||||
|
||||
testSplitStringByEmptyString = {
|
||||
expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "";
|
||||
expected = [ "" ];
|
||||
};
|
||||
|
||||
testSplitStringByComplexPredicate = {
|
||||
expr = strings.splitStringBy (
|
||||
prev: curr:
|
||||
prev != ""
|
||||
&& curr != ""
|
||||
&& builtins.match "[0-9]" prev != null
|
||||
&& builtins.match "[a-z]" curr != null
|
||||
) true "123abc456def";
|
||||
expected = [
|
||||
"123"
|
||||
"abc456"
|
||||
"def"
|
||||
];
|
||||
};
|
||||
|
||||
testSplitStringByUpperCaseStart = {
|
||||
expr = strings.splitStringBy (prev: curr: builtins.match "[A-Z]" curr != null) true "FooBarBaz";
|
||||
expected = [
|
||||
""
|
||||
"Foo"
|
||||
"Bar"
|
||||
"Baz"
|
||||
];
|
||||
};
|
||||
|
||||
testEscapeShellArg = {
|
||||
expr = strings.escapeShellArg "esc'ape\nme";
|
||||
expected = "'esc'\\''ape\nme'";
|
||||
|
||||
@@ -2518,6 +2518,7 @@
|
||||
};
|
||||
awwpotato = {
|
||||
email = "awwpotato@voidq.com";
|
||||
matrix = "@awwpotato:envs.net";
|
||||
github = "awwpotato";
|
||||
githubId = 153149335;
|
||||
name = "awwpotato";
|
||||
@@ -8488,6 +8489,12 @@
|
||||
githubId = 12715461;
|
||||
name = "Anders Bo Rasmussen";
|
||||
};
|
||||
fvckgrimm = {
|
||||
email = "nixpkgs@grimm.wtf";
|
||||
github = "fvckgrimm";
|
||||
githubId = 55907409;
|
||||
name = "Grimm";
|
||||
};
|
||||
fwc = {
|
||||
github = "fwc";
|
||||
githubId = 29337229;
|
||||
@@ -13894,12 +13901,6 @@
|
||||
githubId = 74221543;
|
||||
name = "Moritz Goltdammer";
|
||||
};
|
||||
linuxmobile = {
|
||||
email = "bdiez19@gmail.com";
|
||||
github = "linuxmobile";
|
||||
githubId = 10554636;
|
||||
name = "Braian A. Diez";
|
||||
};
|
||||
linuxwhata = {
|
||||
email = "linuxwhata@qq.com";
|
||||
matrix = "@lwa:envs.net";
|
||||
@@ -26323,6 +26324,13 @@
|
||||
github = "x3rAx";
|
||||
githubId = 2268851;
|
||||
};
|
||||
x807x = {
|
||||
name = "x807x";
|
||||
email = "s10855168@gmail.com";
|
||||
matrix = "@x807x:matrix.org";
|
||||
github = "x807x";
|
||||
githubId = 86676478;
|
||||
};
|
||||
xanderio = {
|
||||
name = "Alexander Sieg";
|
||||
email = "alex@xanderio.de";
|
||||
|
||||
@@ -180,13 +180,13 @@ rec {
|
||||
|
||||
gammastep = mkRedshift rec {
|
||||
pname = "gammastep";
|
||||
version = "2.0.9";
|
||||
version = "2.0.11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "chinstrap";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU=";
|
||||
hash = "sha256-c8JpQLHHLYuzSC9bdymzRTF6dNqOLwYqgwUOpKcgAEU=";
|
||||
};
|
||||
|
||||
meta = redshift.meta // {
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "allure";
|
||||
version = "2.33.0";
|
||||
version = "2.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-ZRAvIBF89LFYWfmO/bPqL85/XQ9l0TRGOs/uQ9no7tA=";
|
||||
hash = "sha256-1R4x8LjUv4ZQXfFeJ1HkHml3sRLhb1tRV3UqApVEo7U=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libxkbcommon,
|
||||
sqlite,
|
||||
zlib,
|
||||
wayland,
|
||||
}:
|
||||
|
||||
let
|
||||
libwifi = fetchFromGitHub {
|
||||
owner = "Ragnt";
|
||||
repo = "libwifi";
|
||||
rev = "71268e1898ad88b8b5d709e186836db417b33e81";
|
||||
hash = "sha256-2X/TZyLX9Tb54c6Sdla4bsWdq05NU72MVSuPvNfxySk=";
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "angryoxide";
|
||||
version = "0.8.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ragnt";
|
||||
repo = "AngryOxide";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Sla5lvyqZho9JE4QVS9r0fx5+DVlU90c8OSfO4/f0B4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm -r libs/libwifi
|
||||
ln -s ${libwifi} libs/libwifi
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-mry4l0a7DZOWkrChU40OVRCBjKwI39cyZtvEBA5tro0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
sqlite
|
||||
wayland
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "802.11 Attack Tool";
|
||||
changelog = "https://github.com/Ragnt/AngryOxide/releases/tag/v${finalAttrs.version}";
|
||||
homepage = "https://github.com/Ragnt/AngryOxide/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ fvckgrimm ];
|
||||
mainProgram = "angryoxide";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -27,12 +27,12 @@ appimageTools.wrapType2 {
|
||||
# disable creating a desktop file and icon in the home folder during runtime
|
||||
linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs
|
||||
echo "export function registerLinuxConfig() {}" > $linuxConfigFilename
|
||||
substituteInPlace $out/beepertexts.desktop --replace-fail "AppRun" "beeper"
|
||||
'';
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -Dm 644 ${appimageContents}/beepertexts.png $out/share/icons/hicolor/512x512/apps/beepertexts.png
|
||||
install -Dm 644 ${appimageContents}/beepertexts.desktop -t $out/share/applications/
|
||||
substituteInPlace $out/share/applications/beepertexts.desktop --replace-fail "AppRun" "beeper"
|
||||
|
||||
. ${makeWrapper}/nix-support/setup-hook
|
||||
wrapProgram $out/bin/beeper \
|
||||
|
||||
@@ -112,12 +112,12 @@ in
|
||||
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "blender";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
|
||||
srcs = fetchzip {
|
||||
name = "source";
|
||||
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-pAzOayAPyRYgTixAyg2prkUtI70uFulRuBYhgU9ZNw4=";
|
||||
hash = "sha256-5MsJ7UFpwwtaq905CiTkas/qPYOaeiacSSl3qu9h5w0=";
|
||||
};
|
||||
|
||||
patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
|
||||
|
||||
+122
@@ -0,0 +1,122 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.98"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
|
||||
|
||||
[[package]]
|
||||
name = "cargo-ament-build"
|
||||
version = "0.1.9"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"cargo-manifest",
|
||||
"pico-args",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cargo-manifest"
|
||||
version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf5acda331466fdea759172dbc2fb9e650e382dbca6a8dd3f576d9aeeac76da6"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"toml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "1.9.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"hashbrown",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pico-args"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.219"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.219"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.5.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-ament-build";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ros2-rust";
|
||||
repo = "cargo-ament-build";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5D0eB3GCQLgVYuYkHMTkboruiYSAaWy3qZjF/hVpRP0=";
|
||||
};
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Cargo plugin for use with colcon workspaces";
|
||||
homepage = "https://github.com/ros2-rust/cargo-ament-build";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ guelakais ];
|
||||
};
|
||||
})
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chamber";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "segmentio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1ySOlP0sFk3+IRt/zstZK6lEE2pzoVSiZz3wFxdesgc=";
|
||||
sha256 = "sha256-9+I/zH4sHlLQkEn+fCboI3vCjYjlk+hdYnWuxq47r5I=";
|
||||
};
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
vendorHash = "sha256-KlouLjW9hVKFi9uz34XHd4CzNOiyO245QNygkB338YQ=";
|
||||
vendorHash = "sha256-IjCBf1h6r+EDLfgGqP/VfsHaD5oPkIR33nYBAcb6SLY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -51,9 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir -p $out/share/icons
|
||||
'';
|
||||
|
||||
# clean up wrongly created dirs in `install.sh` and broken .desktop file
|
||||
postInstall = ''
|
||||
grep -v "Version=#VERSION#" $src/LINUX/die.desktop > $out/share/applications/die.desktop
|
||||
cp -r $src/XYara/yara_rules $out/lib/die/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,21 +14,24 @@
|
||||
which,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "duply";
|
||||
version = "2.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.4.x/duply_${version}.tgz";
|
||||
hash = "sha256-DCrp3o/ukzkfnVaLbIK84bmYnXvqKsvlkGn3GJY3iNg=";
|
||||
url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.5.x/duply_${finalAttrs.version}.tgz";
|
||||
hash = "sha256-ABryuV5jJNoxcJLsSjODLOHuLKrSEhY3buzy1cQh+AU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ txt2man ];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
mkdir -p "$out/share/man/man1"
|
||||
install -vD duply "$out/bin"
|
||||
@@ -45,9 +48,11 @@ stdenv.mkDerivation rec {
|
||||
which
|
||||
]}
|
||||
"$out/bin/duply" txt2man > "$out/share/man/man1/duply.1"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Shell front end for the duplicity backup tool";
|
||||
mainProgram = "duply";
|
||||
longDescription = ''
|
||||
@@ -57,8 +62,8 @@ stdenv.mkDerivation rec {
|
||||
secure backups on non-trusted spaces are no child's play?
|
||||
'';
|
||||
homepage = "https://duply.net/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.bjornfor ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,12 +10,14 @@
|
||||
kdsingleapplication,
|
||||
pipewire,
|
||||
taglib,
|
||||
libebur128,
|
||||
libvgm,
|
||||
libsndfile,
|
||||
libarchive,
|
||||
libopenmpt,
|
||||
game-music-emu,
|
||||
SDL2,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -42,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pipewire
|
||||
SDL2
|
||||
# input plugins
|
||||
libebur128
|
||||
libvgm
|
||||
libsndfile
|
||||
libarchive
|
||||
@@ -63,6 +66,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "INSTALL_FHS" true)
|
||||
];
|
||||
|
||||
# Remove after next release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "qbrush.patch";
|
||||
url = "https://github.com/fooyin/fooyin/commit/e44e08abb33f01fe85cc896170c55dbf732ffcc9.patch";
|
||||
hash = "sha256-soDj/SFctxxsnkePv4dZgyDHYD2eshlEziILOZC4ddM=";
|
||||
})
|
||||
];
|
||||
|
||||
env.LANG = "C.UTF-8";
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/qxb3/fum";
|
||||
changelog = "https://github.com/qxb3/fum/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ linuxmobile ];
|
||||
maintainers = with lib.maintainers; [ FKouhai ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "fum";
|
||||
};
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "glance";
|
||||
version = "0.7.12";
|
||||
version = "0.7.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glanceapp";
|
||||
repo = "glance";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HytxMin0IM6KAqGu/Cq/WCT79DiH01LpTK3RNgWf7iQ=";
|
||||
hash = "sha256-MinskibgOCb8OytC+Uxg31g00Ha/un7MF+uvL9xosUU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+7mOCU5GNQV8+s9QPki+7CDi4qtOIpwjC//QracwzHI=";
|
||||
|
||||
@@ -1,28 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
fetchFromSourcehut,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "loadwatch";
|
||||
version = "1.1-1-g6d2544c";
|
||||
version = "1.1-4-g868bd29";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://woffs.de/git/fd/loadwatch.git";
|
||||
sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b";
|
||||
rev = "6d2544c0caaa8a64bbafc3f851e06b8056c30e6e";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~woffs";
|
||||
repo = "loadwatch";
|
||||
hash = "sha256-/4kfGdpYJWQyb7mRaVUpyQQC5VP96bDsBDfM3XhcJXw=";
|
||||
rev = finalAttrs.version;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install loadwatch lw-ctl $out/bin
|
||||
'';
|
||||
makeFlags = [ "bindir=$(out)/bin" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Run a program using only idle cycles";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ woffs ];
|
||||
platforms = platforms.all;
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ woffs ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
mcpelauncher-client,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
zlib,
|
||||
@@ -27,6 +28,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
patches = [
|
||||
./dont_download_glfw_ui.patch
|
||||
# Qt 6.9 no longer implicitly converts non-char types (such as booleans) to
|
||||
# construct a QChar. This leads to a build failure with Qt 6.9. Upstream
|
||||
# has merged a patch, but has not yet formalized it through a release, so
|
||||
# we must fetch it manually. Remove this fetch on the next point release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/minecraft-linux/mcpelauncher-ui-qt/commit/0526b1fd6234d84f63b216bf0797463f41d2bea0.diff";
|
||||
hash = "sha256-vL5iqbs50qVh4BKDxTOpCwFQWO2gLeqrVLfnpeB6Yp8=";
|
||||
stripLen = 1;
|
||||
extraPrefix = "mcpelauncher-ui-qt/";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mongoc";
|
||||
version = "2.0.0";
|
||||
version = "1.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-c-driver";
|
||||
tag = version;
|
||||
hash = "sha256-GKXfTrZqdfgxzNi0fM9Ik4XeZGn9IlX75+cXmm5tXPY=";
|
||||
hash = "sha256-RDUrD8MPZd1VBePyR+L5GiT/j5EZIY1KHLQKG5MsuSM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,18 +1,20 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pdfcpu";
|
||||
version = "0.9.1";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdfcpu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PJTEaWU/erqVJakvxfB0aYRsi/tcGxYYZjCdEvThmzM=";
|
||||
hash = "sha256-IODE6/TIXZZC5Z8guFK24iiHTwj84fcf9RiAyFkX2F8=";
|
||||
# Apparently upstream requires that the compiled executable will know the
|
||||
# commit hash and the date of the commit. This information is also presented
|
||||
# in the output of `pdfcpu version` which we use as a sanity check in the
|
||||
@@ -35,7 +37,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x5EXv2LkJg2LAdml+1I4MzgTvNo6Gl+6e6UHVQ+Z9rU=";
|
||||
vendorHash = "sha256-27YTR/vYuNggjUIbpKs3/yEJheUXMaLZk8quGPwgNNk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -52,12 +54,24 @@ buildGoModule rec {
|
||||
# No tests
|
||||
doCheck = false;
|
||||
doInstallCheck = true;
|
||||
installCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
# NOTE: Can't use `versionCheckHook` since a writeable $HOME is required and
|
||||
# `versionCheckHook` uses --ignore-environment
|
||||
installCheckPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
echo checking the version print of pdfcpu
|
||||
$out/bin/pdfcpu version | grep ${version}
|
||||
$out/bin/pdfcpu version | grep $(cat COMMIT | cut -c1-8)
|
||||
$out/bin/pdfcpu version | grep $(cat SOURCE_DATE)
|
||||
mkdir -p $HOME/"${
|
||||
if stdenv.hostPlatform.isDarwin then "Library/Application Support" else ".config"
|
||||
}"/pdfcpu
|
||||
versionOutput="$($out/bin/pdfcpu version)"
|
||||
for part in ${version} $(cat COMMIT | cut -c1-8) $(cat SOURCE_DATE); do
|
||||
if [[ ! "$versionOutput" =~ "$part" ]]; then
|
||||
echo version output did not contain expected part $part . Output was:
|
||||
echo "$versionOutput"
|
||||
exit 3
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
subPackages = [ "cmd/pdfcpu" ];
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
cmake,
|
||||
cmark,
|
||||
extra-cmake-modules,
|
||||
fetchpatch,
|
||||
fetchpatch2,
|
||||
gamemode,
|
||||
ghc_filesystem,
|
||||
jdk17,
|
||||
@@ -45,6 +45,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ln -s ${libnbtplusplus} source/libraries/libnbtplusplus
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# https://github.com/PrismLauncher/PrismLauncher/pull/3622
|
||||
# https://github.com/NixOS/nixpkgs/issues/400119
|
||||
(fetchpatch2 {
|
||||
name = "fix-qt6.9-compatibility.patch";
|
||||
url = "https://github.com/PrismLauncher/PrismLauncher/commit/8bb9b168fb996df9209e1e34be854235eda3d42a.diff";
|
||||
hash = "sha256-hOqWBrUrVUhMir2cfc10gu1i8prdNxefTyr7lH6KA2c=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "readest";
|
||||
version = "0.9.35";
|
||||
version = "0.9.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "readest";
|
||||
repo = "readest";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-w6aMfJwQDEG5WmFdZhtxeTi9w8X3tBqBmpo0nItLYrE=";
|
||||
hash = "sha256-r/mpqeHKo6oQqNCnFByxHZf7RSWD5esZbweAEuda9ME=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Generic network load monitor";
|
||||
homepage = "https://github.com/mattthias/slurm";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ mikaelfangel ];
|
||||
mainProgram = "slurm";
|
||||
};
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGo124Module rec {
|
||||
buildGo124Module (finalAttrs: {
|
||||
pname = "traefik";
|
||||
version = "3.3.6";
|
||||
|
||||
# Archive with static assets for webui
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-HA/JSwcss5ytGPqe2dqsKTZxuhWeC/yi8Mva4YVFeDs=";
|
||||
stripRoot = false;
|
||||
};
|
||||
@@ -30,8 +30,8 @@ buildGo124Module rec {
|
||||
|
||||
ldflags="-s"
|
||||
ldflags+=" -w"
|
||||
ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Version=${version}"
|
||||
ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Codename=$CODENAME"
|
||||
ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major finalAttrs.version}/pkg/version.Version=${finalAttrs.version}"
|
||||
ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major finalAttrs.version}/pkg/version.Codename=$CODENAME"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
@@ -42,15 +42,15 @@ buildGo124Module rec {
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://traefik.io";
|
||||
description = "Modern reverse proxy";
|
||||
changelog = "https://github.com/traefik/traefik/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
changelog = "https://github.com/traefik/traefik/raw/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
djds
|
||||
vdemeester
|
||||
];
|
||||
mainProgram = "traefik";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/hlsxx/tuicam";
|
||||
changelog = "https://github.com/hlsxx/tuicam/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ linuxmobile ];
|
||||
maintainers = with lib.maintainers; [ FKouhai ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "tuicam";
|
||||
};
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
libimobiledevice,
|
||||
libusb1,
|
||||
libusbmuxd,
|
||||
usbmuxd,
|
||||
libplist,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "usbfluxd";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "corellium";
|
||||
repo = "usbfluxd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tfAy3e2UssPlRB/8uReLS5f8N/xUUzbjs8sKNlr40T0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libimobiledevice
|
||||
libusb1
|
||||
libusbmuxd
|
||||
usbmuxd
|
||||
libplist
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail 'with_static_libplist=yes' 'with_static_libplist=no'
|
||||
substituteInPlace usbfluxd/utils.h \
|
||||
--replace-fail PLIST_FORMAT_BINARY //PLIST_FORMAT_BINARY \
|
||||
--replace-fail PLIST_FORMAT_XML, NOT_PLIST_FORMAT_XML
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/corellium/usbfluxd";
|
||||
description = "Redirects the standard usbmuxd socket to allow connections to local and remote usbmuxd instances so remote devices appear connected locally";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "usbfluxctl";
|
||||
maintainers = with lib.maintainers; [ x807x ];
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "weaviate";
|
||||
version = "1.29.1";
|
||||
version = "1.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Akg0iY5M3X6ztKxhNEkhi03VnbNpNW7/Vcbv2KB6X54=";
|
||||
hash = "sha256-Rxi21DifRnOzUgPO3U74LMQ/27NwvYzcj3INplTT1j4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-U2ean49ESKmcQ3fTtd6y9MwfWPr6tolvgioyKbQsBmU=";
|
||||
vendorHash = "sha256-jXfVPdORMBOAl3Od3GknGo7Qtfb4H3RqGYdI6Jx1/5I=";
|
||||
|
||||
subPackages = [ "cmd/weaviate-server" ];
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "duckdb.yazi";
|
||||
version = "25.4.8-unstable-2025-04-09";
|
||||
version = "25.4.8-unstable-2025-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wylie102";
|
||||
repo = "duckdb.yazi";
|
||||
rev = "eaa748c62e24f593104569d2dc15d50b1d48497b";
|
||||
hash = "sha256-snQ+n7n+71mqAsdzrXcI2v7Bg0trrbiHv3mIAxldqlc=";
|
||||
rev = "6259e2d26236854b966ebc71d28de0397ddbe4d8";
|
||||
hash = "sha256-9DMqE/pihp4xT6Mo2xr51JJjudMRAesxD5JqQ4WXiM4=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "rich-preview.yazi";
|
||||
version = "0-unstable-2025-01-18";
|
||||
version = "0-unstable-2025-04-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AnirudhG07";
|
||||
repo = "rich-preview.yazi";
|
||||
rev = "2559e5fa7c1651dbe7c5615ef6f3b5291347d81a";
|
||||
hash = "sha256-dW2gAAv173MTcQdqMV32urzfrsEX6STR+oCJoRVGGpA=";
|
||||
rev = "fdcf37320e35f7c12e8087900eebffcdafaee8cb";
|
||||
hash = "sha256-HO9hTCfgGTDERClZaLnUEWDvsV9GMK1kwFpWNM1wq8I=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "starship.yazi";
|
||||
version = "25.4.8-unstable-2025-04-09";
|
||||
version = "25.4.8-unstable-2025-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rolv-Apneseth";
|
||||
repo = "starship.yazi";
|
||||
rev = "c0707544f1d526f704dab2da15f379ec90d613c2";
|
||||
hash = "sha256-H8j+9jcdcpPFXVO/XQZL3zq1l5f/WiOm4YUxAMduSRs=";
|
||||
rev = "6fde3b2d9dc9a12c14588eb85cf4964e619842e6";
|
||||
hash = "sha256-+CSdghcIl50z0MXmFwbJ0koIkWIksm3XxYvTAwoRlDY=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "toggle-pane.yazi";
|
||||
version = "25.2.26-unstable-2025-03-19";
|
||||
version = "25.2.26-unstable-2025-04-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yazi-rs";
|
||||
repo = "plugins";
|
||||
rev = "273019910c1111a388dd20e057606016f4bd0d17";
|
||||
hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I=";
|
||||
rev = "4b027c79371af963d4ae3a8b69e42177aa3fa6ee";
|
||||
hash = "sha256-auGNSn6tX72go7kYaH16hxRng+iZWw99dKTTUN91Cow=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "commitizen";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = "commitizen-tools";
|
||||
repo = "commitizen";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-J3jwCgiwM2SOJJ8tpXNxHodyhkMb631cb1Usr8Cnwx0=";
|
||||
hash = "sha256-tn87aMJf6UeiTaMmG7Yr+1MenGBTSWrNRIM+QME+8uI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docling-serve";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docling-project";
|
||||
repo = "docling-serve";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QasHVoJITOuys4hASwC43eIy5854G12Yvu7Zncr9ia8=";
|
||||
hash = "sha256-ACoqhaGiYHf2dqulxfHQDH/JIhuUlH7wyu0JY4hd0U8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "gguf";
|
||||
version = "0.14.0";
|
||||
version = "0.16.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2ZlvGXp3eDHPngHvrCTL+oF3hzdTBbjE7hYHR3jivOg=";
|
||||
hash = "sha256-D8lWKJow0PHzr9dewNST9zriYpo/IfOEbdFofYeRx8E=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -32,12 +32,12 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "graph-tool";
|
||||
version = "2.96";
|
||||
version = "2.97";
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
|
||||
hash = "sha256-kNW09I/5U2kwKFOCWRdsedoXtIdnZhg9Bjy1GOw1rVc=";
|
||||
hash = "sha256-Yt2PuLuvvv4iNcv6UHzr5lTwFkReVtVO/znSADkxjKU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pystac";
|
||||
version = "1.12.2";
|
||||
version = "1.13.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "stac-utils";
|
||||
repo = "pystac";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Cz9VyHIAfeRvK+az1ETVrTXvBh/VpkgmtERElfgAdBo=";
|
||||
hash = "sha256-DxRJsnbzXBnpQSJE0VwkXV3vyH6WffiMaZ3119XBxJ8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vector";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "vector";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EHvdz6Tv3qJr6yUAw3/TuoMSrOCAQpsFBF1sS5I2p2k=";
|
||||
hash = "sha256-IMr3+YveR/FDQ2MbgbWr1KJFrdH9B+KOFVNGJjz6Zdk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
zip,
|
||||
wxGTK,
|
||||
gtk3,
|
||||
sfml,
|
||||
sfml_2,
|
||||
fluidsynth,
|
||||
curl,
|
||||
freeimage,
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slade";
|
||||
version = "3.2.6";
|
||||
version = "3.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sirjuddington";
|
||||
repo = "SLADE";
|
||||
rev = version;
|
||||
hash = "sha256-pcWmv1fnH18X/S8ljfHxaL1PjApo5jyM8W+WYn+/7zI=";
|
||||
hash = "sha256-+i506uzO2q/9k7en6CKs4ui9gjszrMOYwW+V9W5Lvns=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
wxGTK
|
||||
gtk3
|
||||
sfml
|
||||
sfml_2
|
||||
fluidsynth
|
||||
curl
|
||||
freeimage
|
||||
@@ -64,11 +64,11 @@ stdenv.mkDerivation rec {
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Doom editor";
|
||||
homepage = "http://slade.mancubus.net/";
|
||||
license = licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user