Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900
2024-12-09 09:42:51 +03:00
145 changed files with 4619 additions and 10484 deletions
+29 -31
View File
@@ -551,9 +551,9 @@ are used in [`buildPythonPackage`](#buildpythonpackage-function).
Several versions of the Python interpreter are available on Nix, as well as a
high amount of packages. The attribute `python3` refers to the default
interpreter, which is currently CPython 3.11. The attribute `python` refers to
interpreter, which is currently CPython 3.12. The attribute `python` refers to
CPython 2.7 for backwards-compatibility. It is also possible to refer to
specific versions, e.g. `python311` refers to CPython 3.11, and `pypy` refers to
specific versions, e.g. `python312` refers to CPython 3.12, and `pypy` refers to
the default PyPy interpreter.
Python is used a lot, and in different ways. This affects also how it is
@@ -569,10 +569,10 @@ however, are in separate sets, with one set per interpreter version.
The interpreters have several common attributes. One of these attributes is
`pkgs`, which is a package set of Python libraries for this specific
interpreter. E.g., the `toolz` package corresponding to the default interpreter
is `python3.pkgs.toolz`, and the CPython 3.11 version is `python311.pkgs.toolz`.
is `python3.pkgs.toolz`, and the CPython 3.12 version is `python312.pkgs.toolz`.
The main package set contains aliases to these package sets, e.g.
`pythonPackages` refers to `python.pkgs` and `python311Packages` to
`python311.pkgs`.
`pythonPackages` refers to `python.pkgs` and `python312Packages` to
`python312.pkgs`.
#### Installing Python and packages {#installing-python-and-packages}
@@ -597,7 +597,7 @@ with [`python.buildEnv`](#python.buildenv-function) or [`python.withPackages`](#
executables are wrapped to be able to find each other and all of the modules.
In the following examples we will start by creating a simple, ad-hoc environment
with a nix-shell that has `numpy` and `toolz` in Python 3.11; then we will create
with a nix-shell that has `numpy` and `toolz` in Python 3.12; then we will create
a re-usable environment in a single-file Python script; then we will create a
full Python environment for development with this same environment.
@@ -613,10 +613,10 @@ temporary shell session with a Python and a *precise* list of packages (plus
their runtime dependencies), with no other Python packages in the Python
interpreter's scope.
To create a Python 3.11 session with `numpy` and `toolz` available, run:
To create a Python 3.12 session with `numpy` and `toolz` available, run:
```sh
$ nix-shell -p 'python311.withPackages(ps: with ps; [ numpy toolz ])'
$ nix-shell -p 'python312.withPackages(ps: with ps; [ numpy toolz ])'
```
By default `nix-shell` will start a `bash` session with this interpreter in our
@@ -624,7 +624,7 @@ By default `nix-shell` will start a `bash` session with this interpreter in our
```Python console
[nix-shell:~/src/nixpkgs]$ python3
Python 3.11.3 (main, Apr 4 2023, 22:36:41) [GCC 12.2.0] on linux
Python 3.12.4 (main, Jun 6 2024, 18:26:44) [GCC 13.3.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import numpy; import toolz
```
@@ -644,12 +644,8 @@ will still get 1 wrapped Python interpreter. We can start the interpreter
directly like so:
```sh
$ nix-shell -p "python311.withPackages (ps: with ps; [ numpy toolz requests ])" --run python3
this derivation will be built:
/nix/store/r19yf5qgfiakqlhkgjahbg3zg79549n4-python3-3.11.2-env.drv
building '/nix/store/r19yf5qgfiakqlhkgjahbg3zg79549n4-python3-3.11.2-env.drv'...
created 273 symlinks in user environment
Python 3.11.2 (main, Feb 7 2023, 13:52:42) [GCC 12.2.0] on linux
$ nix-shell -p "python312.withPackages (ps: with ps; [ numpy toolz requests ])" --run python3
Python 3.12.4 (main, Jun 6 2024, 18:26:44) [GCC 13.3.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import requests
>>>
@@ -689,7 +685,7 @@ Executing this script requires a `python3` that has `numpy`. Using what we learn
in the previous section, we could startup a shell and just run it like so:
```ShellSession
$ nix-shell -p 'python311.withPackages (ps: with ps; [ numpy ])' --run 'python3 foo.py'
$ nix-shell -p 'python312.withPackages (ps: with ps; [ numpy ])' --run 'python3 foo.py'
The dot product of [1 2] and [3 4] is: 11
```
@@ -752,12 +748,12 @@ create a single script with Python dependencies, but in the course of normal
development we're usually working in an entire package repository.
As explained [in the `nix-shell` section](https://nixos.org/manual/nix/stable/command-ref/nix-shell) of the Nix manual, `nix-shell` can also load an expression from a `.nix` file.
Say we want to have Python 3.11, `numpy` and `toolz`, like before,
Say we want to have Python 3.12, `numpy` and `toolz`, like before,
in an environment. We can add a `shell.nix` file describing our dependencies:
```nix
with import <nixpkgs> {};
(python311.withPackages (ps: with ps; [
(python312.withPackages (ps: with ps; [
numpy
toolz
])).env
@@ -774,7 +770,7 @@ What's happening here?
imports the `<nixpkgs>` function, `{}` calls it and the `with` statement
brings all attributes of `nixpkgs` in the local scope. These attributes form
the main package set.
2. Then we create a Python 3.11 environment with the [`withPackages`](#python.withpackages-function) function, as before.
2. Then we create a Python 3.12 environment with the [`withPackages`](#python.withpackages-function) function, as before.
3. The [`withPackages`](#python.withpackages-function) function expects us to provide a function as an argument
that takes the set of all Python packages and returns a list of packages to
include in the environment. Here, we select the packages `numpy` and `toolz`
@@ -785,7 +781,7 @@ To combine this with `mkShell` you can:
```nix
with import <nixpkgs> {};
let
pythonEnv = python311.withPackages (ps: [
pythonEnv = python312.withPackages (ps: [
ps.numpy
ps.toolz
]);
@@ -939,8 +935,8 @@ information. The output of the function is a derivation.
An expression for `toolz` can be found in the Nixpkgs repository. As explained
in the introduction of this Python section, a derivation of `toolz` is available
for each interpreter version, e.g. `python311.pkgs.toolz` refers to the `toolz`
derivation corresponding to the CPython 3.11 interpreter.
for each interpreter version, e.g. `python312.pkgs.toolz` refers to the `toolz`
derivation corresponding to the CPython 3.12 interpreter.
The above example works when you're directly working on
`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
@@ -953,7 +949,7 @@ and adds it along with a `numpy` package to a Python environment.
with import <nixpkgs> {};
( let
my_toolz = python311.pkgs.buildPythonPackage rec {
my_toolz = python312.pkgs.buildPythonPackage rec {
pname = "toolz";
version = "0.10.0";
pyproject = true;
@@ -964,7 +960,7 @@ with import <nixpkgs> {};
};
build-system = [
python311.pkgs.setuptools
python312.pkgs.setuptools
];
# has no tests
@@ -977,7 +973,7 @@ with import <nixpkgs> {};
};
};
in python311.withPackages (ps: with ps; [
in python312.withPackages (ps: with ps; [
numpy
my_toolz
])
@@ -985,7 +981,7 @@ with import <nixpkgs> {};
```
Executing `nix-shell` will result in an environment in which you can use
Python 3.11 and the `toolz` package. As you can see we had to explicitly mention
Python 3.12 and the `toolz` package. As you can see we had to explicitly mention
for which Python version we want to build a package.
So, what did we do here? Well, we took the Nix expression that we used earlier
@@ -1991,7 +1987,7 @@ has security implications and is relevant for those using Python in a
When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will
have timestamp 1. The [`buildPythonPackage`](#buildpythonpackage-function) function sets `DETERMINISTIC_BUILD=1`
and [PYTHONHASHSEED=0](https://docs.python.org/3.11/using/cmdline.html#envvar-PYTHONHASHSEED).
and [PYTHONHASHSEED=0](https://docs.python.org/3.12/using/cmdline.html#envvar-PYTHONHASHSEED).
Both are also exported in `nix-shell`.
### How to provide automatic tests to Python packages? {#automatic-tests}
@@ -2062,10 +2058,12 @@ The following rules are desired to be respected:
* `meta.platforms` takes the default value in many cases.
It does not need to be set explicitly unless the package requires a specific platform.
* The file is formatted with `nixfmt-rfc-style`.
* Commit names of Python libraries should reflect that they are Python
libraries, so write for example `python311Packages.numpy: 1.11 -> 1.12`.
It is highly recommended to specify the current default version to enable
automatic build by ofborg.
* Commit names of Python libraries must reflect that they are Python
libraries (e.g. `python312Packages.numpy: 1.11 -> 1.12` rather than `numpy: 1.11 -> 1.12`).
* The current default version of python should be included
in commit messages to enable automatic builds by ofborg.
For example `python312Packages.numpy: 1.11 -> 1.12` should be used rather
than `python3Packages.numpy: 1.11 -> 1.12`.
Note that `pythonPackages` is an alias for `python27Packages`.
* Attribute names in `python-packages.nix` as well as `pname`s should match the
library's name on PyPI, but be normalized according to [PEP
+6
View File
@@ -24307,6 +24307,12 @@
githubId = 145775305;
name = "Sergei Zimmerman";
};
xosnrdev = {
email = "hello@xosnrdev.tech";
github = "xosnrdev";
githubId = 106241330;
name = "Success Kingsley";
};
xrelkd = {
github = "xrelkd";
githubId = 46590321;
@@ -39,6 +39,8 @@
- [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard).
- [KanBoard](https://github.com/kanboard/kanboard), a project management tool that focuses on the Kanban methodology. Available as [services.kanboard](#opt-services.kanboard.enable).
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
@@ -61,6 +63,8 @@
- `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL.
- `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead.
- `nodePackages.insect` has been removed, as it's deprecated by upstream. The suggested replacement is `numbat`.
- `nodePackages.webpack-dev-server` has been removed, as it should be installed in projects that use it instead.
@@ -77,6 +81,9 @@
See the release notes of
[v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)
for more information.
- `nodePackages.expo-cli` has been removed, as it was deprecated by upstream. The suggested replacement is the `npx expo` command.
- `vscode-utils.buildVscodeExtension` now requires pname as an argument
- `nerdfonts` has been separated into individual font packages under the namespace `nerd-fonts`. The directories for font
+1 -1
View File
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
# Generate the squashfs image.
mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $imgPath ${pseudoFilesArgs} \
-no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 ${compFlag} \
-processors $NIX_BUILD_CORES
-processors $NIX_BUILD_CORES -root-mode 0755
'' + lib.optionalString hydraBuildProduct ''
mkdir -p $out/nix-support
+1
View File
@@ -1471,6 +1471,7 @@
./services/web-apps/jirafeau.nix
./services/web-apps/jitsi-meet.nix
./services/web-apps/kasmweb/default.nix
./services/web-apps/kanboard.nix
./services/web-apps/kavita.nix
./services/web-apps/keycloak.nix
./services/web-apps/kimai.nix
+2 -7
View File
@@ -40,13 +40,8 @@ in
'';
};
# Security wrapper
security.wrappers.qgroundcontrol = {
source = lib.getExe cfg.package;
owner = "root"; # Sensible default; not setuid so this is not a security risk
group = "tty";
setgid = true;
};
# Add to systemPackages for desktop entry file
environment.systemPackages = [ cfg.package ];
};
meta.maintainers = pkgs.qgroundcontrol.meta.maintainers;
@@ -535,7 +535,7 @@ in
systemd.timers.seaf-gc = lib.mkIf cfg.gc.enable {
timerConfig = {
randomizedDelaySec = cfg.gc.randomizedDelaySec;
RandomizedDelaySec = cfg.gc.randomizedDelaySec;
Persistent = cfg.gc.persistent;
};
};
@@ -40,15 +40,18 @@ in
type = lib.types.enum [
"scx_bpfland"
"scx_central"
"scx_flash"
"scx_flatcg"
"scx_lavd"
"scx_layered"
"scx_mitosis"
"scx_nest"
"scx_pair"
"scx_qmap"
"scx_rlfifo"
"scx_rustland"
"scx_rusty"
"scx_sdt"
"scx_simple"
"scx_userland"
];
@@ -78,6 +78,13 @@ in
description = "HTTP listen port.";
};
turnAddress = mkOption {
type = types.str;
default = "auto";
example = "127.0.0.1:1194";
description = "Built-in TURN server listen address and port. Set to \"\" to disable.";
};
staticDir = mkOption {
type = types.str;
default = "${cfg.package.static}/static";
@@ -145,6 +152,8 @@ in
WorkingDirectory = cfg.stateDir;
ExecStart = ''${cfg.package}/bin/galene \
${optionalString (cfg.insecure) "-insecure"} \
-http ${cfg.httpAddress}:${cfg.httpPort} \
-turn ${cfg.turnAddress} \
-data ${cfg.dataDir} \
-groups ${cfg.groupsDir} \
-recordings ${cfg.recordingsDir} \
@@ -0,0 +1,175 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.kanboard;
toStringAttrs = lib.mapAttrs (lib.const toString);
in
{
meta.maintainers = with lib.maintainers; [ yzx9 ];
options.services.kanboard = {
enable = lib.mkEnableOption "Kanboard";
package = lib.mkPackageOption pkgs "kanboard" { };
dataDir = lib.mkOption {
type = lib.types.str;
default = "/var/lib/kanboard";
description = "Default data folder for Kanboard.";
example = "/mnt/kanboard";
};
user = lib.mkOption {
type = lib.types.str;
default = "kanboard";
description = "User under which Kanboard runs.";
};
group = lib.mkOption {
type = lib.types.str;
default = "kanboard";
description = "Group under which Kanboard runs.";
};
settings = lib.mkOption {
type =
with lib.types;
attrsOf (oneOf [
str
int
bool
]);
default = { };
description = ''
Customize the default settings, refer to <https://github.com/kanboard/kanboard/blob/main/config.default.php>
for details on supported values.
'';
};
# Nginx
domain = lib.mkOption {
type = lib.types.str;
default = "kanboard";
description = "FQDN for the Kanboard instance.";
example = "kanboard.example.org";
};
nginx = lib.mkOption {
type = lib.types.nullOr (
lib.types.submodule (import ../web-servers/nginx/vhost-options.nix { inherit config lib; })
);
default = { };
description = ''
With this option, you can customize an NGINX virtual host which already
has sensible defaults for Kanboard. Set to `{ }` if you do not need any
customization for the virtual host. If enabled, then by default, the
{option}`serverName` is `''${domain}`. If this is set to null (the
default), no NGINX virtual host will be configured.
'';
example = lib.literalExpression ''
{
enableACME = true;
forceHttps = true;
}
'';
};
phpfpm.settings = lib.mkOption {
type =
with lib.types;
attrsOf (oneOf [
int
str
bool
]);
default = { };
description = ''
Options for kanboard's PHPFPM pool.
'';
};
};
config = lib.mkIf cfg.enable {
users = {
users = lib.mkIf (cfg.user == "kanboard") {
kanboard = {
isSystemUser = true;
group = cfg.group;
home = cfg.dataDir;
createHome = true;
};
};
groups = lib.mkIf (cfg.group == "kanboard") {
kanboard = { };
};
};
services.phpfpm.pools.kanboard = {
user = cfg.user;
group = cfg.group;
settings = lib.mkMerge [
{
"pm" = "dynamic";
"php_admin_value[error_log]" = "stderr";
"php_admin_flag[log_errors]" = true;
"listen.owner" = "nginx";
"catch_workers_output" = true;
"pm.max_children" = "32";
"pm.start_servers" = "2";
"pm.min_spare_servers" = "2";
"pm.max_spare_servers" = "4";
"pm.max_requests" = "500";
}
cfg.phpfpm.settings
];
phpEnv = lib.mkMerge [
{ DATA_DIR = cfg.dataDir; }
(toStringAttrs cfg.settings)
];
};
services.nginx = lib.mkIf (cfg.nginx != null) {
enable = lib.mkDefault true;
virtualHosts."${cfg.domain}" = lib.mkMerge [
{
root = lib.mkForce "${cfg.package}/share/kanboard";
locations."/".extraConfig = ''
rewrite ^ /index.php;
'';
locations."~ \\.php$".extraConfig = ''
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${config.services.phpfpm.pools.kanboard.socket};
include ${config.services.nginx.package}/conf/fastcgi.conf;
include ${config.services.nginx.package}/conf/fastcgi_params;
'';
locations."~ \\.(js|css|ttf|woff2?|png|jpe?g|svg)$".extraConfig = ''
add_header Cache-Control "public, max-age=15778463";
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
add_header Referrer-Policy no-referrer;
access_log off;
'';
extraConfig = ''
try_files $uri /index.php;
'';
}
cfg.nginx
];
};
};
}
+10 -2
View File
@@ -138,7 +138,7 @@ let
};
config.device = lib.mkIf (config.label != null) "/dev/disk/by-label/${escape config.label}";
config.device = lib.mkIf (config.label != null) (lib.mkDefault "/dev/disk/by-label/${escape config.label}");
config.options = let
inInitrd = utils.fsNeededForBoot config;
@@ -354,7 +354,15 @@ in
options.
'';
}
];
] ++ lib.map (fs: {
assertion = fs.label != null -> fs.device == "/dev/disk/by-label/${escape fs.label}";
message = ''
The filesystem with mount point ${fs.mountPoint} has its label and device set to inconsistent values:
label: ${toString fs.label}
device: ${toString fs.device}
'filesystems.<name>.label' and 'filesystems.<name>.device' are mutually exclusive. Please set only one.
'';
}) fileSystems;
# Export for use in other modules
system.build.fileSystems = fileSystems;
+8 -7
View File
@@ -257,13 +257,14 @@ let
cd "$TMPDIR"
${lib.optionalString (cfg.emptyDiskImages != [ ]) "idx=0"}
${flip concatMapStrings cfg.emptyDiskImages (size: ''
if ! test -e "empty$idx.qcow2"; then
${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M"
fi
idx=$((idx + 1))
'')}
${lib.pipe cfg.emptyDiskImages [
(lib.imap0 (
idx: size: ''
test -e "empty${builtins.toString idx}.qcow2" || ${qemu}/bin/qemu-img create -f qcow2 "empty${builtins.toString idx}.qcow2" "${builtins.toString size}M"
''
))
(builtins.concatStringsSep "")
]}
# Start QEMU.
exec ${qemu-common.qemuBinary qemu} \
+1
View File
@@ -499,6 +499,7 @@ in {
jotta-cli = handleTest ./jotta-cli.nix {};
k3s = handleTest ./k3s {};
kafka = handleTest ./kafka.nix {};
kanboard = handleTest ./web-apps/kanboard.nix {};
kanidm = handleTest ./kanidm.nix {};
kanidm-provisioning = handleTest ./kanidm-provisioning.nix {};
karma = handleTest ./karma.nix {};
+25
View File
@@ -0,0 +1,25 @@
import ../make-test-python.nix (
{ lib, ... }:
{
name = "kanboard";
meta.maintainers = with lib.maintainers; [ yzx9 ];
nodes = {
machine = {
services.kanboard = {
enable = true;
};
};
};
testScript = ''
start_all()
machine.wait_for_unit("nginx.service")
machine.wait_for_unit("phpfpm-kanboard.service")
machine.wait_for_open_port(80)
machine.succeed("curl -k --fail http://localhost", timeout=10)
'';
}
)
@@ -15,17 +15,17 @@
buildGoModule rec {
inherit pname;
version = "2.8.3";
version = "2.9.1";
tags = lib.optionals enableGateway [ "gateway" ];
src = fetchFromGitHub {
owner = "kumahq";
repo = "kuma";
rev = version;
hash = "sha256-wGEO7DJLWy/d6SYsTb8EZhF9c1ptYBXDL/Owter4nfo=";
hash = "sha256-aU1YYYnE7hkVL7f5zd/FXgAW95PpLCIGF4+Ulh3Dq4Q=";
};
vendorHash = "sha256-PAW2Byzz6Ky4I51QrJoNoyn1QH/i0SeU2dDHvj2BqXM=";
vendorHash = "sha256-++oL9OetEApRdfjypknPE3GFjLZbKexjtnySIOZJg8U=";
# no test files
doCheck = false;
@@ -27,13 +27,13 @@
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
},
"aiven": {
"hash": "sha256-nWa9ohf3DOiMloJ5J8UcSZjJNHjRZw1sD6k5R8m6LWA=",
"hash": "sha256-jyHhUUFBKpatHl+5G3MHJ4hDYX2tfw2w0ZmYBPa3fwQ=",
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
"owner": "aiven",
"repo": "terraform-provider-aiven",
"rev": "v4.28.0",
"rev": "v4.30.0",
"spdx": "MIT",
"vendorHash": "sha256-UM4EjL1qXOn2TMOupVxSyJVLarHIGTySXNJtWPrseSE="
"vendorHash": "sha256-i05xL00hcJ8qAVyeQD5sQhv5ASM4fWdryAe7KBlNdHY="
},
"akamai": {
"hash": "sha256-v1Y34+SoxVyBqO6QOCrfHFf+ng8ER3ngw8+0HDrB4Hc=",
@@ -81,13 +81,13 @@
"vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
},
"artifactory": {
"hash": "sha256-ehwskBqWAlbv+3ULOic8792kWulKuJ8v9/UmPngooRY=",
"hash": "sha256-cpQ4FqrY7Y2eYAXdmcM5l/mo7XI2ksJtALgQAvj1cOM=",
"homepage": "https://registry.terraform.io/providers/jfrog/artifactory",
"owner": "jfrog",
"repo": "terraform-provider-artifactory",
"rev": "v12.3.1",
"rev": "v12.5.1",
"spdx": "Apache-2.0",
"vendorHash": "sha256-detefSJ3hVIk2xXsAB16XiQkaOAiBkGTnaIku7veFQU="
"vendorHash": "sha256-RtBEXTkmPPccNmbPLNAnF1L8kinL46uBLZVMqO3887I="
},
"auth0": {
"hash": "sha256-1Dvqvv/hWZtavEJgBQrvaAgAF3yxruPo26jPVNk2BBE=",
@@ -180,13 +180,13 @@
"vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso="
},
"bitwarden": {
"hash": "sha256-quiSqpXdqsGCt7ANc2WlFBygUzNIYWstP6Iq6OfLXJw=",
"hash": "sha256-zvl9B1RhViJ83/7i9ab1KvQc9Yfpzq3c1JIz+bzwVmM=",
"homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
"owner": "maxlaverse",
"repo": "terraform-provider-bitwarden",
"rev": "v0.12.0",
"rev": "v0.12.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-oORgmuLn2dQzSKba3lXh8zWnk4Z1bdCWPseC2Po1UBA="
"vendorHash": "sha256-9k3+Qyural6S9xbqZ/NHXPFoo9cgLklIScTEBLuB0kA="
},
"brightbox": {
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -308,13 +308,13 @@
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
},
"datadog": {
"hash": "sha256-8bFMlDEHZzcxSlmahfGo5VKd57KCJqCE7V3Nmc0bcG4=",
"hash": "sha256-40ClkNg0eILfzaMr1VPuemF/I3GgX4p+g7Cxb4n/huQ=",
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
"owner": "DataDog",
"repo": "terraform-provider-datadog",
"rev": "v3.46.0",
"rev": "v3.49.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-aneDpdBydQnBGc3kdCoSBQC8A/MbpcTYDK+Uo5MeXb8="
"vendorHash": "sha256-V54P+lkH15a0OSgy4bIEICZ0Gy7Z7JRicDTEFs46ezU="
},
"deno": {
"hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
@@ -507,13 +507,13 @@
"vendorHash": "sha256-hwWHtrPmzJJT7OUcjiqt7a6Nf1GLvoEcepqIAHv5bsI="
},
"google-beta": {
"hash": "sha256-vYMyLjb2OQAVPmc9wSxTCWG1lLUOH/cxayCJPZIF2Bo=",
"hash": "sha256-JvK4wIKBAxQucqoxia4AgsdyHRJm9xQY80Kxbu+j95Q=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"repo": "terraform-provider-google-beta",
"rev": "v6.9.0",
"rev": "v6.12.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-N7qOuK/RbmXvpalUQEtop8L99R9Q6cYWVFmPxG4+9T4="
"vendorHash": "sha256-7eDlgob/Ig5e9MTDxMPKkQXsu7cYXqego0OrepckMXA="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@@ -525,13 +525,13 @@
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
},
"grafana": {
"hash": "sha256-Qn59GOYJ6XI7lFb63mTR9uXV5zvV8sVmYUgPRJi00Wg=",
"hash": "sha256-tKk+3MMDFwGMB/GhtAiQ7WVcEtDqhWI+SNl1elrXNLs=",
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
"owner": "grafana",
"repo": "terraform-provider-grafana",
"rev": "v3.10.0",
"rev": "v3.14.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-jAYaVNWMEGLDPgnyD2VJwVpDwn9lcvBNLnKPdlqdRZc="
"vendorHash": "sha256-iOT6j7Jm5M8gAikNcdypJ9tANkwuuzyZVts7cV+NWqk="
},
"gridscale": {
"hash": "sha256-J4ZLexpjYXxOTaqih0+Nucyf2soYXxGiB38xAeXUJKs=",
@@ -606,11 +606,11 @@
"vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8="
},
"huaweicloud": {
"hash": "sha256-gCdB2aIpI4IjRldvvVTnV7OTzd64nouiFNQ5bVpGNck=",
"hash": "sha256-u9EU+PusAhnTEivOed+M5eQtXpcKXQprPoY4sFcDAsg=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.69.1",
"rev": "v1.71.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -741,13 +741,13 @@
"vendorHash": "sha256-Q9LdhokZol1jhSfQVIRvPe1XrE8nVvc22aWHt7wkcHY="
},
"linode": {
"hash": "sha256-jPKjxvkIxKXs74Y6teZjs7xHzPlzvyUbZaMDRGpy/t0=",
"hash": "sha256-lM0haU3tLbKaW+EJNMZp9ms/nTH3xEdhBAiIjFSUZ7s=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v2.29.1",
"rev": "v2.31.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-UXX7jnphsPq25dSkcVT5McV6/FcD99wEhPzazsgKTTA="
"vendorHash": "sha256-WCD51W44xN+Qgojbcjrj3f9bUsVLN4itsY7ZBEen0YQ="
},
"linuxbox": {
"hash": "sha256-+8Wyrb/AjzpfhDK42ze0HBIAdGvtJUFEIpYZs7uOym4=",
@@ -804,13 +804,13 @@
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
},
"migadu": {
"hash": "sha256-2kVMYeIAGUpR+8KotbiCOl837nHJM0G/dhqVmnAzcjk=",
"hash": "sha256-0gHAuJ5xT2K9ndCUg3UzAfmpjQwHrrOAeF6zrRbyjSs=",
"homepage": "https://registry.terraform.io/providers/metio/migadu",
"owner": "metio",
"repo": "terraform-provider-migadu",
"rev": "2024.10.10",
"rev": "2024.11.28",
"spdx": "0BSD",
"vendorHash": "sha256-cFt/fbgJsLATi9aolKl9ra1xAz9zp3JjWk+a5aWs88o="
"vendorHash": "sha256-PQAp8YeAopCt/W3w6esI6fLyTC7wtpWY6Jk8xPrjQWI="
},
"minio": {
"hash": "sha256-aSEzsncqNLWfVnnGfz/fDpRw9w2muGnybX8WYd1tP/Y=",
@@ -849,11 +849,11 @@
"vendorHash": null
},
"newrelic": {
"hash": "sha256-H13o42CKAJfiG0eD27RU0TlAKgR7nvHtMzvk6TX/VO8=",
"hash": "sha256-xHBr+6rI0G6Fv7HXTrdvtDc+Ij53IfPAb7bvXgyTaH0=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.52.1",
"rev": "v3.53.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-UsekZjrioy2F/OvfrvXMVYlZO3I2NU4B+BOZHwP5YSk="
},
@@ -949,13 +949,13 @@
"vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI="
},
"opentelekomcloud": {
"hash": "sha256-w98v/Vxcd1864lR7Tvt58TMZui5m8h3Z3uNs9AkIOJI=",
"hash": "sha256-qYBZHUZFpl9jJy/N3kRby322WQ3MWiKem9cdQrGfhR0=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.36.23",
"rev": "v1.36.26",
"spdx": "MPL-2.0",
"vendorHash": "sha256-048tfvolxHHdqImBOgp7xIIpCJpx6QKUSi9fL9aIqh4="
"vendorHash": "sha256-3qdC+Xb6epfN+kjkMlh4FApgQr59V/OFssw6Wek3gpE="
},
"opsgenie": {
"hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",
@@ -1111,13 +1111,13 @@
"vendorHash": "sha256-MP44e56j7rLyT4+TbFDfDb5GNc/LzZNLplm1/qqeGiw="
},
"sentry": {
"hash": "sha256-HGjePQGetglWQEGDtPZ2WAPMlvjEm+KYdagakiko39E=",
"hash": "sha256-nucGcVNotqXeHhymfeB/qhh7XCthX18BeoBF2is2dxk=",
"homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
"owner": "jianyuan",
"repo": "terraform-provider-sentry",
"rev": "v0.14.0",
"rev": "v0.14.1",
"spdx": "MIT",
"vendorHash": "sha256-8ONdkr6RoAyjI6ugeGVsWDc+Sn00sJttojYS94HBqsQ="
"vendorHash": "sha256-ggeIvTGJjuUAa9RIP9FSAAkZDt57eMyteTSFht3qvNc="
},
"shell": {
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
@@ -1129,13 +1129,13 @@
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
},
"signalfx": {
"hash": "sha256-OmM3NvTnT/yZBgBYf15vITJSVOXQ7Vvqn6T6+LXOpbk=",
"hash": "sha256-qZHbeQDbyahUuYLhWFqBogG+w2pI1XAUdPvcNTngQUw=",
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
"owner": "splunk-terraform",
"repo": "terraform-provider-signalfx",
"rev": "v9.1.6",
"rev": "v9.5.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-h+tusSFbu4jmfu0v1BwRrSoDEPYjXZwQ+YykRUoXlv4="
"vendorHash": "sha256-EnEfch59DIBzK8fmhZ1mvTSxPSjtxMTAOUMeocHgA8I="
},
"skytap": {
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
@@ -1246,13 +1246,13 @@
"vendorHash": "sha256-tb9raTGqEuvqfMO/5s4Oc7x/EAk4qBWWDiOgRMB3uAU="
},
"temporalcloud": {
"hash": "sha256-PXXjhxB0pU1dZkfFKH+GBma1uYwMpLHTUJk/GUivNhE=",
"hash": "sha256-QDLqRG8gvEycs1zzPyNKr5nT4t7LT7gzPNJ76PAZW8M=",
"homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
"owner": "temporalio",
"repo": "terraform-provider-temporalcloud",
"rev": "v0.0.14",
"rev": "v0.0.15",
"spdx": "MPL-2.0",
"vendorHash": "sha256-6dQFkmkjoVz1Z5AoD8bvAF0elsk7V1G8yT5ur1WegWE="
"vendorHash": "sha256-IuPCApBHevlxUPdLzyUirN/PKU8UF8MoUhUaO8pWNDw="
},
"tencentcloud": {
"hash": "sha256-P2IvcZHlKFGJcr5ayRmdJpAYmU3mJcVIOll5vZlvkQc=",
@@ -45,14 +45,14 @@ let
pname = "slack";
x86_64-darwin-version = "4.41.97";
x86_64-darwin-sha256 = "1akqchqknbz4vpr6xx0hjfnllcp9b1lnzhb2x9402bkmjh985ps4";
x86_64-darwin-version = "4.41.98";
x86_64-darwin-sha256 = "1bg62139y4y1m4a6fq67d1kn7yjnzaqjffx0v7srf3097k8p304x";
x86_64-linux-version = "4.41.97";
x86_64-linux-sha256 = "15fa2ci9da0wrvxalaqpg412krcwwd1g84d0pa50i5vj1yl3sy3d";
x86_64-linux-version = "4.41.98";
x86_64-linux-sha256 = "0gdnpgp1vc96asx8079ka9fckg7dahrnwk8amwwq36apmssvjz4q";
aarch64-darwin-version = "4.41.97";
aarch64-darwin-sha256 = "09m99yfsfjk71627fpbiryb4f3nrdrccijgfm9pshrvw3mr934r6";
aarch64-darwin-version = "4.41.98";
aarch64-darwin-sha256 = "0nlwdzby9hwsx8vp4bsbjidh61zmdgs791xb5mk7xzigjkg33xga";
version = {
x86_64-darwin = x86_64-darwin-version;
@@ -1,51 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, xxd
, perl
, installShellFiles
, enableAvx2 ? stdenv.hostPlatform.avx2Support
, enableSse4_1 ? stdenv.hostPlatform.sse4_1Support
, enableMpi ? false
, mpi
, openmp
, zlib
, bzip2
}:
stdenv.mkDerivation rec {
pname = "mmseqs2";
version = "15-6f452";
src = fetchFromGitHub {
owner = "soedinglab";
repo = pname;
rev = version;
sha256 = "sha256-L+zOWrGkCLz/wqpBuji8H4/93sDFpcfnDOE8FHq1j84=";
};
nativeBuildInputs = [ cmake xxd perl installShellFiles ];
cmakeFlags =
lib.optional enableAvx2 "-DHAVE_AVX2=1"
++ lib.optional enableSse4_1 "-DHAVE_SSE4_1=1"
++ lib.optional enableMpi "-DHAVE_MPI=1";
buildInputs =
lib.optionals stdenv.cc.isClang [ openmp zlib bzip2 ]
++ lib.optional enableMpi mpi;
postInstall = ''
installShellCompletion --bash --cmd mmseqs $out/util/bash-completion.sh
rm -r $out/util/
'';
meta = with lib; {
description = "Ultra fast and sensitive sequence search and clustering suite";
mainProgram = "mmseqs";
homepage = "https://mmseqs.com/";
license = licenses.gpl3;
maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix;
};
}
File diff suppressed because it is too large Load Diff
+71 -45
View File
@@ -1,50 +1,68 @@
{ lib, rustPlatform, fetchFromGitHub, callPackage, makeDesktopItem
, clang, copyDesktopItems, patchelf, pkg-config, wrapQtAppsHook
, alsa-lib, bash, ffmpeg, mdk-sdk, ocl-icd, opencv, qtbase, qtdeclarative, qtsvg
{
lib,
rustPlatform,
fetchFromGitHub,
makeDesktopItem,
clang,
copyDesktopItems,
patchelf,
pkg-config,
qt6,
alsa-lib,
bash,
ffmpeg,
mdk-sdk,
ocl-icd,
opencv,
}:
let
lens-profiles = fetchFromGitHub {
owner = "gyroflow";
repo = "lens_profiles";
tag = "v19";
hash = "sha256-8R2mMqKxzoa5Sfqxs8pcfwUfo1PQKSrnM+60Ri3wiXY=";
};
in
rustPlatform.buildRustPackage rec {
pname = "gyroflow";
version = "1.5.4-2024-09-05";
version = "1.6.0";
src = fetchFromGitHub {
owner = "gyroflow";
repo = "gyroflow";
rev = "52038dedad0bd14d6af68db36a09da0243ad5455";
hash = "sha256-EuhUF2b8YWv2eN2pcoHA0SlnyeQ8gJ5eHbXi6G4GIzk=";
tag = "v${version}";
hash = "sha256-Ib9GnHN23eTbd3nEwvZf3+CBSkUHycN77o3ura0Ze/0=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"ahrs-0.6.0" = "sha256-CxWyX8t+BjqIyNj1p1LdkCmNrtJkudmKgZPv0MVcghY=";
"akaze-0.7.0" = "sha256-KkGXKoVRZZ7HUTtWYBerrN36a7RqsHjYQb+bwG1JagY=";
"app_dirs2-2.5.5" = "sha256-nQ5Cs9r1k/3zjqXJ18Oilk8ErLKim7bGwCXDlQW4GRQ=";
"fc-blackbox-0.2.0" = "sha256-82DuI0KuHhDVhCMUsnDqk6Fk774VpvoJ1qYFLO+n1X4=";
"ffmpeg-next-7.0.4" = "sha256-F1N70tSxdC36uS9Bh7X2S9Wspd7bcCbGPmoMRs1cm8Y=";
"ffmpeg-sys-next-7.0.2" = "sha256-7C46WJseKIhqXW0cQGaF8Q/xQi7sX+e8fKVrhBMVwZE=";
"keep-awake-0.1.0" = "sha256-iZuntDkAhDZBojRgNEupAExtqOhiw4mf6XK0N6ff2Oc=";
"mp4parse-0.17.0" = "sha256-DktX6zmQsHBlo7uLgLXcXWxKq9uisnX0R16lftWRLZY=";
"naga-22.0.0" = "sha256-+ngomv0VyWKNDkSGVI/f5wtDyLs79qiXxtj3qNOsbFc=";
"nshare-0.9.0" = "sha256-PAV41mMLDmhkAz4+qyf+MZnYTAdMwjk83+f+RdaJji8=";
"qmetaobject-0.2.10" = "sha256-kEwFjDe1tYTLQ8XdjrPyYEYnjVFyYeaWUPCj5D8mg7A=";
"qml-video-rs-0.1.0" = "sha256-8RYB+numVy7u29EYtSSdf/+cTsUMVjrcw4u5mqB7KbE=";
"rs-sync-0.1.0" = "sha256-6xQb0CUlBDx7S7zsqNL9zfZZtkmw0cbUUXd6pOYIrXI=";
"spirv-std-0.9.0" = "sha256-uZn1p2pM5UYQKlY9u16aafPH7dfQcSG7PaFDd1sT4Qc=";
"system_shutdown-4.0.1" = "sha256-YypNnZzTxkmUgIxaP4jOpFBje/fEzI5L1g+3pJgMd0w=";
"telemetry-parser-0.3.0" = "sha256-U26cWC7pSw4NFiu43BZf+KlLy9NU61iRpFx3Btse1aY=";
};
};
useFetchCargoVendor = true;
lens-profiles = callPackage ./lens-profiles.nix { };
cargoHash = "sha256-bqBFAobXwPC4V0OYHbwmkk7shfiFt3YMGAf7F5ybLAQ=";
nativeBuildInputs = [
clang copyDesktopItems patchelf pkg-config rustPlatform.bindgenHook wrapQtAppsHook
clang
copyDesktopItems
patchelf
pkg-config
rustPlatform.bindgenHook
qt6.wrapQtAppsHook
];
buildInputs = [ alsa-lib bash ffmpeg mdk-sdk ocl-icd opencv qtbase qtdeclarative qtsvg ];
buildInputs = [
alsa-lib
bash
ffmpeg
mdk-sdk
ocl-icd
opencv
qt6.qtbase
qt6.qtdeclarative
qt6.qtsvg
];
patches = [ ./no-static-zlib.patch ];
postPatch = ''
substituteInPlace build.rs \
--replace-fail 'println!("cargo:rustc-link-lib=static:+whole-archive=z")' ""
'';
# qml-video-rs and gyroflow assume that all Qt headers are installed
# in a single (qtbase) directory. Apart form QtCore and QtGui from
@@ -55,13 +73,13 @@ rustPlatform.buildRustPackage rec {
# Additionally gyroflow needs QtQuickControls2:
# https://github.com/gyroflow/gyroflow/blob/v1.5.4/build.rs#L173
env.NIX_CFLAGS_COMPILE = toString [
"-I${qtdeclarative}/include/QtQuick"
"-I${qtdeclarative}/include/QtQuick/${qtdeclarative.version}"
"-I${qtdeclarative}/include/QtQuick/${qtdeclarative.version}/QtQuick"
"-I${qtdeclarative}/include/QtQml"
"-I${qtdeclarative}/include/QtQml/${qtdeclarative.version}"
"-I${qtdeclarative}/include/QtQml/${qtdeclarative.version}/QtQml"
"-I${qtdeclarative}/include/QtQuickControls2"
"-I${qt6.qtdeclarative}/include/QtQuick"
"-I${qt6.qtdeclarative}/include/QtQuick/${qt6.qtdeclarative.version}"
"-I${qt6.qtdeclarative}/include/QtQuick/${qt6.qtdeclarative.version}/QtQuick"
"-I${qt6.qtdeclarative}/include/QtQml"
"-I${qt6.qtdeclarative}/include/QtQml/${qt6.qtdeclarative.version}"
"-I${qt6.qtdeclarative}/include/QtQml/${qt6.qtdeclarative.version}/QtQml"
"-I${qt6.qtdeclarative}/include/QtQuickControls2"
];
# FFMPEG_DIR is used by ffmpeg-sys-next/build.rs and
@@ -103,7 +121,7 @@ rustPlatform.buildRustPackage rec {
'';
desktopItems = [
(makeDesktopItem (rec {
(makeDesktopItem ({
name = "gyroflow";
desktopName = "Gyroflow";
genericName = "Video stabilization using gyroscope data";
@@ -112,18 +130,26 @@ rustPlatform.buildRustPackage rec {
exec = "gyroflow-open %u";
terminal = false;
mimeTypes = [ "application/x-gyroflow" ];
categories = [ "AudioVideo" "Video" "AudioVideoEditing" "Qt" ];
categories = [
"AudioVideo"
"Video"
"AudioVideoEditing"
"Qt"
];
startupNotify = true;
startupWMClass = "gyroflow";
prefersNonDefaultGPU = true;
}))
];
meta = with lib; {
meta = {
description = "Advanced gyro-based video stabilization tool";
homepage = "https://gyroflow.xyz/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ orivej ];
homepage = "https://gyroflow.xyz";
license = with lib.licenses; [
gpl3Plus
cc0
];
maintainers = with lib.maintainers; [ orivej ];
platforms = [ "x86_64-linux" ];
};
}
@@ -1,19 +0,0 @@
{ lib, fetchFromGitHub }:
fetchFromGitHub {
pname = "gyroflow-lens-profiles";
version = "2024-09-08";
owner = "gyroflow";
repo = "lens_profiles";
rev = "a100b233a1df242d5bf1be06df2888a5852febf3";
hash = "sha256-z994k2lozakaKNKcdrJKzTiMGeL9oJ70jFnEYgbutq4=";
meta = with lib; {
description = "Lens profile database for Gyroflow";
homepage = "https://github.com/gyroflow/lens_profiles";
license = licenses.cc0;
maintainers = with maintainers; [ orivej ];
platforms = lib.platforms.all;
};
}
@@ -1,6 +0,0 @@
diff --git a/build.rs b/build.rs
index 8ba86bf..f6f00a0 100644
--- a/build.rs
+++ b/build.rs
@@ -203 +202,0 @@ fn main() {
- println!("cargo:rustc-link-lib=static:+whole-archive=z");
+2 -2
View File
@@ -15,13 +15,13 @@
python3Packages.buildPythonApplication rec {
pname = "tartube";
version = "2.5.040";
version = "2.5.059";
src = fetchFromGitHub {
owner = "axcore";
repo = "tartube";
rev = "refs/tags/v${version}";
sha256 = "sha256-yFsQbEXjWPxLYqFxsI6MjK1hE8Lk2Z0sPj3peLBs7r8=";
sha256 = "sha256-PNBmBzoPxbOsBeBmARVq3x/lA0kSQDWp8N96UB6GSV0=";
};
nativeBuildInputs = [
@@ -299,7 +299,7 @@ rec {
# GHC (=> shellcheck) isn't supported on some platforms (such as risc-v)
# but we still want to use writeShellApplication on those platforms
let
shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck-minimal.compiler;
shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck-minimal.compiler && (builtins.tryEval shellcheck-minimal.compiler.outPath).success;
excludeFlags = lib.optionals (excludeShellChecks != [ ]) [ "--exclude" (lib.concatStringsSep "," excludeShellChecks) ];
shellcheckCommand = lib.optionalString shellcheckSupported ''
# use shellcheck which does not include docs
+111
View File
@@ -0,0 +1,111 @@
{
lib,
stdenv,
fetchzip,
fetchurl,
autoPatchelfHook,
makeWrapper,
makeDesktopItem,
cups,
qt5,
undmg,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "010editor";
version = "15.0.1";
src =
if stdenv.hostPlatform.isLinux then
fetchzip {
url = "https://download.sweetscape.com/010EditorLinux64Installer${finalAttrs.version}.tar.gz";
hash = "sha256-/Bfm/fPX3Szla23U9+qoq99E2v8jC3f9pgkJMTxNFUk=";
}
else
fetchurl {
url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg";
hash = "sha256-hpDhcX1xS4Nry2HOIrFwqYK45JOmy66lPq6dJr9pkQg=";
};
sourceRoot = ".";
strictDeps = true;
dontBuild = true;
dontConfigure = true;
nativeBuildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
autoPatchelfHook
makeWrapper
qt5.wrapQtAppsHook
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg ];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
cups
qt5.qtbase
qt5.qtwayland
];
installPhase =
let
darwinInstall = ''
mkdir -p $out/Applications
cp -R *.app $out/Applications
'';
linuxInstall = ''
mkdir -p $out/opt && cp -ar source/* $out/opt
# Unset wrapped QT plugins since they're already included in the package,
# else the program crashes because of the conflict
makeWrapper $out/opt/010editor $out/bin/010editor \
--unset QT_PLUGIN_PATH
# Copy the icon and generated desktop file
install -D $out/opt/010_icon_128x128.png $out/share/icons/hicolor/128x128/apps/010.png
install -D $desktopItem/share/applications/* -t $out/share/applications/
'';
in
''
runHook preInstall
${
if stdenv.hostPlatform.isDarwin then
darwinInstall
else if stdenv.hostPlatform.isLinux then
linuxInstall
else
"echo 'Unsupported Platform' && exit 1"
}
runHook postInstall
'';
desktopItem = makeDesktopItem {
name = "010editor";
exec = "010editor %f";
icon = "010";
desktopName = "010 Editor";
genericName = "Text and hex edtior";
categories = [ "Development" ];
mimeTypes = [
"text/html"
"text/plain"
"text/x-c++hdr"
"text/x-c++src"
"text/xml"
];
};
meta = {
description = "Text and hex editor";
homepage = "https://www.sweetscape.com/010editor/";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ eljamm ];
platforms = [
"aarch64-darwin"
"x86_64-darwin"
"x86_64-linux"
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
mainProgram = "010editor";
};
})
+2 -2
View File
@@ -9,7 +9,7 @@
let
appName = "AeroSpace.app";
version = "0.15.2-Beta";
version = "0.16.2-Beta";
in
stdenv.mkDerivation {
pname = "aerospace";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchzip {
url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
sha256 = "sha256-jOSUtVSiy/S4nsgvfZZqZjxsppqNi90edn8rcTa+pFQ=";
sha256 = "sha256-F208+EibyHlCImNig9lHuY05jGoXqNHsCRDKfqAR3g4=";
};
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -7,14 +7,14 @@ let
description = "Desktop sharing application, providing remote support and online meetings";
in stdenv.mkDerivation (finalAttrs: {
pname = "anydesk";
version = "6.3.3";
version = "6.4.0";
src = fetchurl {
urls = [
"https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
"https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
];
hash = "sha256-uSotkFOpuC2a2sRTagY9KFx3F2VJmgrsn+dBa5ycdck=";
hash = "sha256-yGzTqbv3SQT6V/DcY8GvRDXilYrZXVsmQOnqy/5+ev8=";
};
buildInputs = [
+2 -2
View File
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "azpainter";
version = "3.0.9a";
version = "3.0.10";
src = fetchFromGitLab {
owner = "azelpg";
repo = pname;
rev = "v${version}";
hash = "sha256-QWXlRbCGDk1DRtePeDM3tnbtkdlhbkn/oNTqHvmtEA4=";
hash = "sha256-5bU5rYUyEcZk8un+gksvIZ7S4PTGh9J4+zSX+ox+Khw=";
};
nativeBuildInputs = [
+4 -1
View File
@@ -67,7 +67,10 @@ python3Packages.buildPythonApplication rec {
homepage = "https://github.com/rafaelmardojai/blanket";
license = lib.licenses.gpl3Plus;
mainProgram = "blanket";
maintainers = with lib.maintainers; [ onny ];
maintainers = with lib.maintainers; [
onny
aleksana
];
platforms = lib.platforms.linux;
};
}
+46
View File
@@ -0,0 +1,46 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
bzip2,
}:
rustPlatform.buildRustPackage rec {
pname = "cargonode";
version = "0.1.2";
src = fetchFromGitHub {
owner = "xosnrdev";
repo = "cargonode";
rev = "refs/tags/${version}";
hash = "sha256-xzBLuQRyKmd9k0sbBFV5amtFWwKqXR0CEsRv8SHiJcQ=";
};
cargoHash = "sha256-v+Fs2VJrpnIOk9nPRanYYChlR7WOfkXF1kbYOKjOUYc=";
checkFlags = [
# Skip test that requires network access
"--skip test_download_file"
"--skip test_extract_zip"
"--skip test_invalid_download_url"
"--skip test_create_package"
"--skip test_init_package"
];
nativeBuildInputs = [
pkg-config
];
meta = {
description = "Unified tooling for Node.js";
mainProgram = "cargonode";
homepage = "https://github.com/xosnrdev/cargonode";
changelog = "https://github.com/xosnrdev/cargonode/blob/${version}/CHANGELOG.md";
license = with lib.licenses; [
asl20 # or
mit
];
maintainers = with lib.maintainers; [ xosnrdev ];
};
}
+2 -2
View File
@@ -38,13 +38,13 @@
stdenv.mkDerivation rec {
pname = "cockpit";
version = "328";
version = "329.1";
src = fetchFromGitHub {
owner = "cockpit-project";
repo = "cockpit";
rev = "refs/tags/${version}";
hash = "sha256-0iCFMwnPtbrCXZMQQB0C7xtvGHFLMPk8otgMrJmVxXw=";
hash = "sha256-KQBCJ7u5Dk9CqU9aR96Xx3ShlONcacT1ABowguguI+Y=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "criu";
version = "3.19";
version = "4.0";
src = fetchFromGitHub {
owner = "checkpoint-restore";
repo = pname;
rev = "v${version}";
hash = "sha256-S0nxBHfm7tWmW5PhSDhSAgy1uDa0RD5GTNpMDUHKqwY=";
hash = "sha256-D16s6pGWHWRLvub7foG3Vbzw2hoU4p1VeHt7ymL5hlw=";
};
enableParallelBuilding = true;
+2 -2
View File
@@ -22,13 +22,13 @@ let
in
buildDartApplication rec {
pname = "dart-sass";
version = "1.80.5";
version = "1.82.0";
src = fetchFromGitHub {
owner = "sass";
repo = pname;
rev = version;
hash = "sha256-A9e3GxOg1xkmOXjNyhg2ihnxKiMb2vORpwvAy+JWFZY=";
hash = "sha256-uGiD+tX6KmygMW5VNJrCGr6fFJnlMdj9QisHpPdMdN0=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
+20 -50
View File
@@ -70,11 +70,11 @@
"dependency": "direct main",
"description": {
"name": "charcode",
"sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306",
"sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.1"
"version": "1.4.0"
},
"checked_yaml": {
"dependency": "transitive",
@@ -90,11 +90,11 @@
"dependency": "direct main",
"description": {
"name": "cli_pkg",
"sha256": "f812467b5d6a5f26ad0fba5dcfc95133df02edbae47dfa4ade3df5d2b5afdcf2",
"sha256": "f07db5590796444efdfdc7549e596949b74ce2b707c6a2dfd1f9d841d8337dd4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.10.0"
"version": "2.11.0"
},
"cli_repl": {
"dependency": "direct main",
@@ -140,11 +140,11 @@
"dependency": "transitive",
"description": {
"name": "coverage",
"sha256": "88b0fddbe4c92910fefc09cc0248f5e7f0cd23e450ded4c28f16ab8ee8f83268",
"sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.10.0"
"version": "1.11.1"
},
"crypto": {
"dependency": "direct dev",
@@ -330,11 +330,11 @@
"dependency": "direct dev",
"description": {
"name": "lints",
"sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235",
"sha256": "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.0"
"version": "5.0.0"
},
"logging": {
"dependency": "transitive",
@@ -510,11 +510,11 @@
"dependency": "direct dev",
"description": {
"name": "pub_api_client",
"sha256": "06321793e558b2dfac3a11098a530b816a8f752a5cf9208a382be9a418e3f5fc",
"sha256": "d9ced27bb5b933012a5218120f1fbee2a7d3bd234a7d5cc6fe29dedf4df6127a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.7.1"
"version": "3.0.0"
},
"pub_semver": {
"dependency": "direct main",
@@ -526,16 +526,6 @@
"source": "hosted",
"version": "2.1.4"
},
"pubspec": {
"dependency": "transitive",
"description": {
"name": "pubspec",
"sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.0"
},
"pubspec_parse": {
"dependency": "direct dev",
"description": {
@@ -546,16 +536,6 @@
"source": "hosted",
"version": "1.3.0"
},
"quiver": {
"dependency": "transitive",
"description": {
"name": "quiver",
"sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.2"
},
"retry": {
"dependency": "transitive",
"description": {
@@ -600,11 +580,11 @@
"dependency": "transitive",
"description": {
"name": "shelf_web_socket",
"sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
"sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.0"
"version": "2.0.1"
},
"source_map_stack_trace": {
"dependency": "transitive",
@@ -690,31 +670,31 @@
"dependency": "direct dev",
"description": {
"name": "test",
"sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f",
"sha256": "22eb7769bee38c7e032d532e8daa2e1cc901b799f603550a4db8f3a5f5173ea2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.25.8"
"version": "1.25.12"
},
"test_api": {
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.3"
"version": "0.7.4"
},
"test_core": {
"dependency": "transitive",
"description": {
"name": "test_core",
"sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d",
"sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.6.5"
"version": "0.6.8"
},
"test_descriptor": {
"dependency": "direct dev",
@@ -756,25 +736,15 @@
"source": "hosted",
"version": "1.4.0"
},
"uri": {
"dependency": "transitive",
"description": {
"name": "uri",
"sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.0"
},
"vm_service": {
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
"sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "14.3.1"
"version": "15.0.0"
},
"watcher": {
"dependency": "direct main",
+2 -2
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "docify";
version = "1.0.0";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "AThePeanut4";
repo = "docify";
rev = "refs/tags/v${version}";
hash = "sha256-pt35Kw0kaZsIGTutXPhjdp8czGtWrSUFWMV3NyFQ/NM=";
hash = "sha256-pENahqprTf6weP6qi9CyeQPdNOqr9c/q7j6GO9Lq3N4=";
};
build-system = with python3Packages; [
+4 -1
View File
@@ -130,7 +130,10 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/wwmm/easyeffects";
changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/CHANGELOG.md";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ getchoo ];
maintainers = with lib.maintainers; [
getchoo
aleksana
];
mainProgram = "easyeffects";
platforms = lib.platforms.linux;
};
+1 -1
View File
@@ -98,7 +98,7 @@ let
in
buildFHSEnv {
name = "electron-fiddle";
inherit pname version;
runScript = "${electron}/bin/electron ${unwrapped}/lib/electron-fiddle/resources/app.asar";
extraInstallCommands = ''
-4
View File
@@ -9,7 +9,6 @@
copyDesktopItems,
imagemagick,
makeWrapper,
xdg-user-dirs,
}:
let
# fetch simple-icons directly to avoid cloning with submodules,
@@ -89,9 +88,6 @@ flutter324.buildFlutterApplication rec {
done
install -Dm444 linux/packaging/ente_auth.appdata.xml -t $out/share/metainfo
wrapProgram $out/bin/ente_auth \
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
'';
passthru.updateScript = ./update.sh;
+1 -1
View File
@@ -42,7 +42,7 @@ let
};
expressvpndFHS = buildFHSEnv {
name = "expressvpnd";
inherit pname version;
# When connected, it directly creates/deletes resolv.conf to change the DNS entries.
# Since it's running in an FHS environment, it has no effect on actual resolv.conf.
-5
View File
@@ -1,7 +1,6 @@
{ lib
, flutter327
, mpv-unwrapped
, xdg-user-dirs
, patchelf
, fetchFromGitHub
, copyDesktopItems
@@ -40,10 +39,6 @@ flutter327.buildFlutterApplication {
install -Dm644 $src/assets/icon/icon_foreground.svg $out/share/icons/hicolor/scalable/apps/finamp.svg
'';
extraWrapProgramArgs = ''
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
'';
desktopItems = [(makeDesktopItem {
name = "Finamp";
desktopName = "Finamp";
+4 -1
View File
@@ -54,7 +54,10 @@ stdenv.mkDerivation rec {
homepage = "https://johnfactotum.github.io/foliate";
changelog = "https://github.com/johnfactotum/foliate/releases/tag/${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ onny ];
maintainers = with maintainers; [
onny
aleksana
];
mainProgram = "foliate";
};
}
+4 -1
View File
@@ -70,7 +70,10 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://gitlab.gnome.org/World/Fragments";
description = "Easy to use BitTorrent client for the GNOME desktop environment";
maintainers = with maintainers; [ emilytrau ];
maintainers = with maintainers; [
emilytrau
aleksana
];
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "fragments";
+32
View File
@@ -0,0 +1,32 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
let
pname = "grip-grab";
version = "0.6.7";
in
rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "alexpasmantier";
repo = "grip-grab";
rev = "refs/tags/v${version}";
hash = "sha256-e7duLL4tjW+11jXUqU6sqoKTAPGkH81iDCfjtNcnd4I=";
};
cargoHash = "sha256-g7YdNNN6YJiW8sQa1KMj5evVbLPObRXrKM5HoG87Kxc=";
doCheck = false;
meta = {
description = "Fast, more lightweight ripgrep alternative for daily use cases";
homepage = "https://github.com/alexpasmantier/grip-grab";
changelog = "https://github.com/alexpasmantier/grip-grab/releases";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
mainProgram = "gg";
};
}
+55
View File
@@ -0,0 +1,55 @@
{
lib,
stdenvNoCC,
fetchurl,
writeShellApplication,
curl,
common-updater-scripts,
unzip,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "istatmenus";
version = "7.02.10";
src = fetchurl {
url = "https://cdn.istatmenus.app/files/istatmenus${lib.versions.major finalAttrs.version}/versions/iStatMenus${finalAttrs.version}.zip";
hash = "sha256-ckYIQsJ0QEsIpXRFo1xioSCOwEL06d0cJrATa1URMIQ=";
};
sourceRoot = ".";
nativeBuildInputs = [ unzip ];
installPhase = ''
runHook preInstall
mkdir -p "$out/Applications"
cp -r *.app "$out/Applications"
runHook postInstall
'';
passthru.updateScript = lib.getExe (writeShellApplication {
name = "istatmenus-update-script";
runtimeInputs = [
curl
common-updater-scripts
];
text = ''
redirect_url="$(curl -s -L -f "https://download.bjango.com/istatmenus${lib.versions.major finalAttrs.version}/" -o /dev/null -w '%{url_effective}')"
version="''${redirect_url##*/}"; version="''${version#iStatMenus}"; version="''${version%.zip}"
update-source-version istatmenus "$version" --file=./pkgs/by-name/is/istatmenus/package.nix
'';
});
meta = {
changelog = "https://bjango.com/mac/istatmenus/versionhistory/";
description = "iStat Menus is set of nine separate and highly configurable menu items that let you know exactly what's going on inside your Mac";
homepage = "https://bjango.com/mac/istatmenus/";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ donteatoreo ];
platforms = lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})
+2 -2
View File
@@ -5,7 +5,7 @@
}:
let
version = "7.0.2-5";
version = "7.0.2-7";
in
(ffmpeg_7-full.override {
@@ -14,7 +14,7 @@ in
owner = "jellyfin";
repo = "jellyfin-ffmpeg";
rev = "v${version}";
hash = "sha256-cqyXQNx65eLEumOoSCucNpAqShMhiPqzsKc/GjKKQOA=";
hash = "sha256-l1oCilqWE3NpSzrNHAepglL3BHXZ2yxcQfupFJ3zwvg=";
};
}).overrideAttrs (old: {
pname = "jellyfin-ffmpeg";
+46
View File
@@ -0,0 +1,46 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
nixosTests,
nix-update-script,
php,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "kanboard";
version = "1.2.42";
src = fetchFromGitHub {
owner = "kanboard";
repo = "kanboard";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0=";
};
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/kanboard
cp -rv . $out/share/kanboard
runHook postInstall
'';
passthru = {
updateScript = nix-update-script { };
tests = lib.optionalAttrs stdenvNoCC.hostPlatform.isLinux {
inherit (nixosTests) kanboard;
};
};
meta = {
inherit (php.meta) platforms;
description = "Kanban project management software";
homepage = "https://kanboard.org";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ yzx9 ];
};
})
-5
View File
@@ -12,7 +12,6 @@
mimalloc,
mpv,
mpv-unwrapped,
xdg-user-dirs,
}:
flutter324.buildFlutterApplication rec {
pname = "kazumi";
@@ -110,10 +109,6 @@ flutter324.buildFlutterApplication rec {
install -Dm0644 ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
'';
extraWrapProgramArgs = ''
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
'';
meta = {
description = "Watch Animes online with danmaku support";
homepage = "https://github.com/Predidit/Kazumi";
+2 -2
View File
@@ -12,7 +12,7 @@
}:
let
name = "kingstvis";
pname = "kingstvis";
version = "3.6.1";
src = fetchzip {
url = "http://res.kingst.site/kfs/KingstVIS_v${version}.tar.gz";
@@ -21,7 +21,7 @@ let
in
buildFHSEnv {
inherit name;
inherit pname version;
targetPkgs = pkgs: (with pkgs; [
dbus
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "kubectl-node-shell";
version = "1.10.2";
version = "1.11.0";
src = fetchFromGitHub {
owner = "kvaps";
repo = "kubectl-node-shell";
rev = "v${version}";
hash = "sha256-lB1q+zvgXpjVfxjmYa404hHj0kNPLrzRr1wj8AEM6dQ=";
hash = "sha256-jLwnWp/XS4SOyf5v46DPy2Nc6LatF6AzNvHiGVNpsto=";
};
strictDeps = true;
+2 -1
View File
@@ -21,7 +21,8 @@ let
# FHS env, as patchelf will not work
env = buildFHSEnv {
name = "left4gore-env-${version}";
pname = "left4gore-env";
inherit version;
targetPkgs = _: [ left4gore-unwrapped ];
runScript = "left4gore";
};
+2 -2
View File
@@ -18,7 +18,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libnvme";
version = "1.11";
version = "1.11.1";
outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "linux-nvme";
repo = "libnvme";
rev = "v${finalAttrs.version}";
hash = "sha256-c7+vNUTU0J1e8aWl49C7rEbFAQZ3X53PKtv7r8CcheE=";
hash = "sha256-CEGr7PDOVRi210XvICH8iLYDKn8S9bGruBO4tycvsT8=";
};
postPatch = ''
-2
View File
@@ -35,7 +35,6 @@
libvdpau,
rustPlatform,
stdenv,
xdg-user-dirs,
zenity,
copyDesktopItems,
makeDesktopItem,
@@ -161,7 +160,6 @@ flutter324.buildFlutterApplication {
--prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \
--prefix PATH : "${
lib.makeBinPath [
xdg-user-dirs
zenity
]
}"
+2 -2
View File
@@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec {
pname = "marwaita";
version = "22.2";
version = "23";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
hash = "sha256-LJwobpyQ2KVaJ4jkkg+ISAhjaHLWqYYVuX1z0YJdX6g=";
hash = "sha256-NFXvaKASWltskCSOidXDNVZpFpdpCTnuWjpfETxiI8U=";
};
buildInputs = [
+66 -18
View File
@@ -1,44 +1,92 @@
{ lib, stdenv, fetchurl, autoPatchelfHook
, alsa-lib, gcc-unwrapped, libX11, libcxx, libdrm, libglvnd, libpulseaudio, libxcb, libgbm, wayland, xz, zlib
, libva, libvdpau, addDriverRunpath
{
lib,
stdenv,
fetchurl,
autoPatchelfHook,
alsa-lib,
gcc-unwrapped,
libX11,
libcxx,
libdrm,
libgbm,
libglvnd,
libpulseaudio,
libxcb,
wayland,
xz,
zlib,
libva,
libvdpau,
addDriverRunpath,
freetype,
harfbuzz,
fontconfig,
fribidi,
}:
let
arch =
{
aarch64-linux = "arm64";
x86_64-linux = "amd64";
}
.${stdenv.hostPlatform.system};
in
stdenv.mkDerivation rec {
pname = "mdk-sdk";
version = "0.30.0";
version = "0.30.1";
src = fetchurl {
url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz";
hash = "sha256-dZ6KS3BlJAEOifGgXKBn1jgWTp3x82xJxk8qdXyJTeg=";
url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux.tar.xz";
hash = "sha256-e0NxM+H0RWokJyAqw1SMGykrGgqOTsyqyWQKcTFVXGY=";
};
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [
alsa-lib gcc-unwrapped libX11 libcxx libdrm libglvnd libpulseaudio libxcb libgbm wayland xz zlib
alsa-lib
gcc-unwrapped
libX11
libcxx
libdrm
libgbm
libglvnd
libpulseaudio
libxcb
wayland
xz
zlib
freetype
harfbuzz
fontconfig
fribidi
];
appendRunpaths = lib.makeLibraryPath [
libva libvdpau addDriverRunpath.driverLink
libva
libvdpau
addDriverRunpath.driverLink
];
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp -r include $out
cp -d lib/amd64/libmdk* $out/lib
ln -s . $out/lib/amd64
cp -r lib/cmake $out/lib
mkdir $out
cp -r include $out/include
cp -r lib/${arch} $out/lib
cp -r lib/cmake $out/lib/cmake
ln -s . $out/lib/${arch}
runHook postInstall
'';
meta = with lib; {
meta = {
description = "multimedia development kit";
homepage = "https://github.com/wang-bin/mdk-sdk";
license = licenses.unfree;
maintainers = with maintainers; [ orivej ];
platforms = [ "x86_64-linux" ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ orivej ];
platforms = [
"x86_64-linux"
"aarch64-linux"
];
};
}
+96
View File
@@ -0,0 +1,96 @@
{
lib,
config,
stdenv,
fetchFromGitHub,
cmake,
xxd,
perl,
installShellFiles,
enableAvx2 ? stdenv.hostPlatform.avx2Support,
enableSse4_1 ? stdenv.hostPlatform.sse4_1Support,
enableMpi ? false,
mpi,
cudaSupport ? config.cudaSupport,
cudaPackages,
llvmPackages,
zlib,
bzip2,
pkgsStatic,
runCommand,
}:
let
# require static library, libzstd.a
inherit (pkgsStatic) zstd;
in
stdenv.mkDerivation (finalAttrs: {
pname = "mmseqs2";
version = "16-747c6";
src = fetchFromGitHub {
owner = "soedinglab";
repo = "mmseqs2";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-O7tx+gdVAmZLihPnWSo9RWNVzfPjI61LGY/XeaGHrI0=";
};
nativeBuildInputs =
[
cmake
xxd
perl
installShellFiles
zstd
]
++ lib.optionals cudaSupport [
cudaPackages.cuda_nvcc
];
cmakeFlags =
[
(lib.cmakeBool "HAVE_AVX2" enableAvx2)
(lib.cmakeBool "HAVE_SSE4_1" enableSse4_1)
(lib.cmakeBool "HAVE_MPI" enableMpi)
(lib.cmakeBool "USE_SYSTEM_ZSTD" true)
(lib.cmakeBool "HAVE_ARM8" stdenv.hostPlatform.isAarch64)
]
++ lib.optionals cudaSupport [
(lib.cmakeBool "ENABLE_CUDA" true)
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
];
buildInputs =
lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
zlib
bzip2
]
++ lib.optional enableMpi mpi
++ lib.optionals cudaSupport [
cudaPackages.cuda_cudart
cudaPackages.cuda_cccl
];
postInstall = ''
installShellCompletion --bash --cmd mmseqs $out/util/bash-completion.sh
rm -r $out/util/
'';
passthru.tests = {
example = runCommand "mmseqs2-test" { } ''
${lib.getExe finalAttrs.finalPackage} createdb ${finalAttrs.src}/examples/DB.fasta targetDB > $out
${lib.getExe finalAttrs.finalPackage} createindex targetDB tmp >> $out
${lib.getExe finalAttrs.finalPackage} easy-search ${finalAttrs.src}/examples/QUERY.fasta targetDB alnRes.m8 tmp >> $out
'';
};
meta = with lib; {
description = "Ultra fast and sensitive sequence search and clustering suite";
mainProgram = "mmseqs";
homepage = "https://mmseqs.com/";
license = licenses.mit;
maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix;
};
})
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "mob";
version = "5.3.1";
version = "5.3.3";
src = fetchFromGitHub {
owner = "remotemobprogramming";
repo = "mob";
rev = "v${version}";
hash = "sha256-+zNlxIvIvPyz0vA9IPaMzP8wfEXwNyRcvp45ohzoxQQ=";
hash = "sha256-ibsaejhqvndeIJMCDIuTwrITtFrI+LJT8IZuAlTZE3E=";
};
vendorHash = null;
+16 -5
View File
@@ -1,26 +1,28 @@
{
lib,
alsa-lib,
buildGoModule,
fetchFromGitHub,
pkg-config,
glib,
wrapGAppsHook4,
alsa-lib,
gobject-introspection,
gtk4,
libadwaita,
nix-update-script,
pkg-config,
wrapGAppsHook4,
}:
buildGoModule rec {
pname = "mpris-timer";
version = "1.1.1";
version = "1.5";
src = fetchFromGitHub {
owner = "efogdev";
repo = "mpris-timer";
rev = "refs/tags/${version}";
hash = "sha256-Ak9DASAfW+dOhfbQDRAZJ1YD8j5Fcpz05jlXlUG1ydo=";
hash = "sha256-drp/JB7C1MMEOWbZUmrFtaEDRpgf90MSR6dFqdagCpI=";
};
vendorHash = "sha256-APcQgNEn7ULIjBk7f4q6MMSX9k58+F7vzgUDiIZ3Jxc=";
strictDeps = true;
@@ -42,11 +44,14 @@ buildGoModule rec {
"-s"
"-w"
];
tags = [
"wayland"
];
postInstall = ''
mv $out/bin/cmd $out/bin/mpris-timer
install -Dm644 internal/ui/res/icon.svg $out/share/icons/hicolor/scalable/apps/io.github.efogdev.mpris-timer.svg
install -Dm644 misc/io.github.efogdev.mpris-timer.desktop -t $out/share/applications
install -Dm644 misc/io.github.efogdev.mpris-timer.metainfo.xml -t $out/share/metainfo
@@ -54,6 +59,10 @@ buildGoModule rec {
glib-compile-schemas $out/share/glib-2.0/schemas
'';
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Timer app with seamless GNOME integration";
homepage = "https://github.com/efogdev/mpris-timer";
@@ -63,5 +72,7 @@ buildGoModule rec {
getchoo
];
mainProgram = "mpris-timer";
# Always uses ALSA
platforms = lib.platforms.linux;
};
}
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mysql-connector-java";
version = "9.0.0";
version = "9.1.0";
src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip";
hash = "sha256-3Czzu7hheuF0FYF8+GtjkxXSXfxTaqHrPa/+69I8Wfg=";
hash = "sha256-cs3VP+Rd99JrITkxqlVLn9x5FPyrppZcImhdE10VT0U=";
};
installPhase = ''
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -7,16 +7,16 @@
(buildNpmPackage.override { inherit nodejs; }) rec {
pname = "node-gyp";
version = "10.2.0";
version = "10.3.1";
src = fetchFromGitHub {
owner = "nodejs";
repo = "node-gyp";
rev = "refs/tags/v${version}";
hash = "sha256-AxyGE86nuU9VkbLLR/8GKM6bcTgayYodQ0mWiQhQtA0=";
hash = "sha256-Emq8JC6URFHSigRm+6yY/xX4SeZJKsBE2dXN1aWYxOU=";
};
npmDepsHash = "sha256-LCm1gF7GfjT13k3fe1A+DNNwP48OtFVbYgwCCLH3eHA=";
npmDepsHash = "sha256-/ERbWveCePkKQjeArSYN/tK6c6Op5wtI/2RxBV0ylo4=";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "nvme-cli";
version = "2.10.2";
version = "2.11";
src = fetchFromGitHub {
owner = "linux-nvme";
repo = "nvme-cli";
rev = "v${version}";
hash = "sha256-8vxalIHA4DRQuI18PRmzrlyG1XHcbKPkZgVB5Yqq9EU=";
hash = "sha256-LkFYkfHeBKC/0kr33DKu7oXxXrtfu1YcpuwzRRWsHpc=";
};
mesonFlags = [
+2 -2
View File
@@ -9,12 +9,12 @@
clangStdenv.mkDerivation (finalAttrs: {
pname = "objfw";
version = "1.2.1";
version = "1.2.2";
src = fetchfossil {
url = "https://objfw.nil.im/home";
rev = "${finalAttrs.version}-release";
hash = "sha256-l21ZIuhCAm3zGVEOT34rNyBMdKDoA7Oii5IXer/CbUw=";
hash = "sha256-s1VTI4POllvX8WHlZJezhIx1jt4SRbXlAaYRBeL05Bw=";
};
nativeBuildInputs = [
-5
View File
@@ -12,7 +12,6 @@
libpulseaudio,
libdrm,
mesa,
xdg-user-dirs,
libva,
libva1,
libvdpau,
@@ -104,10 +103,6 @@ flutter324.buildFlutterApplication rec {
ln -s ${lib.getLib libvdpau}/lib/libvdpau.so.1 $out/app/${pname}/lib/libvdpau.so.1
'';
extraWrapProgramArgs = ''
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
'';
meta = {
description = "Anime1 third-party client with bullet screen";
homepage = "https://github.com/Predidit/oneAnime";
@@ -43,12 +43,12 @@
# clang consume much less RAM than GCC
clangStdenv.mkDerivation rec {
pname = "openscad-unstable";
version = "2024-11-18";
version = "2024-12-06";
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
rev = "d65040e820ace5685554c40a7e584125b7df409e";
hash = "sha256-dIZhye1tycDMpJxjIUPioeTah2XS95jkr8HgGgZc5CU=";
rev = "fd3f465aa01b06f96c78ad525654390a83272d5e";
hash = "sha256-B03fEKY9dkB+zFcTsuGzZYe7V5eR5h8vp+EceNk4ZtY=";
fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD
};
+1 -1
View File
@@ -81,7 +81,7 @@ let
terraform {
required_providers {
random = {
source = "registry.terraform.io/hashicorp/random"
source = "hashicorp/random"
}
}
}
+3 -3
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "oterm";
version = "0.6.1";
version = "0.6.9";
pyproject = true;
src = fetchFromGitHub {
owner = "ggozad";
repo = "oterm";
rev = "refs/tags/${version}";
hash = "sha256-kIuWDu7CpLLRyGPcCQYNaAiZ5F/WEatDmf2XbvLedsI=";
tag = version;
hash = "sha256-ltzwb6r7zg41jlTJdU+/zTJ0H6jOL/4NKCZRBN6HQR4=";
};
pythonRelaxDeps = [
+3 -3
View File
@@ -14,7 +14,7 @@ let
pygobject3
]);
version = "0.8.1";
version = "0.8.3";
in stdenv.mkDerivation {
inherit version;
@@ -23,8 +23,8 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "berarma";
repo = "oversteer";
rev = version;
sha256 = "sha256-J23fgEDkfZMjVEYHaSPbU9zh5CQFjPmqMsm09VybBv8=";
rev = "v${version}";
sha256 = "sha256-X58U7lFH53nCaXnE7uXgV7aea6qntNfH5TIt68xSefY=";
};
buildInputs = [ bash gtk3 ];
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "panicparse";
version = "2.3.1";
version = "2.4.0";
src = fetchFromGitHub {
owner = "maruel";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KjWUubrHPJUJWvoa13EGEwTd5uNC0nrHAF8hzdnxEmY=";
sha256 = "sha256-EBNOHI04v47sXAWrjHsU4pixP4TPOuHy8S3YmlkiLN4=";
};
vendorHash = "sha256-udkh/6Bu+7djxugMIuVsZvZ3JN2JooihsmcS2wJT0Wo=";
vendorHash = "sha256-/w/dtt55NVHoJ5AeHsqH/IRe3bJq1YvpasLh8Zn8Ckg=";
subPackages = [ "." ];
+1 -3
View File
@@ -36,7 +36,6 @@
makeDesktopItem,
wrapGAppsHook3,
copyDesktopItems,
xdg-user-dirs,
}:
flutter324.buildFlutterApplication rec {
pname = "pilipalax";
@@ -111,8 +110,7 @@ flutter324.buildFlutterApplication rec {
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
--prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
'';
meta = {
+2 -2
View File
@@ -38,7 +38,7 @@
buildPythonPackage rec {
pname = "poetry";
version = "1.8.4";
version = "1.8.5";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -47,7 +47,7 @@ buildPythonPackage rec {
owner = "python-poetry";
repo = "poetry";
rev = "refs/tags/${version}";
hash = "sha256-pk57Jxf4hkMKLn1pOa9BtHLwLJ6qmXc55TqQN5Vr2k8=";
hash = "sha256-YR0IgDhmpbe8TyTMP1cjUxGRnrfV8CNHkPlZrNcnof0=";
};
build-system = [
+2 -2
View File
@@ -38,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString enableQt "-qt"
+ lib.optionalString (!enableQt) "-sdl"
+ lib.optionalString forceWayland "-wayland";
version = "1.18";
version = "1.18.1";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-ssZthilRMukgJm6Rnv79Yu6Rc/pTIX9E12rXY6Ct6bc=";
hash = "sha256-X5Sb6oxjjhlsm1VN9e0Emk4SqiHTe3G3ZiuIgw5DSds=";
};
patches = lib.optionals useSystemFfmpeg [
+6 -1
View File
@@ -21,7 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Ultimate desktop calculator";
homepage = "http://qalculate.github.io";
maintainers = with maintainers; [ gebner doronbehar alyaeanyx ];
maintainers = with maintainers; [
gebner
doronbehar
alyaeanyx
aleksana
];
license = licenses.gpl2Plus;
mainProgram = "qalculate-gtk";
platforms = platforms.all;
@@ -0,0 +1,29 @@
diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 7992ed00d..a9e0f0ba7 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -207,24 +207,6 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
"sudo apt-get remove modemmanager</pre>").arg(qgcApp()->applicationName())));
return;
}
- // Determine if we have the correct permissions to access USB serial devices
- QFile permFile("/etc/group");
- if(permFile.open(QIODevice::ReadOnly)) {
- while(!permFile.atEnd()) {
- QString line = permFile.readLine();
- if (line.contains("dialout") && !line.contains(getenv("USER"))) {
- permFile.close();
- _exitWithError(QString(
- tr("The current user does not have the correct permissions to access serial devices. "
- "You should also remove modemmanager since it also interferes.<br/><br/>"
- "If you are using Ubuntu, execute the following commands to fix these issues:<br/>"
- "<pre>sudo usermod -a -G dialout $USER<br/>"
- "sudo apt-get remove modemmanager</pre>")));
- return;
- }
- }
- permFile.close();
- }
// Always set style to default, this way QT_QUICK_CONTROLS_STYLE environment variable doesn't cause random changes in ui
QQuickStyle::setStyle("Default");
@@ -91,6 +91,10 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
./disable-bad-message.patch
];
meta = {
description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
homepage = "https://qgroundcontrol.com/";
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rabbitmq-c";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "alanxz";
repo = "rabbitmq-c";
rev = "v${version}";
hash = "sha256-ffdnLEgUg+4G12JntjFag3ZXMvEL42hsrY6VT58ccJ0=";
hash = "sha256-uOI+YV9aV/LGlSxr75sSii5jQ005smCVe14QAGNpKY8=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rdkafka";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "confluentinc";
repo = "librdkafka";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-QjmVu9d/wlLjt5WWyZi+WEWibfDUynHGvTwLbH36T84=";
sha256 = "sha256-qgy5VVB7H0FECtQR6HkTJ58vrHIU9TAFurDNuZGGgvw=";
};
nativeBuildInputs = [ pkg-config python3 which ];
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "rmapi";
version = "0.0.27.1";
version = "0.0.28";
src = fetchFromGitHub {
owner = "ddvk";
repo = "rmapi";
rev = "v${version}";
sha256 = "sha256-nwGTBCzA9+J3S3Gd3YgwCWAj/gMcoS19awluDZWZCbU=";
sha256 = "sha256-/eiW0i7+FLa8i9a2RFcABVSC40MUwhsV+bHVLdPpV3s=";
};
vendorHash = "sha256-5m3/XFyBEWM8UB3WylkBj+QWI5XsnlVD4K3BhKVVCB4=";
vendorHash = "sha256-Qisfw+lCFZns13jRe9NskCaCKVj5bV1CV8WPpGBhKFc=";
doCheck = false;
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "rustic";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "rustic-rs";
repo = "rustic";
rev = "refs/tags/v${version}";
hash = "sha256-DtLyVfABMRhEaelOBKV6tnFYezOOyM8C9T50sPuaHXQ=";
hash = "sha256-HYPzgynCeWDRRNyACHqnzkjn6uZWS0TDHuJE9STJxbQ=";
};
cargoHash = "sha256-Ha9qW+nCG4dMUEL6CYm/gl2Xrsp5gQ2+xi0Se5dxmyU=";
cargoHash = "sha256-0EiegC1eP77sUaruB9wnSViWSKHJcJiMjeEf8r4TqwU=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "sirikali";
version = "1.6.0";
version = "1.7.2";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = "sirikali";
rev = version;
hash = "sha256-org8mYKwZDdOvkQyd3eD+GaI0aHshMbe2f9i1bM+lBk=";
hash = "sha256-UtgK+q06J6T6RJ8jQiwzg5yVtgGZaZzmfadNyXxTCIk=";
};
buildInputs = [
+3 -3
View File
@@ -48,16 +48,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [
rustPlatform.buildRustPackage rec {
pname = "spotify-player";
version = "0.20.1";
version = "0.20.3";
src = fetchFromGitHub {
owner = "aome510";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-SKlESIw8eAyAqR1HVW004yyL2nNVEnb4/xmf0ch3ZMo=";
hash = "sha256-9iXsZod1aLdCQYUKBjdRayQfRUz770Xw3/M85Rp/OCw=";
};
cargoHash = "sha256-VlJ8Bz4EY2rERyOn6ifC7JAL5Mvjt0ZOzlPBOwiH6WA=";
cargoHash = "sha256-e9MAq31FTmukHjP5VoAuHRGf28vX9aPUWjOFfH9uY9g=";
nativeBuildInputs =
[
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "spring-boot-cli";
version = "3.3.4";
version = "3.4.0";
src = fetchzip {
url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip";
hash = "sha256-7/pYGj3GpdLjrFGq9QnlfHhYMs8DjMbmDloDsQu2BZY=";
hash = "sha256-jmqmWlp40DE/CWzPEMfApb3OTDDb0upcePCHj1+yTs4=";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "stochas";
version = "1.3.12";
version = "1.3.13";
src = fetchFromGitHub {
owner = "surge-synthesizer";
repo = pname;
rev = "v${version}";
hash = "sha256-GrYzsyezunFLFVzBfYCbNC53K695eYto9338iAALiSk=";
hash = "sha256-Gp49cWvUkwz4xAq5sA1nUO+amRC39iWeUemQJyv6hTs=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -5,18 +5,18 @@
buildGoModule rec {
pname = "storj-uplink";
version = "1.116.5";
version = "1.118.8";
src = fetchFromGitHub {
owner = "storj";
repo = "storj";
rev = "v${version}";
hash = "sha256-vQftcQU7WUDfVFKYswtpEHbSyReIcWF83vEQrEbzbHk=";
hash = "sha256-kVV5d3ULRg/yGWZJSR2gP0X3gaGPM3Uy0ZkLed1Kb+U=";
};
subPackages = [ "cmd/uplink" ];
vendorHash = "sha256-4wkgQQGbQi9ZcBaExRQysL6r/rJZez9z7keaJReuAeg=";
vendorHash = "sha256-5pNYC1ubjxaU7KPd4lsEOyAe/OU95UID4JtFJ6Q+E3w=";
ldflags = [ "-s" "-w" ];
+86
View File
@@ -0,0 +1,86 @@
{
lib,
stdenv,
fetchFromGitHub,
nodejs,
pnpm,
nix-update-script,
fetchurl,
runCommand,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "synchrony";
version = "2.4.5";
src = fetchFromGitHub {
owner = "relative";
repo = "synchrony";
rev = finalAttrs.version;
hash = "sha256-nJ6H1SZAQCG6U3BPEPmm+BGQa8Af+Vb1E+Lv8lIqDBE=";
};
nativeBuildInputs = [
nodejs
pnpm.configHook
];
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-+hS4UK7sncCxv6o5Yl72AeY+LSGLnUTnKosAYB6QsP0=";
};
buildPhase = ''
runHook preBuild
pnpm run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -Dm755 dist/{index,cli}.js -t $out/share/synchrony
cp -r node_modules $out/share/synchrony
ln -s $out/share/synchrony/cli.js $out/bin/synchrony
runHook postInstall
'';
fixupPhase = ''
runHook preFixup
substituteInPlace $out/share/synchrony/cli.js \
--replace-fail "require('../')" "require('$out/share/synchrony')"
patchShebangs $out/share/synchrony/cli.js
runHook postFixup
'';
passthru = {
tests.deobfuscate =
let
obfuscated = fetchurl {
url = "https://gist.github.com/relative/79e392bced4b9bed8fd076f834e06dee/raw/obfuscated.js";
hash = "sha256-AQWKVIyb6x3wWG3bMMqIJWsV26S9W5Xd+QVB26zu8LA=";
};
in
runCommand "synchrony-test" { } ''
mkdir -p $out
${lib.getExe finalAttrs.finalPackage} deobfuscate ${obfuscated} -o $out/deobfuscated.js
'';
updateScript = nix-update-script { };
};
meta = {
description = "Simple deobfuscator for mangled or obfuscated JavaScript files";
homepage = "https://deobfuscate.relative.im/";
license = with lib.licenses; [ gpl3Only ];
maintainers = with lib.maintainers; [ pluiedev ];
inherit (nodejs.meta) platforms;
mainProgram = "synchrony";
};
})
+3 -3
View File
@@ -15,16 +15,16 @@
buildNpmPackage rec {
pname = "teams-for-linux";
version = "1.11.2";
version = "1.12.3";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
rev = "refs/tags/v${version}";
hash = "sha256-fSZ94Px0NuxUZqc9cHE6czG/VzNsWp+UXllq7kEQvtI=";
hash = "sha256-uEyRozJR9KOVfiSiIUAZfNrExNn3rO21VRG5y4FumV4=";
};
npmDepsHash = "sha256-MfPdOqxiMDsvxsS3yWukRokDitqWQpTpK407xVX461o=";
npmDepsHash = "sha256-APHPnKyGqYKgve+34csa2RUmPvNZkMtzVE6nW/MjyyE=";
nativeBuildInputs = [
makeWrapper
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ticker";
version = "4.7.0";
version = "4.7.1";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-CSOaLFINg1ppTecDAI0tmFY8QMGwWKaeLly+9XI3YPM=";
hash = "sha256-7yAmwyKIO0bMqNgTcdWcgBXPV/T7753z/x2KAB8W070=";
};
vendorHash = "sha256-XrZdv6QpR1HGN2o/Itbw+7hOkgVjzvx3jwlHeaJ2m0U=";
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "traefik-certs-dumper";
version = "2.8.3";
version = "2.9.3";
src = fetchFromGitHub {
owner = "ldez";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dSVtowebmDA0X/PtLKktvb1+FhQ+evMoxFBXIXqZujw=";
sha256 = "sha256-krJ2oPz72mqlmJxQTZaFbyDtUaprRLJGZMSS7ZuvPfA=";
};
vendorHash = "sha256-a23kTtjIaMYs3+S9rYZ6ttyCyyK6Wm2wUZQw+In/hG4=";
vendorHash = "sha256-CmqeIQk7lAENMDNWAG7XylnXRXvgyRN5GMt0ilwJX0U=";
excludedPackages = "integrationtest";
meta = with lib; {
+4 -1
View File
@@ -63,6 +63,9 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "com.github.louis77.tuner";
maintainers = [ maintainers.abbe ];
maintainers = with maintainers; [
abbe
aleksana
];
};
}
+2 -1
View File
@@ -45,7 +45,8 @@ let
};
typoraFHS = buildFHSEnv {
name = "typora-fhs";
pname = "typora-fhs";
inherit version;
targetPkgs = pkgs: (with pkgs; [
typoraBase
udev
+7 -15
View File
@@ -5,7 +5,6 @@
fetchFromGitHub,
pkg-config,
darwin,
audioSupport ? true,
alsa-lib,
webcamSupport ? false,
@@ -13,39 +12,32 @@
# passthru.tests.run
runCommand,
uiua,
unstable ? false,
}:
let
inherit (darwin.apple_sdk.frameworks) AppKit AudioUnit CoreServices;
versionInfo = import (if unstable then ./unstable.nix else ./stable.nix);
in
rustPlatform.buildRustPackage rec {
pname = "uiua";
version = "0.13.0";
inherit (versionInfo) version cargoHash;
src = fetchFromGitHub {
owner = "uiua-lang";
repo = "uiua";
rev = version;
hash = "sha256-5IqJ/lvozXzc7LRUzxpG04M3Nir+3h+GoL7dqTgC9J8=";
inherit (versionInfo) rev hash;
};
cargoHash = "sha256-0hbE2ZH7daw/VQLe51CxOIborABDF0x00kTyx9NCs9g=";
nativeBuildInputs =
lib.optionals (webcamSupport || stdenv.hostPlatform.isDarwin) [ rustPlatform.bindgenHook ]
++ lib.optionals audioSupport [ pkg-config ];
buildInputs =
lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
CoreServices
]
++ lib.optionals (audioSupport && stdenv.hostPlatform.isDarwin) [ AudioUnit ]
++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ];
buildInputs = lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ];
buildFeatures = lib.optional audioSupport "audio" ++ lib.optional webcamSupport "webcam";
passthru.updateScript = ./update.sh;
passthru.updateScript = versionInfo.updateScript;
passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } ''
uiua init
diff -U3 --color=auto <(uiua run main.ua) <(echo '"Hello, World!"')
+7
View File
@@ -0,0 +1,7 @@
rec {
version = "0.13.0";
rev = version;
hash = "sha256-5IqJ/lvozXzc7LRUzxpG04M3Nir+3h+GoL7dqTgC9J8=";
cargoHash = "sha256-0hbE2ZH7daw/VQLe51CxOIborABDF0x00kTyx9NCs9g=";
updateScript = ./update-stable.sh;
}
+7
View File
@@ -0,0 +1,7 @@
rec {
version = "0.14.0-dev.6";
rev = version;
hash = "sha256-YRv4i014xD4d8YN5PuMsa06+7kZgISPBGkKrVLU5ZN0=";
cargoHash = "sha256-GYBHaYGmKcV0Gw1I4IWzfmecHwQtb2ys5bMguqfo8S0=";
updateScript = ./update-unstable.sh;
}
@@ -1,7 +1,7 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq nix-update common-updater-scripts
nix-update uiua
nix-update --override-filename pkgs/by-name/ui/uiua/stable.nix --version-regex '^(\d*\.\d*\.\d*)$' uiua
EXT_VER=$(curl https://raw.githubusercontent.com/uiua-lang/uiua-vscode/main/package.json | jq -r .version)
update-source-version vscode-extensions.uiua-lang.uiua-vscode $EXT_VER
+4
View File
@@ -0,0 +1,4 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-update
nix-update --override-filename pkgs/by-name/ui/uiua/unstable.nix uiua-unstable
+4 -1
View File
@@ -77,7 +77,10 @@ stdenv.mkDerivation rec {
homepage = "https://mpobaschnig.github.io/vaults/";
changelog = "https://github.com/mpobaschnig/vaults/releases/tag/${version}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ benneti ];
maintainers = with lib.maintainers; [
benneti
aleksana
];
mainProgram = "vaults";
platforms = lib.platforms.linux;
};
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "versatiles";
version = "0.13.0"; # When updating: Replace with current version
version = "0.14.5"; # When updating: Replace with current version
src = fetchFromGitHub {
owner = "versatiles-org";
repo = "versatiles-rs";
rev = "refs/tags/v${version}"; # When updating: Replace with long commit hash of new version
hash = "sha256-6HuBKRvt6P4GpFaIiYsGO/8wcjML2UDdUFoYvIM/Z0k="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
hash = "sha256-ejMqTMGLbVr/Aaqw8U0ojV43N6t0GeWdYIcP0guAsO0="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
};
cargoHash = "sha256-7kJf6BHNRfLDFRZp8Q2M2ZGXH0NzG/QBqw5/s20AIm4="; # When updating: Same as above
cargoHash = "sha256-2C/oPB48CTX7i4xoF1iegrpNvaSMkIbVeEyy/WteKqM="; # When updating: Same as above
# Testing only necessary for the `bins` and `lib` features
cargoTestFlags = [
+2 -2
View File
@@ -50,7 +50,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vips";
version = "8.15.5";
version = "8.16.0";
outputs = [
"bin"
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "libvips";
repo = "libvips";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-Lwe4lu3kS1WxgbM0eRfrMf/UIpDebvooHKvyVv7lq24=";
hash = "sha256-Cx657BEZecPeB9rCeVym3C/d+/u+YLJn9vwxfe8b0dM=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
postFetch = ''
+5 -1
View File
@@ -71,7 +71,11 @@ stdenv.mkDerivation rec {
description = "Fast and secure file transfer";
homepage = "https://apps.gnome.org/Warp/";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ];
maintainers = with lib.maintainers; [
dotlambda
foo-dogsquared
aleksana
];
platforms = lib.platforms.all;
mainProgram = "warp";
broken = stdenv.hostPlatform.isDarwin;
+3 -3
View File
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "wit-bindgen";
version = "0.34.0";
version = "0.36.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wit-bindgen";
rev = "v${version}";
hash = "sha256-ZnMQpIfKN6ByEZasvy+UM12ZBsrhTM1s3TN1dF/3YMY=";
hash = "sha256-Ebg5llC7w2YoHqs3UatZbC5gVi6L9zGuEkzqhJhGXh4=";
};
cargoHash = "sha256-eF1qJ0fH3ODG1u9tUD3dj/2i7+0BJ4fJPlaYjS3XiGU=";
cargoHash = "sha256-NgKxDUYWMib0+HpuuXh2znRcYVVo30VRXPHPIkW6rpk=";
# Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
# However, GitHub Actions ensures a proper build.
+7 -2
View File
@@ -12,17 +12,19 @@
libxmp,
libebur128,
python3,
yyjson,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "woof-doom";
version = "15.0.0";
version = "15.0.1";
src = fetchFromGitHub {
owner = "fabiangreffrath";
repo = "woof";
rev = "woof_${finalAttrs.version}";
hash = "sha256-YLkQ2Hv+lO5wqFBqwmj0jwd/XHN3tj6fMh6x7c1PpMw=";
hash = "sha256-B1pcozy6ZyJkrrxnoL4tXSlb/VzZ9NoSPub8OVVorXo=";
};
nativeBuildInputs = [
@@ -39,8 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
libxmp
libebur128
openal
yyjson
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Woof! is a continuation of the Boom/MBF bloodline of Doom source ports";
homepage = "https://github.com/fabiangreffrath/woof";

Some files were not shown because too many files have changed in this diff Show More