Merge staging-next into staging
This commit is contained in:
commit
c040ffb531
|
@ -1,26 +1,41 @@
|
|||
# Go {#sec-language-go}
|
||||
|
||||
## Go modules {#ssec-language-go}
|
||||
## Building Go modules with `buildGoModule` {#ssec-language-go}
|
||||
|
||||
The function `buildGoModule` builds Go programs managed with Go modules. It builds a [Go Modules](https://github.com/golang/go/wiki/Modules) through a two phase build:
|
||||
The function `buildGoModule` builds Go programs managed with Go modules. It builds [Go Modules](https://github.com/golang/go/wiki/Modules) through a two phase build:
|
||||
|
||||
- An intermediate fetcher derivation. This derivation will be used to fetch all of the dependencies of the Go module.
|
||||
- An intermediate fetcher derivation called `goModules`. This derivation will be used to fetch all the dependencies of the Go module.
|
||||
- A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output.
|
||||
|
||||
### Attributes of `buildGoModule` {#buildgomodule-parameters}
|
||||
|
||||
The `buildGoModule` function accepts the following parameters in addition to the [attributes accepted by both Go builders](#ssec-go-common-attributes):
|
||||
|
||||
- `vendorHash`: is the hash of the output of the intermediate fetcher derivation (the dependencies of the Go modules).
|
||||
|
||||
`vendorHash` can be set to `null`.
|
||||
In that case, rather than fetching the dependencies, the dependencies already vendored in the `vendor` directory of the source repo will be used.
|
||||
|
||||
To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;`.
|
||||
You can read more about [vendoring in the Go documentation](https://go.dev/ref/mod#vendoring).
|
||||
|
||||
To obtain the actual hash, set `vendorHash = lib.fakeHash;` and run the build ([more details here](#sec-source-hashes)).
|
||||
- `proxyVendor`: If `true`, the intermediate fetcher downloads dependencies from the
|
||||
[Go module proxy](https://go.dev/ref/mod#module-proxy) (using `go mod download`) instead of vendoring them. The resulting
|
||||
[module cache](https://go.dev/ref/mod#module-cache) is then passed to the final derivation.
|
||||
|
||||
This is useful if your code depends on C code and `go mod tidy` does not include the needed sources to build or
|
||||
if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums.
|
||||
|
||||
Defaults to `false`.
|
||||
- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash`.
|
||||
Note that if you change this attribute, you need to update `vendorHash` attribute.
|
||||
- `modRoot`: The root directory of the Go module that contains the `go.mod` file.
|
||||
Defaults to `./`, which is the root of `src`.
|
||||
|
||||
### Example for `buildGoModule` {#ex-buildGoModule}
|
||||
|
||||
In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function:
|
||||
|
||||
- `vendorHash`: is the hash of the output of the intermediate fetcher derivation.
|
||||
|
||||
`vendorHash` can also be set to `null`.
|
||||
In that case, rather than fetching the dependencies and vendoring them, the dependencies vendored in the source repo will be used.
|
||||
|
||||
To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;`
|
||||
|
||||
To obtain the actual hash, set `vendorHash = lib.fakeHash;` and run the build ([more details here](#sec-source-hashes)).
|
||||
- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums.
|
||||
- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash`. Note that if you change this attribute, you need to update `vendorHash` attribute.
|
||||
The following is an example expression using `buildGoModule`:
|
||||
|
||||
```nix
|
||||
pet = buildGoModule rec {
|
||||
|
@ -51,7 +66,7 @@ The function `buildGoPackage` builds legacy Go programs, not supporting Go modul
|
|||
|
||||
### Example for `buildGoPackage` {#example-for-buildgopackage}
|
||||
|
||||
In the following is an example expression using buildGoPackage, the following arguments are of special significance to the function:
|
||||
In the following is an example expression using `buildGoPackage`, the following arguments are of special significance to the function:
|
||||
|
||||
- `goPackagePath` specifies the package's canonical Go import path.
|
||||
- `goDeps` is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate `deps.nix` file for readability. The dependency data structure is described below.
|
||||
|
@ -103,7 +118,7 @@ The `goDeps` attribute can be imported from a separate `nix` file that defines w
|
|||
]
|
||||
```
|
||||
|
||||
To extract dependency information from a Go package in automated way use [go2nix](https://github.com/kamilchm/go2nix). It can produce complete derivation and `goDeps` file for Go programs.
|
||||
To extract dependency information from a Go package in automated way use [go2nix (deprecated)](https://github.com/kamilchm/go2nix). It can produce complete derivation and `goDeps` file for Go programs.
|
||||
|
||||
You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc:
|
||||
|
||||
|
@ -113,7 +128,7 @@ for p in $NIX_PROFILES; do
|
|||
done
|
||||
```
|
||||
|
||||
## Attributes used by the builders {#ssec-go-common-attributes}
|
||||
## Attributes used by both builders {#ssec-go-common-attributes}
|
||||
|
||||
Many attributes [controlling the build phase](#variables-controlling-the-build-phase) are respected by both `buildGoModule` and `buildGoPackage`. Note that `buildGoModule` reads the following attributes also when building the `vendor/` goModules fixed output derivation as well:
|
||||
|
||||
|
@ -124,11 +139,18 @@ Many attributes [controlling the build phase](#variables-controlling-the-build-p
|
|||
- [`postPatch`](#var-stdenv-postPatch)
|
||||
- [`preBuild`](#var-stdenv-preBuild)
|
||||
|
||||
To control test execution of the build derivation, the following attributes are of interest:
|
||||
|
||||
- [`checkInputs`](#var-stdenv-checkInputs)
|
||||
- [`preCheck`](#var-stdenv-preCheck)
|
||||
- [`checkFlags`](#var-stdenv-checkFlags)
|
||||
|
||||
In addition to the above attributes, and the many more variables respected also by `stdenv.mkDerivation`, both `buildGoModule` and `buildGoPackage` respect Go-specific attributes that tweak them to behave slightly differently:
|
||||
|
||||
### `ldflags` {#var-go-ldflags}
|
||||
|
||||
Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build`. The most common use case for this argument is to make the resulting executable aware of its own version. For example:
|
||||
A string list of flags to pass to the Go linker tool via the `-ldflags` argument of `go build`. Possible values can be retrieved by running `go tool link --help`.
|
||||
The most common use case for this argument is to make the resulting executable aware of its own version by injecting the value of string variable using the `-X` flag. For example:
|
||||
|
||||
```nix
|
||||
ldflags = [
|
||||
|
@ -139,7 +161,7 @@ Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build
|
|||
|
||||
### `tags` {#var-go-tags}
|
||||
|
||||
Arguments to pass to the Go via the `-tags` argument of `go build`. For example:
|
||||
A string list of [Go build tags (also called build constraints)](https://pkg.go.dev/cmd/go#hdr-Build_constraints) that are passed via the `-tags` argument of `go build`. These constraints control whether Go files from the source should be included in the build. For example:
|
||||
|
||||
```nix
|
||||
tags = [
|
||||
|
@ -148,18 +170,101 @@ Arguments to pass to the Go via the `-tags` argument of `go build`. For example:
|
|||
];
|
||||
```
|
||||
|
||||
Tags can also be set conditionally:
|
||||
|
||||
```nix
|
||||
tags = [ "production" ] ++ lib.optionals withSqlite [ "sqlite" ];
|
||||
```
|
||||
|
||||
### `deleteVendor` {#var-go-deleteVendor}
|
||||
|
||||
Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete.
|
||||
If set to `true`, removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete.
|
||||
|
||||
### `subPackages` {#var-go-subPackages}
|
||||
|
||||
Specified as a string or list of strings. Limits the builder from building child packages that have not been listed. If `subPackages` is not specified, all child packages will be built.
|
||||
|
||||
Many Go projects keep the main package in a `cmd` directory.
|
||||
Following example could be used to only build the example-cli and example-server binaries:
|
||||
|
||||
```nix
|
||||
subPackages = [
|
||||
"cmd/example-cli"
|
||||
"cmd/example-server"
|
||||
];
|
||||
```
|
||||
|
||||
### `excludedPackages` {#var-go-excludedPackages}
|
||||
|
||||
Specified as a string or list of strings. Causes the builder to skip building child packages that match any of the provided values. If `excludedPackages` is not specified, all child packages will be built.
|
||||
Specified as a string or list of strings. Causes the builder to skip building child packages that match any of the provided values.
|
||||
|
||||
### `CGO_ENABLED` {#var-go-CGO_ENABLED}
|
||||
|
||||
When set to `0`, the [cgo](https://pkg.go.dev/cmd/cgo) command is disabled. As consequence, the build
|
||||
program can't link against C libraries anymore, and the resulting binary is statically linked.
|
||||
|
||||
When building with CGO enabled, Go will likely link some packages from the Go standard library against C libraries,
|
||||
even when the target code does not explicitly call into C dependencies. With `CGO_ENABLED = 0;`, Go
|
||||
will always use the Go native implementation of these internal packages. For reference see
|
||||
[net](https://pkg.go.dev/net#hdr-Name_Resolution) and [os/user](https://pkg.go.dev/os/user#pkg-overview) packages.
|
||||
Notice that the decision whether these packages should use native Go implementation or not can also be controlled
|
||||
on a per package level using build tags (`tags`). In case CGO is disabled, these tags have no additional effect.
|
||||
|
||||
When a Go program depends on C libraries, place those dependencies in `buildInputs`:
|
||||
|
||||
```nix
|
||||
buildInputs = [
|
||||
libvirt
|
||||
libxml2
|
||||
];
|
||||
```
|
||||
|
||||
`CGO_ENABLED` defaults to `1`.
|
||||
|
||||
### `enableParallelBuilding` {#var-go-enableParallelBuilding}
|
||||
|
||||
Whether builds and tests should run in parallel.
|
||||
|
||||
Defaults to `true`.
|
||||
|
||||
### `allowGoReference` {#var-go-allowGoReference}
|
||||
|
||||
Whether the build result should be allowed to contain references to the Go tool chain. This might be needed for programs that are coupled with the compiler, but shouldn't be set without a good reason.
|
||||
|
||||
Defaults to `false`
|
||||
|
||||
## Controlling the Go environment {#ssec-go-environment}
|
||||
|
||||
The Go build can be further tweaked by setting environment variables. In most cases, this isn't needed. Possible values can be found in the [Go documentation of accepted environment variables](https://pkg.go.dev/cmd/go#hdr-Environment_variables). Notice that some of these flags are set by the builder itself and should not be set explicitly. If in doubt, grep the implementation of the builder.
|
||||
|
||||
## Skipping tests {#ssec-skip-go-tests}
|
||||
|
||||
`buildGoModule` runs tests by default. Failing tests can be disabled using the `checkFlags` parameter.
|
||||
This is done with the [`-skip` or `-run`](https://pkg.go.dev/cmd/go#hdr-Testing_flags) flags of the `go test` command.
|
||||
|
||||
For example, only a selection of tests could be run with:
|
||||
|
||||
```nix
|
||||
# -run and -skip accept regular expressions
|
||||
checkFlags = [
|
||||
"-run=^Test(Simple|Fast)$"
|
||||
];
|
||||
```
|
||||
|
||||
If a larger amount of tests should be skipped, the following pattern can be used:
|
||||
|
||||
```nix
|
||||
checkFlags =
|
||||
let
|
||||
# Skip tests that require network access
|
||||
skippedTests = [
|
||||
"TestNetwork"
|
||||
"TestDatabase/with_mysql" # exclude only the subtest
|
||||
"TestIntegration"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
```
|
||||
|
||||
To disable tests altogether, set `doCheck = false;`.
|
||||
`buildGoPackage` does not execute tests by default.
|
||||
|
|
|
@ -35,7 +35,7 @@ select the image, select the USB flash drive and click "Write".
|
|||
4. Then use the `dd` utility to write the image to the USB flash drive.
|
||||
|
||||
```ShellSession
|
||||
sudo dd if=<path-to-image> of=/dev/sdX bs=4M conv=fsync
|
||||
sudo dd bs=4M conv=fsync oflag=direct status=progress if=<path-to-image> of=/dev/sdX
|
||||
```
|
||||
|
||||
## Creating bootable USB flash drive from a Terminal on macOS {#sec-booting-from-usb-macos}
|
||||
|
|
|
@ -65,6 +65,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
|
||||
- `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`.
|
||||
|
||||
- The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead.
|
||||
|
||||
- `mkosi` was updated to v19. Parts of the user interface have changed. Consult the
|
||||
[release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes.
|
||||
|
||||
|
@ -82,6 +84,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
```
|
||||
- The `kanata` package has been updated to v1.5.0, which includes [breaking changes](https://github.com/jtroo/kanata/releases/tag/v1.5.0).
|
||||
|
||||
- The `craftos-pc` package has been updated to v2.8, which includes [breaking changes](https://github.com/MCJack123/craftos2/releases/tag/v2.8).
|
||||
- Files are now handled in binary mode; this could break programs with embedded UTF-8 characters.
|
||||
- The ROM was updated to match ComputerCraft version v1.109.2.
|
||||
- The bundled Lua was updated to Lua v5.2, which includes breaking changes. See the [Lua manual](https://www.lua.org/manual/5.2/manual.html#8) for more information.
|
||||
- The WebSocket API [was rewritten](https://github.com/MCJack123/craftos2/issues/337), which introduced breaking changes.
|
||||
|
||||
- The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows:
|
||||
- If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**)
|
||||
- If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud28` will be installed by default.
|
||||
|
|
|
@ -16,16 +16,13 @@ let
|
|||
|
||||
in
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options.services.pcscd = {
|
||||
enable = mkEnableOption (lib.mdDoc "PCSC-Lite daemon");
|
||||
|
||||
plugins = mkOption {
|
||||
type = types.listOf types.package;
|
||||
defaultText = literalExpression "[ pkgs.ccid ]";
|
||||
example = literalExpression "[ pkgs.pcsc-cyberjack ]";
|
||||
example = literalExpression "with pkgs; [ pcsc-cyberjack yubikey-personalization ]";
|
||||
description = lib.mdDoc "Plugin packages to be used for PCSC-Lite.";
|
||||
};
|
||||
|
||||
|
@ -46,10 +43,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.pcscd.enable {
|
||||
|
||||
environment.etc."reader.conf".source = cfgFile;
|
||||
|
||||
environment.systemPackages = [ package ];
|
||||
|
@ -61,7 +55,6 @@ in
|
|||
|
||||
systemd.services.pcscd = {
|
||||
environment.PCSCLITE_HP_DROPDIR = pluginEnv;
|
||||
restartTriggers = [ "/etc/reader.conf" ];
|
||||
|
||||
# If the cfgFile is empty and not specified (in which case the default
|
||||
# /etc/reader.conf is assumed), pcscd will happily start going through the
|
||||
|
|
|
@ -7,7 +7,11 @@ let
|
|||
|
||||
argsFormat = {
|
||||
type = with lib.types; attrsOf (nullOr (oneOf [ bool int str ]));
|
||||
generate = lib.cli.toGNUCommandLineShell { };
|
||||
generate = lib.cli.toGNUCommandLineShell {
|
||||
mkBool = k: v: [
|
||||
"--${k}=${if v then "true" else "false"}"
|
||||
];
|
||||
};
|
||||
};
|
||||
in {
|
||||
options.services.c2fmzq-server = {
|
||||
|
|
|
@ -451,6 +451,21 @@ in
|
|||
cfg.services
|
||||
);
|
||||
|
||||
assertions = concatLists (
|
||||
mapAttrsToList
|
||||
(name: service:
|
||||
map (message: {
|
||||
assertion = false;
|
||||
inherit message;
|
||||
}) (concatLists [
|
||||
(optional ((builtins.elem "network-interfaces.target" service.after) || (builtins.elem "network-interfaces.target" service.wants))
|
||||
"Service '${name}.service' is using the deprecated target network-interfaces.target, which no longer exists. Using network.target is recommended instead."
|
||||
)
|
||||
])
|
||||
)
|
||||
cfg.services
|
||||
);
|
||||
|
||||
system.build.units = cfg.units;
|
||||
|
||||
system.nssModules = [ cfg.package.out ];
|
||||
|
|
|
@ -1449,16 +1449,6 @@ in
|
|||
listToAttrs
|
||||
];
|
||||
|
||||
# The network-interfaces target is kept for backwards compatibility.
|
||||
# New modules must NOT use it.
|
||||
systemd.targets.network-interfaces =
|
||||
{ description = "All Network Interfaces (deprecated)";
|
||||
wantedBy = [ "network.target" ];
|
||||
before = [ "network.target" ];
|
||||
after = [ "network-pre.target" ];
|
||||
unitConfig.X-StopOnReconfiguration = true;
|
||||
};
|
||||
|
||||
systemd.services = {
|
||||
network-local-commands = {
|
||||
description = "Extra networking commands.";
|
||||
|
|
|
@ -12,6 +12,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
# make sure multiple freeform options evaluate
|
||||
allow-new-accounts = true;
|
||||
auto-approve-new-accounts = true;
|
||||
licenses = false;
|
||||
};
|
||||
};
|
||||
environment = {
|
||||
|
@ -74,5 +75,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
with subtest("Test that PWA is served"):
|
||||
msg = machine.succeed("curl -sSfL http://localhost:8080")
|
||||
assert "c2FmZQ" in msg, f"Could not find 'c2FmZQ' in the output:\n{msg}"
|
||||
|
||||
with subtest("A setting with false value is properly passed"):
|
||||
machine.succeed("systemctl show -p ExecStart --value c2fmzq-server.service | grep -F -- '--licenses=false'");
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -11,6 +11,8 @@ import ./make-test-python.nix ({ lib, ... }:
|
|||
testScript = ''
|
||||
machine.wait_for_unit("prowlarr.service")
|
||||
machine.wait_for_open_port(9696)
|
||||
machine.succeed("curl --fail http://localhost:9696/")
|
||||
response = machine.succeed("curl --fail http://localhost:9696/")
|
||||
assert '<title>Prowlarr</title>' in response, "Login page didn't load successfully"
|
||||
machine.succeed("[ -d /var/lib/prowlarr ]")
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libmikmod, ncurses }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, libmikmod, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mikmod";
|
||||
|
@ -9,6 +9,17 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1k54p8pn3jinha0f2i23ad15pf1pamibzcxjrbzjbklpcz1ipc6v";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix player startup crash due to stack overflow check:
|
||||
# https://sourceforge.net/p/mikmod/patches/17/
|
||||
(fetchpatch {
|
||||
name = "fortify-source-3.patch";
|
||||
url = "https://sourceforge.net/p/mikmod/patches/17/attachment/0001-mikmod-fix-startup-crash-on-_FROTIFY_SOURCE-3-system.patch";
|
||||
stripLen = 1;
|
||||
hash = "sha256-YtbnLTsW3oYPo4r3fh3DUd3DD5ogWrCNlrDcneY03U0=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ libmikmod ncurses ];
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PYTHONPATH : "${python3.pkgs.pygobject3}/${python3.sitePackages}:$out/lib/rhythmbox/plugins/"
|
||||
--prefix PYTHONPATH : "$out/lib/rhythmbox/plugins/"
|
||||
)
|
||||
'';
|
||||
|
||||
|
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "roomeqwizard";
|
||||
version = "5.20.13";
|
||||
version = "5.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh";
|
||||
sha256 = "sha256-6zaBDOmQlyMRQ84j64oS7TMwcctT1PSbuQOUYY9QjvY=";
|
||||
sha256 = "sha256-585xfNzhWFdtNS4E5BE84zjkWDr/p1Nu9CJ3nTJc7dw=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||
--prefix PATH : ${lib.makeBinPath [ coreutils gnused gawk ]}
|
||||
|
||||
cp -r "$desktopItem/share/applications" $out/share/
|
||||
cp $out/share/roomeqwizard/.install4j/s_*.png "$out/share/icons/hicolor/256x256/apps/${pname}.png"
|
||||
cp $out/share/roomeqwizard/.install4j/roomeqwizard.png "$out/share/icons/hicolor/256x256/apps/${pname}.png"
|
||||
|
||||
${lib.optionalString recommendedUdevRules ''echo "$udevRules" > $out/lib/udev/rules.d/90-roomeqwizard.rules''}
|
||||
|
||||
|
@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.roomeqwizard.com/";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ zaninime ];
|
||||
maintainers = with maintainers; [ orivej zaninime ];
|
||||
description = "Room Acoustics Software";
|
||||
longDescription = ''
|
||||
REW is free software for room acoustic measurement, loudspeaker
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which
|
||||
, alsa-lib, libjack2, liblo, qtbase
|
||||
, alsa-lib, libjack2, liblo, qtbase, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1jvra1wzlycfpvffnqidk264zw6fyl4fsghkw5256ldk22aalmq9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config qttools which ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ alsa-lib libjack2 liblo qtbase ];
|
||||
|
||||
|
@ -21,17 +21,20 @@ stdenv.mkDerivation rec {
|
|||
for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do
|
||||
substituteInPlace "$d/Makefile.am" --replace '$(git_info)' '${version}'
|
||||
done
|
||||
|
||||
# gcc-13 headers compatibilty. TODO: try to remove with next version
|
||||
# update
|
||||
sed -e '1i #include <cstdint>' -i libseq66/src/os/daemonize.cpp
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ahlstromcj/seq66";
|
||||
description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
mainProgram = "qseq66";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -73,7 +73,6 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
python3.pkgs.wrapPython
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
|
@ -137,12 +136,8 @@ stdenv.mkDerivation rec {
|
|||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ];
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PYTHONPATH : "$program_PYTHONPATH"
|
||||
# For sysprof-agent
|
||||
--prefix PATH : "${sysprof}/bin"
|
||||
)
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ldtk";
|
||||
version = "1.4.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip";
|
||||
hash = "sha256-Qt6ADyIbhuxFGh7IP1WwcsvMtjOUZoTd99GeWt5s4UM=";
|
||||
hash = "sha256-/2exLVMdSnn/Rc2lL1ytDZ6NvYRJA6W+NT7gGzxm6Vc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/xed/meson.build b/xed/meson.build
|
||||
index 7525bad..ae0814e 100644
|
||||
--- a/xed/meson.build
|
||||
+++ b/xed/meson.build
|
||||
@@ -143,7 +143,7 @@ libxed = library(
|
||||
dependencies: xed_deps,
|
||||
include_directories: include_dirs,
|
||||
install: true,
|
||||
- install_dir: join_paths(libdir, 'xed')
|
||||
+ install_dir: join_paths(prefix, libdir, 'xed')
|
||||
)
|
||||
|
||||
install_headers(
|
|
@ -28,6 +28,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-MXRxzmRo/dRhp5Llib9ng1gzWW8uvzqTMjUVK8a3eJ8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# We patch gobject-introspection and meson to store absolute paths to libraries in typelibs
|
||||
# but that requires the install_dir is an absolute path.
|
||||
./correct-gir-lib-path.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
|
|
|
@ -16,17 +16,17 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.7.5";
|
||||
version = "2.8";
|
||||
craftos2-lua = fetchFromGitHub {
|
||||
owner = "MCJack123";
|
||||
repo = "craftos2-lua";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY=";
|
||||
hash = "sha256-xuNcWt3Wnh3WlYe6pB4dvP3PY9S5ghL9QQombGn8iyY=";
|
||||
};
|
||||
craftos2-rom = fetchFromGitHub {
|
||||
owner = "McJack123";
|
||||
repo = "craftos2-rom";
|
||||
rev = "v${version}.1"; # Author released a hotfix; remove trailing '.1' on next update
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WZs/KIdpqLLzvpH2hiJpe/AehluoQMtewBbAb4htz8k=";
|
||||
};
|
||||
in
|
||||
|
@ -39,9 +39,18 @@ stdenv.mkDerivation rec {
|
|||
owner = "MCJack123";
|
||||
repo = "craftos2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t2yhSuNPFCF2NaQFWuN9Nos5ZPinAvecV6EZNO0Cy9I=";
|
||||
hash = "sha256-nT/oN2XRU1Du1/IHlkRCzLqFwQ5s9Sr4FQs3ES+aPFs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
( # Fixes CCEmuX. This is a one-character change that did not make it into the release.
|
||||
fetchpatch {
|
||||
url = "https://github.com/MCJack123/craftos2/commit/9ef7e16b69ead69b5fe076724842a1e24b3de058.patch";
|
||||
hash = "sha256-SjNnsooDFt3JoVOO0xf6scrGXEQQmrQf91GY7VWaTOw=";
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ];
|
||||
|
||||
preBuild = ''
|
||||
|
@ -50,6 +59,12 @@ stdenv.mkDerivation rec {
|
|||
make -C craftos2-lua linux
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -15,13 +15,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ausweisapp";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Governikus";
|
||||
repo = "AusweisApp2";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RUjc4KqyKZXBW+CMaRhKsbwVzmWw6/QHNK+RpBd7Gxw=";
|
||||
hash = "sha256-m+GZkaJyuqErsvkUXi+uAsrMXHyQg9Vd77ZkfGxMqg4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
pythonPath = with python3Packages; [
|
||||
pyqt5
|
||||
pyqt5_sip
|
||||
pyqt5-sip
|
||||
send2trash
|
||||
sphinx
|
||||
polib
|
||||
|
|
|
@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
protobuf
|
||||
pyogg
|
||||
pyqt5
|
||||
pyqt5_sip
|
||||
pyqt5-sip
|
||||
pyxdg
|
||||
requests
|
||||
setuptools
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
# python deps
|
||||
, python, buildPythonPackage
|
||||
, alembic, beautifulsoup4, chardet, lxml, mako, pyenchant
|
||||
, pyqt5-webkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate
|
||||
, pyqt5-webkit, pyxdg, sip4, sqlalchemy, sqlalchemy-migrate
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
pyenchant
|
||||
pyqt5-webkit
|
||||
pyxdg
|
||||
sip_4
|
||||
sip4
|
||||
sqlalchemy
|
||||
sqlalchemy-migrate
|
||||
];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.31.1";
|
||||
version = "0.31.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-01Hlf/wFJjqQbvr/yvzEb+W8Z3krkPlQHUWw04FM7ts=";
|
||||
hash = "sha256-ZNYIGs8oBy4U7y4GiOCcIhnAGRx92V+cQzTE+40QE+A=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-F7RxqxfjcmBAa8MmgRfUvEEtGMvs7NK5P257n7isl9E=";
|
||||
vendorHash = "sha256-RXKotLyH97EgfDxQzFSSgATGu96SnfwZyR3WprhwsMM=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
|
||||
|
|
|
@ -26,7 +26,7 @@ let
|
|||
pygobject3
|
||||
] ++ lib.optionals withGui [
|
||||
pyqt5
|
||||
pyqt5_sip
|
||||
pyqt5-sip
|
||||
]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
psutil
|
||||
sentry-sdk
|
||||
setuptools
|
||||
sip_4 (pyqt5.override { withWebSockets = true; })
|
||||
sip4 (pyqt5.override { withWebSockets = true; })
|
||||
truststore
|
||||
qt5.qtwayland
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
|
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
sed -i "s~ -geom 10x10~~g" src/config.cc
|
||||
'';
|
||||
|
||||
pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ] ++ extraPythonPackages;
|
||||
pythonPath = with python3.pkgs; requiredPythonModules extraPythonPackages;
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
gappsWrapperArgs+=(
|
||||
|
|
|
@ -73,14 +73,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
pygobject3
|
||||
pycairo
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
|
||||
postFixup = ''
|
||||
buildPythonPath ${python3Packages.pycairo}
|
||||
patchPythonScript $out/lib/liferea/plugins/trayicon.py
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ mkDerivation, lib, fetchurl,
|
||||
cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee,
|
||||
cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee, qtxmlpatterns,
|
||||
kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
|
||||
kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive,
|
||||
kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared-mime-info
|
||||
|
@ -7,11 +7,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "skrooge";
|
||||
version = "2.28.0";
|
||||
version = "2.31.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz";
|
||||
sha256 = "sha256-s2SkGMBx7HVpr1NBUJpqji3PTPnw4RqnkakdQVC5ric=";
|
||||
hash = "sha256-S90sUKJkUwgPAGlIuyN05a5DoehTFpFOnVLMF8Ac+HI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -19,7 +19,7 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
qtwebengine qtscript grantlee kxmlgui kwallet kparts
|
||||
qtwebengine qtscript grantlee kxmlgui kwallet kparts qtxmlpatterns
|
||||
kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
|
||||
kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx
|
||||
];
|
||||
|
|
|
@ -58,7 +58,7 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
postInstall = with python3Packages; ''
|
||||
wrapProgram $out/bin/pymol \
|
||||
--prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5_sip ]}
|
||||
--prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5-sip ]}
|
||||
|
||||
mkdir -p "$out/share/icons/"
|
||||
ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
propagatedBuildInputs = with python3Packages; [
|
||||
pyqt5
|
||||
lxml
|
||||
sip_4
|
||||
sip4
|
||||
];
|
||||
preBuild = ''
|
||||
make qt5py3
|
||||
|
|
|
@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/WizardMac/ReadStat/commit/211c342a1cfe46fb7fb984730dd7a29ff4752f35.patch";
|
||||
hash = "sha256-nkaEgusylVu7NtzSzBklBuOnqO9qJPovf0qn9tTE6ls=";
|
||||
})
|
||||
|
||||
# Backport use-after-free:
|
||||
# https://github.com/WizardMac/ReadStat/pull/298
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WizardMac/ReadStat/commit/718d49155e327471ed9bf4a8c157f849f285b46c.patch";
|
||||
hash = "sha256-9hmuFa05b4JlxSzquIxXArOGhbi27A+3y5gH1IDg+R0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
|
|
@ -41,7 +41,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication {
|
|||
pyqtwebengine
|
||||
pyzmq
|
||||
requests
|
||||
sip_4
|
||||
sip4
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -25,13 +25,6 @@
|
|||
, xapp
|
||||
, yelp-tools }:
|
||||
|
||||
let
|
||||
pythonenv = python3.withPackages (ps: [
|
||||
ps.pygobject3
|
||||
ps.dbus-python # For one plugin
|
||||
]);
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xplayer";
|
||||
version = "2.4.4";
|
||||
|
@ -66,6 +59,7 @@ stdenv.mkDerivation rec {
|
|||
intltool
|
||||
itstool
|
||||
pkg-config
|
||||
python3.pkgs.wrapPython
|
||||
yelp-tools
|
||||
gobject-introspection
|
||||
];
|
||||
|
@ -82,15 +76,15 @@ stdenv.mkDerivation rec {
|
|||
libpeas
|
||||
libxml2
|
||||
libxplayer-plparser
|
||||
pythonenv
|
||||
python3
|
||||
xapp
|
||||
# to satisfy configure script
|
||||
pythonenv.pkgs.pygobject3
|
||||
python3.pkgs.pygobject3
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/xplayer \
|
||||
--prefix PATH : ${lib.makeBinPath [ pythonenv ]}
|
||||
postFixup = ''
|
||||
buildPythonPath ${python3.pkgs.dbus-python}
|
||||
patchPythonScript $out/lib/xplayer/plugins/dbus/dbusservice.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "aarch64-esr-decoder";
|
||||
version = "0.2.1";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "aarch64-esr-decoder";
|
||||
rev = version;
|
||||
hash = "sha256-YdB/8EUeELcKBj8UMbeWFzJ8HeMHvDgrP2qlOJp2dXA=";
|
||||
hash = "sha256-U9i5L3s4oQOIqlECSaKkHxS2Vzr6SY4tIUpvl3+oSl0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-P55DiHBUkr6mreGnWET4+TzLkKnVQJ0UwvrGp6BQ304=";
|
||||
cargoHash = "sha256-BdxRvvU3AovlT7QloZ/LlkjRTVCWEsPUj4NkP4gBPsY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility for decoding aarch64 ESR register values";
|
||||
|
|
|
@ -1,42 +1,62 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
|
||||
, alsa-lib, bluez, glib, sbc, dbus
|
||||
|
||||
# optional, but useful utils
|
||||
, readline, libbsd, ncurses
|
||||
|
||||
# optional codecs
|
||||
, aacSupport ? true, fdk_aac
|
||||
# TODO: aptxSupport
|
||||
{ lib
|
||||
, stdenv
|
||||
, aacSupport ? true
|
||||
, alsa-lib
|
||||
, autoreconfHook
|
||||
, bluez
|
||||
, dbus
|
||||
, fdk_aac
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, glib
|
||||
, libbsd
|
||||
, ncurses
|
||||
, pkg-config
|
||||
, readline
|
||||
, sbc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bluez-alsa";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Arkq";
|
||||
repo = "bluez-alsa";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib bluez glib sbc dbus
|
||||
readline libbsd ncurses
|
||||
]
|
||||
++ lib.optional aacSupport fdk_aac;
|
||||
alsa-lib
|
||||
bluez
|
||||
glib
|
||||
sbc
|
||||
dbus
|
||||
readline
|
||||
libbsd
|
||||
ncurses
|
||||
] ++ lib.optionals aacSupport [
|
||||
fdk_aac
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-alsaplugindir=${placeholder "out"}/lib/alsa-lib"
|
||||
"--with-dbusconfdir=${placeholder "out"}/share/dbus-1/system.d"
|
||||
"--enable-rfcomm"
|
||||
"--enable-hcitop"
|
||||
]
|
||||
++ lib.optional aacSupport "--enable-aac";
|
||||
(lib.enableFeature aacSupport "aac")
|
||||
(lib.enableFeature true "hcitop")
|
||||
(lib.enableFeature true "rfcomm")
|
||||
(lib.withFeatureAs true "alsaplugindir" "${placeholder "out"}/lib/alsa-lib")
|
||||
(lib.withFeatureAs true "dbusconfdir" "${placeholder "out"}/share/dbus-1/system.d")
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Arkq/bluez-alsa";
|
||||
description = "Bluez 5 Bluetooth Audio ALSA Backend";
|
||||
longDescription = ''
|
||||
Bluez-ALSA (BlueALSA) is an ALSA backend for Bluez 5 audio interface.
|
||||
|
@ -57,10 +77,10 @@ stdenv.mkDerivation rec {
|
|||
BluezALSA if you disable `bluetooth-discover` and `bluez5-discover`
|
||||
modules in PA and configure it to play/capture sound over `bluealsa` PCM.
|
||||
'';
|
||||
homepage = src.meta.homepage;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.oxij ];
|
||||
license = with lib.licenses; [ mit ];
|
||||
mainProgram = "bluealsa";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres oxij ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
})
|
||||
# TODO: aptxSupport
|
|
@ -13,10 +13,10 @@ let
|
|||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-Tip719cZ2La7d7fdpwrKCTRyUyaZCaNXb3bH0fb6WUs=";
|
||||
aarch64-linux = "sha256-Ua0GNPZRT4VCeSpnczkWXhzV7fHeyyLJlkOzMXskNiU=";
|
||||
x86_64-darwin = "sha256-GAus7HeKyEPfts6nKJfKVVsCgdw0nUou+oFO6orIkAM=";
|
||||
aarch64-darwin = "sha256-AvikE5fIsrIkeJth1x5J+hAJI1U18+JwZpAJe0laDAQ=";
|
||||
x86_64-linux = "sha256-zJsgYjmnGT9Ye5hnhqtv5piGM1/HT+DFhVivKLlvE1Q=";
|
||||
aarch64-linux = "sha256-RjIiSgSxkejS+Dun1xMCZ6C9SPH9AahudQMICH3thC0=";
|
||||
x86_64-darwin = "sha256-PrfHusjA6o1L60eMblnydTKAYe8vKvK2W3jQZYp5dPc=";
|
||||
aarch64-darwin = "sha256-LpyXsdjPpdoIqFzm3sLOlBBQdJgrNl8cPehNAVqFvXg=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
bin = "$out/bin/codeium_language_server";
|
||||
|
@ -24,7 +24,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "codeium";
|
||||
version = "1.6.20";
|
||||
version = "1.6.22";
|
||||
src = fetchurl {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "files-cli";
|
||||
version = "2.12.14";
|
||||
version = "2.12.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3saSSEvX/KxMs3r3sVmdTQDAkwtqo8IYdTcPVhmeD18=";
|
||||
hash = "sha256-xjHPlZenkxZCJ9KwjyWsrAd1LiQRRuS9Z2fsRdHV7eA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yqg1Xd3tIe4LxPaghh+Rm3++Lugc1T7/EmbX0ZZMMxw=";
|
||||
vendorHash = "sha256-JzIafJOSlZUWwewp6sJaM7x3U+vZMdY4gBx/NfI7p5I=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "unbook";
|
||||
version = "0.7.3";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ludios";
|
||||
repo = "unbook";
|
||||
rev = version;
|
||||
hash = "sha256-KYnSIT/zIrbDFRWIaQRto0sPPmpJC8V7f00j4t/AsGQ=";
|
||||
hash = "sha256-THCPJ4zOKSXKZDa5DuqpBfBKZ96TdFEuDMVw/HmO7Eo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AjyeTFgjl3XLplo8w9jne5FyKd2EciwbAKKiaDshpcA=";
|
||||
cargoHash = "sha256-EbSayNz9cPmMDQOaOiyQAYmtlnb+4jzbffm1On0BBxI=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
@ -91,9 +91,7 @@ stdenv.mkDerivation rec {
|
|||
adwaita-icon-theme
|
||||
gnome-desktop
|
||||
gsettings-desktop-schemas
|
||||
# for plug-ins
|
||||
python3Packages.pygobject3
|
||||
python3Packages.dbus-python
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
@ -124,8 +122,6 @@ stdenv.mkDerivation rec {
|
|||
runHook postCheck
|
||||
'';
|
||||
|
||||
wrapPrefixVariables = [ "PYTHONPATH" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "totem";
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, gitUpdater
|
||||
, makeFontsConf
|
||||
, testers
|
||||
|
@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "0001-lomiri-api-Add-missing-headers-for-GCC13.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/lomiri-api/-/commit/029b42a9b4d5467951595dff8bc536eb5a9e3ef7.patch";
|
||||
hash = "sha256-eWrDQGrwf22X49rtUAVbrd+QN+OwyGacVLCWYFsS02o=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs $(find test -name '*.py')
|
||||
|
||||
|
|
|
@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
|
|||
itstool
|
||||
perl
|
||||
pkg-config
|
||||
python3.pkgs.wrapPython
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
|
@ -47,6 +48,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
pycairo
|
||||
six
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
buildPythonPath "$pythonPath"
|
||||
patchPythonScript $out/lib/pluma/plugins/snippets/Snippet.py
|
||||
'';
|
||||
|
||||
passthru.updateScript = mateUpdateScript { inherit pname; };
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -5,7 +5,12 @@ let
|
|||
inherit (stdenv) hostPlatform;
|
||||
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
|
||||
MODEL = toString hostPlatform.parsed.cpu.bits;
|
||||
in stdenv.mkDerivation {
|
||||
in
|
||||
|
||||
# On linux pargets like `pkgsLLVM.dmd` `cc` does not expose `libgcc`
|
||||
# and can't build `dmd`.
|
||||
assert hostPlatform.isLinux -> (stdenv.cc.cc ? libgcc);
|
||||
stdenv.mkDerivation {
|
||||
pname = "dmd-bootstrap";
|
||||
inherit version;
|
||||
|
||||
|
|
|
@ -25,14 +25,14 @@
|
|||
|
||||
# TODO: enable more folks backends
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "folks";
|
||||
version = "0.15.7";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/folks/${lib.versions.majorMinor finalAttrs.version}/folks-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "Eg8hnvYyEsqpWuf2rrZOKZKLCxqLlFIFQwSgDQ80eHE=";
|
||||
};
|
||||
|
||||
|
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||
mesonFlags = [
|
||||
"-Ddocs=true"
|
||||
"-Dtelepathy_backend=${lib.boolToString telepathySupport}"
|
||||
"-Dtests=${lib.boolToString stdenv.isLinux}"
|
||||
"-Dtests=${lib.boolToString (finalAttrs.doCheck && stdenv.isLinux)}"
|
||||
];
|
||||
|
||||
# backends/eds/lib/libfolks-eds.so.26.0.0.p/edsf-persona-store.c:10697:4:
|
||||
|
@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
packageName = "folks";
|
||||
versionPolicy = "none";
|
||||
};
|
||||
};
|
||||
|
@ -115,4 +115,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ zlib openssl libuuid ]
|
||||
++ lib.optionals stdenv.isDarwin [ bzip2 ];
|
||||
|
||||
# cannot run test program while cross compiling
|
||||
configureFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
"ac_cv_openssl_xts_duplicate_keys=yes"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library for support of the Expert Witness Compression Format";
|
||||
homepage = "https://sourceforge.net/projects/libewf/";
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, substituteAll
|
||||
, pkg-config
|
||||
, gi-docgen
|
||||
, gobject-introspection
|
||||
|
@ -25,6 +26,16 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-ndwdUfOGY9pN9SFjBRt7LOo6JCz67p9afhQPB4TIqnc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Make PyGObject’s gi library available.
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [
|
||||
python3.pkgs.pygobject3
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
@ -12,6 +13,7 @@
|
|||
, gobject-introspection
|
||||
, python3
|
||||
, ncurses
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -25,6 +27,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "KXy5wszNjoYXYj0aPoQVtFMLjlqJPjUnu/0e3RMje0w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Make PyGObject’s gi library available.
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [
|
||||
python3.pkgs.pygobject3
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
@ -36,6 +48,7 @@ stdenv.mkDerivation rec {
|
|||
gettext
|
||||
gi-docgen
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
14
pkgs/development/libraries/libpeas/fix-paths.patch
Normal file
14
pkgs/development/libraries/libpeas/fix-paths.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
diff --git a/loaders/python/peas-plugin-loader-python.c b/loaders/python/peas-plugin-loader-python.c
|
||||
index 26edbf3..0d65ada 100644
|
||||
--- a/loaders/python/peas-plugin-loader-python.c
|
||||
+++ b/loaders/python/peas-plugin-loader-python.c
|
||||
@@ -248,6 +248,9 @@ peas_plugin_loader_python_initialize (PeasPluginLoader *loader)
|
||||
goto python_init_error;
|
||||
}
|
||||
|
||||
+ /* Add PyGObject to path */
|
||||
+ PyRun_SimpleString("import site; import functools; functools.reduce(lambda k, p: site.addsitedir(p, k), [@pythonPaths@], site._init_pathinfo())");
|
||||
+
|
||||
/* Initialize PyGObject */
|
||||
pygobject_init (PYGOBJECT_MAJOR_VERSION,
|
||||
PYGOBJECT_MINOR_VERSION,
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, makeFontsConf
|
||||
, nix-update-script
|
||||
, testers
|
||||
|
@ -19,14 +18,14 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsidplayfp";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libsidplayfp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-1e1QDSJ8CjLU794saba2auCKko7p2ylrdI0JWhh8Kco=";
|
||||
hash = "sha256-6Gbujz20EHQ7s9GaPpEPju+WqePjpduJqb5hcrswTm8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
@ -35,26 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"doc"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Pull autoconf-2.72 compatibility fix:
|
||||
# https://github.com/libsidplayfp/libsidplayfp/pull/103
|
||||
# Remove when version > 2.5.1
|
||||
(fetchpatch {
|
||||
name = "0001-libsidplayfp-autoconf-2.72-compat.patch";
|
||||
url = "https://github.com/libsidplayfp/libsidplayfp/commit/2b1b41beb5099d5697e3f8416d78f27634732a9e.patch";
|
||||
hash = "sha256-5Hk202IuHUBow7HnnPr2/ieWFjKDuHLQjQ9mJUML9q8=";
|
||||
})
|
||||
|
||||
# Fix --disable-tests logic
|
||||
# https://github.com/libsidplayfp/libsidplayfp/pull/108
|
||||
# Remove when version > 2.5.1
|
||||
(fetchpatch {
|
||||
name = "0002-libsidplayfp-Fix-autoconf-logic-for-tests-option.patch";
|
||||
url = "https://github.com/libsidplayfp/libsidplayfp/commit/39dd2893b6186c4932d17b529bb62627b742b742.patch";
|
||||
hash = "sha256-ErdfPvu8R81XxdHu2TaV87OpLFlRhJai51QcYUIkUZ4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openmm";
|
||||
version = "8.1.0";
|
||||
version = "8.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openmm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-uNAqjklgBWM2v2z6qu17ZMFO4gn3fsnYPxyGO++UtTw=";
|
||||
hash = "sha256-pYWBniV1J+UZBOPPjuUxVevONHaclo+GvGBEpr7Zmxg=";
|
||||
};
|
||||
|
||||
# "This test is stochastic and may occassionally fail". It does.
|
||||
|
|
|
@ -96,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://valhalla.readthedocs.io/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.Thra11 ];
|
||||
pkgConfigModules = [ "libvalhalla" ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
git
|
||||
, # oil deps
|
||||
file
|
||||
, glibcLocales
|
||||
, pkgsBuildBuild
|
||||
, six
|
||||
, typing
|
||||
}:
|
||||
|
@ -123,7 +123,7 @@ rec {
|
|||
'';
|
||||
|
||||
# See earlier note on glibcLocales TODO: verify needed?
|
||||
LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
|
||||
LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${pkgsBuildBuild.glibcLocales}/lib/locale/locale-archive";
|
||||
|
||||
# not exhaustive; sample what resholve uses as a sanity check
|
||||
pythonImportsCheck = [
|
||||
|
|
|
@ -3,22 +3,28 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, yarl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiotractive";
|
||||
version = "0.5.6";
|
||||
format = "setuptools";
|
||||
version = "0.5.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zhulik";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jJw1L1++Z/r+E12tA6zoyyy4MmTpaaVVzKwfI6xcDBQ=";
|
||||
repo = "aiotractive";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fIdIFG1OpAN1R2L2RryTzYZyqGLo3tqAAkRC8UUFM4k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
yarl
|
||||
|
@ -27,7 +33,9 @@ buildPythonPackage rec {
|
|||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aiotractive" ];
|
||||
pythonImportsCheck = [
|
||||
"aiotractive"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/zhulik/aiotractive/releases/tag/v${version}";
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, numpy
|
||||
, astropy
|
||||
, astropy-extension-helpers
|
||||
|
@ -24,16 +23,6 @@ buildPythonPackage rec {
|
|||
hash = "sha256-74k4vfcpdXw4CowXNHlNc3StAOB2f8Si+mOma+8SYkI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove on next udpate. make Numpy loop function args const correct.
|
||||
# https://github.com/astropy/astropy-healpix/pull/199
|
||||
(fetchpatch {
|
||||
name = "numpy-const-args-match.patch";
|
||||
url = "https://github.com/astropy/astropy-healpix/commit/ccf6d9ea4be131f56646adbd7bc482bfcd84f21c.patch";
|
||||
hash = "sha256-fpDxTbs3sHJSb4mnveorM+wlseXbZu1biGyBTNC9ZUo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
astropy-extension-helpers
|
||||
setuptools
|
||||
|
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "clip-anytorch";
|
||||
version = "2.5.2";
|
||||
version = "2.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rom1504";
|
||||
repo = "CLIP";
|
||||
rev = version;
|
||||
hash = "sha256-EqVkpMQHawoCFHNupf49NrvLdGCq35wnYBpdP81Ztd4=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4A8R9aEiOWC05uhMQslhVSkQ4hyjs6VsqkFi76miodY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "command_runner";
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jzTckxDQxY8nIvQE3l0RTfpOH8RVIylS3YN3izr7Ns8=";
|
||||
sha256 = "sha256-lzt1UhhrPqQrBKsRmPhqhtOIfFlCteQqo6sZ6rOut0A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ psutil ];
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
, jax
|
||||
, jaxlib
|
||||
, jinja2
|
||||
, peft
|
||||
, protobuf
|
||||
, tensorboard
|
||||
, torch
|
||||
|
@ -38,7 +39,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "diffusers";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -47,7 +48,7 @@ buildPythonPackage rec {
|
|||
owner = "huggingface";
|
||||
repo = "diffusers";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ccWF8hQzPhFY/kqRum2tbanI+cQiT25MmvPZN+hGadc=";
|
||||
hash = "sha256-3IwBZWSbAMaOo76rUejt4YG7PA0RMLq4LYkNB6SvK6k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -80,6 +81,7 @@ buildPythonPackage rec {
|
|||
accelerate
|
||||
datasets
|
||||
jinja2
|
||||
peft
|
||||
protobuf
|
||||
tensorboard
|
||||
];
|
||||
|
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-cachalot";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noripyt";
|
||||
repo = "django-cachalot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bCiIZkh02+7xL6aSWE9by+4dFDsanr0iXuO9QKpLOjw=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8sC0uvfnGh3rp6C9/GsEevVDxAiI6MafIBfUuvnPeas=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-vite";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "MrBin99";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-S7n14nv6DZgusntVXh65PM/oaYZGCxaFylPbVXxmLj4=";
|
||||
hash = "sha256-Lnecxkn+E1Bce/EhP1AHH9/VrdzBiMGLv+eYld5+QKM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "epion";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "devenzo-com";
|
||||
repo = "epion_python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-XyYjbr0EPRrwWsXhZT2oWcoDPZoZCuT9aZ2UHSSt0E8=";
|
||||
hash = "sha256-9tE/SqR+GHZXeE+bOtXkLu+4jy1vO8WoiLjb6MJazxQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -42,6 +42,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module to access Epion sensor data";
|
||||
homepage = "https://github.com/devenzo-com/epion_python";
|
||||
changelog = "https://github.com/devenzo-com/epion_python/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -8,17 +8,17 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "FireflyAlgorithm";
|
||||
version = "0.3.4";
|
||||
format = "pyproject";
|
||||
pname = "fireflyalgorithm";
|
||||
version = "0.4.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-cpp";
|
||||
repo = pname;
|
||||
repo = "FireflyAlgorithm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rJOcPQU/oz/qP787OpZsfbjSsT2dWvhJLTs4N5TriWc=";
|
||||
hash = "sha256-xsTgSHBtN4gGw+9YvprcLubnCXSNRdn4abcz391cMEE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "garth";
|
||||
version = "0.4.43";
|
||||
format = "pyproject";
|
||||
version = "0.4.44";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PlHyyXsB79wsEvZY4CmpX4ohCQUjz+ogmHOtIxEhIcc=";
|
||||
hash = "sha256-CgLWstmhWXI2w6KBSpIGp8G1smWAKXC0goHKw3I9rJ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -59,6 +59,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Garmin SSO auth and connect client";
|
||||
homepage = "https://github.com/matin/garth";
|
||||
changelog = "https://github.com/matin/garth/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "gotenberg-client";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "stumpylog";
|
||||
repo = "gotenberg-client";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mjVzwlawJojSHI7SSchUWLS320wXl1eHy7A7/IPU8mk=";
|
||||
hash = "sha256-38s7XLCh55uXxu/Go04Ku/m4xeqAAa2sRe4SiqIXolU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "grafanalib";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yQIDAQMG84onYWqBxIl5IXSaBlJBO/uUIy4CVvoFyGk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vXnyAfC9avKz8U4+MJVnu2zoPD0nR2qarWYidhEPW5s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2024.1.6";
|
||||
version = "2024.1.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = "hahomematic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LE5bdcsEPd40w/qQu4Dwxxn2q3fcC0W+u8Dm00r1P40=";
|
||||
hash = "sha256-98biJ/BXFZV55FMRvT8QexzWVB2rfF/YVa66+HU06mI=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "idasen";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "newAM";
|
||||
repo = "idasen";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ybM3dQhTogjhtIO5daWMXpnxUM7uWYnKONMOEx3u+58=";
|
||||
hash = "sha256-nduag5ubgwhOcprdZppLIPQPDE06dk9OzniIIJpM12s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildPythonPackage, python, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake, sip_4, protobuf, pythonOlder }:
|
||||
, cmake, sip4, protobuf, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libarcus";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
propagatedBuildInputs = [ sip_4 ];
|
||||
propagatedBuildInputs = [ sip4 ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ protobuf ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip_4 }:
|
||||
{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip4 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libsavitar";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
propagatedBuildInputs = [ sip_4 ];
|
||||
propagatedBuildInputs = [ sip4 ];
|
||||
|
||||
disabled = pythonOlder "3.4.0";
|
||||
|
||||
|
|
|
@ -6,14 +6,13 @@
|
|||
, pyotp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opower";
|
||||
version = "0.1.0";
|
||||
format = "pyproject";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
|
@ -21,16 +20,10 @@ buildPythonPackage rec {
|
|||
owner = "tronikos";
|
||||
repo = "opower";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-218AQ++ndwfS9wStWF7Zcn12gyoy5K7PAwv0HDGqbww=";
|
||||
hash = "sha256-OT+QCbHQbL3vCfPuyzxBKqUJ2EtFn+PslrKGlrC6Ip8=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# https://github.com/tronikos/opower/pull/4
|
||||
"asyncio"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-serialization";
|
||||
version = "5.2.0";
|
||||
version = "5.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "oslo.serialization";
|
||||
inherit version;
|
||||
hash = "sha256-nPAw1hpszh9Hpi1AUPXoPhvRoQGKxnG7GTruB9Fb28I=";
|
||||
hash = "sha256-IoiY9PM7feq8dCibMrvTAqZZw5z23akEhRD5MPxPdu0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydrawise";
|
||||
version = "2024.1.0";
|
||||
version = "2024.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "dknowles2";
|
||||
repo = "pydrawise";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FbnCo0kdAkm//OHINeEL8ibEH0BxVb9cOypyo54kXY4=";
|
||||
hash = "sha256-fMwWGE6WfgENti4H+WSfd8ZSHqxHyBVATUhng/o8qeY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, python, cmake
|
||||
, libnest2d, sip_4, clipper }:
|
||||
, libnest2d, sip4, clipper }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.12.0";
|
||||
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
|||
hash = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libnest2d sip_4 clipper ];
|
||||
propagatedBuildInputs = [ libnest2d sip4 clipper ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
CLIPPER_PATH = "${clipper.out}";
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
, lndir
|
||||
, dbus-python
|
||||
, sip
|
||||
, pyqt5_sip
|
||||
, pyqt5-sip
|
||||
, pyqt-builder
|
||||
, libsForQt5
|
||||
, enableVerbose ? true
|
||||
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
# Fix some wrong assumptions by ./project.py
|
||||
# TODO: figure out how to send this upstream
|
||||
./pyqt5-fix-dbus-mainloop-support.patch
|
||||
# confirm license when installing via pyqt5_sip
|
||||
# confirm license when installing via pyqt5-sip
|
||||
./pyqt5-confirm-license.patch
|
||||
];
|
||||
|
||||
|
@ -158,11 +158,11 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
dbus-python
|
||||
pyqt5_sip
|
||||
pyqt5-sip
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit sip pyqt5_sip;
|
||||
inherit sip pyqt5-sip;
|
||||
multimediaEnabled = withMultimedia;
|
||||
webKitEnabled = withWebKit;
|
||||
WebSocketsEnabled = withWebSockets;
|
||||
|
|
|
@ -1,31 +1,30 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, importlib-metadata
|
||||
, mitogen
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2";
|
||||
version = "0.7.10";
|
||||
format = "pyproject";
|
||||
version = "0.7.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zC+QqtFRfLCzAQQfZ4zI08NCfCblPxXHjJPGeSjYmgI=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "svinota";
|
||||
repo = "pyroute2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rX/aUmL9H4dSoRngxVVX1olfGtxK93g76E6Z0CYNr2M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mitogen
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
|
@ -49,7 +48,7 @@ buildPythonPackage rec {
|
|||
description = "Python Netlink library";
|
||||
homepage = "https://github.com/svinota/pyroute2";
|
||||
changelog = "https://github.com/svinota/pyroute2/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.asl20;
|
||||
license = with licenses; [ asl20 /* or */ gpl2Plus ];
|
||||
maintainers = with maintainers; [ fab mic92 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-lsp-ruff";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "python-lsp-ruff";
|
||||
sha256 = "sha256-sgS0wwFuAaaen9b/vpJrpAsUvE2lehfHVaOB/hSol9k=";
|
||||
hash = "sha256-tKYhkRnXPZF1/9iK6ssNtoWa5y9gYVj9zFUOEFlXyOA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "soco";
|
||||
version = "0.30.1";
|
||||
version = "0.30.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "SoCo";
|
||||
repo = "SoCo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MajtB754VY+WmeJ2UROeNfvFdqSWIDXQwDSDK7zn8fk=";
|
||||
hash = "sha256-T5kZxwLtqdECuYNfI0z2kLuTPp8yuPsx+MQG27WUJYU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
, aioresponses
|
||||
, vdirsyncer
|
||||
, testers
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -44,6 +45,11 @@ buildPythonPackage rec {
|
|||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aiostream"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, wheel
|
||||
, cloudpathlib
|
||||
, confection
|
||||
, fetchFromGitHub
|
||||
, packaging
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, setuptools
|
||||
, smart-open
|
||||
, srsly
|
||||
, typer
|
||||
, wasabi
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -30,9 +30,13 @@ buildPythonPackage rec {
|
|||
hash = "sha256-6Ck8R10/YW2Nc6acNk2bzgyqSg+OPqwyJjhUgXP/umw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"cloudpathlib"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -59,8 +63,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Weasel: A small and easy workflow system";
|
||||
description = "A small and easy workflow system";
|
||||
homepage = "https://github.com/explosion/weasel/";
|
||||
changelog = "https://github.com/explosion/weasel/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
|
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tarpaulin";
|
||||
version = "0.27.2";
|
||||
version = "0.27.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xd009642";
|
||||
repo = "tarpaulin";
|
||||
rev = version;
|
||||
hash = "sha256-NvpWWk/Rr1Hnekc8vrjmOXknRe9sUFQFwPi0obGfXEA=";
|
||||
hash = "sha256-ejrnqkeMhCBWCjLCOblhZV/fY4Aib4F1uanufHyUmfw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KuYh1td9O9rSnxtPSYX5zp4A71IQkUJDVR0VaIZOh7g=";
|
||||
cargoHash = "sha256-YO91vSyMwRTrQxRAgWJemL+dlmnEN7VSGrwnE6z7ocI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
, python3
|
||||
, fetchYarnDeps
|
||||
, fetchNpmDeps
|
||||
, fixup_yarn_lock
|
||||
, prefetch-yarn-deps
|
||||
, npmHooks
|
||||
, yarn
|
||||
, substituteAll
|
||||
|
@ -27,7 +27,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
|
|||
inherit (info) version;
|
||||
buildTargets = [ "electron:electron_dist_zip" ];
|
||||
|
||||
nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn fixup_yarn_lock unzip npmHooks.npmConfigHook ];
|
||||
nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn prefetch-yarn-deps unzip npmHooks.npmConfigHook ];
|
||||
buildInputs = base.buildInputs ++ [ libnotify ];
|
||||
|
||||
electronOfflineCache = fetchYarnDeps {
|
||||
|
@ -107,7 +107,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
|
|||
cd electron
|
||||
export HOME=$TMPDIR/fake_home
|
||||
yarn config --offline set yarn-offline-mirror $electronOfflineCache
|
||||
fixup_yarn_lock yarn.lock
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
|
||||
)
|
||||
|
||||
|
|
1264
pkgs/development/tools/git-ps-rs/Cargo.lock
generated
1264
pkgs/development/tools/git-ps-rs/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
|
@ -3,8 +3,6 @@
|
|||
, rustPlatform
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, libgpg-error
|
||||
, gpgme
|
||||
, dbus
|
||||
, openssl
|
||||
, Security
|
||||
|
@ -12,29 +10,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-ps-rs";
|
||||
version = "6.9.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uptech";
|
||||
repo = "git-ps-rs";
|
||||
rev = version;
|
||||
hash = "sha256-D6613T87jLEur8WXHed2cSKVafKVfgGWap/z/UBe31U=";
|
||||
hash = "sha256-HPHFjYfug642NXeNmv50UzsdOAlDR9F/MtgYnzwiZP8=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"home-dir-0.1.0" = "sha256-k5GYZcR1FI/JEfJhPWOdICBZ9CqJCqX+fYygxxWvFp4=";
|
||||
};
|
||||
};
|
||||
cargoHash = "sha256-mvRcOwCe5NQ+cJ9brnbZ6HLtLn+fnjYzSBQwA3Qn9PU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gpgme # gpgme runs a small script at build time so has to go here
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl dbus libgpg-error gpgme ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for working with a stack of patches";
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, go
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
@ -26,13 +28,23 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
allowGoReference = true;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd go-licenses \
|
||||
--bash <("$out/bin/go-licenses" completion bash) \
|
||||
--fish <("$out/bin/go-licenses" completion fish) \
|
||||
--zsh <("$out/bin/go-licenses" completion zsh)
|
||||
|
||||
# workaround empty output when GOROOT differs from built environment
|
||||
# see https://github.com/google/go-licenses/issues/149
|
||||
wrapProgram "$out/bin/go-licenses" \
|
||||
--set GOROOT '${go}/share/go'
|
||||
'';
|
||||
|
||||
# Tests require internet connection
|
||||
|
|
|
@ -6,11 +6,11 @@ else
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dune";
|
||||
version = "3.12.1";
|
||||
version = "3.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
|
||||
hash = "sha256-uf1lYIefnTQK6Kh8lnsNK808QSDP/Nn7Zh8yUHj3T28=";
|
||||
hash = "sha256-6KpfAf7oPvrIcz3wvsPiOq7NtFJLxYuAZc0YzAcpX7M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
|
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oxlint";
|
||||
version = "0.0.18";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "web-infra-dev";
|
||||
repo = "oxc";
|
||||
rev = "oxlint_v${version}";
|
||||
hash = "sha256-WvNPfEgeBBbzhyJsMPpqhhkZ8GRn3mCq7HVaoVrCm2U=";
|
||||
hash = "sha256-XQDkNfgqjfUSDwC3JgdzCqYT4O14UWGImpk5gVyQKfE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nWaa3JzACy6ftfm/qEfdBOxK3j4QJof7MtFI8GIpUxY=";
|
||||
cargoHash = "sha256-pJW7191gUv3Sbp8C2IYxJz2G/nunmBnnKaV+yLX1ZKc=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
|
|
@ -1,19 +1,22 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
kramdown (2.3.2)
|
||||
kramdown (2.4.0)
|
||||
rexml
|
||||
mini_portile2 (2.8.0)
|
||||
mustache (0.99.8)
|
||||
nokogiri (1.13.4)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
mini_portile2 (2.8.5)
|
||||
mustache (1.1.1)
|
||||
nokogiri (1.16.0)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
racc (1.6.0)
|
||||
rexml (3.2.5)
|
||||
ronn-ng (0.9.1)
|
||||
kramdown (~> 2.1)
|
||||
mustache (~> 0.7, >= 0.7.0)
|
||||
nokogiri (~> 1.9, >= 1.9.0)
|
||||
racc (1.7.3)
|
||||
rexml (3.2.6)
|
||||
ronn-ng (0.10.1)
|
||||
kramdown (~> 2, >= 2.1)
|
||||
kramdown-parser-gfm (~> 1, >= 1.0.1)
|
||||
mustache (~> 1)
|
||||
nokogiri (~> 1, >= 1.14.3)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
@ -22,4 +25,4 @@ DEPENDENCIES
|
|||
ronn-ng
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.9
|
||||
2.5.3
|
||||
|
|
|
@ -5,30 +5,41 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0757lqaq593z8hzdv98nai73ag384dkk7jgj3mcq2r6ix7130ifb";
|
||||
sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
};
|
||||
kramdown-parser-gfm = {
|
||||
dependencies = ["kramdown"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
|
||||
sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.0";
|
||||
version = "2.8.5";
|
||||
};
|
||||
mustache = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2";
|
||||
sha256 = "1l0p4wx15mi3wnamfv92ipkia4nsx8qi132c6g51jfdma3fiz2ch";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.99.8";
|
||||
version = "1.1.1";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
|
@ -36,40 +47,40 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd";
|
||||
sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.4";
|
||||
version = "1.16.0";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
|
||||
sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
version = "1.7.3";
|
||||
};
|
||||
rexml = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
|
||||
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.5";
|
||||
version = "3.2.6";
|
||||
};
|
||||
ronn-ng = {
|
||||
dependencies = ["kramdown" "mustache" "nokogiri"];
|
||||
dependencies = ["kramdown" "kramdown-parser-gfm" "mustache" "nokogiri"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1slxfg57cabmh98fw507z4ka6lwq1pvbrqwppflxw6700pi8ykfh";
|
||||
sha256 = "1h2y2v3wkl5c710wfanqwxlxi74l1ssva8yrzsg8iypvq22h3ssf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.1";
|
||||
version = "0.10.1";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.1.11";
|
||||
version = "0.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yKb74GADeALai4qZ/+dR6u/QzKQF5404+YJKSYU/oFU=";
|
||||
hash = "sha256-cH/Vw04QQ3U7E1ZCwozjhPcn0KVljP976/p3okrBpEU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lvgLQH/WaLTO0k/L7n9ujylOhbbFAn3R4MY5JsOTcwI=";
|
||||
cargoHash = "sha256-tmoFnghHQEsyv0vO9fnWyTsxiIhmovhi/zHXOCi5u10=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
|
||||
, SDL2
|
||||
, cmake
|
||||
, curl
|
||||
, discord-rpc
|
||||
, duktape
|
||||
, expat
|
||||
, flac
|
||||
, fontconfig
|
||||
, freetype
|
||||
|
@ -28,48 +30,48 @@
|
|||
}:
|
||||
|
||||
let
|
||||
openrct2-version = "0.4.5";
|
||||
openrct2-version = "0.4.7";
|
||||
|
||||
# Those versions MUST match the pinned versions within the CMakeLists.txt
|
||||
# file. The REPLAYS repository from the CMakeLists.txt is not necessary.
|
||||
objects-version = "1.3.11";
|
||||
openmsx-version = "1.3.0";
|
||||
objects-version = "1.3.13";
|
||||
openmsx-version = "1.5";
|
||||
opensfx-version = "1.0.3";
|
||||
title-sequences-version = "0.4.0";
|
||||
title-sequences-version = "0.4.6";
|
||||
|
||||
openrct2-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenRCT2";
|
||||
rev = "v${openrct2-version}";
|
||||
sha256 = "sha256-TMtaEqui3gUd+j3LwF7VsHiBtbYZMu6Rvo1aMkkU9LY=";
|
||||
hash = "sha256-2nSzXbZH1o+BEaxhdQTCM/u4Qbun4tqBKjQ4z7owHeg=";
|
||||
};
|
||||
|
||||
objects-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "objects";
|
||||
rev = "v${objects-version}";
|
||||
sha256 = "sha256-fA2Kz4GALu6IP7ulbwpAFt3dz6NCPgyB0CWy5uOLBQY=";
|
||||
hash = "sha256-7RvRe7skXH5x8RbkQgtKs1YMBwq8dHInVo/4FAJwUD0=";
|
||||
};
|
||||
|
||||
openmsx-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenMusic";
|
||||
rev = "v${openmsx-version}";
|
||||
sha256 = "sha256-bp+uwTy2ZFMCK8Dq4YVACpQSwo8v1te+NQGwdqViIjU=";
|
||||
hash = "sha256-p/wlvQFfu3R+jIuCcRbTMvxt0VKGGwJw0NDIsf6URWI=";
|
||||
};
|
||||
|
||||
opensfx-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenSoundEffects";
|
||||
rev = "v${opensfx-version}";
|
||||
sha256 = "sha256-AMuCpq1Hszi2Vikto/cX9g81LwBDskaRMTLxNzU0/Gk=";
|
||||
hash = "sha256-AMuCpq1Hszi2Vikto/cX9g81LwBDskaRMTLxNzU0/Gk=";
|
||||
};
|
||||
|
||||
title-sequences-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "title-sequences";
|
||||
rev = "v${title-sequences-version}";
|
||||
sha256 = "sha256-anqCZkhYoaxPu3MYCYSsFFngOmPp2wnx2MGb0hj6W5U=";
|
||||
hash = "sha256-HWp2ecClNM/7O3oaydVipOnEsYNP/bZnZFS+SDidPi0=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
@ -78,6 +80,19 @@ stdenv.mkDerivation {
|
|||
|
||||
src = openrct2-src;
|
||||
|
||||
patches = [
|
||||
# https://github.com/OpenRCT2/OpenRCT2/pull/21043
|
||||
#
|
||||
# Basically <https://github.com/OpenRCT2/OpenRCT2/pull/19785> has broken
|
||||
# OpenRCT2 - at least with older maps, as were used for testing - as stated
|
||||
# in <https://github.com/NixOS/nixpkgs/issues/263025>.
|
||||
(fetchpatch {
|
||||
name = "remove-openrct2-music.patch";
|
||||
url = "https://github.com/OpenRCT2/OpenRCT2/commit/9ea13848be0b974336c34e6eb119c49ba42a907c.patch";
|
||||
hash = "sha256-2PPRqUZf4+ys89mdzp5nvdtdv00V9Vzj3v/95rmlf1c=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
@ -88,6 +103,7 @@ stdenv.mkDerivation {
|
|||
curl
|
||||
discord-rpc
|
||||
duktape
|
||||
expat
|
||||
flac
|
||||
fontconfig
|
||||
freetype
|
||||
|
|
|
@ -82,12 +82,12 @@ python3Packages.buildPythonApplication {
|
|||
pygobject3
|
||||
reportlab
|
||||
usbutils
|
||||
sip_4
|
||||
sip4
|
||||
dbus-python
|
||||
distro
|
||||
] ++ lib.optionals withQt5 [
|
||||
pyqt5
|
||||
pyqt5_sip
|
||||
pyqt5-sip
|
||||
enum-compat
|
||||
];
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ buildPythonApplication rec {
|
|||
lilypond
|
||||
pygame
|
||||
python-ly
|
||||
sip_4
|
||||
sip4
|
||||
pyqt5
|
||||
poppler-qt5
|
||||
pyqtwebengine
|
||||
|
|
|
@ -13,12 +13,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iwd";
|
||||
version = "2.12";
|
||||
version = "2.13";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
|
||||
rev = version;
|
||||
hash = "sha256-XlhzPEXYGmJvQ6ZfPK1nxbHibXLdNsDKhZ0UAIRmN6U=";
|
||||
hash = "sha256-Nyp7Gm3JK6bLzAZxuEjxKnzAK/eAYUO5owMbG90WQ8E=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ]
|
||||
|
|
|
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
|
|||
"${sys}/${pname}-${sys}-${fmver}-archive.tar.xz";
|
||||
inherit sha256;
|
||||
};
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
find .
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "mushroom";
|
||||
version = "3.2.3";
|
||||
version = "3.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "piitaya";
|
||||
repo = "lovelace-mushroom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JGpMcIO8zTjcTqjKWxmVHnshIvBeCy/6UmMT+qTHla4=";
|
||||
hash = "sha256-UV/kqeVslB1lc1a9uvj8ocQKeAVINwo3aH8oHC9GLBQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-0vSTpCG8AbDaiHW5d5nUgcrfPMt85JHX4KKoWTOgr4g=";
|
||||
npmDepsHash = "sha256-p43ks6HM23LK3LOBOZA0uV+DTOj89/boBpjcXpbcw24=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
@ -2,15 +2,16 @@
|
|||
|
||||
let
|
||||
hashes = {
|
||||
"15" = "sha256-1vmwoflbU3++PFDcsLt9gyLkuzMRGNCD7vWl7/6Q+SE=";
|
||||
"14" = "sha256-w93Q499sZRk4q85A9yqKQjGUd9Pl8UL8K1D3W7mHRTU=";
|
||||
"13" = "sha256-Sot7FR0oW7kWA680pNCMCmlflu4RfJTSWZn9mrXrpzw=";
|
||||
"12" = "sha256-XezcXoHHLCD1/2OHmKhxome2pdjOsYAfZlpvOoU3aS4=";
|
||||
"16" = "sha256-sXh/vmGyYj00ALfFVdeql2DZ6nCJQDNKyNgzlOZnPAw=";
|
||||
"15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM=";
|
||||
"14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E=";
|
||||
"13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw=";
|
||||
"12" = "sha256-JFNk17ESsIt20dwXrfBkQ5E6DbZzN/Q9eS6+WjCXGd4=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "age";
|
||||
version = "1.4.0-rc0";
|
||||
version = "1.5.0-rc0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
|
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
installPhase = ''
|
||||
install -D -t $out/lib *.so
|
||||
install -D -t $out/lib *${postgresql.dlSuffix}
|
||||
install -D -t $out/share/postgresql/extension *.sql
|
||||
install -D -t $out/share/postgresql/extension *.control
|
||||
'';
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plpgsql-check";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = "plpgsql_check";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2SOBisIElNqqg5NwFk+pp7sE/+OvTifJUKMWOaOvO3k=";
|
||||
hash = "sha256-7CHKcUpqEXJ+z0OcxrEpYHaO/zUtRbCXa8LgL+/roSg=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell_plugin_formats";
|
||||
inherit (nushell) version src;
|
||||
cargoHash = "sha256-eGRaYbYB+zHT8rXm6aCrnPVgyDA8ltsg0GOYgghmov0=";
|
||||
cargoHash = "sha256-81U7Ul6LPubTshxW2/c+Pmz8UolmM42sFEt2igmDgGY=";
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell_plugin_gstat";
|
||||
inherit (nushell) version src;
|
||||
cargoHash = "sha256-Ar5rFPHf+ugZuugVKVRFACYhh3F0JvQtfp6KibPIByw=";
|
||||
cargoHash = "sha256-YUr//URKoN99Pc5tJx9eGopKqy4Yu83jPBhLu5UYgiY=";
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
rustPlatform.buildRustPackage {
|
||||
pname = "nushell_plugin_query";
|
||||
inherit (nushell) version src;
|
||||
cargoHash = "sha256-NVdXbpmGBAcv47jbel2cccoe0m2FInSSOnMWofqtpiM=";
|
||||
cargoHash = "sha256-IAMfd76+Sx01d4axn3qcLvXZW6nxu0fjy9CvupUTHBM=";
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||
|
|
|
@ -54,11 +54,11 @@ assert lib.assertMsg
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-VaGYjCp1KVRTxEKzUdMCavZBIGEnEvP5fdFqQeKGa44=";
|
||||
hash = "sha256-LkWQ3fSHJSaXztX+soGZ+pl3MnXNgw6tV09356bAfYY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nebula";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slackhq";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lLDoAR3n3V0hJWvvSqz0nWXSsiXK+kjJJo7okv4KX8c=";
|
||||
hash = "sha256-tbzdbI4QTLQcJ6kyD3c+jQvXn9ERV/9hrzNPXV9XwVM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-amOveyxXGyQVV6yQspExXfj0JTN9yLs6+bcKYRst1tU=";
|
||||
vendorHash = "sha256-BL9Tx87pBZIAuoneu6Sm2gjyTTC6yOZv5GVYNNeuhtw=";
|
||||
|
||||
subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user