mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 19:21:04 +00:00
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/pycdio/default.nix
This commit is contained in:
Martin Weinelt
commit
0e1624df44
|
|
@ -251,25 +251,42 @@ You, as the writer of documentation, are still in charge of its content.
|
|||
For example:
|
||||
|
||||
```markdown
|
||||
# pkgs.coolFunction
|
||||
# pkgs.coolFunction {#pkgs.coolFunction}
|
||||
|
||||
Description of what `coolFunction` does.
|
||||
`pkgs.coolFunction` *`name`* *`config`*
|
||||
|
||||
## Inputs
|
||||
Description of what `callPackage` does.
|
||||
|
||||
`coolFunction` expects a single argument which should be an attribute set, with the following possible attributes:
|
||||
|
||||
`name` (String)
|
||||
## Inputs {#pkgs-coolFunction-inputs}
|
||||
|
||||
If something's special about `coolFunction`'s general argument handling, you can say so here.
|
||||
Otherwise, just describe the single argument or start the arguments' definition list without introduction.
|
||||
|
||||
*`name`* (String)
|
||||
|
||||
: The name of the resulting image.
|
||||
|
||||
`tag` (String; _optional_)
|
||||
*`config`* (Attribute set)
|
||||
|
||||
: Tag of the generated image.
|
||||
: Introduce the parameter. Maybe you have a test to make sure `{ }` is a sensible default; then you can say: these attributes are optional; `{ }` is a valid argument.
|
||||
|
||||
_Default:_ the output path's hash.
|
||||
`outputHash` (String; _optional_)
|
||||
|
||||
: A brief explanation including when and when not to pass this attribute.
|
||||
|
||||
: _Default:_ the output path's hash.
|
||||
```
|
||||
|
||||
Checklist:
|
||||
- Start with a synopsis, to show the order of positional arguments.
|
||||
- Metavariables are in emphasized code spans: ``` *`arg1`* ```. Metavariables are placeholders where users may write arbitrary expressions. This includes positional arguments.
|
||||
- Attribute names are regular code spans: ``` `attr1` ```. These identifiers can _not_ be picked freely by users, so they are _not_ metavariables.
|
||||
- _optional_ attributes have a _`Default:`_ if it's easily described as a value.
|
||||
- _optional_ attributes have a _`Default behavior:`_ if it's not easily described using a value.
|
||||
- Nix types aren't in code spans, because they are not code
|
||||
- Nix types are capitalized, to distinguish them from the camelCase [Module System](#module-system) types, which _are_ code and behave like functions.
|
||||
|
||||
#### Examples
|
||||
|
||||
To define a referenceable figure use the following fencing:
|
||||
|
|
|
|||
|
|
@ -316,13 +316,7 @@ python3Packages.buildPythonApplication rec {
|
|||
}
|
||||
```
|
||||
|
||||
This is then added to `all-packages.nix` just as any other application would be.
|
||||
|
||||
```nix
|
||||
{
|
||||
luigi = callPackage ../applications/networking/cluster/luigi { };
|
||||
}
|
||||
```
|
||||
This is then added to `pkgs/by-name` just as any other application would be.
|
||||
|
||||
Since the package is an application, a consumer doesn't need to care about
|
||||
Python versions or modules, which is why they don't go in `python3Packages`.
|
||||
|
|
@ -331,25 +325,27 @@ Python versions or modules, which is why they don't go in `python3Packages`.
|
|||
|
||||
A distinction is made between applications and libraries, however, sometimes a
|
||||
package is used as both. In this case the package is added as a library to
|
||||
`python-packages.nix` and as an application to `all-packages.nix`. To reduce
|
||||
`python-packages.nix` and as an application to `pkgs/by-name`. To reduce
|
||||
duplication the `toPythonApplication` can be used to convert a library to an
|
||||
application.
|
||||
|
||||
The Nix expression shall use [`buildPythonPackage`](#buildpythonpackage-function) and be called from
|
||||
`python-packages.nix`. A reference shall be created from `all-packages.nix` to
|
||||
`python-packages.nix`. A reference shall be created from `pkgs/by-name` to
|
||||
the attribute in `python-packages.nix`, and the `toPythonApplication` shall be
|
||||
applied to the reference:
|
||||
|
||||
```nix
|
||||
{
|
||||
youtube-dl = with python3Packages; toPythonApplication youtube-dl;
|
||||
}
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.toPythonApplication python3Packages.youtube-dl
|
||||
```
|
||||
|
||||
#### `toPythonModule` function {#topythonmodule-function}
|
||||
|
||||
In some cases, such as bindings, a package is created using
|
||||
[`stdenv.mkDerivation`](#sec-using-stdenv) and added as attribute in `all-packages.nix`. The Python
|
||||
[`stdenv.mkDerivation`](#sec-using-stdenv) and added as attribute in `pkgs/by-name` or in `all-packages.nix`. The Python
|
||||
bindings should be made available from `python-packages.nix`. The
|
||||
`toPythonModule` function takes a derivation and makes certain Python-specific
|
||||
modifications.
|
||||
|
|
|
|||
|
|
@ -77,6 +77,10 @@
|
|||
}).nixos.manual;
|
||||
};
|
||||
|
||||
devShells = forAllSystems (system: {
|
||||
default = import ./shell.nix { inherit system; };
|
||||
});
|
||||
|
||||
# The "legacy" in `legacyPackages` doesn't imply that the packages exposed
|
||||
# through this attribute are "legacy" packages. Instead, `legacyPackages`
|
||||
# is used here as a substitute attribute name for `packages`. The problem
|
||||
|
|
|
|||
|
|
@ -16685,6 +16685,13 @@
|
|||
githubId = 23097564;
|
||||
name = "Nora Widdecke";
|
||||
};
|
||||
pwnwriter = {
|
||||
name = "Nabeen Tiwaree";
|
||||
email = "hey@pwnwriter.xyz";
|
||||
keys = [ { fingerprint = "B681 763F 9B5B DF27 9A13 9E0C 0544 A89B C519 20AA"; } ];
|
||||
github = "pwnwriter";
|
||||
githubId = 90331517;
|
||||
};
|
||||
pwoelfel = {
|
||||
name = "Philipp Woelfel";
|
||||
email = "philipp.woelfel@gmail.com";
|
||||
|
|
|
|||
|
|
@ -65,8 +65,8 @@ rec {
|
|||
client1.wait_for_x()
|
||||
client2.wait_for_x()
|
||||
|
||||
client1.execute("quake3 +set r_fullscreen 0 +set name Foo +connect server &")
|
||||
client2.execute("quake3 +set r_fullscreen 0 +set name Bar +connect server &")
|
||||
client1.execute("quake3 +set r_fullscreen 0 +set name Foo +connect server >&2 &", check_return = False)
|
||||
client2.execute("quake3 +set r_fullscreen 0 +set name Bar +connect server >&2 &", check_return = False)
|
||||
|
||||
server.wait_until_succeeds("grep -q 'Foo.*entered the game' /tmp/log")
|
||||
server.wait_until_succeeds("grep -q 'Bar.*entered the game' /tmp/log")
|
||||
|
|
|
|||
|
|
@ -12,18 +12,18 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "youtube-music";
|
||||
version = "3.4.1";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "th-ch";
|
||||
repo = "youtube-music";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-HuV1jFSFvb/Ji150rVIvHrPLY3167W9/9xNnI81k9B8=";
|
||||
hash = "sha256-6aAaIugho8yHohEHp0HVkmzIOfhpkNYts6BOKPp9Wbw=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-uN4rB/S/uoqR+qj7T/TGtU+3PRGagYVfx51nn6U8sdo=";
|
||||
hash = "sha256-lxqBmtHkyk4mnM/AJQmpyCmvhW2e96vZBkgtoREjEXY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ]
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oranda";
|
||||
version = "0.6.3";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axodotdev";
|
||||
repo = "oranda";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PECM0HLomMzNWnERgvYSfSh+XQAjGLxybZAJcaAzEBo=";
|
||||
hash = "sha256-FVd8NQVtzlZsDY40ZMJDdaX+6Q5jUxZHUq2v+kDFVOk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qO48oR3RtyCbhdGn+VZPceZX/RMqS+5LacSASYRboMo=";
|
||||
cargoHash = "sha256-48qDAgHf1tGUwhQWqEi4LQQmSi9PplTlgjVd7/yxZZc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
|
|||
if stdenv.isAarch64 then
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "1.68.134";
|
||||
version = "1.68.137";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-FP+Afk62/aiKd6ZPX0zy76bzO3pJjm4pqauxluFYEl8=";
|
||||
hash = "sha256-9HMgLZ/iK5xJByZuvD8n5cv+aK5oZRm2Xbm4NhgWpCk=";
|
||||
platform = "aarch64-linux";
|
||||
}
|
||||
else if stdenv.isx86_64 then
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "1.68.134";
|
||||
version = "1.68.137";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-l07sbkM5gDMcXeMoWiWH/8nU+Y0ShyB2jIHsqEFaoew=";
|
||||
hash = "sha256-lEW4bv/BWjV8ncB8TMbLMSoQCW960kWP9DaZkEws428=";
|
||||
platform = "x86_64-linux";
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -34,16 +34,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "argo";
|
||||
version = "3.5.8";
|
||||
version = "3.5.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BYUP/Gu+N8KK9mfjRAXupXqrwfZMZlYPxxuZCmUDFfE=";
|
||||
hash = "sha256-35Hp5lISQuFNsbSOKsLRcD695ZRCgQue+H8rKEPma5M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pVOTeH6fq4Gqarjvi7w2wYJ3FSqV6yNZERmOmbVGxLM=";
|
||||
vendorHash = "sha256-dGDXDpjf1kWcqBhCMKLXGXax6ApOL9eIiiem86CxdGs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.11.16";
|
||||
version = "0.11.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
hash = "sha256-i/wEgUK4NxFonZXJKuhLHBgCXQ25A/UDyavhJdjuJ+M=";
|
||||
hash = "sha256-Vhldn9CMxC/5qPFN+ohydHuMsrHjpBuFkP4khf+OQds=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.16.14";
|
||||
version = "0.16.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VYfLy0vR3ON29EHUx1R2jF61+DbxH2RUsUQXFgxjMUU=";
|
||||
hash = "sha256-5LqRHa0ytprwAAIl7iNZQ9zKnn5wNtFubQdvLuX9qGM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
versions =
|
||||
if stdenv.isLinux then {
|
||||
stable = "0.0.62";
|
||||
stable = "0.0.63";
|
||||
ptb = "0.0.98";
|
||||
canary = "0.0.465";
|
||||
development = "0.0.24";
|
||||
|
|
@ -17,7 +17,7 @@ let
|
|||
x86_64-linux = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-gtoTcTcZYJdclEqi1BcxlhVJqU2POdk7XpDq7Dt5YMg=";
|
||||
hash = "sha256-KtVX9EJPYmzDQd2beV/dDW8jjLDjacKZDrD72kLUwKo=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -3,16 +3,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "homebank";
|
||||
version = "5.8.1";
|
||||
version = "5.8.2";
|
||||
src = fetchurl {
|
||||
url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
|
||||
hash = "sha256-YMNf6v40GuyP7Z3ksKh13A9cFnTF9YBP9xkKbGxT3AE=";
|
||||
hash = "sha256-1CpForKKHXp6le8vVlObm22VTh2LqQlI9Qk4bwlzfLA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-clang-build.diff
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ];
|
||||
buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
C Standard says in 6.8.1:
|
||||
|
||||
labeled-statement:
|
||||
identifier : statement
|
||||
case constant-expression : statement
|
||||
default : statement
|
||||
|
||||
Notably, only expressions and no declarations are allowed. A common workaround for this
|
||||
is adding an empty statement.
|
||||
|
||||
diff --git a/src/rep-budget.c b/src/rep-budget.c
|
||||
index eb5cce6..61e2e77 100644
|
||||
--- a/src/rep-budget.c
|
||||
+++ b/src/rep-budget.c
|
||||
@@ -255,7 +255,7 @@ gint tmpmode;
|
||||
}
|
||||
else
|
||||
{
|
||||
-libname:
|
||||
+libname: ;
|
||||
gchar *name;
|
||||
|
||||
gtk_tree_model_get(model, iter,
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ticktick";
|
||||
version = "2.0.30";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/ticktick-${finalAttrs.version}-amd64.deb";
|
||||
hash = "sha256-oo1ssIU6nYMBoEc888xAiTS7PHuEkoaC7KsPRTwL0ZA=";
|
||||
hash = "sha256-yoskJ7v0RgRZ16gs9UY1xf/PunLoFkNGKmVMkPJDPmM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cvc5";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc5";
|
||||
repo = "cvc5";
|
||||
rev = "cvc5-${version}";
|
||||
hash = "sha256-v+3/2IUslQOySxFDYgTBWJIDnyjbU2RPdpfLcIkEtgQ=";
|
||||
hash = "sha256-d5F4KwPQ1nwYJbEidQsvqyaGwEugo291SpsJE2rr558=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake flex ];
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-workspace";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orf";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9/t2MDZ5bYTuzCYTodeATqk+xqST2aQMr7Z1x5fPIuw=";
|
||||
sha256 = "sha256-qAJv4iCw9gkO9yPVQUqla7UWpNkPjPBa4IGQfOyd8k0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ=";
|
||||
cargoHash = "sha256-p+mZN0TXxntT22vp6uBRc6kBTzVN3/Oy7D4v3ihwV8Y=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "filebot";
|
||||
version = "5.1.3";
|
||||
version = "5.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz";
|
||||
hash = "sha256-1TkCV3Cjg/5YZODceV5mQDsPYk09IU7+UHwPRwt2vAQ=";
|
||||
hash = "sha256-UEgG3bQT5GPMfh/nxC1aXGsb8HKE5Ov5ax0ULjLr73U=";
|
||||
};
|
||||
|
||||
unpackPhase = "tar xvf $src";
|
||||
|
|
|
|||
|
|
@ -92,7 +92,12 @@ let
|
|||
autodeint
|
||||
autoload
|
||||
;
|
||||
inherit (callPackage ./occivink.nix { }) blacklistExtensions seekTo;
|
||||
inherit (callPackage ./occivink.nix { })
|
||||
blacklistExtensions
|
||||
crop
|
||||
encode
|
||||
seekTo
|
||||
;
|
||||
|
||||
buildLua = callPackage ./buildLua.nix { };
|
||||
autosubsync-mpv = callPackage ./autosubsync-mpv.nix { };
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ buildLua {
|
|||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = ''Script to "cropping" dynamically, hard-coded black bars detected with lavfi-cropdetect filter for Ultra Wide Screen or any screen (Smartphone/Tablet).'';
|
||||
description = ''Script to "cropping" dynamically, hard-coded black bars detected with lavfi-cropdetect filter for Ultra Wide Screen or any screen (Smartphone/Tablet)'';
|
||||
homepage = "https://github.com/Ashyni/mpv-scripts";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.iynaix ];
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ let
|
|||
in
|
||||
lib.mapAttrs (name: lib.makeOverridable (mkBuiltin name)) {
|
||||
acompressor.meta = {
|
||||
description = "Script to toggle and control ffmpeg's dynamic range compression filter.";
|
||||
description = "Script to toggle and control ffmpeg's dynamic range compression filter";
|
||||
maintainers = with lib.maintainers; [ nicoo ];
|
||||
};
|
||||
|
||||
autocrop.meta.description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video.";
|
||||
autocrop.meta.description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video";
|
||||
|
||||
autodeint.meta.description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video.";
|
||||
autodeint.meta.description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video";
|
||||
|
||||
autoload.meta = {
|
||||
description = "This script automatically loads playlist entries before and after the currently played file";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
buildLua,
|
||||
ffmpeg,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -44,6 +45,16 @@ in
|
|||
lib.mapAttrs (name: lib.makeOverridable (mkScript name)) {
|
||||
|
||||
# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.seekTo ]; }`
|
||||
crop.meta.description = "Crop the current video in a visual manner";
|
||||
seekTo.meta.description = "Mpv script for seeking to a specific position";
|
||||
blacklistExtensions.meta.description = "Automatically remove playlist entries based on their extension.";
|
||||
blacklistExtensions.meta.description = "Automatically remove playlist entries based on their extension";
|
||||
|
||||
encode = {
|
||||
meta.description = "Make an extract of the video currently playing using ffmpeg";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/encode.lua \
|
||||
--replace-fail '"ffmpeg"' '"${lib.getExe ffmpeg}"'
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@
|
|||
|
||||
let
|
||||
pname = "openshot-qt";
|
||||
version = "3.1.1";
|
||||
version = "3.2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenShot";
|
||||
repo = "openshot-qt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kEz1APBitWLlnIbyloYMsqNrwC9RqU04kyyWzm5klYc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zZZ7C/1+Qh7KS1WJ8YWkhFgw0+UHJhjk+145u9/TBcI=";
|
||||
};
|
||||
in
|
||||
mkDerivationWith python3.pkgs.buildPythonApplication {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
Remove a pipe that was causing SIGPIPE
|
||||
issues on overloaded Hydra machines.
|
||||
|
||||
diff --git a/docs/figs/Makefile b/docs/figs/Makefile
|
||||
index e128a4364f..943f745dda 100644
|
||||
--- a/docs/figs/Makefile
|
||||
+++ b/docs/figs/Makefile
|
||||
@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
|
||||
all: $(TARGETS)
|
||||
|
||||
%.png: %.fig
|
||||
- $(FIG2DEV) -L png $< >$@.tmp
|
||||
+ $(FIG2DEV) -L png $< $@.tmp
|
||||
mv -f $@.tmp $@
|
||||
|
||||
clean:
|
||||
|
|
@ -23,7 +23,10 @@ callPackage (import ../generic.nix {
|
|||
xen = {
|
||||
rev = "4b33780de790bd438dd7cbb6143b410d94f0f049";
|
||||
hash = "sha256-2kcmfKwBo3w1U5CSxLSYSteqvzcJaB+cA7keVb3amyA=";
|
||||
patches = [ ./0000-xen-ipxe-src-4.16.patch ] ++ upstreamPatchList;
|
||||
patches = [
|
||||
./0000-xen-ipxe-src-4.16.patch
|
||||
./0001-xen-fig-geneneration-4.16.patch
|
||||
] ++ upstreamPatchList;
|
||||
};
|
||||
qemu = {
|
||||
rev = "c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
Remove a pipe that was causing SIGPIPE
|
||||
issues on overloaded Hydra machines.
|
||||
|
||||
diff --git a/docs/figs/Makefile b/docs/figs/Makefile
|
||||
index e128a4364f..943f745dda 100644
|
||||
--- a/docs/figs/Makefile
|
||||
+++ b/docs/figs/Makefile
|
||||
@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
|
||||
all: $(TARGETS)
|
||||
|
||||
%.png: %.fig
|
||||
- $(FIG2DEV) -L png $< >$@.tmp
|
||||
+ $(FIG2DEV) -L png $< $@.tmp
|
||||
mv -f $@.tmp $@
|
||||
|
||||
clean:
|
||||
|
|
@ -26,7 +26,10 @@ callPackage (import ../generic.nix {
|
|||
xen = {
|
||||
rev = "d530627aaa9b6e03c7f911434bb342fca3d13300";
|
||||
hash = "sha256-4ltQUzo4XPzGT/7fGt1hnNMqBQBVF7VP+WXD9ZaJcGo=";
|
||||
patches = [ ./0000-xen-ipxe-src-4.17.patch ] ++ upstreamPatchList;
|
||||
patches = [
|
||||
./0000-xen-ipxe-src-4.17.patch
|
||||
./0001-xen-fig-geneneration-4.17.patch
|
||||
] ++ upstreamPatchList;
|
||||
};
|
||||
qemu = {
|
||||
rev = "ffb451126550b22b43b62fb8731a0d78e3376c03";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
Remove a pipe that was causing SIGPIPE
|
||||
issues on overloaded Hydra machines.
|
||||
|
||||
diff --git a/docs/figs/Makefile b/docs/figs/Makefile
|
||||
index e128a4364f..943f745dda 100644
|
||||
--- a/docs/figs/Makefile
|
||||
+++ b/docs/figs/Makefile
|
||||
@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
|
||||
all: $(TARGETS)
|
||||
|
||||
%.png: %.fig
|
||||
- $(FIG2DEV) -L png $< >$@.tmp
|
||||
+ $(FIG2DEV) -L png $< $@.tmp
|
||||
mv -f $@.tmp $@
|
||||
|
||||
clean:
|
||||
|
|
@ -26,7 +26,10 @@ callPackage (import ../generic.nix {
|
|||
xen = {
|
||||
rev = "d152a0424677d8b78e00ed1270a583c5dafff16f";
|
||||
hash = "sha256-pHCjj+Bcy4xQfB9xHU9fccFwVdP2DXrUhdszwGvrdmY=";
|
||||
patches = [ ./0000-xen-ipxe-src-4.18.patch ] ++ upstreamPatchList;
|
||||
patches = [
|
||||
./0000-xen-ipxe-src-4.18.patch
|
||||
./0001-xen-fig-geneneration-4.18.patch
|
||||
] ++ upstreamPatchList;
|
||||
};
|
||||
qemu = {
|
||||
rev = "0df9387c8983e1b1e72d8c574356f572342c03e6";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
Remove a pipe that was causing SIGPIPE
|
||||
issues on overloaded Hydra machines.
|
||||
|
||||
diff --git a/docs/figs/Makefile b/docs/figs/Makefile
|
||||
index e128a4364f..943f745dda 100644
|
||||
--- a/docs/figs/Makefile
|
||||
+++ b/docs/figs/Makefile
|
||||
@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
|
||||
all: $(TARGETS)
|
||||
|
||||
%.png: %.fig
|
||||
- $(FIG2DEV) -L png $< >$@.tmp
|
||||
+ $(FIG2DEV) -L png $< $@.tmp
|
||||
mv -f $@.tmp $@
|
||||
|
||||
clean:
|
||||
|
|
@ -23,7 +23,10 @@ callPackage (import ../generic.nix {
|
|||
xen = {
|
||||
rev = "026c9fa29716b0ff0f8b7c687908e71ba29cf239";
|
||||
hash = "sha256-Q6x+2fZ4ITBz6sKICI0NHGx773Rc919cl+wzI89UY+Q=";
|
||||
patches = [ ./0000-xen-ipxe-src-4.19.patch ] ++ upstreamPatchList;
|
||||
patches = [
|
||||
./0000-xen-ipxe-src-4.19.patch
|
||||
./0001-xen-fig-geneneration-4.19.patch
|
||||
] ++ upstreamPatchList;
|
||||
};
|
||||
qemu = {
|
||||
rev = "0df9387c8983e1b1e72d8c574356f572342c03e6";
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let
|
|||
};
|
||||
in {
|
||||
pname = "affine";
|
||||
version = "0.15.7";
|
||||
version = "0.16.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip";
|
||||
hash = "sha256-CbbCYcZ6z5Prj9GwIoneHU3LUsae0S4o40LgunLmQ8s=";
|
||||
hash = "sha256-6F6BzEnseqdzkEUVgUa9eu7MkyNsvucK9lGL+dsKhwc=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "ares-cli";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "webos-tools";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gMAGMg/hobV8WhqutDmYBjqjZqfAdw+EoJX7j8pux18=";
|
||||
hash = "sha256-xiyXJ95MVG06ZoAsC4fIZHQn7lnKumlM3f9MB4uQ7Xc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -19,7 +19,7 @@ buildNpmPackage rec {
|
|||
'';
|
||||
|
||||
dontNpmBuild = true;
|
||||
npmDepsHash = "sha256-3ZUlGJY0aEf7wBig75txlkA6a6JcdkphJILFfIGIN04=";
|
||||
npmDepsHash = "sha256-QtCssL8LLDafRbdB9sWWjP49fjOk+9y3h9xdQ1hIudg=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
nix-update-script
|
||||
}: stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "autoprefixer";
|
||||
version = "10.4.19";
|
||||
version = "10.4.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postcss";
|
||||
repo = "autoprefixer";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Br0z573QghkYHLgF9/OFp8FL0bIW2frW92ohJnHhgHE=";
|
||||
hash = "sha256-CGAUv6qzpcjDPcW7Vsak0iYC6GOJAkKLciVnxYcOeus=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-sGcqM87xR9XTL/MUO7fGpI1cPK7EgJNpeYwBmqVNB6I=";
|
||||
hash = "sha256-AKOcKly8uBohhxx9nSo8rMrm0Ebk06LHZ1Yt9yoZj7g=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, nodejs
|
||||
, makeBinaryWrapper
|
||||
, shellcheck
|
||||
, versionCheckHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -28,11 +29,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nodejs
|
||||
pnpm_8.configHook
|
||||
makeBinaryWrapper
|
||||
versionCheckHook
|
||||
];
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm --filter=bash-language-server build
|
||||
pnpm compile server
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
|
@ -53,13 +55,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
# Create the executable, based upon what happens in npmHooks.npmInstallHook
|
||||
makeWrapper ${lib.getExe nodejs} $out/bin/bash-language-server \
|
||||
--prefix PATH : ${lib.makeBinPath [ shellcheck ]} \
|
||||
--suffix PATH : ${lib.makeBinPath [ shellcheck ]} \
|
||||
--inherit-argv0 \
|
||||
--add-flags $out/lib/bash-language-server/out/cli.js
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A language server for Bash";
|
||||
homepage = "https://github.com/bash-lsp/bash-language-server";
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
{
|
||||
x86_64-linux = {
|
||||
name = "BombSquad_Linux_x86_64";
|
||||
hash = "sha256-XSt6YvBZba/0fO85aJpg1vJnr5tLQsKVuqxSKOrMXw8=";
|
||||
hash = "sha256-ICjaNZSCUbslB5pELbI4e+1zXWrZzkCkv69jLRx4dr0=";
|
||||
};
|
||||
aarch-64-linux = {
|
||||
name = "BombSquad_Linux_Arm64";
|
||||
|
|
@ -34,7 +34,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bombsquad";
|
||||
version = "1.7.36";
|
||||
version = "1.7.37";
|
||||
sourceRoot = ".";
|
||||
src = fetchurl {
|
||||
url = "https://files.ballistica.net/bombsquad/builds/${archive.name}_${finalAttrs.version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -48,13 +48,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cemu";
|
||||
version = "2.0-91";
|
||||
version = "2.0-92";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cemu-project";
|
||||
repo = "Cemu";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4Z2cTunYQ9KEx1VQRiPSqGOLn0eAqcXF+A32KjQDga8=";
|
||||
hash = "sha256-bjt+2RzmG8iKcdyka4HsHM5NEzCwGah4s9eiywSHXbw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flashgbx";
|
||||
version = "4.1";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "FlashGBX";
|
||||
owner = "lesserkuma";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4/f3K5MQBEIdYdcT2NudHJL+VyZT/hj9bw5tfJIco8w=";
|
||||
hash = "sha256-3Oqr70+6BWlt+9M1gkzpcnXC4Q44e1SRI3ylYfMOI90=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@
|
|||
, fcft
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fnott";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "fnott";
|
||||
rev = version;
|
||||
hash = "sha256-out3OZCGZGIIHFZ4t2nN6/3UpsRH9zfw35emexVo4RE=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-KVuBSpf6djf+ceb3LglC/RHAGWS1UAsAT46aPyd2fHQ=";
|
||||
};
|
||||
|
||||
PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services";
|
||||
|
|
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
homepage = "https://codeberg.org/dnkl/fnott";
|
||||
changelog = "https://codeberg.org/dnkl/fnott/src/tag/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://codeberg.org/dnkl/fnott/src/tag/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors";
|
||||
license = with lib.licenses; [ mit zlib ];
|
||||
maintainers = with lib.maintainers; [
|
||||
|
|
@ -69,4 +69,4 @@ stdenv.mkDerivation rec {
|
|||
mainProgram = "fnott";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
2454
pkgs/by-name/gi/gitbutler/Cargo.lock
generated
2454
pkgs/by-name/gi/gitbutler/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -20,16 +20,17 @@
|
|||
openssl,
|
||||
webkitgtk,
|
||||
nix-update-script,
|
||||
cacert,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitbutler";
|
||||
version = "0.12.7";
|
||||
version = "0.12.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitbutlerapp";
|
||||
repo = "gitbutler";
|
||||
rev = "release/${version}";
|
||||
hash = "sha256-TNaWLcdPECK1y04aYW4bFk7YKlW+z5kny4uyG0TA5ps=";
|
||||
hash = "sha256-L4PVaNb3blpLIcyA7XLc71qwUPUADclxvbOkq1Jc1no=";
|
||||
};
|
||||
|
||||
# deactivate the upstream updater in tauri configuration
|
||||
|
|
@ -43,13 +44,13 @@ rustPlatform.buildRustPackage rec {
|
|||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tauri-plugin-context-menu-0.7.1" = "sha256-vKfq20hrFLmfoXO94D8HwAE3UdGcuqVZf3+tOBhLqj0=";
|
||||
"tauri-plugin-log-0.0.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
|
||||
"tauri-plugin-log-0.0.0" = "sha256-gde2RS5NFA0Xap/Xb7XOeVQ/5t2Nw+j+HOwfeJmSNMU=";
|
||||
};
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version src;
|
||||
hash = "sha256-HKsb+96YklgPoqc7bA6fMuRQzWFGmKSBOcF5I0BO3oQ=";
|
||||
hash = "sha256-r2PkNDvOofginL5Y0K+7Qhnsev2zle1q9qraG/ub7Wo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -61,6 +62,7 @@ rustPlatform.buildRustPackage rec {
|
|||
pkg-config
|
||||
pnpm_9.configHook
|
||||
wrapGAppsHook3
|
||||
cacert
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
|
@ -84,6 +86,9 @@ rustPlatform.buildRustPackage rec {
|
|||
# `pnpm`'s `fetchDeps` and `configHook` uses a specific version of pnpm, not upstream's
|
||||
COREPACK_ENABLE_STRICT = 0;
|
||||
|
||||
# disable turbo telemetry
|
||||
TURBO_TELEMETRY_DEBUG = 1;
|
||||
|
||||
# we depend on nightly features
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
|
|
@ -118,11 +123,18 @@ rustPlatform.buildRustPackage rec {
|
|||
);
|
||||
}
|
||||
);
|
||||
|
||||
# Needed to get openssl-sys to use pkgconfig.
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pushd packages/ui
|
||||
pnpm package
|
||||
popd
|
||||
|
||||
cargo tauri build --bundles "$tauriBundle"
|
||||
|
||||
runHook postBuild
|
||||
|
|
@ -171,7 +183,10 @@ rustPlatform.buildRustPackage rec {
|
|||
changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}";
|
||||
mainProgram = "git-butler";
|
||||
license = lib.licenses.fsl11Mit;
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
maintainers = with lib.maintainers; [
|
||||
getchoo
|
||||
techknowlogick
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.79.4";
|
||||
version = "0.79.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "grype";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-h9XqqT4cyOxfAdQuG3DcLQLLXgjrRNjdwmE7eaeLxbg=";
|
||||
hash = "sha256-JgCEiMETervYPI1XI25kAmleOMEs+w3atxKrwuGPxKc=";
|
||||
# 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-qlkGNQC1MUkRg+coKruEwyu3hBrYgILaj8IOhOj7nAc=";
|
||||
vendorHash = "sha256-mMZUE82NjZyy6haY9nkY1KCwrpqt81F+o7wdpaq5dxQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -29,16 +29,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ironbar";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JakeStanger";
|
||||
repo = "ironbar";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TPbvKQdoGfZMzp+fl72vy6MtRV1yGcOG/es67VOA0xw=";
|
||||
hash = "sha256-bvg7U7asuTONZgINQO8wSM2QjXAybvV7j5Ex/g6IDok=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+9R505xyEycv5Dav4ZCh1BiYRp3U1I9yBDqSPefo9uY=";
|
||||
cargoHash = "sha256-Hlucn83Uf1XydRY4SYso+fJ5EvH2hOGmCFYuKgCeSuE=";
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
|
|
|
|||
40
pkgs/by-name/ka/kanha/package.nix
Normal file
40
pkgs/by-name/ka/kanha/package.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchCrate,
|
||||
stdenv,
|
||||
darwin,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanha";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
pname = "kanha";
|
||||
hash = "sha256-ftTmYCkra3x/oDgGJ2WSf6yLeKXkwLJXhjuBdv7fVLY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kjHLc+qWo5dB4qbdlIWzk/pjpghRaDcX/7kkjEM219c=";
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
Security
|
||||
CoreFoundation
|
||||
SystemConfiguration
|
||||
]
|
||||
);
|
||||
|
||||
meta = {
|
||||
description = "Web-app pentesting suite written in rust";
|
||||
homepage = "https://github.com/pwnwriter/kanha";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pwnwriter ];
|
||||
mainProgram = "kanha";
|
||||
};
|
||||
}
|
||||
|
|
@ -29,7 +29,7 @@ buildGoModule rec {
|
|||
postInstall = ''
|
||||
installShellCompletion --cmd litmusctl \
|
||||
--bash <($out/bin/litmusctl completion bash) \
|
||||
--fish <($out/bin/listmusctl completion fish) \
|
||||
--fish <($out/bin/litmusctl completion fish) \
|
||||
--zsh <($out/bin/litmusctl completion zsh)
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -69,13 +69,13 @@ let
|
|||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "3499";
|
||||
version = "3565";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-qF2vjZqRFWVMQhswdlDv80ML7H4UiVc0hWva9nxMGUk=";
|
||||
hash = "sha256-eAsChIG30Oj5aFQyFDtyWqqT2PTgmdJ2jSrsi2UH+Gc=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, nix-output-monitor
|
||||
}:
|
||||
let
|
||||
version = "3.5.19";
|
||||
version = "3.5.21";
|
||||
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-m6LmfrUMpt1ZUX3eqB7Gp+ZV6sAWPqkATwZNvA7Bj9U=";
|
||||
hash = "sha256-Ujo6MQvwolE1eWSkPXCC9WFJeLtRfnMpvxoeAGNcbFI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
|
|||
--prefix PATH : ${lib.makeBinPath runtimeDeps}
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-fyHyuZGjTsKynihlD3H3tSZeo8s9Trbe4NZ3Zv2MHmQ=";
|
||||
cargoHash = "sha256-UFWw59puUWgs8/oHuMqwmjS7ZZQ/WIC1/p8odEtUzVU=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,5 @@
|
|||
{
|
||||
"depends": [
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"lscolors"
|
||||
],
|
||||
"path": "/nix/store/h2rqjnvjg3xihh88f2hm72506vpklilz-source",
|
||||
"ref": "v0.3.3",
|
||||
"rev": "668b46c835944254a445b9cc6dfb887e38fa13f1",
|
||||
"sha256": "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/joachimschmidt557/nim-lscolors/archive/668b46c835944254a445b9cc6dfb887e38fa13f1.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
|
|
@ -24,17 +12,29 @@
|
|||
"srcDir": "",
|
||||
"url": "https://github.com/dom96/nimbox/archive/6a56e76c01481176f16ae29b7d7c526bd83f229b.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"lscolors"
|
||||
],
|
||||
"path": "/nix/store/7pk6334nqpy78l56v15mij0m7khq5skm-source",
|
||||
"ref": "1.0.0",
|
||||
"rev": "3aaaf0422fcf1e708b135e4118832ee6260277b3",
|
||||
"sha256": "103x45z0bp4vh22hfnw2pgqfmgxlph9yd7lr09sggihvszj96r17",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/joachimschmidt557/nim-lscolors/archive/3aaaf0422fcf1e708b135e4118832ee6260277b3.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"wcwidth"
|
||||
],
|
||||
"path": "/nix/store/inpq6nm27r7ixyjsdsm4sg6qna7d2vbc-source",
|
||||
"ref": "v0.1.3",
|
||||
"rev": "fd60d2dd10fd945a471450551ba471c3be80df52",
|
||||
"ref": "v0.1.3^{}",
|
||||
"rev": "86f8db1a883f6a64e590a56aed81e788389b7196",
|
||||
"sha256": "06b9ylqbjcxgm9mjfzljbi8gr9sbajykcqpcxgyqymynqyhxmqjn",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/shoyu777/wcwidth-nim/archive/fd60d2dd10fd945a471450551ba471c3be80df52.tar.gz"
|
||||
"url": "https://github.com/shoyu777/wcwidth-nim/archive/86f8db1a883f6a64e590a56aed81e788389b7196.tar.gz"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "nimmm";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joachimschmidt557";
|
||||
repo = "nimmm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gRQWReZP7bpGX9fvueQaQkX8yMmngT5DT3o4ly9Ux1g=";
|
||||
hash = "sha256-yq91rQlX6bfYHHw72+8m53PCD7hViLe56jAwPTeBBcg=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
|
|
@ -16,7 +16,7 @@ buildNimPackage (finalAttrs: {
|
|||
buildInputs = [ termbox pcre ];
|
||||
|
||||
meta = {
|
||||
description = "Terminal file manager written in Nim";
|
||||
description = "Terminal file manager for Linux";
|
||||
mainProgram = "nimmm";
|
||||
homepage = "https://github.com/joachimschmidt557/nimmm";
|
||||
license = lib.licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
let
|
||||
bits = if stdenv.is64bit then "x64" else "ia32";
|
||||
version = "0.89.0";
|
||||
version = "0.90.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "nwjs-ffmpeg-prebuilt";
|
||||
|
|
@ -16,8 +16,8 @@ stdenv.mkDerivation {
|
|||
src =
|
||||
let
|
||||
hashes = {
|
||||
"x64" = "sha256-uaCGZsPQrA1dl90IqRg7TgWMJyQAGBBF/qNBTShVHcY=";
|
||||
"ia32" = "sha256-uaCGZsPQrA1dl90IqRg7TgWMJyQAGBBF/qNBTShVHcY=";
|
||||
"x64" = "sha256-AAKV896AuOm9dMV98tkEdHIpdUOSBx1QKyPR01VpqSw=";
|
||||
"ia32" = "sha256-AAKV896AuOm9dMV98tkEdHIpdUOSBx1QKyPR01VpqSw=";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
let
|
||||
pname = "openfga-cli";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
in
|
||||
|
||||
buildGoModule {
|
||||
|
|
@ -17,10 +17,10 @@ buildGoModule {
|
|||
owner = "openfga";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-o7JwMLelnHfQd21yTHRfhrX4KgZ1jgyru1/J/+KyjVE=";
|
||||
hash = "sha256-tWGklsAsZ+kBTjpA2by3S0fSpUMNkh9dFKJ7DPzXNRA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OR9UB6/5qPXw/ghE08hL3qlHmLUMvgLoqGBI4tqVr0w=";
|
||||
vendorHash = "sha256-GDYj4KcRK9/J5BTuUsk4f+qBrkT3ofP141mmKIqZAWA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "peergos";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar";
|
||||
hash = "sha256-qscNGuptkRd7bQhIq51bJ/cH2Gzn60lB4IUT9RK6eIo=";
|
||||
hash = "sha256-GxJI33EVNSZfmrj5H70kwW9RE8YuJKt36qYmdWKtEJ8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
|
||||
pythonRelaxDeps = [
|
||||
"importlib-metadata"
|
||||
"kombu"
|
||||
"pillow"
|
||||
"protobuf"
|
||||
"python-bidi"
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signaturepdf";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "24eme";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lDvPPnwMKtM/ZxY6ei5GH7qFrZtRPrbZbi+csfL80jE=";
|
||||
hash = "sha256-WPcnG1iRT4l4S/CSZkj75lIiyzVLsrSyH3GUJa7Tedc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svdtools";
|
||||
version = "0.3.17";
|
||||
version = "0.3.18";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
hash = "sha256-mXxxsAN/KgQOAgVq6jNVtrb11g3WUbU6e+T1Tgmgciw=";
|
||||
hash = "sha256-Pf5OCeIbrVtwEeo6x2xpPpbbAEnHuScC0pUb0NLdtfg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2qA9xMJFj+28/ZCnz4KKm7T3EiG6NUY01JQvYmmuIOc=";
|
||||
cargoHash = "sha256-nQWxhfupbAE4W4hCn4KOP8MEoTfia+BfgA1QQsV9YyI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools to handle vendor-supplied, often buggy SVD files";
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "syft";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WzVJqr96yUnRZ68dX1y+vLFc92nLLPfsBgGjtgCIvbk=";
|
||||
hash = "sha256-VC8aZPHJ4TDDzEObh6zIfx2FfpOfhP8/KLAHEaX7+uM=";
|
||||
# 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;
|
||||
|
|
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||
# hash mismatch with darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-OuTIkGln7EgwI3m0LjIE7giz26Bza4T5PXEkWd+QnI0=";
|
||||
vendorHash = "sha256-+bCua7M8evHN1GDGNQBhthkyr7zHubylP2wQB6b+KEI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tuxmux";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edeneast";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HujdIT55NmXpHDa0a4EmB30va8bNdZ/MHu7+SwF9Nvc=";
|
||||
rev = "tuxmux-v${version}";
|
||||
hash = "sha256-WtcEPvNC1GLOfX0ULUnGHtVO8CyHWQYAPCKwsUlKEzc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ceXeYa8MGGc0I8Q/r4GVsR71St/hlNc75a20BN0Haas=";
|
||||
cargoHash = "sha256-OBaFBEsFjK7Mf2zqI60q6uSG5JnZiohQg79+Fm++tK4=";
|
||||
|
||||
buildInputs = [ libiconv ];
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
|
|
|||
62
pkgs/by-name/xm/xmoji/package.nix
Normal file
62
pkgs/by-name/xm/xmoji/package.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
fontconfig,
|
||||
harfbuzz,
|
||||
libpng,
|
||||
xcbutil,
|
||||
libXcursor,
|
||||
xcbutilimage,
|
||||
libxkbcommon,
|
||||
xcb-util-cursor,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "xmoji";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zirias";
|
||||
repo = "xmoji";
|
||||
rev =
|
||||
let
|
||||
inherit (lib.versions) majorMinor patch;
|
||||
inherit (finalAttrs) version;
|
||||
in
|
||||
"refs/tags/v${majorMinor version}-${patch version}";
|
||||
hash = "sha256-ZZ1jW97JUv003bAMZZfGWbAAPgeZlpBKREaedFi3R8M=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace zimk/lib/platform.mk \
|
||||
--replace-fail 'PATH:=''$(POSIXPATH)' "#"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
harfbuzz
|
||||
libXcursor
|
||||
libpng
|
||||
libxkbcommon
|
||||
xcb-util-cursor
|
||||
xcbutil
|
||||
xcbutilimage
|
||||
];
|
||||
|
||||
makeFlagsArray = [ "prefix=${placeholder "out"}" ];
|
||||
|
||||
meta = {
|
||||
description = "Plain X11 emoji keyboard";
|
||||
homepage = "https://github.com/Zirias/xmoji";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -27,7 +27,7 @@ let
|
|||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "yabai";
|
||||
version = "7.1.1";
|
||||
version = "7.1.2";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
|
||||
|
|
@ -96,13 +96,13 @@ stdenv'.mkDerivation (finalAttrs: {
|
|||
# See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
|
||||
"aarch64-darwin" = fetchzip {
|
||||
url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-LNOAT1vm6EEmcKdshMKjYWFfoRoRNbgZgjEpOTacWc8=";
|
||||
hash = "sha256-4ZJs7Xpou0Ek0CCCjbK47Nu/XPpuTpBDU8GJz5AsaUg=";
|
||||
};
|
||||
"x86_64-darwin" = fetchFromGitHub {
|
||||
owner = "koekeishiya";
|
||||
repo = "yabai";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-dznMjSaS2kkyYf7JrNf1Y++Nb5YFOmk/JQP3BBrf5Bk=";
|
||||
hash = "sha256-H+7vH6AjP6HQ1ifXe8qlLSh0FQu8KJkwr+38C5akk/c=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,21 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yggstack";
|
||||
version = "0-unstable-2024-07-26";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yggdrasil-network";
|
||||
repo = "yggstack";
|
||||
rev = "5a87e43f9a7a0efdb20c9bc9a2e342c335a8767b";
|
||||
sha256 = "sha256-1/Tr4LYXO+GIDzVAjFmPPsXD6X9ZKs1lFpLy4K4zeMw=";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-RQ7AvVv+VLfgzlb7orZbSB7TNz/hj2fo832ed4WUN80=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Sw9FCeZ6kIaEuxJ71XnxbbTdknBomxFuEeEyCSXeJcM=";
|
||||
vendorHash = "sha256-Hjb3KSh+2qYYKdgv4+dsSp0kAbzz8gu9qnQdA7wB5fA=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}"
|
||||
"-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}"
|
||||
"-X github.com/yggdrasil-network/yggdrasil-go/src/config.defaultAdminListen=unix:///var/run/yggdrasil/yggdrasil.sock"
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
|
@ -31,6 +26,6 @@ buildGoModule rec {
|
|||
description = "Yggdrasil as SOCKS proxy / port forwarder";
|
||||
homepage = "https://yggdrasil-network.github.io/";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
maintainers = with maintainers; [ ehmry peigongdsd ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "box2d";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erincatto";
|
||||
repo = "box2d";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cL8L+WSTcswj+Bwy8kSOwuEqLyWEM6xa/j/94aBiSck=";
|
||||
hash = "sha256-yvhpgiZpjTPeSY7Ma1bh4LwIokUUKB10v2WHlamL9D8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--replace-fail 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15'
|
||||
'';
|
||||
|
||||
# tests are broken on 2.4.1 and 2.3.x doesn't have tests: https://github.com/erincatto/box2d/issues/677
|
||||
# tests are broken on 2.4.2 and 2.3.x doesn't have tests: https://github.com/erincatto/box2d/issues/677
|
||||
doCheck = lib.versionAtLeast finalAttrs.version "2.4.2";
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "functionalplus";
|
||||
version = "0.2.24";
|
||||
version = "0.2.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dobiasd";
|
||||
repo = "FunctionalPlus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iQGvqFiTqejSqXALgUWCBjfH9QO0cg3vnI5PphgVoms=";
|
||||
sha256 = "sha256-eKCOi5g8YdKgxaI/mLlqB2m1zwrU9DOSrQF+PW2DBBQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, substituteAll
|
||||
{ lib, stdenv, fetchurl, fetchpatch2, substituteAll
|
||||
, libtool, gettext, zlib, bzip2, flac, libvorbis
|
||||
, exiv2, libgsf, pkg-config
|
||||
, rpmSupport ? stdenv.isLinux, rpm
|
||||
|
|
@ -14,23 +14,24 @@
|
|||
# '';
|
||||
# See also <https://nixos.org/nixpkgs/manual/#sec-language-gnome>.
|
||||
, gtkSupport ? true, glib, gtk3
|
||||
, videoSupport ? true, ffmpeg_4, libmpeg2
|
||||
, videoSupport ? true, libmpeg2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libextractor";
|
||||
version = "1.11";
|
||||
version = "1.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libextractor/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-FvYzq4dGo4VHxKHaP0WRGSsIJa2DxDNvBXW4WEPYvY8=";
|
||||
hash = "sha256-u48xLFHSAlciQ/ETxrYtghAwGrMMuu5gT5g32HjN91U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "libextractor-exiv2-0.28.patch";
|
||||
url = "https://git.pld-linux.org/?p=packages/libextractor.git;a=blob_plain;f=libextractor-exiv2-0.28.patch;h=d763b65f2578f1127713de8dc82f432d34f95a85;hb=0e7de1c6794e8c331a1a1a6a829993c7cd217d3a";
|
||||
hash = "sha256-szAv2A+NmiQyj2+R7BO6fHX588vlTgljPtrnMR6mgGY=";
|
||||
# 0008513: test_exiv2 fails with Exiv2 0.28
|
||||
# https://bugs.gnunet.org/view.php?id=8513
|
||||
(fetchpatch2 {
|
||||
url = "https://sources.debian.org/data/main/libe/libextractor/1%3A1.13-4/debian/patches/exiv2-0.28.diff";
|
||||
hash = "sha256-Re5iwlSyEpWu3PcHibaRKSfmdyHSZGMOdMZ6svTofvs=";
|
||||
})
|
||||
] ++ lib.optionals gstreamerSupport [
|
||||
|
||||
|
|
@ -58,14 +59,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals gstreamerSupport
|
||||
([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
|
||||
++ lib.optionals gtkSupport [ glib gtk3 ]
|
||||
++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-ltdl-install"
|
||||
"--with-ltdl-include=${libtool}/include"
|
||||
"--with-ltdl-lib=${libtool.lib}/lib"
|
||||
"--enable-xpdf"
|
||||
];
|
||||
++ lib.optionals videoSupport [ libmpeg2 ];
|
||||
|
||||
# Checks need to be run after "make install", otherwise plug-ins are not in
|
||||
# the search path, etc.
|
||||
|
|
|
|||
|
|
@ -1,23 +1,29 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
, vala
|
||||
, gi-docgen
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, gnome
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gobject-introspection,
|
||||
vala,
|
||||
gi-docgen,
|
||||
glib,
|
||||
gtk4,
|
||||
libadwaita,
|
||||
gnome,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpanel";
|
||||
version = "1.6.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"devdoc"
|
||||
];
|
||||
|
||||
outputBin = "dev";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -25,6 +31,10 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-t3NJSjxpMANFzY4nAnRI0RiRgwJswTeAL4hkF8bqMLY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
@ -32,6 +42,7 @@ stdenv.mkDerivation rec {
|
|||
gobject-introspection
|
||||
vala
|
||||
gi-docgen
|
||||
gtk4 # gtk4-update-icon-cache
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -40,9 +51,7 @@ stdenv.mkDerivation rec {
|
|||
libadwaita
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dinstall-examples=true"
|
||||
];
|
||||
mesonFlags = [ (lib.mesonBool "install-examples" true) ];
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
|
|
@ -50,9 +59,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
updateScript = gnome.updateScript { packageName = pname; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
89
pkgs/development/node-packages/node-packages.nix
generated
89
pkgs/development/node-packages/node-packages.nix
generated
|
|
@ -57248,95 +57248,6 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
"@astrojs/language-server" = nodeEnv.buildNodePackage {
|
||||
name = "_at_astrojs_slash_language-server";
|
||||
packageName = "@astrojs/language-server";
|
||||
version = "2.12.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.12.1.tgz";
|
||||
sha512 = "CCibE6XwSmrZEKlPDr48LZJN7NWxOurOJK1yOzqZFMNV8Y6DIqF6s1e60gbNNHMZkthWYBNTPno4Ni/XyviinQ==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@astrojs/compiler-2.9.2"
|
||||
sources."@emmetio/abbreviation-2.3.3"
|
||||
sources."@emmetio/css-abbreviation-2.1.8"
|
||||
sources."@emmetio/css-parser-0.4.0"
|
||||
sources."@emmetio/html-matcher-1.3.0"
|
||||
sources."@emmetio/scanner-1.0.4"
|
||||
sources."@emmetio/stream-reader-2.2.0"
|
||||
sources."@emmetio/stream-reader-utils-0.1.0"
|
||||
sources."@jridgewell/sourcemap-codec-1.5.0"
|
||||
sources."@nodelib/fs.scandir-2.1.5"
|
||||
sources."@nodelib/fs.stat-2.0.5"
|
||||
sources."@nodelib/fs.walk-1.2.8"
|
||||
sources."@volar/kit-2.4.0-alpha.18"
|
||||
sources."@volar/language-core-2.4.0-alpha.18"
|
||||
sources."@volar/language-server-2.4.0-alpha.18"
|
||||
sources."@volar/language-service-2.4.0-alpha.18"
|
||||
sources."@volar/snapshot-document-2.4.0-alpha.18"
|
||||
sources."@volar/source-map-2.4.0-alpha.18"
|
||||
sources."@volar/typescript-2.4.0-alpha.18"
|
||||
(sources."@vscode/emmet-helper-2.9.3" // {
|
||||
dependencies = [
|
||||
sources."vscode-uri-2.1.2"
|
||||
];
|
||||
})
|
||||
sources."@vscode/l10n-0.0.18"
|
||||
sources."braces-3.0.3"
|
||||
sources."emmet-2.4.7"
|
||||
sources."fast-glob-3.3.2"
|
||||
sources."fastq-1.17.1"
|
||||
sources."fill-range-7.1.1"
|
||||
sources."glob-parent-5.1.2"
|
||||
sources."is-extglob-2.1.1"
|
||||
sources."is-glob-4.0.3"
|
||||
sources."is-number-7.0.0"
|
||||
sources."jsonc-parser-2.3.1"
|
||||
sources."merge2-1.4.1"
|
||||
sources."micromatch-4.0.7"
|
||||
sources."muggle-string-0.4.1"
|
||||
sources."path-browserify-1.0.1"
|
||||
sources."picomatch-2.3.1"
|
||||
sources."prettier-3.3.3"
|
||||
sources."prettier-plugin-astro-0.14.1"
|
||||
sources."queue-microtask-1.2.3"
|
||||
sources."request-light-0.7.0"
|
||||
sources."reusify-1.0.4"
|
||||
sources."run-parallel-1.2.0"
|
||||
sources."s.color-0.0.15"
|
||||
sources."sass-formatter-0.7.9"
|
||||
sources."semver-7.6.3"
|
||||
sources."suf-log-2.5.3"
|
||||
sources."to-regex-range-5.0.1"
|
||||
sources."typesafe-path-0.2.2"
|
||||
sources."typescript-5.5.4"
|
||||
sources."typescript-auto-import-cache-0.3.3"
|
||||
sources."volar-service-css-0.0.59"
|
||||
sources."volar-service-emmet-0.0.59"
|
||||
sources."volar-service-html-0.0.59"
|
||||
sources."volar-service-prettier-0.0.59"
|
||||
sources."volar-service-typescript-0.0.59"
|
||||
sources."volar-service-typescript-twoslash-queries-0.0.59"
|
||||
sources."vscode-css-languageservice-6.3.0"
|
||||
sources."vscode-html-languageservice-5.3.0"
|
||||
sources."vscode-jsonrpc-8.2.0"
|
||||
sources."vscode-languageserver-9.0.1"
|
||||
sources."vscode-languageserver-protocol-3.17.5"
|
||||
sources."vscode-languageserver-textdocument-1.0.11"
|
||||
sources."vscode-languageserver-types-3.17.5"
|
||||
sources."vscode-nls-5.2.0"
|
||||
sources."vscode-uri-3.0.8"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "The Astro language server, implement the [language server protocol](https://microsoft.github.io/language-server-protocol/)";
|
||||
homepage = "https://github.com/withastro/language-tools#readme";
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
"@babel/cli" = nodeEnv.buildNodePackage {
|
||||
name = "_at_babel_slash_cli";
|
||||
packageName = "@babel/cli";
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "accelerate";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
owner = "huggingface";
|
||||
repo = "accelerate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/Is5aKTYHxvgUJSkF7HxMbEA6dgn/y5F1B3D6qSCSaE=";
|
||||
hash = "sha256-SYhAYz180jdOUhzbe0iUFBuGRv4n4PmgfCVOEOZKBGA=";
|
||||
};
|
||||
|
||||
buildInputs = [ llvmPackages.openmp ];
|
||||
|
|
|
|||
|
|
@ -1,39 +1,31 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
stdenv,
|
||||
billiard,
|
||||
kombu,
|
||||
vine,
|
||||
click,
|
||||
buildPythonPackage,
|
||||
click-didyoumean,
|
||||
click-repl,
|
||||
click-plugins,
|
||||
tzdata,
|
||||
python-dateutil,
|
||||
|
||||
# optional-dependencies
|
||||
click-repl,
|
||||
click,
|
||||
fetchPypi,
|
||||
google-cloud-storage,
|
||||
kombu,
|
||||
moto,
|
||||
msgpack,
|
||||
nixosTests,
|
||||
pymongo,
|
||||
pyyaml,
|
||||
|
||||
# tests
|
||||
pytest-celery,
|
||||
pytest-click,
|
||||
pytest-subtests,
|
||||
pytest-timeout,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
nixosTests,
|
||||
python-dateutil,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
setuptools,
|
||||
tzdata,
|
||||
vine,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -62,28 +54,22 @@ buildPythonPackage rec {
|
|||
vine
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
passthru.optional-dependencies = {
|
||||
gcs = [ google-cloud-storage ];
|
||||
mongodb = [ pymongo ];
|
||||
msgpack = [ msgpack ];
|
||||
yaml = [ pyyaml ];
|
||||
};
|
||||
|
||||
nativeCheckInputs =
|
||||
[
|
||||
moto
|
||||
pytest-celery
|
||||
pytest-click
|
||||
pytest-subtests
|
||||
pytest-timeout
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
]
|
||||
# based on https://github.com/celery/celery/blob/main/requirements/test.txt
|
||||
++ optional-dependencies.yaml
|
||||
++ optional-dependencies.msgpack
|
||||
++ optional-dependencies.mongodb
|
||||
++ optional-dependencies.gcs;
|
||||
nativeCheckInputs = [
|
||||
moto
|
||||
pytest-celery
|
||||
pytest-click
|
||||
pytest-subtests
|
||||
pytest-timeout
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
|
||||
disabledTestPaths = [
|
||||
# test_eventlet touches network
|
||||
|
|
@ -91,7 +77,7 @@ buildPythonPackage rec {
|
|||
# test_multi tries to create directories under /var
|
||||
"t/unit/bin/test_multi.py"
|
||||
"t/unit/apps/test_multi.py"
|
||||
# requires moto<5
|
||||
# Test requires moto<5
|
||||
"t/unit/backends/test_s3.py"
|
||||
];
|
||||
|
||||
|
|
@ -102,13 +88,15 @@ buildPythonPackage rec {
|
|||
# seems to only fail on higher core counts
|
||||
# AssertionError: assert 3 == 0
|
||||
"test_setup_security_disabled_serializers"
|
||||
# fails with pytest-xdist
|
||||
# Test is flaky, especially on hydra
|
||||
"test_ready"
|
||||
# Tests fail with pytest-xdist
|
||||
"test_itercapture_limit"
|
||||
"test_stamping_headers_in_options"
|
||||
"test_stamping_with_replace"
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
# too many open files on hydra
|
||||
# Too many open files on hydra
|
||||
"test_cleanup"
|
||||
"test_with_autoscaler_file_descriptor_safety"
|
||||
"test_with_file_descriptor_safety"
|
||||
|
|
@ -122,10 +110,10 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Distributed task queue";
|
||||
mainProgram = "celery";
|
||||
homepage = "https://github.com/celery/celery/";
|
||||
changelog = "https://github.com/celery/celery/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "celery";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,36 +1,40 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
django_4,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
django,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-admin-sortable2";
|
||||
version = "2.2.1";
|
||||
format = "setuptools";
|
||||
version = "2.2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "django_admin_sortable2";
|
||||
inherit version;
|
||||
hash = "sha256-MKlSf5P8YbeixZVNtX2EKJMeN/Riw7RssQEFPcX1F1E=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jrief";
|
||||
repo = "django-admin-sortable2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BgydzSrbEMC6fE3W9TqjedBYtxMhK/bsYexNTXnJfUo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django_4 ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ django ];
|
||||
|
||||
pythonImportsCheck = [ "adminsortable2" ];
|
||||
|
||||
# Tests are very slow (end-to-end with playwright)
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Generic drag-and-drop ordering for objects in the Django admin interface";
|
||||
homepage = "https://github.com/jrief/django-admin-sortable2";
|
||||
changelog = "https://github.com/jrief/django-admin-sortable2/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sephi ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sephi ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "iminuit";
|
||||
version = "2.27.0";
|
||||
version = "2.28.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TOgwZncw520gsQQWpYUWcsf8wwHdH0i5FDz9GHuJq44=";
|
||||
hash = "sha256-ZkauC2akdg4CzXNxHUYKbPI3U4K3jOg0QUF1FZVZaq0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "kombu";
|
||||
version = "5.3.7";
|
||||
version = "5.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ARxM2aNVwUod6NNdJXMUodJFbVK3FAOIVhrKw88al78=";
|
||||
hash = "sha256-rSAKjb2qorvF8m0u59cH2aH97TU6D0vXUc6MfZ9EnGA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "marimo";
|
||||
version = "0.7.16";
|
||||
version = "0.7.19";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zEbuCw9gQiqNvzMg/8kYKW02/YdsdDyXzjDskGergK0=";
|
||||
hash = "sha256-YZ5XmBFyU48OC8sI2tyZShwqmfwywbtEjlRBGScfeo0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
57
pkgs/development/python-modules/pdm-build-locked/default.nix
Normal file
57
pkgs/development/python-modules/pdm-build-locked/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
pdm-backend,
|
||||
tomli,
|
||||
build,
|
||||
hatchling,
|
||||
pkginfo,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdm-build-locked";
|
||||
version = "0.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdm-project";
|
||||
repo = "pdm-build-locked";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tgLC1tUgmyX7QvlLpNb/SMQRTDZ+DNFV3o0JELAZEeo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/conftest.py \
|
||||
--replace-fail '"pdm.pytest"' ""
|
||||
sed -i "/addopts/d" pyproject.toml
|
||||
'';
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
dependencies = lib.optionals (pythonOlder "3.11") [ tomli ];
|
||||
|
||||
pythonImportsCheck = [ "pdm_build_locked" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
build
|
||||
hatchling
|
||||
pkginfo
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# circular import of pdm
|
||||
"tests/unit/test_build_command.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Pdm-build-locked is a pdm plugin to publish locked dependencies as optional-dependencies";
|
||||
homepage = "https://github.com/pdm-project/pdm-build-locked";
|
||||
changelog = "https://github.com/pdm-project/pdm-build-locked/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,56 +1,52 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
nose,
|
||||
pkgs,
|
||||
pkg-config,
|
||||
swig,
|
||||
libcdio,
|
||||
libiconv,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycdio";
|
||||
version = "2.1.1";
|
||||
format = "setuptools";
|
||||
version = "2.1.1-unstable-2024-02-26";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "61734db8c554b7b1a2cb2da2e2c15d3f9f5973a57cfb06f8854c38029004a9f8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rocky";
|
||||
repo = "pycdio";
|
||||
rev = "806c6a2eeeeb546055ce2ac9a0ae6a14ea53ae35"; # no tag for this version (yet)
|
||||
hash = "sha256-bOm82mBUIaw4BGHj3Y24Fv5+RfAew+Ma1u4QENXoRiU=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'library_dirs=library_dirs' 'library_dirs=[dir.decode("utf-8") for dir in library_dirs]' \
|
||||
--replace 'include_dirs=include_dirs' 'include_dirs=[dir.decode("utf-8") for dir in include_dirs]' \
|
||||
--replace 'runtime_library_dirs=runtime_lib_dirs' 'runtime_library_dirs=[dir.decode("utf-8") for dir in runtime_lib_dirs]'
|
||||
substituteInPlace test/test-cdtext.py \
|
||||
--replace-fail assertEquals assertEqual
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nose
|
||||
pkgs.pkg-config
|
||||
pkgs.swig
|
||||
pkg-config
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
setuptools
|
||||
pkgs.libcdio
|
||||
] ++ lib.optional stdenv.isDarwin pkgs.libiconv;
|
||||
libcdio
|
||||
libiconv
|
||||
];
|
||||
|
||||
# Run tests using nosetests but first need to install the binaries
|
||||
# to the root source directory where they can be found.
|
||||
checkPhase = ''
|
||||
./setup.py install_lib -d .
|
||||
nosetests
|
||||
'';
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
pytestFlagsArray = [ "test/test-*.py" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/libcdio/";
|
||||
changelog = "https://github.com/rocky/pycdio/blob/${src.rev}/ChangeLog";
|
||||
description = "Wrapper around libcdio (CD Input and Control library)";
|
||||
license = licenses.gpl3Plus;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinstaller-hooks-contrib";
|
||||
version = "2024.7";
|
||||
version = "2024.8";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pyinstaller_hooks_contrib";
|
||||
inherit version;
|
||||
hash = "sha256-/V833Pmb7OGE5AZCr4i+Fqm4lhPsuViovRE2Y0/J+sU=";
|
||||
hash = "sha256-KbaNh4q3OelnBVtWqT65tY5SnVsFT7q3ovK6z4DO8+I=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mill";
|
||||
version = "0.11.10";
|
||||
version = "0.11.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly";
|
||||
hash = "sha256-/IVWeTUu3piV80SfbqeSG6tnRUDTpAyoBcbeCVelUpc=";
|
||||
hash = "sha256-tTLLY/4rTnV/Mj6/InK7Pfl/49feeWivEWURusRT6Bk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -13,21 +13,21 @@ let
|
|||
|
||||
channels = {
|
||||
stable = {
|
||||
version = "2.11.4";
|
||||
version = "2.13.4";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-um7bwlHzPh6dF2KspGLQfzSVywWdImUc0U/HTkWT2jA=";
|
||||
x86_64-darwin = "sha256-AiT63c47obiGnf9Vo0C2F3YoVLWdbH/+pkgFT0Tvzew=";
|
||||
aarch64-linux = "sha256-7tl58GmO5pBsjSkiF/Oy1r3a+Giko/+2Ir7r4V6vy4c=";
|
||||
aarch64-darwin = "sha256-e86dqZptcQeGlCclLRfNW3Ku9UucW0vXHBGC7r/0Apc=";
|
||||
x86_64-linux = "sha256-vIqqVVJxKlxiKWsb9soy6yZQ9NQ8ZCjUqzu6k8m9MJE=";
|
||||
x86_64-darwin = "sha256-m7ZMVEaqIvmutTaQk3r8/p8h5zt4k/s34IdKjv89awA=";
|
||||
aarch64-linux = "sha256-fBHZijXeqRNr9zvmgaFhMaIIF9kgP7J32CwJgBvf9/0=";
|
||||
aarch64-darwin = "sha256-3QnxGDV4VRlxw3BayYD4akC6ZRjaUhEkptTGt3Zzecg=";
|
||||
};
|
||||
};
|
||||
mainline = {
|
||||
version = "2.12.3";
|
||||
version = "2.14.1";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-cg2Xr4yZXVFl081fGYztDa35TnaQYmS/uMqc1z5UAmc=";
|
||||
x86_64-darwin = "sha256-zK/I/D5N5hcFMrBxebaA5WSRml0RaKrSX1FI/+YSXxI=";
|
||||
aarch64-linux = "sha256-KRIdyQFTBmhEm0hkdoilYNlQhcpagilc5fZ6k18Riu4=";
|
||||
aarch64-darwin = "sha256-4q6Sz+ZguMxznPuwf0Ip+KWTDKPPZ/ICdvltVLmQinE=";
|
||||
x86_64-linux = "sha256-zOMcngzhG6SxN/Hjamf5g0Cb/nhrD3NcVKC8MdL2L80=";
|
||||
x86_64-darwin = "sha256-FzFrE3moll8D0of0Chs47XI9baAjFDzpcPJdpwteMpE=";
|
||||
aarch64-linux = "sha256-RsQ3sv5t+o6gObdG81hZ8dHng39qjlynENH30oAhZqM=";
|
||||
aarch64-darwin = "sha256-MPIm/d6fOe6DjVIewDeoxMs2OKz9urWgKMW6vmM9RGs=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "atlas";
|
||||
version = "0.25.0";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ariga";
|
||||
repo = "atlas";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-X8r1DCuKswM9C7HaSkPbyOs9uRG+KGTzWCxGgvajr6k=";
|
||||
hash = "sha256-QSm8KfpygHkXulwBrTG18l3pVEB32xj3HwezjZzJFl8=";
|
||||
};
|
||||
|
||||
modRoot = "cmd/atlas";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-wmvWdUqSPmTaGNDuTJPNEqlJcxy+ckAjHvHH9L7aAGg=";
|
||||
vendorHash = "sha256-9K4zsly00dis3pYR++vXy0E8buKR6uOAmqw8IVYGXGM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fission";
|
||||
version = "1.20.2";
|
||||
version = "1.20.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fission";
|
||||
repo = "fission";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DkSilNn98m7E9qTRpf+g2cmo3SHeJkW4eJ5T6XQM3S8=";
|
||||
hash = "sha256-q1wyyzkqEMEYmgmj11YaZYl3lTtJKfPM8fxjTmh7cT4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IChr8jC21yI5zOkHF2v9lQoqXT95FSMXJdWj7HqikB4=";
|
||||
vendorHash = "sha256-Vi6eEQR3DQupn3CnasKxknaSk7Hs7C7v2yUGtxhsovQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X info.Version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -136,9 +136,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
|||
|
||||
[[package]]
|
||||
name = "els"
|
||||
version = "0.1.53"
|
||||
version = "0.1.54-nightly.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97104e067d1a4432a49a18da26af10a0f51d8d99f69e46aeb9890440f6a36457"
|
||||
checksum = "4fb27dc0754e2490b8984d95f4fe6368258de544eedd37798a314acfeb5ccfc6"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_compiler",
|
||||
|
|
@ -150,9 +150,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "erg_common"
|
||||
version = "0.6.41"
|
||||
version = "0.6.42-nightly.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3868e184db0bb4a69538aa0744f6b19e51c43233f5369f8e7e114c263b9ff996"
|
||||
checksum = "415899164e7873f66eecad5ad37683c5fa31c038802033f35ad08f3fa38882dc"
|
||||
dependencies = [
|
||||
"backtrace-on-stack-overflow",
|
||||
"erg_proc_macros",
|
||||
|
|
@ -162,9 +162,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "erg_compiler"
|
||||
version = "0.6.41"
|
||||
version = "0.6.42-nightly.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7fcd5809b7797e85a87555cbe5d79580749a8b9ba8edf0ac7a422ad90c67793"
|
||||
checksum = "048b3d74d5ca2c5279e18f15fd5997fe0cdfcad0a8d6ff2e4e238a8b76d86b36"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_parser",
|
||||
|
|
@ -172,9 +172,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "erg_parser"
|
||||
version = "0.6.41"
|
||||
version = "0.6.42-nightly.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9f986e2ca5c640c39083fcfe97009f11138458b1f1e3aa17595c81e9ae9e33d0"
|
||||
checksum = "ca774922a3555cb1973ead24f9ad27056057480bbcfff2ccab0b8b3637517054"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_proc_macros",
|
||||
|
|
@ -183,9 +183,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "erg_proc_macros"
|
||||
version = "0.6.41"
|
||||
version = "0.6.42-nightly.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e828d1dcb5ee351dcba9707a8ecd46e9ba510367595e922a26528fa0d2853920"
|
||||
checksum = "a7500b1a02978ccf36cef9eecb31f99911a0b56753589e375f0a51b6ff57b750"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
|
|
@ -551,7 +551,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "py2erg"
|
||||
version = "0.0.57"
|
||||
version = "0.0.58"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_compiler",
|
||||
|
|
@ -561,7 +561,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pylyzer"
|
||||
version = "0.0.57"
|
||||
version = "0.0.58"
|
||||
dependencies = [
|
||||
"els",
|
||||
"erg_common",
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pylyzer";
|
||||
version = "0.0.57";
|
||||
version = "0.0.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtshiba";
|
||||
repo = "pylyzer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/poCNyM0bfoCbpMIMZ+Ga8SAuioCLijJCJRhJdLGAOQ=";
|
||||
hash = "sha256-IhfWl8Txhlddrr/Rny5ZyJaOKLft6R4ghYlwu6iOJsk=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "nest-cli";
|
||||
version = "10.4.2";
|
||||
version = "10.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nestjs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Xy4KhgDGEJGIAv7eC15nIU9ozhWUh2x8D8FnOf5jRDs=";
|
||||
hash = "sha256-m08QZBBIWl/JB3Z7aOiNE4kagL0wFn4JJhCFCtjkpdo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-dCfoX1WOhPFIXrhoErx4CJVicB11Gz378POagS5B8bE=";
|
||||
npmDepsHash = "sha256-PbUleMm6J/5R64ZceZ5G4CsU+P3etdlV7rdT5VvUSFQ=";
|
||||
|
||||
env = {
|
||||
npm_config_build_from_source = true;
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "renderdoc";
|
||||
version = "1.33";
|
||||
version = "1.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baldurk";
|
||||
repo = "renderdoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BQR7ENgdblzamO5GgtLJriNiJFICsj0/iWVn1usxBjU=";
|
||||
sha256 = "sha256-obRCILzMR7tCni0YoT3/oesTSADGI2sXqY3G6RS1h1o=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-hack";
|
||||
version = "0.6.30";
|
||||
version = "0.6.31";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-t2fpQWXHZzdwkgGk7yhi5IsEDYxeQ5c9gpq78xl9cb0=";
|
||||
hash = "sha256-PMqGDwiQYTtPna4buO6pxUjF+RXT9phjPUNcpQQSn6Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FUODX+alK3lWRPXDxhduNeA9WW44I3fAw33sNCmIUKc=";
|
||||
cargoHash = "sha256-/bkGWQZAHkMtH6Y9ntFJEKV6gmUZEAbYf5A5xoUOMM8=";
|
||||
|
||||
# some necessary files are absent in the crate version
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
let
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
pname = "cargo-mobile2";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -20,14 +20,14 @@ rustPlatform.buildRustPackage {
|
|||
owner = "tauri-apps";
|
||||
repo = pname;
|
||||
rev = "cargo-mobile2-v${version}";
|
||||
hash = "sha256-K7Ul3a1n3JpDm31XuwVAWiAjbQtuKm5faRiWelgU4fU=";
|
||||
hash = "sha256-MEq7NHoGQ8Qp7qXQXTyiV9vE+wXFMihrqPfj7q5AdxI=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
# sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-wXLvv9fijFELKzACDgza3fxEFV5rip3Jj9Xn1M27hgc=";
|
||||
cargoHash = "sha256-6atMhn1DaItybJUT/NndRce//j+LdpuoBsY6z3DKxE0=";
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p $out/share/
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "schemacrawler";
|
||||
version = "16.22.1";
|
||||
version = "16.22.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip";
|
||||
hash = "sha256-GEorJxVBHrT0JGSDvqNbt00kjs0VMH1aJR9BZ5mewoc=";
|
||||
hash = "sha256-N08lKCTbpX4b05i4UcCEy6wycsiIJu5BRr7EZ3oZ1rA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
1. Copy the old Nix expression (e.g., `linux-2.6.21.nix`) to the new one (e.g., `linux-2.6.22.nix`) and update it.
|
||||
|
||||
2. Add the new kernel to the `kernels` attribute set in [`linux-kernels.nix`](./linux-kernels.nix) (e.g., create an attribute `kernel_2_6_22`).
|
||||
2. Add the new kernel to the `kernels` attribute set in [`linux-kernels.nix`](../../../top-level/linux-kernels.nix) (e.g., create an attribute `kernel_2_6_22`).
|
||||
|
||||
3. Update the kernel configuration:
|
||||
|
||||
|
|
|
|||
|
|
@ -478,7 +478,7 @@ fi
|
|||
|
||||
# Find configuration.nix and open editor instead of building.
|
||||
if [ "$action" = edit ]; then
|
||||
if [[ -n $attr || -n $buildFile ]]; then
|
||||
if [[ -z $buildingAttribute ]]; then
|
||||
log "error: '--file' and '--attr' are not supported with 'edit'"
|
||||
exit 1
|
||||
elif [[ -z $flake ]]; then
|
||||
|
|
|
|||
|
|
@ -60,6 +60,8 @@
|
|||
|
||||
tuya_local = callPackage ./tuya_local {};
|
||||
|
||||
volkswagen_we_connect_id = callPackage ./volkswagen_we_connect_id { };
|
||||
|
||||
volkswagencarnet = callPackage ./volkswagencarnet { };
|
||||
|
||||
waste_collection_schedule = callPackage ./waste_collection_schedule {};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
{
|
||||
ascii-magic,
|
||||
buildHomeAssistantComponent,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
weconnect,
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "mitch-dc";
|
||||
domain = "volkswagen_we-connect_id";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "volkswagen_we_connect_id";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Pmx1jXWXYta/kY51Ih1YRB+QeIfklVvBKcUYU5bHbsQ=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
ascii-magic
|
||||
weconnect
|
||||
];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/mitch-dc/volkswagen_we_connect_id/releases/tag/v${version}";
|
||||
description = "Statistics from the Volkswagen ID API";
|
||||
homepage = "https://github.com/mitch-dc/volkswagen_we_connect_id";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -64,7 +64,7 @@ in
|
|||
};
|
||||
|
||||
tomcat10 = common {
|
||||
version = "10.1.26";
|
||||
hash = "sha256-9z92dgE3gzszBd+xjtF0+H/qw6t49lKJoINahR18/rI=";
|
||||
version = "10.1.28";
|
||||
hash = "sha256-89N3d9Pqv4TwQ9ljTQj6Qzfw2B75ADzo/H4c8Uc7hdo=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HISDW6qxpfJpOFweUQo6T+8aV5mvB3o3jnx8CZxweJo=";
|
||||
hash = "sha256-QOokLht/nIzQAzXQuJv5M4QTQD0Zhzf9+Q0ILl2Mds0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "traefik";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
# Archive with static assets for webui
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
hash = "sha256-+OLjR46I2cPVdtrFYQsWNGhibYhc+T6PiR9NAoq2/1Y=";
|
||||
hash = "sha256-PHS4x9RDoc2zDPS1SaYYEeZVa4SyQpvqzPT/SDo1ygg=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XmRIrPHI0YOUqUP/dynlM4OlaOL0kuoKoX3SWAo3L64=";
|
||||
vendorHash = "sha256-xQPDlwu/mRdyvZW0qSCA9eko9pOQAMwh2vVJWzMnyfs=";
|
||||
|
||||
subPackages = [ "cmd/traefik" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "unpackerr";
|
||||
version = "0.14.3";
|
||||
version = "0.14.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davidnewhall";
|
||||
repo = "unpackerr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QwsrH0Wq5oix1qFqObFadZTCIJr8ny4Umx8cwErcBcM=";
|
||||
sha256 = "sha256-uQwpdgV6ksouW9JTuiiuQjxBGOE/ypDW769kNJgWrHw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wWIw0gNn5tqRq0udzPy/n2OkiIVESpSotOSn2YlBNS4=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "procs";
|
||||
version = "0.14.5";
|
||||
version = "0.14.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dalance";
|
||||
repo = "procs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9kxJrvlaEoEkPPoU4/9IlX2TvDUG9VZwtb4a3N9rAsc=";
|
||||
hash = "sha256-Dp0XdARZrDrZ9QOv+V2ZKYV7J89t135ie5LSWz/KKHY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2g+6FmcO4t9tjLq7xkBaLAgbzQoBgskr8csM/1tHbWI=";
|
||||
cargoHash = "sha256-EifER0wt2Nw7WrlVwc49tZHH/av4OkzTPYSzl9mVJI8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ]
|
||||
++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ];
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "turbovnc";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TurboVNC";
|
||||
repo = "turbovnc";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-7dft5Wp9LvRy3FM/cZ5F6qUIesu7mzd/Ww8P3xsSvyI=";
|
||||
hash = "sha256-bU23sCjU3lUQszqyLHjKTxUKj0ngkkrUb8xYi9XSFj0=";
|
||||
};
|
||||
|
||||
# TODO:
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "wal-g";
|
||||
version = "3.0.0";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wal-g";
|
||||
repo = "wal-g";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k+GaOb+o5b+Rmggk+Wq3NscDS+fIvyK0e/EhX6UMlqM=";
|
||||
sha256 = "sha256-r46svvUAMjZx+Oc/vTWet9iZLEiXkRFevUz4x0OixVI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZsVqR02D4YmZP/tVz2UWpXa6fM7HU7Hi2CSnvuVx9UU=";
|
||||
vendorHash = "sha256-CfXLeFQA7ix1DP+DB5qWQryS2tLFNlfZrA3OBYxIpjU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "resvg";
|
||||
version = "0.42.0";
|
||||
version = "0.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RazrFalcon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GAP/jCWtaMVmsLGD8EosspfzemrDAIAdts1tAz+zNik=";
|
||||
hash = "sha256-7JnNgTLpRo39EjYWchnfjGRfNgEwy5x4tUUzWT/d8h0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mRj5Hz8jY0NZSUJXFCvLswQE7H3+fkouZbNtWLP47FE=";
|
||||
cargoHash = "sha256-ok+Bqtc6YJoCRFis8JRmtKs1Jag04Ged2J4p4trI2ls=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package=resvg"
|
||||
|
|
|
|||
|
|
@ -1,54 +1,64 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, python3Packages
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "barman";
|
||||
version = "3.10.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnterpriseDB";
|
||||
repo = pname;
|
||||
repo = "barman";
|
||||
rev = "refs/tags/release/${version}";
|
||||
hash = "sha256-38r1CwS4BUqhzAUmBvxuqKquGfGlgSekKXe7EbumSe0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./unwrap-subprocess.patch
|
||||
patches = [ ./unwrap-subprocess.patch ];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
distutils
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
argcomplete
|
||||
azure-identity
|
||||
azure-mgmt-compute
|
||||
azure-storage-blob
|
||||
boto3
|
||||
google-cloud-compute
|
||||
google-cloud-storage
|
||||
grpcio
|
||||
psycopg2
|
||||
python-dateutil
|
||||
python-snappy
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
mock
|
||||
python-snappy
|
||||
google-cloud-storage
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
argcomplete
|
||||
azure-identity
|
||||
azure-storage-blob
|
||||
boto3
|
||||
psycopg2
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Assertion error
|
||||
"test_help_output"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# FsOperationFailed
|
||||
"test_get_file_mode"
|
||||
];
|
||||
disabledTests =
|
||||
[
|
||||
# Assertion error
|
||||
"test_help_output"
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
# FsOperationFailed
|
||||
"test_get_file_mode"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.pgbarman.org/";
|
||||
description = "Backup and Recovery Manager for PostgreSQL";
|
||||
homepage = "https://www.pgbarman.org/";
|
||||
changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,11 +102,11 @@ in
|
|||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "273";
|
||||
version = "274";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
hash = "sha256-TccR/Vxq6Zf9tEvknLWewPVvJqo8pVSIi1+KxKMASq4=";
|
||||
hash = "sha256-XRh1wfsLE8YnaKWgFKvDQkhY1J76Dw5KLWtHQJtWbfI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "pdm";
|
||||
version = "2.15.4";
|
||||
version = "2.17.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-WOIlhQVn3K3OQkGNtGOJlt8rE3jNCDDNSK/aG0VdnHI=";
|
||||
hash = "sha256-9JIg8iXscSWMv3FIsUp2yurGEnRb7atn+QYjmOpWp6U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -27,6 +27,7 @@ buildPythonApplication rec {
|
|||
|
||||
build-system = [
|
||||
pdm-backend
|
||||
pdm-build-locked
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
|
|
@ -102,11 +103,14 @@ buildPythonApplication rec {
|
|||
"test_convert_setup_py_project"
|
||||
# pythonfinder isn't aware of nix's python infrastructure
|
||||
"test_use_wrapper_python"
|
||||
"test_build_with_no_isolation"
|
||||
"test_run_script_with_inline_metadata"
|
||||
|
||||
# touches the network
|
||||
"test_find_candidates_from_find_links"
|
||||
"test_lock_all_with_excluded_groups"
|
||||
"test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV"
|
||||
"test_build_distributions"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue