mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
8b6e0c6c05
|
|
@ -116,6 +116,82 @@ On Linux, `stdenv` also includes the `patchelf` utility.
|
|||
|
||||
## Specifying dependencies {#ssec-stdenv-dependencies}
|
||||
|
||||
Build systems often require more dependencies than just what `stdenv` provides. This section describes attributes accepted by `stdenv.mkDerivation` that can be used to make these dependencies available to the build system.
|
||||
|
||||
### Overview {#ssec-stdenv-dependencies-overview}
|
||||
|
||||
A full reference of the different kinds of dependencies is provided in [](#ssec-stdenv-dependencies-reference), but here is an overview of the most common ones.
|
||||
It should cover most use cases.
|
||||
|
||||
Add dependencies to `nativeBuildInputs` if they are executed during the build:
|
||||
- those which are needed on `$PATH` during the build, for example `cmake` and `pkg-config`
|
||||
- [setup hooks](#ssec-setup-hooks), for example [`makeWrapper`](#fun-makeWrapper)
|
||||
- interpreters needed by [`patchShebangs`](#patch-shebangs.sh) for build scripts (with the `--build` flag), which can be the case for e.g. `perl`
|
||||
|
||||
Add dependencies to `buildInputs` if they will end up copied or linked into the final output or otherwise used at runtime:
|
||||
- libraries used by compilers, for example `zlib`,
|
||||
- interpreters needed by [`patchShebangs`](#patch-shebangs.sh) for scripts which are installed, which can be the case for e.g. `perl`
|
||||
|
||||
::: {.note}
|
||||
These criteria are independent.
|
||||
|
||||
For example, software using Wayland usually needs the `wayland` library at runtime, so `wayland` should be added to `buildInputs`.
|
||||
But it also executes the `wayland-scanner` program as part of the build to generate code, so `wayland` should also be added to `nativeBuildInputs`.
|
||||
:::
|
||||
|
||||
Dependencies needed only to run tests are similarly classified between native (executed during build) and non-native (executed at runtime):
|
||||
- `nativeCheckInputs` for test tools needed on `$PATH` (such as `ctest`) and [setup hooks](#ssec-setup-hooks) (for example [`pytestCheckHook`](#python))
|
||||
- `checkInputs` for libraries linked into test executables (for example the `qcheck` OCaml package)
|
||||
|
||||
These dependencies are only injected when [`doCheck`](#var-stdenv-doCheck) is set to `true`.
|
||||
|
||||
#### Example {#ssec-stdenv-dependencies-overview-example}
|
||||
|
||||
Consider for example this simplified derivation for `solo5`, a sandboxing tool:
|
||||
```nix
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "solo5";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz";
|
||||
sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
buildInputs = [ libseccomp ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/bin/solo5-virtio-mkimage \
|
||||
--replace "/usr/lib/syslinux" "${syslinux}/share/syslinux" \
|
||||
--replace "/usr/share/syslinux" "${syslinux}/share/syslinux" \
|
||||
--replace "cp " "cp --no-preserve=mode "
|
||||
|
||||
wrapProgram $out/bin/solo5-virtio-mkimage \
|
||||
--prefix PATH : ${lib.makeBinPath [ dosfstools mtools parted syslinux ]}
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [ util-linux qemu ];
|
||||
checkPhase = '' [elided] '';
|
||||
}
|
||||
```
|
||||
|
||||
- `makeWrapper` is a setup hook, i.e., a shell script sourced by the generic builder of `stdenv`.
|
||||
It is thus executed during the build and must be added to `nativeBuildInputs`.
|
||||
- `pkg-config` is a build tool which the configure script of `solo5` expects to be on `$PATH` during the build:
|
||||
therefore, it must be added to `nativeBuildInputs`.
|
||||
- `libseccomp` is a library linked into `$out/bin/solo5-elftool`.
|
||||
As it is used at runtime, it must be added to `buildInputs`.
|
||||
- Tests need `qemu` and `getopt` (from `util-linux`) on `$PATH`, these must be added to `nativeCheckInputs`.
|
||||
- Some dependencies are injected directly in the shell code of phases: `syslinux`, `dosfstools`, `mtools`, and `parted`.
|
||||
In this specific case, they will end up in the output of the derivation (`$out` here).
|
||||
As Nix marks dependencies whose absolute path is present in the output as runtime dependencies, adding them to `buildInputs` is not required.
|
||||
|
||||
For more complex cases, like libraries linked into an executable which is then executed as part of the build system, see [](#ssec-stdenv-dependencies-reference).
|
||||
|
||||
### Reference {#ssec-stdenv-dependencies-reference}
|
||||
|
||||
As described in the Nix manual, almost any `*.drv` store path in a derivation’s attribute set will induce a dependency on that derivation. `mkDerivation`, however, takes a few attributes intended to include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the `PATH`. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See [](#ssec-setup-hooks) for details.
|
||||
|
||||
Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation’s, and whether they are propagated. The platform distinctions are motivated by cross compilation; see [](#chap-cross) for exactly what each platform means. [^footnote-stdenv-ignored-build-platform] But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with `strictDeps` set it is mostly enforced even in the native case.
|
||||
|
|
@ -187,21 +263,21 @@ Because of the bounds checks, the uncommon cases are `h = t` and `h + 2 = t`. In
|
|||
|
||||
Overall, the unifying theme here is that propagation shouldn’t be introducing transitive dependencies involving platforms the depending package is unaware of. \[One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn’t know how to ask for. The platform description in that scenario is a kind of unforagable capability.\] The offset bounds checking and definition of `mapOffset` together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren’t in the derivation “spec” of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency.
|
||||
|
||||
### Variables specifying dependencies {#variables-specifying-dependencies}
|
||||
#### Variables specifying dependencies {#variables-specifying-dependencies}
|
||||
|
||||
#### `depsBuildBuild` {#var-stdenv-depsBuildBuild}
|
||||
##### `depsBuildBuild` {#var-stdenv-depsBuildBuild}
|
||||
|
||||
A list of dependencies whose host and target platforms are the new derivation’s build platform. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it in `nativeBuildInputs` instead. The most common use of this `buildPackages.stdenv.cc`, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries.
|
||||
|
||||
Since these packages are able to be run at build-time, they are always added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future.
|
||||
|
||||
#### `nativeBuildInputs` {#var-stdenv-nativeBuildInputs}
|
||||
##### `nativeBuildInputs` {#var-stdenv-nativeBuildInputs}
|
||||
|
||||
A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s host platform. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild` or `depsBuildTarget`. This could be called `depsBuildHost` but `nativeBuildInputs` is used for historical continuity.
|
||||
|
||||
Since these packages are able to be run at build-time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future.
|
||||
|
||||
#### `depsBuildTarget` {#var-stdenv-depsBuildTarget}
|
||||
##### `depsBuildTarget` {#var-stdenv-depsBuildTarget}
|
||||
|
||||
A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s target platform. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won’t run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional.
|
||||
|
||||
|
|
@ -209,41 +285,41 @@ This is a somewhat confusing concept to wrap one’s head around, and for good r
|
|||
|
||||
Since these packages are able to run at build time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future.
|
||||
|
||||
#### `depsHostHost` {#var-stdenv-depsHostHost}
|
||||
##### `depsHostHost` {#var-stdenv-depsHostHost}
|
||||
|
||||
A list of dependencies whose host and target platforms match the new derivation’s host platform. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It’s always preferable to use a `depsBuildBuild` dependency in the derivation being built over a `depsHostHost` on the tool doing the building for this purpose.
|
||||
|
||||
#### `buildInputs` {#var-stdenv-buildInputs}
|
||||
##### `buildInputs` {#var-stdenv-buildInputs}
|
||||
|
||||
A list of dependencies whose host platform and target platform match the new derivation’s. This would be called `depsHostTarget` but for historical continuity. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild`.
|
||||
|
||||
These are often programs and libraries used by the new derivation at *run*-time, but that isn’t always the case. For example, the machine code in a statically-linked library is only used at run-time, but the derivation containing the library is only needed at build-time. Even in the dynamic case, the library may also be needed at build-time to appease the linker.
|
||||
|
||||
#### `depsTargetTarget` {#var-stdenv-depsTargetTarget}
|
||||
##### `depsTargetTarget` {#var-stdenv-depsTargetTarget}
|
||||
|
||||
A list of dependencies whose host platform matches the new derivation’s target platform. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It’s poor form in almost all cases for a package to depend on another from a future stage \[future stage corresponding to positive offset\]. Do not use this attribute unless you are packaging a compiler and are sure it is needed.
|
||||
|
||||
#### `depsBuildBuildPropagated` {#var-stdenv-depsBuildBuildPropagated}
|
||||
##### `depsBuildBuildPropagated` {#var-stdenv-depsBuildBuildPropagated}
|
||||
|
||||
The propagated equivalent of `depsBuildBuild`. This perhaps never ought to be used, but it is included for consistency \[see below for the others\].
|
||||
|
||||
#### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs}
|
||||
##### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs}
|
||||
|
||||
The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. If instead, package `Z` has `nativeBuildInputs = [Y]`, then `Z` will be built as if it included `X` in the `depsBuildBuild` of package `Z`, because of the sum of the two `-1` host offsets.
|
||||
|
||||
#### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated}
|
||||
##### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated}
|
||||
|
||||
The propagated equivalent of `depsBuildTarget`. This is prefixed for the same reason of alerting potential users.
|
||||
|
||||
#### `depsHostHostPropagated` {#var-stdenv-depsHostHostPropagated}
|
||||
##### `depsHostHostPropagated` {#var-stdenv-depsHostHostPropagated}
|
||||
|
||||
The propagated equivalent of `depsHostHost`.
|
||||
|
||||
#### `propagatedBuildInputs` {#var-stdenv-propagatedBuildInputs}
|
||||
##### `propagatedBuildInputs` {#var-stdenv-propagatedBuildInputs}
|
||||
|
||||
The propagated equivalent of `buildInputs`. This would be called `depsHostTargetPropagated` but for historical continuity.
|
||||
|
||||
#### `depsTargetTargetPropagated` {#var-stdenv-depsTargetTargetPropagated}
|
||||
##### `depsTargetTargetPropagated` {#var-stdenv-depsTargetTargetPropagated}
|
||||
|
||||
The propagated equivalent of `depsTargetTarget`. This is prefixed for the same reason of alerting potential users.
|
||||
|
||||
|
|
|
|||
|
|
@ -1307,6 +1307,7 @@
|
|||
./system/boot/systemd/logind.nix
|
||||
./system/boot/systemd/nspawn.nix
|
||||
./system/boot/systemd/oomd.nix
|
||||
./system/boot/systemd/repart.nix
|
||||
./system/boot/systemd/shutdown.nix
|
||||
./system/boot/systemd/tmpfiles.nix
|
||||
./system/boot/systemd/user.nix
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
# Udisks daemon.
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.udisks2;
|
||||
settingsFormat = pkgs.formats.ini {
|
||||
listToValue = concatMapStringsSep "," (generators.mkValueStringDefault {});
|
||||
};
|
||||
|
|
@ -19,7 +18,17 @@ in
|
|||
|
||||
services.udisks2 = {
|
||||
|
||||
enable = mkEnableOption (lib.mdDoc "udisks2, a DBus service that allows applications to query and manipulate storage devices");
|
||||
enable = mkEnableOption (mdDoc "udisks2, a DBus service that allows applications to query and manipulate storage devices");
|
||||
|
||||
mountOnMedia = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = mdDoc ''
|
||||
When enabled, instructs udisks2 to mount removable drives under `/media/` directory, instead of the
|
||||
default, ACL-controlled `/run/media/$USER/`. Since `/media/` is not mounted as tmpfs by default, it
|
||||
requires cleanup to get rid of stale mountpoints; enabling this option will take care of this at boot.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption rec {
|
||||
type = types.attrsOf settingsFormat.type;
|
||||
|
|
@ -44,7 +53,7 @@ in
|
|||
};
|
||||
};
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
description = mdDoc ''
|
||||
Options passed to udisksd.
|
||||
See [here](http://manpages.ubuntu.com/manpages/latest/en/man5/udisks2.conf.5.html) and
|
||||
drive configuration in [here](http://manpages.ubuntu.com/manpages/latest/en/man8/udisks.8.html) for supported options.
|
||||
|
|
@ -73,10 +82,15 @@ in
|
|||
|
||||
services.dbus.packages = [ pkgs.udisks2 ];
|
||||
|
||||
systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ];
|
||||
systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]
|
||||
++ optional cfg.mountOnMedia "D! /media 0755 root root -";
|
||||
|
||||
services.udev.packages = [ pkgs.udisks2 ];
|
||||
|
||||
services.udev.extraRules = optionalString cfg.mountOnMedia ''
|
||||
ENV{ID_FS_USAGE}=="filesystem", ENV{UDISKS_FILESYSTEM_SHARED}="1"
|
||||
'';
|
||||
|
||||
systemd.packages = [ pkgs.udisks2 ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -229,6 +229,9 @@ in
|
|||
cp -r ${cfg.package}/etc/onlyoffice/documentserver/* /run/onlyoffice/config/
|
||||
chmod u+w /run/onlyoffice/config/default.json
|
||||
|
||||
# Allow members of the onlyoffice group to serve files under /var/lib/onlyoffice/documentserver/App_Data
|
||||
chmod g+x /var/lib/onlyoffice/documentserver
|
||||
|
||||
cp /run/onlyoffice/config/default.json{,.orig}
|
||||
|
||||
# for a mapping of environment variables from the docker container to json options see
|
||||
|
|
@ -284,6 +287,8 @@ in
|
|||
group = "onlyoffice";
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
nginx.extraGroups = [ "onlyoffice" ];
|
||||
};
|
||||
|
||||
users.groups.onlyoffice = { };
|
||||
|
|
|
|||
101
nixos/modules/system/boot/systemd/repart.nix
Normal file
101
nixos/modules/system/boot/systemd/repart.nix
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.boot.initrd.systemd.repart;
|
||||
|
||||
writeDefinition = name: partitionConfig: pkgs.writeText
|
||||
"${name}.conf"
|
||||
(lib.generators.toINI { } { Partition = partitionConfig; });
|
||||
|
||||
listOfDefinitions = lib.mapAttrsToList
|
||||
writeDefinition
|
||||
(lib.filterAttrs (k: _: !(lib.hasPrefix "_" k)) cfg.partitions);
|
||||
|
||||
# Create a directory in the store that contains a copy of all definition
|
||||
# files. This is then passed to systemd-repart in the initrd so it can access
|
||||
# the definition files after the sysroot has been mounted but before
|
||||
# activation. This needs a hard copy of the files and not just symlinks
|
||||
# because otherwise the files do not show up in the sysroot.
|
||||
definitionsDirectory = pkgs.runCommand "systemd-repart-definitions" { } ''
|
||||
mkdir -p $out
|
||||
${(lib.concatStringsSep "\n"
|
||||
(map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions)
|
||||
)}
|
||||
'';
|
||||
in
|
||||
{
|
||||
options.boot.initrd.systemd.repart = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "systemd-repart") // {
|
||||
description = lib.mdDoc ''
|
||||
Grow and add partitions to a partition table a boot time in the initrd.
|
||||
systemd-repart only works with GPT partition tables.
|
||||
'';
|
||||
};
|
||||
|
||||
partitions = lib.mkOption {
|
||||
type = with lib.types; attrsOf (attrsOf (oneOf [ str int bool ]));
|
||||
default = { };
|
||||
example = {
|
||||
"10-root" = {
|
||||
Type = "root";
|
||||
};
|
||||
"20-home" = {
|
||||
Type = "home";
|
||||
SizeMinBytes = "512M";
|
||||
SizeMaxBytes = "2G";
|
||||
};
|
||||
};
|
||||
description = lib.mdDoc ''
|
||||
Specify partitions as a set of the names of the definition files as the
|
||||
key and the partition configuration as its value. The partition
|
||||
configuration can use all upstream options. See <link
|
||||
xlink:href="https://www.freedesktop.org/software/systemd/man/repart.d.html"/>
|
||||
for all available options.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
# Link the definitions into /etc so that they are included in the
|
||||
# /nix/store of the sysroot. This also allows the user to run the
|
||||
# systemd-repart binary after activation manually while automatically
|
||||
# picking up the definition files.
|
||||
environment.etc."repart.d".source = definitionsDirectory;
|
||||
|
||||
boot.initrd.systemd = {
|
||||
additionalUpstreamUnits = [
|
||||
"systemd-repart.service"
|
||||
];
|
||||
|
||||
storePaths = [
|
||||
"${config.boot.initrd.systemd.package}/bin/systemd-repart"
|
||||
];
|
||||
|
||||
# Override defaults in upstream unit.
|
||||
services.systemd-repart = {
|
||||
# Unset the coniditions as they cannot be met before activation because
|
||||
# the definition files are not stored in the expected locations.
|
||||
unitConfig.ConditionDirectoryNotEmpty = [
|
||||
" " # required to unset the previous value.
|
||||
];
|
||||
serviceConfig = {
|
||||
# systemd-repart runs before the activation script. Thus we cannot
|
||||
# rely on them being linked in /etc already. Instead we have to
|
||||
# explicitly pass their location in the sysroot to the binary.
|
||||
ExecStart = [
|
||||
" " # required to unset the previous value.
|
||||
''${config.boot.initrd.systemd.package}/bin/systemd-repart \
|
||||
--definitions=/sysroot${definitionsDirectory} \
|
||||
--dry-run=no
|
||||
''
|
||||
];
|
||||
};
|
||||
# Because the initrd does not have the `initrd-usr-fs.target` the
|
||||
# upestream unit runs too early in the boot process, before the sysroot
|
||||
# is available. However, systemd-repart needs access to the sysroot to
|
||||
# find the definition files.
|
||||
after = [ "sysroot.mount" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -666,6 +666,7 @@ in {
|
|||
systemd-nspawn = handleTest ./systemd-nspawn.nix {};
|
||||
systemd-oomd = handleTest ./systemd-oomd.nix {};
|
||||
systemd-portabled = handleTest ./systemd-portabled.nix {};
|
||||
systemd-repart = handleTest ./systemd-repart.nix {};
|
||||
systemd-shutdown = handleTest ./systemd-shutdown.nix {};
|
||||
systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
|
||||
systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix {};
|
||||
|
|
|
|||
108
nixos/tests/systemd-repart.nix
Normal file
108
nixos/tests/systemd-repart.nix
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
{ system ? builtins.currentSystem
|
||||
, config ? { }
|
||||
, pkgs ? import ../.. { inherit system config; }
|
||||
}:
|
||||
|
||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
# A testScript fragment that prepares a disk with some empty, unpartitioned
|
||||
# space. and uses it to boot the test with. Takes a single argument `machine`
|
||||
# from which the diskImage is extraced.
|
||||
useDiskImage = machine: ''
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
|
||||
tmp_disk_image = tempfile.NamedTemporaryFile()
|
||||
|
||||
shutil.copyfile("${machine.system.build.diskImage}/nixos.img", tmp_disk_image.name)
|
||||
|
||||
subprocess.run([
|
||||
"${pkgs.qemu}/bin/qemu-img",
|
||||
"resize",
|
||||
"-f",
|
||||
"raw",
|
||||
tmp_disk_image.name,
|
||||
"+32M",
|
||||
])
|
||||
|
||||
# Fix the GPT table by moving the backup table to the end of the enlarged
|
||||
# disk image. This is necessary because we increased the size of the disk
|
||||
# before. The disk needs to be a raw disk because sgdisk can only run on
|
||||
# raw images.
|
||||
subprocess.run([
|
||||
"${pkgs.gptfdisk}/bin/sgdisk",
|
||||
"--move-second-header",
|
||||
tmp_disk_image.name,
|
||||
])
|
||||
|
||||
# Set NIX_DISK_IMAGE so that the qemu script finds the right disk image.
|
||||
os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name
|
||||
'';
|
||||
|
||||
common = { config, pkgs, lib, ... }: {
|
||||
virtualisation.useDefaultFilesystems = false;
|
||||
virtualisation.fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/vda2";
|
||||
fsType = "ext4";
|
||||
};
|
||||
};
|
||||
|
||||
boot.initrd.systemd.enable = true;
|
||||
boot.initrd.systemd.repart.enable = true;
|
||||
|
||||
# systemd-repart operates on disks with a partition table. The qemu module,
|
||||
# however, creates separate filesystem images without a partition table, so
|
||||
# we have to create a disk image manually.
|
||||
#
|
||||
# This creates two partitions, an ESP mounted on /dev/vda1 and the root
|
||||
# partition mounted on /dev/vda2
|
||||
system.build.diskImage = import ../lib/make-disk-image.nix {
|
||||
inherit config pkgs lib;
|
||||
# Use a raw format disk so that it can be resized before starting the
|
||||
# test VM.
|
||||
format = "raw";
|
||||
# Keep the image as small as possible but leave some room for changes.
|
||||
bootSize = "32M";
|
||||
additionalSpace = "0M";
|
||||
# GPT with an EFI System Partition is the typical use case for
|
||||
# systemd-repart because it does not support MBR.
|
||||
partitionTableType = "efi";
|
||||
# We do not actually care much about the content of the partitions, so we
|
||||
# do not need a bootloader installed.
|
||||
installBootLoader = false;
|
||||
# Improve determinism by not copying a channel.
|
||||
copyChannel = false;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
basic = makeTest {
|
||||
name = "systemd-repart";
|
||||
meta.maintainers = with maintainers; [ nikstur ];
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
imports = [ common ];
|
||||
|
||||
boot.initrd.systemd.repart.partitions = {
|
||||
"10-root" = {
|
||||
Type = "linux-generic";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
${useDiskImage nodes.machine}
|
||||
|
||||
machine.start()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
systemd_repart_logs = machine.succeed("journalctl --boot --unit systemd-repart.service")
|
||||
assert "Growing existing partition 1." in systemd_repart_logs
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.176.0";
|
||||
version = "1.183.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-7J/FAcmZYmgbmYEFm2V3+RBUcLE+8A+yOiJd/xp2Aww=";
|
||||
hash = "sha256-hfOEL1Qkf8Sk6cNWUBwZXH/DSuo/ObyA5sRLOj9Iw3M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -66,8 +66,12 @@ stdenv.mkDerivation rec {
|
|||
NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
|
||||
|
||||
buildPhase = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dep: ''
|
||||
ln -s ${dep} ${name}
|
||||
cp -r ${dep} ${name}
|
||||
'') deps) + ''
|
||||
# See https://wiki.freepascal.org/CudaText#How_to_compile_CudaText
|
||||
substituteInPlace ATSynEdit/atsynedit/atsynedit_package.lpk \
|
||||
--replace GTK2_IME_CODE _GTK2_IME_CODE
|
||||
|
||||
lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \
|
||||
bgrabitmap/bgrabitmap/bgrabitmappack.lpk \
|
||||
EncConv/encconv/encconv_package.lpk \
|
||||
|
|
|
|||
28
pkgs/applications/editors/cudatext/deps.json
generated
28
pkgs/applications/editors/cudatext/deps.json
generated
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"EncConv": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.06.19",
|
||||
"hash": "sha256-M00rHH3dG6Vx6MEALxRNlnLLfX/rRI+rdTS7riOhgeg="
|
||||
"rev": "2023.01.02",
|
||||
"hash": "sha256-4/ih4sBDel2wm+YFpNcwHoOrK8AgHe3Jbqxl+CYrQFM="
|
||||
},
|
||||
"ATBinHex-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.11.09",
|
||||
"hash": "sha256-2Q1azfhThrk1t65Q+2aRr00V0UFrvR+z5oVMeW9c2ug="
|
||||
"rev": "2023.02.05",
|
||||
"hash": "sha256-ZOnIhUnFd+7mBEz6YIhUOQkhBbCNeTFD0tfUILuC1x4="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.11.09",
|
||||
"hash": "sha256-rgXVOWmmc1ap/fCiXCvn34rhUbNRoMHbTXXYtnxk2pQ="
|
||||
"rev": "2023.02.05",
|
||||
"hash": "sha256-V0mvSuiO5dTztXZ4uvteF0e7B21Ll1uq6o0UHPcZm1o="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
@ -26,18 +26,18 @@
|
|||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.08.22",
|
||||
"hash": "sha256-o87V32HhFpCeSxhgkfKiL69oCcmpiReVmiNBPyv1kc4="
|
||||
"rev": "2023.01.18",
|
||||
"hash": "sha256-5R4ZHMTfmIF0VnwOFNOV/i6Dc91yk5dVNcFNrxMMzm0="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.09.03",
|
||||
"hash": "sha256-6xzYn9x5tZLUhLAT9mQ4+UmpEemg386tAjlWdK8j/Ew="
|
||||
"rev": "2023.01.18",
|
||||
"hash": "sha256-SLZIDcrLwvhkJY92e/wtSsoY5SrjghcumbdpuVdK4iE="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.10.26",
|
||||
"hash": "sha256-pVVO3PMazcGizN3RI4zO2tgLJLDOYIKhwnMLBJ5IiwY="
|
||||
"rev": "2023.01.02",
|
||||
"hash": "sha256-NnPrQAqmKg3Lh16Qp/LZVS4JRtAxXi3qRovLTbzUyYQ="
|
||||
},
|
||||
"Emmet-Pascal": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
},
|
||||
"bgrabitmap": {
|
||||
"owner": "bgrabitmap",
|
||||
"rev": "v11.5.2",
|
||||
"hash": "sha256-aGNKkLDbGTeFgFEhuX7R2BXhnllsanJmk4k+1muiSD8="
|
||||
"rev": "v11.5.3",
|
||||
"hash": "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8="
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -194,6 +194,13 @@ let
|
|||
stripDebugList = [ "share" ];
|
||||
});
|
||||
|
||||
epkg = super.epkg.overrideAttrs (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace lisp/epkg.el \
|
||||
--replace '(call-process "sqlite3"' '(call-process "${pkgs.sqlite}/bin/sqlite3"'
|
||||
'';
|
||||
});
|
||||
|
||||
erlang = super.erlang.overrideAttrs (attrs: {
|
||||
buildInputs = attrs.buildInputs ++ [
|
||||
pkgs.perl
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ assert withPgtk -> withGTK3 && !withX && gtk3 != null;
|
|||
assert withXwidgets -> withGTK3 && webkitgtk != null;
|
||||
|
||||
|
||||
let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (lib.optionalAttrs nativeComp {
|
||||
(if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
|
||||
NATIVE_FULL_AOT = "1";
|
||||
LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
|
||||
} // {
|
||||
|
|
@ -69,7 +69,7 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation
|
|||
|
||||
patches = patches fetchpatch ++ lib.optionals nativeComp [
|
||||
(substituteAll {
|
||||
src = if lib.versionOlder version "29"
|
||||
src = if lib.versionOlder finalAttrs.version "29"
|
||||
then ./native-comp-driver-options-28.patch
|
||||
else ./native-comp-driver-options.patch;
|
||||
backendPath = (lib.concatStringsSep " "
|
||||
|
|
@ -241,7 +241,7 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation
|
|||
|
||||
passthru = {
|
||||
inherit nativeComp;
|
||||
pkgs = recurseIntoAttrs (emacsPackagesFor emacs);
|
||||
pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
|
||||
tests = { inherit (nixosTests) emacs-daemon; };
|
||||
};
|
||||
|
||||
|
|
@ -269,5 +269,4 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation
|
|||
separately.
|
||||
'';
|
||||
};
|
||||
});
|
||||
in emacs
|
||||
}))
|
||||
|
|
|
|||
|
|
@ -6297,6 +6297,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
|
||||
};
|
||||
|
||||
nvim-osc52 = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-osc52";
|
||||
version = "2023-01-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ojroques";
|
||||
repo = "nvim-osc52";
|
||||
rev = "27da4724a887dabed3768b41fa51c785cb62ef26";
|
||||
sha256 = "1wylh055y2dyb7zcdk9sa41wnkfbknp2bgnlrhmxdq5h2bkr8hbd";
|
||||
};
|
||||
meta.homepage = "https://github.com/ojroques/nvim-osc52/";
|
||||
};
|
||||
|
||||
nvim-peekup = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-peekup";
|
||||
version = "2022-11-16";
|
||||
|
|
|
|||
|
|
@ -530,6 +530,7 @@ https://github.com/smiteshp/nvim-navic/,HEAD,
|
|||
https://github.com/AckslD/nvim-neoclip.lua/,,
|
||||
https://github.com/yamatsum/nvim-nonicons/,,
|
||||
https://github.com/rcarriga/nvim-notify/,,
|
||||
https://github.com/ojroques/nvim-osc52/,,
|
||||
https://github.com/gennaro-tedesco/nvim-peekup/,,
|
||||
https://github.com/olrtg/nvim-rename-state/,HEAD,
|
||||
https://github.com/petertriho/nvim-scrollbar/,HEAD,
|
||||
|
|
|
|||
|
|
@ -82,6 +82,6 @@ gcc11Stdenv.mkDerivation {
|
|||
homepage = "https://rpcs3.net/";
|
||||
maintainers = with maintainers; [ abbradar neonfuz ilian zane ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "denaro";
|
||||
version = "2023.1.1";
|
||||
version = "2023.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlogozzo";
|
||||
repo = "NickvisionMoney";
|
||||
rev = version;
|
||||
hash = "sha256-U6/laqmOS7ZUhgCCHggIn1U3GyQ/wy05XuCcqc7gtVQ=";
|
||||
hash = "sha256-ot6VfCzGrJnLaw658QsOe9M0HiqNDrtxvLWpXj9nXko=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
|
@ -64,6 +64,7 @@ buildDotnetModule rec {
|
|||
homepage = "https://github.com/nlogozzo/NickvisionMoney";
|
||||
mainProgram = "NickvisionMoney.GNOME";
|
||||
license = licenses.mit;
|
||||
changelog = "https://github.com/nlogozzo/NickvisionMoney/releases/tag/${version}";
|
||||
maintainers = with maintainers; [ chuangzhu ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
116
pkgs/applications/finance/denaro/deps.nix
generated
116
pkgs/applications/finance/denaro/deps.nix
generated
|
|
@ -3,38 +3,116 @@
|
|||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; })
|
||||
(fetchNuGet { pname = "GirCore.Adw-1"; version = "0.2.0"; sha256 = "1lvyw61kcjq9m6iaw7c7xfjk1b99ccsh79819qnigdi37p7dgb7y"; })
|
||||
(fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.2.0"; sha256 = "14jr3476h3lr3s0iahyf9in96631h7b8g36wpfgr0gz6snic6ch1"; })
|
||||
(fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.2.0"; sha256 = "0as1iknxx8vd5c0snf3bssij20fy74dbzaqbq60djf7v4c5q46nq"; })
|
||||
(fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.2.0"; sha256 = "19rh6mm2zxg46gdnizic4v6pmdk2hx25r4k12r8z4mkbmzpmcaaf"; })
|
||||
(fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.2.0"; sha256 = "11v4zplb7flh24vn1pralanzjm9jlnmx8r867ihvzj73mphmzs6m"; })
|
||||
(fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.2.0"; sha256 = "0489ba4gw6wq1ndlrhfi7pmnifvnhq52p0riih60lrhgi3664ybc"; })
|
||||
(fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.2.0"; sha256 = "0ms6gbrrinznhvs15mhfm3xh4zlqv5j4sw2zgajisiiprdzh2rcz"; })
|
||||
(fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.2.0"; sha256 = "17qk1zhvfmmywndv2n6d3hg0gs1cwmxlmsns5ink7g8prwfp0vpf"; })
|
||||
(fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.2.0"; sha256 = "0gkj37rrazksvyc4nq3scmch7mxlcj40w8kwsmfvmvyl58z2faq7"; })
|
||||
(fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.2.0"; sha256 = "0qxw84hl40rbgjcxwx4rhmi4dif519kbdypazl2laz14pirh0b8v"; })
|
||||
(fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.2.0"; sha256 = "1klskbfkaaqy5asy83hbgb64pziib63s6d0szx3i3z24ynwhqjp3"; })
|
||||
(fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.2.0"; sha256 = "03vp892bzy3nm5x35aqg8ripkw2n9gc86fqm3pr9fa1l88dhbqnl"; })
|
||||
(fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.2.0"; sha256 = "158bsyirbdzyxnyphgzl8p6mxw1f9xbjpd92aijxk4hwdjvgn9hn"; })
|
||||
(fetchNuGet { pname = "GirCore.Adw-1"; version = "0.3.0"; sha256 = "1bsjqxck58dff9hnw21cp3xk1afly8721sfsbnxcr5i39hlrbl37"; })
|
||||
(fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.3.0"; sha256 = "1zb8ilgywpwgjrzrbdvzvy70f46fb05iy49592mkjg2lv24q5l3y"; })
|
||||
(fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.3.0"; sha256 = "1bc78409bdhfqqbirwr1lkzxl27adndv05q5fcm5sivmlzr7fbkm"; })
|
||||
(fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.3.0"; sha256 = "1dz7f29jbmkzcwbggjwsx6r4nmw5xvvyfmia0xpjvpx1zzmfvmc4"; })
|
||||
(fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.3.0"; sha256 = "1jgwhqghg14z5qkgakd42dnyk6n8cj7nkgf0hbj9zxbd0my9vv6p"; })
|
||||
(fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.3.0"; sha256 = "0hv55x8snr4fk0z8dn52n8p030f02i3gfysin0bsrlmi879gn9ln"; })
|
||||
(fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.3.0"; sha256 = "1aibc13yb96bbirh25jv5gp0cqvz1ya9drrdhirfsrn41274ikpm"; })
|
||||
(fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.3.0"; sha256 = "1xd4yfppr34ngmal3s16f08mqdn7mra97jmjpk13aa9yjbp0avij"; })
|
||||
(fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.3.0"; sha256 = "065fg5dj97sidrr7n2a6gv8vmylhpfznhw3zazra6krcvzgf1gcz"; })
|
||||
(fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.3.0"; sha256 = "1r68lfxj98y3fvcxl33lk2cbjz7dn9grqb6c5axdlfjjgnkwjvlj"; })
|
||||
(fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.3.0"; sha256 = "0c9im9sbiqsykrj4yq93x5nlsj9c5an7dj1j6yirb874zqq6jhsp"; })
|
||||
(fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.3.0"; sha256 = "12nva0xzykvf102m69gn19ap1cyiap3i93n9gha9pnl4d5g4b4k1"; })
|
||||
(fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.3.0"; sha256 = "1waiqs52gmpfqxc7yfdz7lp4jr3462js8hrs6acfr47vzddksymi"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })
|
||||
(fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.1"; sha256 = "1abakjiljrh0jabdk2bdgbi7lwzrzxmkkd8p5sm67xm5f4ni8db5"; })
|
||||
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.1"; sha256 = "1vkgng2rmpmazklwd9gnyrdngjf2n8bdm2y55njzny2fwpdy82rq"; })
|
||||
(fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; })
|
||||
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.2"; sha256 = "0xipbci6pshj825a1r8nlc19hf26n4ba33sx7dbx727ja5lyjv8m"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
|
||||
(fetchNuGet { pname = "QuestPDF"; version = "2022.12.0"; sha256 = "0hkcw871jm77jqbgnbxixd5nxpxzzz0jcr61adsry2b15ymzmkb1"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
|
||||
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
|
||||
(fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; })
|
||||
(fetchNuGet { pname = "QuestPDF"; version = "2022.12.1"; sha256 = "0nbbk43jr73f0pfgdx3fzn57mjba34sir5jzxk2rscyfljfw002x"; })
|
||||
(fetchNuGet { pname = "ReadSharp.Ports.SgmlReader.Core"; version = "1.0.0"; sha256 = "0pcvlh0gq513vw6y12lfn90a0br56a6f26lvppcj4qb839zmh3id"; })
|
||||
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
|
||||
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
|
||||
(fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; })
|
||||
(fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; })
|
||||
(fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; })
|
||||
(fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; })
|
||||
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; })
|
||||
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; })
|
||||
(fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
|
||||
(fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; })
|
||||
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.2"; sha256 = "07rc4pj3rphi8nhzkcvilnm0fv27qcdp68jdwk4g0zjk7yfvbcay"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.4"; sha256 = "1v9wly6v2bj244wch6ijfx2imrbgmafn1w9km44718fngdxfhysq"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.2"; sha256 = "0jn98bkjk8h4smi09z31ib6s6392054lwmkziqmkqf5gf614k2fz"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.2"; sha256 = "0bnm2fhvcsyg5ry74gal2cziqnyf5a8d2cb491vsa7j41hbbx7kv"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.4"; sha256 = "14qr84h88jfvy263yx51zjm059aqgwlvgi6g02yxhbr2m7brs4mm"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.4"; sha256 = "1s1dv1qfgjsvcdbwf2pl48c6k60hkxwyy6z5w8g32fypksnvb7cs"; })
|
||||
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
|
||||
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
|
||||
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
|
||||
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
|
||||
(fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
|
||||
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
|
||||
(fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; })
|
||||
(fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; })
|
||||
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
|
||||
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
|
||||
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
|
||||
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
|
||||
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; })
|
||||
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
|
||||
(fetchNuGet { pname = "System.Net.Requests"; version = "4.3.0"; sha256 = "0pcznmwqqk0qzp0gf4g4xw7arhb0q8v9cbzh3v8h8qp6rjcr339a"; })
|
||||
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; })
|
||||
(fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; })
|
||||
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
|
||||
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
|
||||
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; })
|
||||
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
|
||||
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
|
||||
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
|
||||
(fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; })
|
||||
(fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; })
|
||||
(fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
|
||||
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
|
||||
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; })
|
||||
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
|
||||
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
|
||||
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
|
||||
]
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.8.16";
|
||||
version = "0.8.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "sha256-0tIDoNQoqSn1nYm+YdgzXh34aH1e5N8wl9lqGbQoOeU=";
|
||||
hash = "sha256-z7v59wXvSIDC7f4IMT8bblPgn+3+J54XqIPzXqWDses=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,20 @@
|
|||
{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools }:
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rofi-rbw";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fdw";
|
||||
repo = "rofi-rbw";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-YDL0pMl3BX59kzjuykn0lQHu2RMvPhsBrlSiqdcZAXs=";
|
||||
hash = "sha256-5K6tofC1bIxxNOQ0jk6NbVoaGGyQImYiUZAaAmkwiTA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ configargparse ];
|
||||
|
|
@ -24,7 +25,7 @@ buildPythonApplication rec {
|
|||
description = "Rofi frontend for Bitwarden";
|
||||
homepage = "https://github.com/fdw/rofi-rbw";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
maintainers = with maintainers; [ equirosa dit7ya ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filezilla";
|
||||
version = "3.62.2";
|
||||
version = "3.63.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
|
||||
hash = "sha256-p2cJY1yg6kdPaR9sYLGRM0rzB57xksB8NGUEuqtzjBI=";
|
||||
hash = "sha256-TgtcD3n0+LykuiHnE7qXuG1bRcRyPeZ7nBDSO/QXo38=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aerc";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rjarry";
|
||||
repo = "aerc";
|
||||
rev = version;
|
||||
hash = "sha256-pUp/hW4Kk3pixGfbQvphLJM9Dc/w01T1KPRewOicPqM=";
|
||||
hash = "sha256-qC7lNqjgljUqRUp+S7vBVLPyRB3+Ie5UOxuio+Q88hg=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-Nx+k0PLPIx7Ia0LobXUOw7oOFVz1FXV49haAkRAVOcM=";
|
||||
vendorHash = "sha256-MVek3TQpE3AChGyQ4z01fLfkcGKJcckmFV21ww9zT7M=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/config/aerc.conf b/config/aerc.conf
|
||||
index fbbf587..ede1a03 100644
|
||||
--- a/config/aerc.conf
|
||||
+++ b/config/aerc.conf
|
||||
@@ -107,8 +107,7 @@ next-message-on-delete=true
|
||||
diff --git i/config/aerc.conf w/config/aerc.conf
|
||||
index 05ebbf4..db6877b 100644
|
||||
--- i/config/aerc.conf
|
||||
+++ w/config/aerc.conf
|
||||
@@ -152,8 +152,7 @@
|
||||
#
|
||||
# ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
|
||||
# ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
|
||||
|
|
@ -10,9 +10,9 @@ index fbbf587..ede1a03 100644
|
|||
-# /usr/share/aerc/stylesets
|
||||
+# @out@/share/aerc/stylesets
|
||||
#
|
||||
# default: ""
|
||||
stylesets-dirs=
|
||||
@@ -254,8 +253,7 @@ new-email=
|
||||
#stylesets-dirs=
|
||||
|
||||
@@ -445,8 +444,7 @@ message/rfc822=colorize
|
||||
#
|
||||
# ${XDG_CONFIG_HOME:-~/.config}/aerc/templates
|
||||
# ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
|
||||
|
|
@ -20,37 +20,27 @@ index fbbf587..ede1a03 100644
|
|||
-# /usr/share/aerc/templates
|
||||
+# @out@/share/aerc/templates
|
||||
#
|
||||
# default: ""
|
||||
template-dirs=
|
||||
diff --git a/config/config.go b/config/config.go
|
||||
index 2120310..92b7655 100644
|
||||
--- a/config/config.go
|
||||
+++ b/config/config.go
|
||||
@@ -331,8 +331,8 @@ func buildDefaultDirs() []string {
|
||||
#template-dirs=
|
||||
|
||||
diff --git i/config/config.go w/config/config.go
|
||||
index 09fb5ef..c73a7ee 100644
|
||||
--- i/config/config.go
|
||||
+++ w/config/config.go
|
||||
@@ -60,8 +60,7 @@ func buildDefaultDirs() []string {
|
||||
}
|
||||
|
||||
// Add fixed fallback locations
|
||||
- defaultDirs = append(defaultDirs, "/usr/local/share/aerc")
|
||||
- defaultDirs = append(defaultDirs, "/usr/share/aerc")
|
||||
+ defaultDirs = append(defaultDirs, "@out@/local/share/aerc")
|
||||
+ defaultDirs = append(defaultDirs, "@out@/share/aerc")
|
||||
|
||||
return defaultDirs
|
||||
}
|
||||
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
|
||||
index 885c4f8..77a853e 100644
|
||||
--- a/doc/aerc-config.5.scd
|
||||
+++ b/doc/aerc-config.5.scd
|
||||
@@ -12,7 +12,7 @@ account credentials. We look for these files in your XDG config home plus
|
||||
"aerc", which defaults to ~/.config/aerc.
|
||||
|
||||
Examples of these config files are typically included with your installation of
|
||||
-aerc and are usually installed in /usr/share/aerc.
|
||||
+aerc and are usually installed in @out@/share/aerc.
|
||||
|
||||
Each file uses the _ini_ format, and consists of sections with keys and values.
|
||||
A line beginning with # is considered a comment and ignored, as are empty lines.
|
||||
@@ -221,8 +221,7 @@ These options are configured in the *[ui]* section of aerc.conf.
|
||||
diff --git i/doc/aerc-config.5.scd w/doc/aerc-config.5.scd
|
||||
index d48e38a..39784c4 100644
|
||||
--- i/doc/aerc-config.5.scd
|
||||
+++ w/doc/aerc-config.5.scd
|
||||
@@ -279,8 +279,7 @@ These options are configured in the *[ui]* section of _aerc.conf_.
|
||||
```
|
||||
${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
|
||||
${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
|
||||
|
|
@ -59,26 +49,8 @@ index 885c4f8..77a853e 100644
|
|||
+ @out@/share/aerc/stylesets
|
||||
```
|
||||
|
||||
Default: ""
|
||||
@@ -381,7 +380,7 @@ against (non-case-sensitive) and a comma, e.g. subject,text will match a
|
||||
subject which contains "text". Use header,~regex to match against a regex.
|
||||
|
||||
aerc ships with some default filters installed in the share directory (usually
|
||||
-_/usr/share/aerc/filters_). Note that these may have additional dependencies
|
||||
+_@out@/share/aerc/filters_). Note that these may have additional dependencies
|
||||
that aerc does not have alone.
|
||||
|
||||
## TRIGGERS
|
||||
@@ -407,7 +406,7 @@ and forward commands can be called with the -T flag with the name of the
|
||||
template name.
|
||||
|
||||
aerc ships with some default templates installed in the share directory (usually
|
||||
-_/usr/share/aerc/templates_).
|
||||
+_@out@/share/aerc/templates_).
|
||||
|
||||
These options are configured in the *[templates]* section of aerc.conf.
|
||||
|
||||
@@ -419,8 +418,7 @@ These options are configured in the *[templates]* section of aerc.conf.
|
||||
*styleset-name* = _<string>_
|
||||
@@ -822,8 +821,7 @@ These options are configured in the *[templates]* section of _aerc.conf_.
|
||||
```
|
||||
${XDG_CONFIG_HOME:-~/.config}/aerc/templates
|
||||
${XDG_DATA_HOME:-~/.local/share}/aerc/templates
|
||||
|
|
@ -87,4 +59,26 @@ index 885c4f8..77a853e 100644
|
|||
+ @out@/share/aerc/templates
|
||||
```
|
||||
|
||||
Default: ""
|
||||
*new-message* = _<template_name>_
|
||||
diff --git i/doc/aerc-templates.7.scd w/doc/aerc-templates.7.scd
|
||||
index 6c9e319..0ef97ce 100644
|
||||
--- i/doc/aerc-templates.7.scd
|
||||
+++ w/doc/aerc-templates.7.scd
|
||||
@@ -111,7 +111,7 @@ aerc provides the following additional functions:
|
||||
Execute external command, provide the second argument to its stdin.
|
||||
|
||||
```
|
||||
- {{exec `/usr/local/share/aerc/filters/html` .OriginalText}}
|
||||
+ {{exec `@out@/share/aerc/filters/html` .OriginalText}}
|
||||
```
|
||||
|
||||
*toLocal*
|
||||
@@ -142,7 +142,7 @@ aerc provides the following additional functions:
|
||||
Example: Automatic HTML parsing for text/html mime type messages
|
||||
```
|
||||
{{if eq .OriginalMIMEType "text/html"}}
|
||||
- {{exec `/usr/local/share/aerc/filters/html` .OriginalText | wrap 72 | quote}}
|
||||
+ {{exec `@out@/share/aerc/filters/html` .OriginalText | wrap 72 | quote}}
|
||||
{{else}}
|
||||
{{wrap 72 .OriginalText | quote}}
|
||||
{{end}}
|
||||
|
|
|
|||
|
|
@ -15,16 +15,12 @@ nodePackages.n8n.override {
|
|||
pkgs.postgresql
|
||||
];
|
||||
|
||||
# Patch minified source with changes from https://github.com/n8n-io/n8n/pull/5052
|
||||
preRebuild = ''
|
||||
patch -p1 -i ${./fix-permissions.diff}
|
||||
'' +
|
||||
# Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64.
|
||||
# This can supposedly be fixed by building a custom copy of the module from source, but that's way
|
||||
# too much complexity for a setup no one would ever actually run.
|
||||
#
|
||||
# NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch.
|
||||
lib.optionalString stdenv.isAarch64 ''
|
||||
preRebuild = lib.optionalString stdenv.isAarch64 ''
|
||||
rm -rf node_modules/oracledb
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
--- a/dist/LoadNodesAndCredentials.js
|
||||
+++ b/dist/LoadNodesAndCredentials.js
|
||||
@@ -216,6 +216,7 @@
|
||||
const { types } = loader;
|
||||
this.types.nodes = this.types.nodes.concat(types.nodes);
|
||||
this.types.credentials = this.types.credentials.concat(types.credentials);
|
||||
+ let seen = new Set();
|
||||
const iconPromises = Object.entries(types).flatMap(([typeName, typesArr]) => typesArr.map((type) => {
|
||||
var _a;
|
||||
if (!((_a = type.icon) === null || _a === void 0 ? void 0 : _a.startsWith('file:')))
|
||||
@@ -226,7 +227,16 @@
|
||||
type.iconUrl = iconUrl;
|
||||
const source = path_1.default.join(dir, icon);
|
||||
const destination = path_1.default.join(constants_1.GENERATED_STATIC_DIR, iconUrl);
|
||||
- return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => (0, promises_1.copyFile)(source, destination));
|
||||
+ if (!seen.has(destination)) {
|
||||
+ seen.add(destination);
|
||||
+ return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => {
|
||||
+ await (0, promises_1.copyFile)(source, destination);
|
||||
+ await (0, promises_1.chmod)(destination, 0o644);
|
||||
+ });
|
||||
+ }
|
||||
+ else {
|
||||
+ return Promise.resolve();
|
||||
+ }
|
||||
}));
|
||||
await Promise.all(iconPromises);
|
||||
for (const nodeTypeName in loader.nodeTypes) {
|
||||
689
pkgs/applications/networking/n8n/node-packages.nix
generated
689
pkgs/applications/networking/n8n/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.7.1";
|
||||
version = "3.7.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ mkDerivation rec {
|
|||
owner = "nextcloud";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MbxGS1Msb3xCW0z8FrIZEY3XaBa4BmN+JFBkV/Pf79A=";
|
||||
sha256 = "sha256-SzQdT2BJ0iIMTScJ7ft47oKd+na5MlOx5xRB1SQ7CBc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -54,6 +54,6 @@ fi
|
|||
tags=$(git ls-remote --tags --refs "$url")
|
||||
|
||||
# keep only the version part of the tag
|
||||
tags=$(echo "$tags" | cut --delimiter=/ --field=3)
|
||||
tags=$(echo "$tags" | cut --delimiter=/ --field=3-)
|
||||
|
||||
echo "$tags"
|
||||
|
|
|
|||
|
|
@ -187,6 +187,10 @@
|
|||
"lockkeys@vaina.lt",
|
||||
"lockkeys@fawtytoo"
|
||||
],
|
||||
"clipboard-indicator": [
|
||||
"clipboard-indicator@tudmotu.com",
|
||||
"clipboard-indicator@Dieg0Js.github.io"
|
||||
],
|
||||
"noannoyance": [
|
||||
"noannoyance@sindex.com",
|
||||
"noannoyance@daase.net"
|
||||
|
|
@ -221,10 +225,22 @@
|
|||
"workspace-indicator@gnome-shell-extensions.gcampax.github.com",
|
||||
"horizontal-workspace-indicator@tty2.io"
|
||||
],
|
||||
"clipboard-indicator": [
|
||||
"clipboard-indicator@tudmotu.com",
|
||||
"clipboard-indicator@Dieg0Js.github.io"
|
||||
],
|
||||
"keep-awake": [
|
||||
"KeepAwake@jepfa.de",
|
||||
"awake@vixalien.com"
|
||||
],
|
||||
"noannoyance": [
|
||||
"noannoyance@sindex.com",
|
||||
"noannoyance@daase.net"
|
||||
],
|
||||
"battery-time": [
|
||||
"batime@martin.zurowietz.de",
|
||||
"batterytime@typeof.pw"
|
||||
],
|
||||
"floating-panel": [
|
||||
"floating-panel@aylur",
|
||||
"floating-panel-usedbymyself@wpism"
|
||||
|
|
|
|||
|
|
@ -12,17 +12,23 @@
|
|||
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
|
||||
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
|
||||
|
||||
# no source repository can be found for this extension
|
||||
"floating-panel@aylur" = "floating-panel";
|
||||
"floating-panel-usedbymyself@wpism" = null;
|
||||
"clipboard-indicator@tudmotu.com" = "clipboard-indicator";
|
||||
"clipboard-indicator@Dieg0Js.github.io" = "clipboard-indicator-2";
|
||||
|
||||
# forks of each other, azan@faissal.bensefia.id is more recent
|
||||
"azan@faissal.bensefia.id" = "azan-islamic-prayer-times";
|
||||
"azan@hatem.masmoudi.org" = null;
|
||||
# DEPRECATED: Use "Caffeine" instead
|
||||
"KeepAwake@jepfa.de" = "keep-awake";
|
||||
"awake@vixalien.com" = null;
|
||||
|
||||
"noannoyance@sindex.com" = "noannoyance";
|
||||
"noannoyance@daase.net" = "noannoyance-2";
|
||||
|
||||
"batime@martin.zurowietz.de" = "battery-time";
|
||||
"batterytime@typeof.pw" = "battery-time-2";
|
||||
|
||||
# no source repository can be found for this extension
|
||||
"floating-panel@aylur" = "floating-panel";
|
||||
"floating-panel-usedbymyself@wpism" = null;
|
||||
|
||||
# ############################################################################
|
||||
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
|
||||
# Make sure to move them up once they are updated
|
||||
|
|
@ -85,6 +91,10 @@
|
|||
"transparent-window@pbxqdown.github.com" = "transparent-window";
|
||||
"transparentwindows.mdirshad07" = null;
|
||||
|
||||
# Forks of each other, azan@faissal.bensefia.id is more recent
|
||||
"azan@faissal.bensefia.id" = "azan-islamic-prayer-times";
|
||||
"azan@hatem.masmoudi.org" = null;
|
||||
|
||||
# That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612
|
||||
"flypie@schneegans.github.com" = null;
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -49,7 +49,8 @@ stdenv.mkDerivation rec {
|
|||
# https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue.
|
||||
#
|
||||
# As a temporary fix, we disabled these tests when using clang stdenv
|
||||
LIT_FILTER_OUT = lib.optionalString stdenv.cc.isClang "CIRCT :: Target/ExportSystemC/.*\.mlir";
|
||||
# cannot use lib.optionalString as it creates an empty string, disabling all tests
|
||||
LIT_FILTER_OUT = if stdenv.cc.isClang then "CIRCT :: Target/ExportSystemC/.*\.mlir" else null;
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace test/circt-reduce/test/annotation-remover.mlir --replace "/usr/bin/env" "${coreutils}/bin/env"
|
||||
|
|
|
|||
27
pkgs/development/libraries/jpcre2/default.nix
Normal file
27
pkgs/development/libraries/jpcre2/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pcre2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jpcre2";
|
||||
version = "10.32.01";
|
||||
rev = version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpcre2";
|
||||
repo = "jpcre2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CizjxAiajDLqajZKizMRAk5UEZA+jDeBSldPyIb6Ic8=";
|
||||
};
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.neuzunix.com/jpcre2/latest/";
|
||||
description = "C++ wrapper for PCRE2 Library";
|
||||
platforms = lib.platforms.all;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "out"}/include/lib3mf"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include/lib3mf"
|
||||
"-DUSE_INCLUDED_ZLIB=OFF"
|
||||
"-DUSE_INCLUDED_LIBZIP=OFF"
|
||||
"-DUSE_INCLUDED_GTEST=OFF"
|
||||
|
|
@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
# fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3mf.pc.in
|
||||
sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in
|
||||
|
||||
|
||||
# replace bundled binaries
|
||||
for i in AutomaticComponentToolkit/bin/act.*; do
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
|
||||
import ./generic.nix {
|
||||
version = "3.87";
|
||||
hash = "sha256-aKGJRJbT0Vi6vHX4pd2j9Vt8FWBXOTbjsQGhD6SsFS0=";
|
||||
version = "3.88.1";
|
||||
hash = "sha256-J9JD7fh9HPG7nIYfA9OH4OkjDOUBf0MIyUH1WLVLNJY=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rabbitmq-c";
|
||||
version = "0.11.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alanxz";
|
||||
repo = "rabbitmq-c";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u1uOrZRiQOU/6vlLdQHypBRSCo3zw7FC1AI9v3NlBVE=";
|
||||
sha256 = "sha256-4tSZ+eaLZAkSmFsGnIrRXNvn3xA/4sTKyYZ3hPUMcd0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ let
|
|||
else throw "Unsupported ROCm LLVM platform";
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocm-comgr";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiowinreg";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "skelsec";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4/xElE70rJKBMS1HdHb6BlcKs4gzNfuEo/6ahN6ixSM=";
|
||||
hash = "sha256-FyrYqNqp0PTEHHit3Rn00jtvPOvgVy+lz3jDRJnsobI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-lint";
|
||||
version = "6.12.1";
|
||||
version = "6.12.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-u7GVOqVjuqJYfttu+pS/SAWEarAftZbnGMSPmnmpmok=";
|
||||
hash = "sha256-qzMVKDTJX8/E+2Xs1Tyc0b8cmz6tF57dYwQnS4KzSFI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "argh";
|
||||
version = "0.27.1";
|
||||
version = "0.27.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2wbZEIHxck40fM23iclXD+yUc351WvFZiDcpPgH8TNI=";
|
||||
hash = "sha256-AMkCf29GG88kr+WZooG72ly9Xe5LZwW+++opOkyn0iE=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bite-parser";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "bite_parser";
|
||||
inherit version;
|
||||
hash = "sha256-PmZCCQzxCfCq6Mr1qn03tj/7/0we9Bfk5fj4K+wMhsk=";
|
||||
hash = "sha256-mBghKgrNv4ZaRNowo7csWekmqrI0xAVKJKowSeumr4g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,19 +28,16 @@
|
|||
, icalendar
|
||||
, pandas
|
||||
, pythonImportsCheckHook
|
||||
, contourpy
|
||||
, xyzservices
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bokeh";
|
||||
# update together with panel which is not straightforward
|
||||
version = "3.0.3";
|
||||
format = "setuptools";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash= "sha256-HChHHvXmEQulvtUTE3/SYFTrxEVLx2hlDq7vxTuJioo=";
|
||||
sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -73,10 +70,10 @@ buildPythonPackage rec {
|
|||
requests
|
||||
nbconvert
|
||||
icalendar
|
||||
pandas
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
contourpy
|
||||
pillow
|
||||
jinja2
|
||||
python-dateutil
|
||||
|
|
@ -84,10 +81,8 @@ buildPythonPackage rec {
|
|||
pyyaml
|
||||
tornado
|
||||
numpy
|
||||
pandas
|
||||
packaging
|
||||
typing-extensions
|
||||
xyzservices
|
||||
]
|
||||
++ lib.optionals ( isPy27 ) [
|
||||
futures
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
diff --git a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py
|
||||
index 9af8691..4b93543 100644
|
||||
--- a/src/bokeh/util/compiler.py
|
||||
+++ b/src/bokeh/util/compiler.py
|
||||
@@ -415,8 +415,8 @@ def _detect_nodejs() -> str:
|
||||
raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' +
|
||||
diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py
|
||||
index a752aad7d..8af05ff63 100644
|
||||
--- a/bokeh/util/compiler.py
|
||||
+++ b/bokeh/util/compiler.py
|
||||
@@ -442,8 +442,8 @@ def _detect_nodejs():
|
||||
raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version +
|
||||
'("conda install nodejs" or follow https://nodejs.org/en/download/)')
|
||||
|
||||
-_nodejs = None
|
||||
|
|
@ -11,5 +11,5 @@ index 9af8691..4b93543 100644
|
|||
+_nodejs = "@node_bin@"
|
||||
+_npmjs = "@npm_bin@"
|
||||
|
||||
def _nodejs_path() -> str:
|
||||
def _nodejs_path():
|
||||
global _nodejs
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "emoji";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "carpedm20";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3mCzbFuBIMdF6tbKLxqNKAO50vaRWeOxpydJ4ZeE+Vc=";
|
||||
hash = "sha256-Zo5mH+AAi75vbjsV0UmEOrXKw1IUwspjWStJa+PI/as=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lupupy";
|
||||
version = "0.2.7";
|
||||
version = "0.2.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nSa/qFJUnk1QTwUqq2il0RWCPdF4Jwby9NPIwAwcVds=";
|
||||
hash = "sha256-UIfv5lt9Vcyes9VYXkaQyBzfkcRiIE4It7q/CMJc7go=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "motionblinds";
|
||||
version = "0.6.15";
|
||||
version = "0.6.16";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "starkillerOG";
|
||||
repo = "motion-blinds";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-OTnlfJeE64tURR5YrTXjzTHbvGnbeEWu9UHGynzmSiQ=";
|
||||
hash = "sha256-S+3aIeP63JklGbH2Gc0r8jeThJywQZnJo8alAsPvxhQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.90.4";
|
||||
version = "2.91.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-alJ0FMh2bZLHG3pUfBJDpnihreSkswQ4BizIMIXKcFc=";
|
||||
hash = "sha256-sKz++PtqLjgBTf8Y/pYoa/wyuK3OoXOdGyjsbXX0iao=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-concurrency";
|
||||
version = "5.0.1";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "oslo.concurrency";
|
||||
inherit version;
|
||||
sha256 = "sha256-DfvzYJX0Y3/7tl5cJB9MJYUavTtyjd2tnwc5YwKnJUQ=";
|
||||
sha256 = "sha256-iyF2xXzFSWkrXCAbTJWqV4rnzN+lwPgUxXgY1pptTVE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,20 +1,22 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonRelaxDepsHook
|
||||
, bleach
|
||||
, bokeh
|
||||
, param
|
||||
, pyviz-comms
|
||||
, markdown
|
||||
, pyct
|
||||
, testpath
|
||||
, requests
|
||||
, setuptools
|
||||
, tqdm
|
||||
, nodejs
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "panel";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
|
|
@ -23,31 +25,42 @@ buildPythonPackage rec {
|
|||
# tries to fetch even more artifacts
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-cDjrim7esGduL8IHxPpoqHB43uA78R9UMIrhNktqUdU=";
|
||||
hash = "sha256-XOu17oydXwfyowYUmCKF7/RC0RQ0Uf1Ixmn+VTa85Lo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"bokeh"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bleach
|
||||
bokeh
|
||||
param
|
||||
pyviz-comms
|
||||
markdown
|
||||
param
|
||||
pyct
|
||||
testpath
|
||||
pyviz-comms
|
||||
requests
|
||||
setuptools
|
||||
tqdm
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"panel"
|
||||
];
|
||||
|
||||
# infinite recursion in test dependencies (hvplot)
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
inherit nodejs; # For convenience
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high level dashboarding library for python visualization libraries";
|
||||
homepage = "https://pyviz.org";
|
||||
homepage = "https://github.com/holoviz/panel";
|
||||
changelog = "https://github.com/holoviz/panel/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.2.4";
|
||||
version = "23.2.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tunFd+hgaRx5wc1gRwZaNUEX550Rl1NR9rZfEWUw6H4=";
|
||||
hash = "sha256-yxE+Gx48JQE++7SB8ouwgh2/rKKv8CC0QQSvwaSeFVc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "py3status";
|
||||
version = "3.47";
|
||||
version = "3.48";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-e2UTTD8J1GDg43FdzU8Xiaj2bL/gHLIT2lzwbwarIyI=";
|
||||
sha256 = "sha256-igt0niF52at/LERv4+1aVvdU+ZLVvgL2W+l6feuEAO0=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
diff --git a/pynvml/nvml.py b/pynvml/nvml.py
|
||||
index 56d908f..1de0b97 100644
|
||||
--- a/pynvml/nvml.py
|
||||
+++ b/pynvml/nvml.py
|
||||
@@ -1475,7 +1475,11 @@ def _LoadNvmlLibrary():
|
||||
nvmlLib = CDLL(os.path.join(os.getenv("ProgramFiles", "C:/Program Files"), "NVIDIA Corporation/NVSMI/nvml.dll"))
|
||||
else:
|
||||
# assume linux
|
||||
- nvmlLib = CDLL("libnvidia-ml.so.1")
|
||||
+ try:
|
||||
+ nvmlLib = CDLL("libnvidia-ml.so.1")
|
||||
+ except OSError:
|
||||
+ # assume NixOS
|
||||
+ nvmlLib = CDLL("@driverLink@/lib/libnvidia-ml.so.1")
|
||||
except OSError as ose:
|
||||
_nvmlCheckReturn(NVML_ERROR_LIBRARY_NOT_FOUND)
|
||||
if (nvmlLib == None):
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, substituteAll
|
||||
, pythonOlder
|
||||
, cudatoolkit
|
||||
, addOpenGLRunpath
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -15,6 +17,13 @@ buildPythonPackage rec {
|
|||
sha256 = "b2e4a33b80569d093b513f5804db0c7f40cfc86f15a013ae7a8e99c5e175d5dd";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch;
|
||||
inherit (addOpenGLRunpath) driverLink;
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ cudatoolkit ];
|
||||
|
||||
doCheck = false; # no tests in PyPi dist
|
||||
|
|
|
|||
|
|
@ -1,22 +1,24 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, imageio
|
||||
, numpy
|
||||
, pillow
|
||||
, pooch
|
||||
, scooby
|
||||
, vtk
|
||||
, unittestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvista";
|
||||
version = "0.37.0";
|
||||
version = "0.38.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-02osbV9T9HOrapJBZpaTrO56UXk5Tcl1ldoUzB3iMUE=";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7UK5vUlOleH24uJQ3WN8qVxWCfwlFYwhXTrS6Am7E+E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -28,8 +30,11 @@ buildPythonPackage rec {
|
|||
vtk
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
# Fatal Python error: Aborted
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyvista"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowflake-connector-python";
|
||||
version = "2.9.0";
|
||||
version = "3.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dVGyQEsmhQ+xLGIy0BW6XRCtsTsJHjef6Lg2ZJL2JLg=";
|
||||
hash = "sha256-F0EbgRSS/kYKUDPhf6euM0eLqIqVjQsHC6C9ZZSRCIE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowflake-sqlalchemy";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-clUDElZ17xxbrJ+O0oplzVAxL1afWDwdk/g5ZofEhOs=";
|
||||
hash = "sha256-xkx8QlabOCodqj4tRYxpln0z+HHVwYdqlXkaitzmKx8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8tkdjj2qTzhUA8bNu2s49UgrLegrboNKMAs2NSOA5o4=";
|
||||
hash = "sha256-wAjdCMWZhtzwWfu3dkhucLgtT6RqY8oQhdlLJojCjhk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "hotspot";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDAB";
|
||||
repo = "hotspot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7GuIe8F3QqosW/XaN3KC1WeWcI7woUiEc9Nw0b+fSk0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DW4R7+rnonmEMbCkNS7TGodw+3mEyHl6OlFK3kbG5HM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -62,7 +62,7 @@ mkDerivation rec {
|
|||
mkdir -p 3rdparty/{perfparser,PrefixTickLabels}/.git
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A GUI for Linux perf";
|
||||
longDescription = ''
|
||||
hotspot is a GUI replacement for `perf report`.
|
||||
|
|
@ -70,8 +70,9 @@ mkDerivation rec {
|
|||
then displays the result in a graphical way.
|
||||
'';
|
||||
homepage = "https://github.com/KDAB/hotspot";
|
||||
license = with lib.licenses; [ gpl2Only gpl3Only ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ nh2 ];
|
||||
changelog = "https://github.com/KDAB/hotspot/releases/tag/v${version}";
|
||||
license = with licenses; [ gpl2Only gpl3Only ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ nh2 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,13 +53,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "godot";
|
||||
version = "4.0-beta16";
|
||||
version = "4.0-rc1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godotengine";
|
||||
repo = "godot";
|
||||
rev = "518b9e5801a19229805fe837d7d0cf92920ad413";
|
||||
sha256 = "sha256-45x4moHOn/PWRazuJ/CBb3WYaPZqv4Sn8ZIugUSaVjY=";
|
||||
rev = "c4fb119f03477ad9a494ba6cdad211b35a8efcce";
|
||||
hash = "sha256-YJrm3or4QSzs+MDc06gY6TvUtWRgLST8RkdsomY8lZk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
pname = "rocminfo";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
64
pkgs/development/tools/rust/cargo-binstall/default.nix
Normal file
64
pkgs/development/tools/rust/cargo-binstall/default.nix
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, bzip2
|
||||
, xz
|
||||
, zstd
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-binstall";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MxbZlUlan58TVgcr2n5ZA+L01u90bYYqf88GU+sLmKk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HG43UCjPCB5bEH0GYPoHsOlaJQNPRrD175SuUJ6QbEI=";
|
||||
|
||||
patches = [
|
||||
# make it possible to disable the static feature
|
||||
# https://github.com/cargo-bins/cargo-binstall/pull/782
|
||||
./fix-features.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bzip2
|
||||
xz
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
"fancy-no-backtrace"
|
||||
"pkg-config"
|
||||
"rustls"
|
||||
"trust-dns"
|
||||
"zstd-thin"
|
||||
];
|
||||
|
||||
# remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
|
||||
postPatch = ''
|
||||
rm .cargo/config
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for installing rust binaries as an alternative to building from source";
|
||||
homepage = "https://github.com/cargo-bins/cargo-binstall";
|
||||
changelog = "https://github.com/cargo-bins/cargo-binstall/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
--- a/crates/bin/Cargo.toml
|
||||
+++ b/crates/bin/Cargo.toml
|
||||
@@ -22,7 +22,7 @@ pkg-fmt = "zip"
|
||||
pkg-fmt = "zip"
|
||||
|
||||
[dependencies]
|
||||
-binstalk = { path = "../binstalk", version = "0.7.1" }
|
||||
+binstalk = { path = "../binstalk", version = "0.7.1", default-features = false }
|
||||
binstalk-manifests = { path = "../binstalk-manifests", version = "0.2.0" }
|
||||
clap = { version = "4.1.1", features = ["derive"] }
|
||||
crates_io_api = { version = "0.8.1", default-features = false }
|
||||
--- a/crates/binstalk/Cargo.toml
|
||||
+++ b/crates/binstalk/Cargo.toml
|
||||
@@ -11,7 +11,7 @@ license = "GPL-3.0"
|
||||
|
||||
[dependencies]
|
||||
async-trait = "0.1.61"
|
||||
-binstalk-downloader = { version = "0.3.2", path = "../binstalk-downloader" }
|
||||
+binstalk-downloader = { version = "0.3.2", path = "../binstalk-downloader", default-features = false }
|
||||
binstalk-types = { version = "0.2.0", path = "../binstalk-types" }
|
||||
cargo_toml = "0.14.0"
|
||||
command-group = { version = "2.0.1", features = ["with-tokio"] }
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-zigbuild";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "messense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4Sp3PVhUvXn7FzPHHyyRBUHY5TQYEPLFdoI4ARQ4V0k=";
|
||||
sha256 = "sha256-ITevZv/4Q21y3o9N4WSqD2vONQfNEXKHE/Af/f6T8vw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-QplcedhsqFiAwcqBrEe2ns4DdZ+R/IuoKtkx8eGk19g=";
|
||||
cargoSha256 = "sha256-e5MIaX4R/z41x11SyZaiOERokCllC10J+rLra2I1N9c=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, jq
|
||||
, glslang
|
||||
, libffi
|
||||
, libX11
|
||||
|
|
@ -37,15 +38,10 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-+VbiXtxzYaF5o+wIrJ+09LmgBdaLv/0VJGFDnBkrXms=";
|
||||
});
|
||||
|
||||
# Include absolute paths to layer libraries in their associated
|
||||
# layer definition json files.
|
||||
postPatch = ''
|
||||
sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$<TARGET_FILE_NAME:\''${TARGET_NAME}>\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
jq
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -74,6 +70,15 @@ stdenv.mkDerivation rec {
|
|||
# available in Nix sandbox. Fails with VK_ERROR_INCOMPATIBLE_DRIVER.
|
||||
doCheck = false;
|
||||
|
||||
# Include absolute paths to layer libraries in their associated
|
||||
# layer definition json files.
|
||||
preFixup = ''
|
||||
for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do
|
||||
jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path"
|
||||
mv tmp.json "$f"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The official Khronos Vulkan validation layers";
|
||||
homepage = "https://github.com/KhronosGroup/Vulkan-ValidationLayers";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fheroes2";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihhub";
|
||||
repo = "fheroes2";
|
||||
rev = version;
|
||||
sha256 = "sha256-86+4rFSvJ3xIVx+qDXZ65TSqIrPkbyoLNo1A+mFPdy8=";
|
||||
sha256 = "sha256-l7MFvcUOv1jA7moA8VYcaQO15eyK/06x6Jznz5jsNNg=";
|
||||
};
|
||||
|
||||
buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];
|
||||
|
|
|
|||
|
|
@ -2,61 +2,61 @@
|
|||
"4.14": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.304-hardened1.patch",
|
||||
"sha256": "099fqlfl9p57pfh5jr7cv30476q2cbhrqs6w63cy3mkwj7l4jwln",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.304-hardened1/linux-hardened-4.14.304-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.305-hardened1.patch",
|
||||
"sha256": "05zcfy7dh8vlbvf9iw99m2xi7d9df254lg3a77hhb8cb264yn6z0",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.305-hardened1/linux-hardened-4.14.305-hardened1.patch"
|
||||
},
|
||||
"sha256": "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4",
|
||||
"version": "4.14.304"
|
||||
"sha256": "16lmhxqpbhyqmgmlyicjadzz3axhl5smfrr230x45ahkdghwsnx3",
|
||||
"version": "4.14.305"
|
||||
},
|
||||
"4.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.271-hardened1.patch",
|
||||
"sha256": "0xvd9n2fqmr863a4vljki2saa85dccj7mflcfwaslj9g2ygbrf93",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.271-hardened1/linux-hardened-4.19.271-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.272-hardened1.patch",
|
||||
"sha256": "1qimbp19mimy6dqv4rc8hb6966sq7l1y72hp0s0vy682qx556zwg",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.272-hardened1/linux-hardened-4.19.272-hardened1.patch"
|
||||
},
|
||||
"sha256": "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3",
|
||||
"version": "4.19.271"
|
||||
"sha256": "1y8kyc48v8bsl53zc6dsy5xhazv0vyna98fycj181aypicvbk7s8",
|
||||
"version": "4.19.272"
|
||||
},
|
||||
"5.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.166-hardened1.patch",
|
||||
"sha256": "1ygxald6mq47n7i6x80mv9d5idfpwk6gpcijci8bsazhndwvi7qy",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.166-hardened1/linux-hardened-5.10.166-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.167-hardened1.patch",
|
||||
"sha256": "0i74kjzilsgyjidz7p9jjxpjx3yqx5gsh7nwlw6zclxg1a82fw24",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.167-hardened1/linux-hardened-5.10.167-hardened1.patch"
|
||||
},
|
||||
"sha256": "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80",
|
||||
"version": "5.10.166"
|
||||
"sha256": "1iprbgwdgnylzw4dc8jgims54x8dkq070c9vs4642rp529wgj1yq",
|
||||
"version": "5.10.167"
|
||||
},
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.91-hardened1.patch",
|
||||
"sha256": "041yigcqzp7m6cibl9h3jgsz20xhxc9y7y5pay9c7fkh2ypy9zgz",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.91-hardened1/linux-hardened-5.15.91-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.92-hardened1.patch",
|
||||
"sha256": "0wwi15r51jb0396vc4nbwjh9kxh68jvcbdw72pllwsgkhijgzkhg",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.92-hardened1/linux-hardened-5.15.92-hardened1.patch"
|
||||
},
|
||||
"sha256": "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56",
|
||||
"version": "5.15.91"
|
||||
"sha256": "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz",
|
||||
"version": "5.15.92"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.230-hardened1.patch",
|
||||
"sha256": "0xk80i6wddd909wzhcp7b64sbsjjqpwyjr8gknpc83zcdzv3y892",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.230-hardened1/linux-hardened-5.4.230-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.231-hardened1.patch",
|
||||
"sha256": "1fximwmcp0205i3jxmglf0jawgy1knrc9cnjpz05am8yi7ndikmd",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.231-hardened1/linux-hardened-5.4.231-hardened1.patch"
|
||||
},
|
||||
"sha256": "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7",
|
||||
"version": "5.4.230"
|
||||
"sha256": "1a1nbyvkf6iaj5lz6ahg7kk9pyrx7j77jmaj92fyihdl3mzyml4d",
|
||||
"version": "5.4.231"
|
||||
},
|
||||
"6.1": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.1.8-hardened1.patch",
|
||||
"sha256": "1ry0cb1dsq84n6cxn8ndx47qz1g69kqlfkb16rrlgk49w81i8y8z",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.8-hardened1/linux-hardened-6.1.8-hardened1.patch"
|
||||
"name": "linux-hardened-6.1.10-hardened1.patch",
|
||||
"sha256": "0v0w4phc02ghylqnyhzkl1frmjkxwkxgadf2ycyzm8ckl73q8lr5",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.10-hardened1/linux-hardened-6.1.10-hardened1.patch"
|
||||
},
|
||||
"sha256": "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn",
|
||||
"version": "6.1.8"
|
||||
"sha256": "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb",
|
||||
"version": "6.1.10"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.92";
|
||||
version = "5.15.93";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz";
|
||||
sha256 = "1baxkkd572110p95ah1wv0b4i2hfbkf8vyncb08y3w0bd7r29vg7";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.1.10";
|
||||
version = "6.1.11";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb";
|
||||
sha256 = "18gpkaa030g8mgmyprl05h4i8y5rjgyvbh0jcl8waqvq0xh0a6sq";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "19044";
|
||||
sha256 = "1xiykp6lwvlz8x48i7f1f3izra2hfz75iihw3y4w5f1jlji6y56m";
|
||||
rev = "19049";
|
||||
sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.15.86-rt56"; # updated by ./update-rt.sh
|
||||
version = "5.15.92-rt57"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -18,14 +18,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40";
|
||||
sha256 = "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0y7pkzacxh1fsvnbmjq0ljfb4zjw6dq9br6rl8kr3w4dj56fmaxs";
|
||||
sha256 = "181db4cdaw8wjrqfh07mbqgyzv1awl1g12x6k8lciv78j10x5kmb";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,4 +20,12 @@ aarch64-linux = fetchurl {
|
|||
sha256 = "sha256-qC7BrBhI9berbuIVIQ6yOo74eHRsoneVRJMx1K/Ljds=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
armv6l-linux = fetchurl {
|
||||
sha256 = "sha256-cWoEpOScFzcz3tsG7IIBV2xpBT+uvSYMEfrmE3pohWA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_armv6.tar.gz";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
sha256 = "sha256-DTGyyNCncbGrrpHzcIxpZqukAYsHarqSJhlbYvjN6dA=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_armv7.tar.gz";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ declare -A systems
|
|||
systems[linux_386]=i686-linux
|
||||
systems[linux_amd64]=x86_64-linux
|
||||
systems[linux_arm64]=aarch64-linux
|
||||
systems[linux_armv6]=armv6l-linux
|
||||
systems[linux_armv7]=armv7l-linux
|
||||
systems[darwin_amd64]=x86_64-darwin
|
||||
systems[darwin_arm64]=aarch64-darwin
|
||||
|
||||
|
|
@ -30,7 +32,7 @@ echo '{' >> "$bins"
|
|||
|
||||
for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do
|
||||
url="$(jq -r '.browser_download_url' <<< "$asset")"
|
||||
adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64)' <<< "$url" || true)"
|
||||
adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64|armv6|armv7)' <<< "$url" || true)"
|
||||
if [ -n "$adg_system" ]; then
|
||||
fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)"
|
||||
nix_system=${systems[$adg_system]}
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ buildBazelPackage rec {
|
|||
"--spawn_strategy=standalone"
|
||||
"--noexperimental_strict_action_env"
|
||||
"--cxxopt=-Wno-error"
|
||||
"--linkopt=-Wl,-z,noexecstack"
|
||||
|
||||
# Force use of system Java.
|
||||
"--extra_toolchains=@local_jdk//:all"
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dmarc-metrics-exporter";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
disabled = python3.pythonOlder "3.7";
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "jgosmann";
|
||||
repo = "dmarc-metrics-exporter";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OUeTOnb9ZhdJWzO+Wzl+liv4u3mlbyJ4tWyCHU5loqc=";
|
||||
hash = "sha256-o22Jn2x2mFczjQTttKEfrzGBAKpXSe9JT8kIA5WGjmA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
|
|
|||
|
|
@ -33,29 +33,16 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "tts";
|
||||
version = "0.10.2";
|
||||
version = "0.11.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = "TTS";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IcuRhsURgEYIuS7ldZtxAy4Z/XNDehTGsOfYW+DhScg=";
|
||||
hash = "sha256-EVFFETiGbrouUsrIhMFZEex3UGCCWTI3CC4yFAcERyw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use packaging.version for version comparisons
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coqui-ai/TTS/commit/77a9ef8ac97ea1b0f7f8d8287dba69a74fdf22ce.patch";
|
||||
hash = "sha256-zWJmINyxw2efhR9KIVkDPHao5703zlpCKwdzOh/1APY=";
|
||||
})
|
||||
# Fix espeak version detection logic
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coqui-ai/TTS/commit/0031df0143b069d7db59ba04d1adfafcc1a92f47.patch";
|
||||
hash = "sha256-6cL9YqWrB+0QomINpA9BxdYmEDpXF03udGEchydQmBA=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = let
|
||||
relaxedConstraints = [
|
||||
"cython"
|
||||
|
|
@ -149,6 +136,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
"test_models_offset_2_step_3"
|
||||
"test_run_all_models"
|
||||
"test_synthesize"
|
||||
"test_voice_cloning"
|
||||
"test_voice_conversion"
|
||||
"test_multi_speaker_multi_lingual_model"
|
||||
"test_single_speaker_model"
|
||||
|
|
@ -166,9 +154,12 @@ python.pkgs.buildPythonApplication rec {
|
|||
"tests/tts_tests/test_align_tts_train.py"
|
||||
"tests/tts_tests/test_fast_pitch_speaker_emb_train.py"
|
||||
"tests/tts_tests/test_fast_pitch_train.py"
|
||||
"tests/tts_tests/test_fastspeech_2_speaker_emb_train.py"
|
||||
"tests/tts_tests/test_fastspeech_2_train.py"
|
||||
"tests/tts_tests/test_glow_tts_d-vectors_train.py"
|
||||
"tests/tts_tests/test_glow_tts_speaker_emb_train.py"
|
||||
"tests/tts_tests/test_glow_tts_train.py"
|
||||
"tests/tts_tests/test_neuralhmm_tts_train.py"
|
||||
"tests/tts_tests/test_overflow_train.py"
|
||||
"tests/tts_tests/test_speedy_speech_train.py"
|
||||
"tests/tts_tests/test_tacotron2_d-vectors_train.py"
|
||||
|
|
|
|||
33
pkgs/tools/filesystems/rnm/default.nix
Normal file
33
pkgs/tools/filesystems/rnm/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gmp
|
||||
, jpcre2
|
||||
, pcre2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rnm";
|
||||
version = "4.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neurobin";
|
||||
repo = "rnm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cMWIxRuL7UCDjGr26+mfEYBPRA/dxEt0Us5qU92TelY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
jpcre2
|
||||
pcre2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://neurobin.org/projects/softwares/unix/rnm/";
|
||||
description = "Bulk rename utility";
|
||||
changelog = "https://github.com/neurobin/rnm/blob/${version}/ChangeLog";
|
||||
platforms = lib.platforms.all;
|
||||
license = licenses.gpl3Only;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
diff -Naur source-old/pyproject.toml source-new/pyproject.toml
|
||||
--- source-old/pyproject.toml 1980-01-02 00:00:00.000000000 -0300
|
||||
+++ source-new/pyproject.toml 2023-02-04 10:09:48.087418202 -0300
|
||||
@@ -29,11 +29,11 @@
|
||||
"Topic :: Security",
|
||||
]
|
||||
dependencies = [
|
||||
- "pydantic~=1.10.2",
|
||||
- "python-dotenv~=0.21.0",
|
||||
- "requests~=2.28.1",
|
||||
- "rich~=12.6.0",
|
||||
- "shodan~=1.28.0",
|
||||
+ "pydantic",
|
||||
+ "python-dotenv",
|
||||
+ "requests",
|
||||
+ "rich",
|
||||
+ "shodan",
|
||||
]
|
||||
dynamic = ["version"]
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
"mypy",
|
||||
"pytest",
|
||||
"pytest-cov",
|
||||
- "types-requests~=2.28.1",
|
||||
+ "types-requests",
|
||||
]
|
||||
[tool.hatch.envs.default.scripts]
|
||||
typecheck = "mypy -p {args:wtfis}"
|
||||
41
pkgs/tools/networking/wtfis/default.nix
Normal file
41
pkgs/tools/networking/wtfis/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "wtfis";
|
||||
version = "0.5.1";
|
||||
in python3.pkgs.buildPythonApplication {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pirxthepilot";
|
||||
repo = "wtfis";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XoQ/iJTdZoekA5guxI8POG4NEhN8Up3OuIz344G75ao=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# TODO: get rid of that newbie patch
|
||||
./000-pyproject-remove-versions.diff
|
||||
];
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3.pkgs.hatchling
|
||||
python3.pkgs.pydantic
|
||||
python3.pkgs.rich
|
||||
python3.pkgs.shodan
|
||||
python3.pkgs.python-dotenv
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/pirxthepilot/wtfis";
|
||||
description = "Passive hostname, domain and IP lookup tool for non-robots";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
};
|
||||
}
|
||||
|
|
@ -181,6 +181,10 @@ self = stdenv.mkDerivation {
|
|||
];
|
||||
|
||||
makeFlags = [
|
||||
# gcc runs multi-threaded LTO using make and does not yet detect the new fifo:/path style
|
||||
# of make jobserver. until gcc adds support for this we have to instruct make to use this
|
||||
# old style or LTO builds will run their linking on only one thread, which takes forever.
|
||||
"--jobserver-style=pipe"
|
||||
"profiledir=$(out)/etc/profile.d"
|
||||
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"
|
||||
++ lib.optional (stdenv.hostPlatform.isDarwin) "PRECOMPILE_HEADERS=1";
|
||||
|
|
|
|||
36
pkgs/tools/system/zps/default.nix
Normal file
36
pkgs/tools/system/zps/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zps";
|
||||
version = "1.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "zps";
|
||||
rev = version;
|
||||
hash = "sha256-t0kVMrJn+eqUUD98pp3iIK28MoLwOplLk0sYgRJkO4c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
substitute ../.application/zps.desktop $out/share/applications/zps.desktop \
|
||||
--replace Exec=zps Exec=$out/zps \
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A small utility for listing and reaping zombie processes on GNU/Linux";
|
||||
homepage = "https://github.com/orhun/zps";
|
||||
changelog = "https://github.com/orhun/zps/releases/tag/${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
|
|||
version = "2021-04-24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bellard.org/libnc/gpt2tc-${version}.tar.gz";
|
||||
hash = "sha256-kHnRziSNRewifM/oKDQwG27rXRvntuUUX8M+PUNHpA4=";
|
||||
url = "https://web.archive.org/web/20220603034455/https://bellard.org/libnc/gpt2tc-2021-04-24.tar.gz";
|
||||
hash = "sha256-6oTxnbBwjHAXVrWMjOQVwdODbqLRoinx00pi29ff5w0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -11200,6 +11200,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
rnm = callPackage ../tools/filesystems/rnm { };
|
||||
|
||||
rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
|
||||
|
||||
rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix {
|
||||
|
|
@ -13738,6 +13740,8 @@ with pkgs;
|
|||
|
||||
zplug = callPackage ../shells/zsh/zplug { };
|
||||
|
||||
zps = callPackage ../tools/system/zps { };
|
||||
|
||||
zi = callPackage ../shells/zsh/zi {};
|
||||
|
||||
zinit = callPackage ../shells/zsh/zinit {} ;
|
||||
|
|
@ -15696,6 +15700,7 @@ with pkgs;
|
|||
cargo-audit = callPackage ../development/tools/rust/cargo-audit {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { };
|
||||
cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
@ -20520,6 +20525,8 @@ with pkgs;
|
|||
|
||||
jose = callPackage ../development/libraries/jose { };
|
||||
|
||||
jpcre2 = callPackage ../development/libraries/jpcre2 { };
|
||||
|
||||
jshon = callPackage ../development/tools/parsing/jshon { };
|
||||
|
||||
json2hcl = callPackage ../development/tools/json2hcl { };
|
||||
|
|
@ -38813,6 +38820,8 @@ with pkgs;
|
|||
|
||||
undaemonize = callPackage ../tools/system/undaemonize {};
|
||||
|
||||
wtfis = callPackage ../tools/networking/wtfis { };
|
||||
|
||||
houdini = callPackage ../applications/misc/houdini {};
|
||||
|
||||
openfst = callPackage ../development/libraries/openfst {};
|
||||
|
|
|
|||
Loading…
Reference in a new issue