Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
57bbe4245f
@ -129,19 +129,17 @@ When a PR is created, it will be pre-populated with some checkboxes detailed bel
|
||||
|
||||
#### Tested using sandboxing
|
||||
|
||||
When sandbox builds are enabled, Nix will setup an isolated environment for each build process. It is used to remove further hidden dependencies set by the build environment to improve reproducibility. This includes access to the network during the build outside of `fetch*` functions and files outside the Nix store. Depending on the operating system access to other resources are blocked as well (ex. inter process communication is isolated on Linux); see [sandbox](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-sandbox) in the Nix manual for details.
|
||||
When sandbox builds are enabled, Nix will set up an isolated environment for each build process.
|
||||
It is used to remove further hidden dependencies set by the build environment to improve reproducibility.
|
||||
This includes access to the network during the build outside of `fetch*` functions and files outside the Nix store.
|
||||
Depending on the operating system, access to other resources is blocked as well (e.g., inter-process communication is isolated on Linux); see [sandbox](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-sandbox) in the Nix manual for details.
|
||||
|
||||
Sandboxing is not enabled by default in Nix due to a small performance hit on each build. In pull requests for [nixpkgs](https://github.com/NixOS/nixpkgs/) people are asked to test builds with sandboxing enabled (see `Tested using sandboxing` in the pull request template) because in [Hydra](https://nixos.org/hydra/) sandboxing is also used.
|
||||
In pull requests for [nixpkgs](https://github.com/NixOS/nixpkgs/) people are asked to test builds with sandboxing enabled (see `Tested using sandboxing` in the pull request template) because in [Hydra](https://nixos.org/hydra/) sandboxing is also used.
|
||||
|
||||
Depending if you use NixOS or other platforms you can use one of the following methods to enable sandboxing **before** building the package:
|
||||
If you are on Linux, sandboxing is enabled by default.
|
||||
On other platforms, sandboxing is disabled by default due to a small performance hit on each build.
|
||||
|
||||
- **Globally enable sandboxing on NixOS**: add the following to `configuration.nix`
|
||||
|
||||
```nix
|
||||
nix.settings.sandbox = true;
|
||||
```
|
||||
|
||||
- **Globally enable sandboxing on non-NixOS platforms**: add the following to: `/etc/nix/nix.conf`
|
||||
Please enable sandboxing **before** building the package by adding the following to: `/etc/nix/nix.conf`:
|
||||
|
||||
```ini
|
||||
sandbox = true
|
||||
@ -441,14 +439,14 @@ gitGraph
|
||||
|
||||
Here's an overview of the different branches:
|
||||
|
||||
| branch | `master` | `staging` | `staging-next` |
|
||||
| branch | `master` | `staging-next` | `staging` |
|
||||
| --- | --- | --- | --- |
|
||||
| Used for development | ✔️ | ✔️ | ❌ |
|
||||
| Built by Hydra | ✔️ | ❌ | ✔️ |
|
||||
| [Mass rebuilds][mass-rebuild] | ❌ | ✔️ | ⚠️ Only to fix Hydra builds |
|
||||
| Critical security fixes | ✔️ for non-mass-rebuilds | ❌ | ✔️ for mass-rebuilds |
|
||||
| Automatically merged into | `staging-next` | - | `staging` |
|
||||
| Manually merged into | - | `staging-next` | `master` |
|
||||
| Used for development | ✔️ | ❌ | ✔️ |
|
||||
| Built by Hydra | ✔️ | ✔️ | ❌ |
|
||||
| [Mass rebuilds][mass-rebuild] | ❌ | ⚠️ Only to fix Hydra builds | ✔️ |
|
||||
| Critical security fixes | ✔️ for non-mass-rebuilds | ✔️ for mass-rebuilds | ❌ |
|
||||
| Automatically merged into | `staging-next` | `staging` | - |
|
||||
| Manually merged into | - | `master` | `staging-next` |
|
||||
|
||||
The staging workflow is used for all main branches, `master` and `release-YY.MM`, with corresponding names:
|
||||
- `master`/`release-YY.MM`
|
||||
|
||||
@ -1866,12 +1866,6 @@
|
||||
github = "Atry";
|
||||
githubId = 601530;
|
||||
};
|
||||
attila-lendvai = {
|
||||
name = "Attila Lendvai";
|
||||
email = "attila@lendvai.name";
|
||||
github = "attila-lendvai";
|
||||
githubId = 840345;
|
||||
};
|
||||
auchter = {
|
||||
name = "Michael Auchter";
|
||||
email = "a@phire.org";
|
||||
@ -4433,6 +4427,12 @@
|
||||
githubId = 49904992;
|
||||
name = "Dawid Sowa";
|
||||
};
|
||||
dawoox = {
|
||||
email = "contact@antoinebellanger.fr";
|
||||
github = "dawoox";
|
||||
githubId = 48325941;
|
||||
name = "Dawoox";
|
||||
};
|
||||
daylinmorgan = {
|
||||
email = "daylinmorgan@gmail.com";
|
||||
github = "daylinmorgan";
|
||||
|
||||
@ -37,7 +37,6 @@ target-version = ['py39']
|
||||
include = '\.pyi?$'
|
||||
|
||||
[tool.mypy]
|
||||
python_version = "3.10"
|
||||
warn_redundant_casts = true
|
||||
disallow_untyped_calls = true
|
||||
disallow_untyped_defs = true
|
||||
|
||||
@ -900,7 +900,6 @@
|
||||
./services/networking/autossh.nix
|
||||
./services/networking/avahi-daemon.nix
|
||||
./services/networking/babeld.nix
|
||||
./services/networking/bee-clef.nix
|
||||
./services/networking/bee.nix
|
||||
./services/networking/biboumi.nix
|
||||
./services/networking/bind.nix
|
||||
|
||||
@ -1,35 +1,43 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.programs.ccache;
|
||||
in {
|
||||
options.programs.ccache = {
|
||||
# host configuration
|
||||
enable = mkEnableOption (lib.mdDoc "CCache");
|
||||
cacheDir = mkOption {
|
||||
type = types.path;
|
||||
enable = lib.mkEnableOption (lib.mdDoc "CCache");
|
||||
cacheDir = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = lib.mdDoc "CCache directory";
|
||||
default = "/var/cache/ccache";
|
||||
};
|
||||
# target configuration
|
||||
packageNames = mkOption {
|
||||
type = types.listOf types.str;
|
||||
packageNames = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = lib.mdDoc "Nix top-level packages to be compiled using CCache";
|
||||
default = [];
|
||||
example = [ "wxGTK32" "ffmpeg" "libav_all" ];
|
||||
};
|
||||
owner = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "root";
|
||||
description = lib.mdDoc "Owner of CCache directory";
|
||||
};
|
||||
group = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "nixbld";
|
||||
description = lib.mdDoc "Group owner of CCache directory";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
config = lib.mkMerge [
|
||||
# host configuration
|
||||
(mkIf cfg.enable {
|
||||
systemd.tmpfiles.rules = [ "d ${cfg.cacheDir} 0770 root nixbld -" ];
|
||||
(lib.mkIf cfg.enable {
|
||||
systemd.tmpfiles.rules = [ "d ${cfg.cacheDir} 0770 ${cfg.owner} ${cfg.group} -" ];
|
||||
|
||||
# "nix-ccache --show-stats" and "nix-ccache --clear"
|
||||
security.wrappers.nix-ccache = {
|
||||
owner = "root";
|
||||
group = "nixbld";
|
||||
inherit (cfg) owner group;
|
||||
setuid = false;
|
||||
setgid = true;
|
||||
source = pkgs.writeScript "nix-ccache.pl" ''
|
||||
@ -50,9 +58,9 @@ in {
|
||||
})
|
||||
|
||||
# target configuration
|
||||
(mkIf (cfg.packageNames != []) {
|
||||
(lib.mkIf (cfg.packageNames != []) {
|
||||
nixpkgs.overlays = [
|
||||
(self: super: genAttrs cfg.packageNames (pn: super.${pn}.override { stdenv = builtins.trace "with ccache: ${pn}" self.ccacheStdenv; }))
|
||||
(self: super: lib.genAttrs cfg.packageNames (pn: super.${pn}.override { stdenv = builtins.trace "with ccache: ${pn}" self.ccacheStdenv; }))
|
||||
|
||||
(self: super: {
|
||||
ccacheWrapper = super.ccacheWrapper.override {
|
||||
@ -65,7 +73,7 @@ in {
|
||||
echo "Directory '$CCACHE_DIR' does not exist"
|
||||
echo "Please create it with:"
|
||||
echo " sudo mkdir -m0770 '$CCACHE_DIR'"
|
||||
echo " sudo chown root:nixbld '$CCACHE_DIR'"
|
||||
echo " sudo chown ${cfg.owner}:${cfg.group} '$CCACHE_DIR'"
|
||||
echo "====="
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -33,6 +33,41 @@ let
|
||||
|
||||
kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig;
|
||||
|
||||
# Flag based settings are deprecated, use the `--config` flag with a
|
||||
# `KubeletConfiguration` struct.
|
||||
# https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/
|
||||
#
|
||||
# NOTE: registerWithTaints requires a []core/v1.Taint, therefore requires
|
||||
# additional work to be put in config format.
|
||||
#
|
||||
kubeletConfig = pkgs.writeText "kubelet-config" (builtins.toJSON ({
|
||||
apiVersion = "kubelet.config.k8s.io/v1beta1";
|
||||
kind = "KubeletConfiguration";
|
||||
address = cfg.address;
|
||||
port = cfg.port;
|
||||
authentication = {
|
||||
x509 = lib.optionalAttrs (cfg.clientCaFile != null) { clientCAFile = cfg.clientCaFile; };
|
||||
webhook = {
|
||||
enabled = true;
|
||||
cacheTTL = "10s";
|
||||
};
|
||||
};
|
||||
authorization = {
|
||||
mode = "Webhook";
|
||||
};
|
||||
cgroupDriver = "systemd";
|
||||
hairpinMode = "hairpin-veth";
|
||||
registerNode = cfg.registerNode;
|
||||
containerRuntimeEndpoint = cfg.containerRuntimeEndpoint;
|
||||
healthzPort = cfg.healthz.port;
|
||||
healthzBindAddress = cfg.healthz.bind;
|
||||
} // lib.optionalAttrs (cfg.tlsCertFile != null) { tlsCertFile = cfg.tlsCertFile; }
|
||||
// lib.optionalAttrs (cfg.tlsKeyFile != null) { tlsPrivateKeyFile = cfg.tlsKeyFile; }
|
||||
// lib.optionalAttrs (cfg.clusterDomain != "") { clusterDomain = cfg.clusterDomain; }
|
||||
// lib.optionalAttrs (cfg.clusterDns != "") { clusterDNS = [ cfg.clusterDns ] ; }
|
||||
// lib.optionalAttrs (cfg.featureGates != []) { featureGates = cfg.featureGates; }
|
||||
));
|
||||
|
||||
manifestPath = "kubernetes/manifests";
|
||||
|
||||
taintOptions = with lib.types; { name, ... }: {
|
||||
@ -294,21 +329,7 @@ in
|
||||
Restart = "on-failure";
|
||||
RestartSec = "1000ms";
|
||||
ExecStart = ''${top.package}/bin/kubelet \
|
||||
--address=${cfg.address} \
|
||||
--authentication-token-webhook \
|
||||
--authentication-token-webhook-cache-ttl="10s" \
|
||||
--authorization-mode=Webhook \
|
||||
${optionalString (cfg.clientCaFile != null)
|
||||
"--client-ca-file=${cfg.clientCaFile}"} \
|
||||
${optionalString (cfg.clusterDns != "")
|
||||
"--cluster-dns=${cfg.clusterDns}"} \
|
||||
${optionalString (cfg.clusterDomain != "")
|
||||
"--cluster-domain=${cfg.clusterDomain}"} \
|
||||
${optionalString (cfg.featureGates != [])
|
||||
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
|
||||
--hairpin-mode=hairpin-veth \
|
||||
--healthz-bind-address=${cfg.healthz.bind} \
|
||||
--healthz-port=${toString cfg.healthz.port} \
|
||||
--config=${kubeletConfig} \
|
||||
--hostname-override=${cfg.hostname} \
|
||||
--kubeconfig=${kubeconfig} \
|
||||
${optionalString (cfg.nodeIp != null)
|
||||
@ -316,18 +337,10 @@ in
|
||||
--pod-infra-container-image=pause \
|
||||
${optionalString (cfg.manifests != {})
|
||||
"--pod-manifest-path=/etc/${manifestPath}"} \
|
||||
--port=${toString cfg.port} \
|
||||
--register-node=${boolToString cfg.registerNode} \
|
||||
${optionalString (taints != "")
|
||||
"--register-with-taints=${taints}"} \
|
||||
--root-dir=${top.dataDir} \
|
||||
${optionalString (cfg.tlsCertFile != null)
|
||||
"--tls-cert-file=${cfg.tlsCertFile}"} \
|
||||
${optionalString (cfg.tlsKeyFile != null)
|
||||
"--tls-private-key-file=${cfg.tlsKeyFile}"} \
|
||||
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
|
||||
--container-runtime-endpoint=${cfg.containerRuntimeEndpoint} \
|
||||
--cgroup-driver=systemd \
|
||||
${cfg.extraOpts}
|
||||
'';
|
||||
WorkingDirectory = top.dataDir;
|
||||
|
||||
@ -270,6 +270,6 @@ in
|
||||
|
||||
meta = {
|
||||
buildDocsInSandbox = false;
|
||||
maintainers = with lib.maintainers; [ lom SuperSandro2000 ];
|
||||
maintainers = with lib.maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -60,6 +60,10 @@ in
|
||||
systemd.services.hddfancontrol = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment.HDDFANCONTROL_ARGS = lib.escapeShellArgs args;
|
||||
serviceConfig = {
|
||||
# Hardening
|
||||
PrivateNetwork = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
@ -217,8 +217,13 @@ in {
|
||||
|
||||
systemd.services = {
|
||||
thinkfan.environment.THINKFAN_ARGS = escapeShellArgs ([ "-c" configFile ] ++ cfg.extraArgs);
|
||||
thinkfan.serviceConfig.Restart = "on-failure";
|
||||
thinkfan.serviceConfig.RestartSec = "30s";
|
||||
thinkfan.serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = "30s";
|
||||
|
||||
# Hardening
|
||||
PrivateNetwork = true;
|
||||
};
|
||||
|
||||
# must be added manually, see issue #81138
|
||||
thinkfan.wantedBy = [ "multi-user.target" ];
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
# NOTE for now nothing is installed into /etc/bee-clef/. the config files are used as read-only from the nix store.
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.bee-clef;
|
||||
in {
|
||||
meta = {
|
||||
maintainers = with maintainers; [ attila-lendvai ];
|
||||
};
|
||||
|
||||
### interface
|
||||
|
||||
options = {
|
||||
services.bee-clef = {
|
||||
enable = mkEnableOption (lib.mdDoc "clef external signer instance for Ethereum Swarm Bee");
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = "/var/lib/bee-clef";
|
||||
description = lib.mdDoc ''
|
||||
Data dir for bee-clef. Beware that some helper scripts may not work when changed!
|
||||
The service itself should work fine, though.
|
||||
'';
|
||||
};
|
||||
|
||||
passwordFile = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = "/var/lib/bee-clef/password";
|
||||
description = lib.mdDoc "Password file for bee-clef.";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "bee-clef";
|
||||
description = lib.mdDoc ''
|
||||
User the bee-clef daemon should execute under.
|
||||
'';
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "bee-clef";
|
||||
description = lib.mdDoc ''
|
||||
Group the bee-clef daemon should execute under.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# if we ever want to have rules.js under /etc/bee-clef/
|
||||
# environment.etc."bee-clef/rules.js".source = ${pkgs.bee-clef}/rules.js
|
||||
|
||||
systemd.packages = [ pkgs.bee-clef ]; # include the upstream bee-clef.service file
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.dataDir}/' 0750 ${cfg.user} ${cfg.group}"
|
||||
"d '${cfg.dataDir}/keystore' 0700 ${cfg.user} ${cfg.group}"
|
||||
];
|
||||
|
||||
systemd.services.bee-clef = {
|
||||
path = [
|
||||
# these are needed for the ensure-clef-account script
|
||||
pkgs.coreutils
|
||||
pkgs.gnused
|
||||
pkgs.gawk
|
||||
];
|
||||
|
||||
wantedBy = [ "bee.service" "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
ExecStartPre = ''${pkgs.bee-clef}/share/bee-clef/ensure-clef-account "${cfg.dataDir}" "${pkgs.bee-clef}/share/bee-clef/"'';
|
||||
ExecStart = [
|
||||
"" # this hides/overrides what's in the original entry
|
||||
"${pkgs.bee-clef}/share/bee-clef/bee-clef-service start"
|
||||
];
|
||||
ExecStop = [
|
||||
"" # this hides/overrides what's in the original entry
|
||||
"${pkgs.bee-clef}/share/bee-clef/bee-clef-service stop"
|
||||
];
|
||||
Environment = [
|
||||
"CONFIGDIR=${cfg.dataDir}"
|
||||
"PASSWORD_FILE=${cfg.passwordFile}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
users.users = optionalAttrs (cfg.user == "bee-clef") {
|
||||
bee-clef = {
|
||||
group = cfg.group;
|
||||
home = cfg.dataDir;
|
||||
isSystemUser = true;
|
||||
description = "Daemon user for the bee-clef service";
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = optionalAttrs (cfg.group == "bee-clef") {
|
||||
bee-clef = {};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -8,7 +8,7 @@ let
|
||||
in {
|
||||
meta = {
|
||||
# doc = ./bee.xml;
|
||||
maintainers = with maintainers; [ attila-lendvai ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
### interface
|
||||
@ -73,13 +73,10 @@ in {
|
||||
}
|
||||
];
|
||||
|
||||
warnings = optional (! config.services.bee-clef.enable) "The bee service requires an external signer. Consider setting `config.services.bee-clef.enable` = true";
|
||||
|
||||
services.bee.settings = {
|
||||
data-dir = lib.mkDefault "/var/lib/bee";
|
||||
password-file = lib.mkDefault "/var/lib/bee/password";
|
||||
clef-signer-enable = lib.mkDefault true;
|
||||
clef-signer-endpoint = lib.mkDefault "/var/lib/bee-clef/clef.ipc";
|
||||
swap-endpoint = lib.mkDefault "https://rpc.slock.it/goerli";
|
||||
};
|
||||
|
||||
@ -90,9 +87,6 @@ in {
|
||||
];
|
||||
|
||||
systemd.services.bee = {
|
||||
requires = optional config.services.bee-clef.enable
|
||||
"bee-clef.service";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
@ -120,7 +114,6 @@ Bee has SWAP enabled by default and it needs ethereum endpoint to operate.
|
||||
It is recommended to use external signer with bee.
|
||||
Check documentation for more info:
|
||||
- SWAP https://docs.ethswarm.org/docs/installation/manual#swap-bandwidth-incentives
|
||||
- External signer https://docs.ethswarm.org/docs/installation/bee-clef
|
||||
|
||||
After you finish configuration run 'sudo bee-get-addr'."
|
||||
fi
|
||||
@ -133,8 +126,6 @@ After you finish configuration run 'sudo bee-get-addr'."
|
||||
home = cfg.settings.data-dir;
|
||||
isSystemUser = true;
|
||||
description = "Daemon user for Ethereum Swarm Bee";
|
||||
extraGroups = optional config.services.bee-clef.enable
|
||||
config.services.bee-clef.group;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
24
nixos/tests/ccache.nix
Normal file
24
nixos/tests/ccache.nix
Normal file
@ -0,0 +1,24 @@
|
||||
import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
name = "ccache";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ ehmry ];
|
||||
};
|
||||
|
||||
nodes.machine = { ... }: {
|
||||
imports = [ ../modules/profiles/minimal.nix ];
|
||||
environment.systemPackages = [ pkgs.hello ];
|
||||
programs.ccache = {
|
||||
enable = true;
|
||||
packageNames = [ "hello" ];
|
||||
};
|
||||
};
|
||||
|
||||
testScript =
|
||||
''
|
||||
start_all()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed("nix-ccache --show-stats")
|
||||
machine.succeed("hello")
|
||||
machine.shutdown()
|
||||
'';
|
||||
})
|
||||
@ -47,4 +47,8 @@ in {
|
||||
name = "matomo-beta";
|
||||
meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ];
|
||||
};
|
||||
matomo_5 = matomoTest pkgs.matomo_5 // {
|
||||
name = "matomo-5";
|
||||
meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ] ++ lib.teams.flyingcircus.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -346,7 +346,7 @@ There are a few naming guidelines:
|
||||
|
||||
- The `pname` attribute _should_ be identical to the upstream package name.
|
||||
|
||||
- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer" instead of `"MPlayer"`.
|
||||
- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer"` instead of `"MPlayer"`.
|
||||
|
||||
- The `version` attribute _must_ start with a digit e.g., `"0.3.1rc2"`.
|
||||
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
, glib
|
||||
, gtk4
|
||||
, librsvg
|
||||
, libadwaita
|
||||
, wrapGAppsHook4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, cava
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cavalier";
|
||||
version = "2023.01.29";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fsobolev";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6bvi73cFQHtIyD4d4+mqje0qkmG4wkahZ2ohda5RvRQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
wrapGAppsHook4
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
librsvg
|
||||
libadwaita
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pygobject3
|
||||
];
|
||||
|
||||
# Prevent double wrapping
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--prefix PATH ":" "${lib.makeBinPath [ cava ]}"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Audio visualizer based on CAVA with customizable LibAdwaita interface";
|
||||
homepage = "https://github.com/fsobolev/cavalier";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkg-config, shntool, flac
|
||||
, opusTools, vorbis-tools, mp3gain, lame, taglib, wavpack, vorbisgain, sox, gtk3
|
||||
, qtbase, qttools, wrapQtAppsHook }:
|
||||
, opusTools, vorbis-tools, mp3gain, lame, taglib, wavpack, vorbisgain
|
||||
, monkeysAudio, sox, gtk3, qtbase, qttools, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flacon";
|
||||
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
|
||||
mp3gain
|
||||
lame
|
||||
wavpack
|
||||
monkeysAudio
|
||||
vorbisgain
|
||||
sox
|
||||
];
|
||||
|
||||
@ -8,10 +8,13 @@
|
||||
, ffmpeg
|
||||
, fftw
|
||||
, flac
|
||||
, gbenchmark
|
||||
, glibcLocales
|
||||
, gtest
|
||||
, hidapi
|
||||
, lame
|
||||
, libebur128
|
||||
, libdjinterop
|
||||
, libGLU
|
||||
, libid3tag
|
||||
, libkeyfinder
|
||||
@ -26,6 +29,7 @@
|
||||
, libxcb
|
||||
, lilv
|
||||
, lv2
|
||||
, microsoft-gsl
|
||||
, mp4v2
|
||||
, opusfile
|
||||
, pcre
|
||||
@ -52,13 +56,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mixxx";
|
||||
version = "2.3.6";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mixxxdj";
|
||||
repo = "mixxx";
|
||||
rev = version;
|
||||
hash = "sha256-VdgCsd/7vMFUleOU0ESoZDQ8yhQSsLZADVi4XI76Ouw=";
|
||||
hash = "sha256-JSWUzerm7D6AKq6g/9eRrt3EE2movRdM+VLUg07sLHo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
@ -69,12 +73,15 @@ mkDerivation rec {
|
||||
ffmpeg
|
||||
fftw
|
||||
flac
|
||||
gbenchmark
|
||||
glibcLocales
|
||||
gtest
|
||||
hidapi
|
||||
lame
|
||||
libebur128
|
||||
libGLU
|
||||
libid3tag
|
||||
libdjinterop
|
||||
libkeyfinder
|
||||
libmad
|
||||
libmodplug
|
||||
@ -87,6 +94,7 @@ mkDerivation rec {
|
||||
libxcb
|
||||
lilv
|
||||
lv2
|
||||
microsoft-gsl
|
||||
mp4v2
|
||||
opusfile
|
||||
pcre
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "raysession";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Houston4444/RaySession/releases/download/v${version}/RaySession-${version}-source.tar.gz";
|
||||
sha256 = "sha256-qEN3zBK/goRLIZaU06XXm8H5yj4Qjj/NH+bkHkjhLaw=";
|
||||
sha256 = "sha256-3+g1zdjGkxNEpyuKuxzhr2p9gkEFjYAso4fPedbjmlY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.75.0";
|
||||
version = "2.77.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-sVaQbfpgHgd1OZgR+R0PUmNENfDOcNRfvO2AVKFyDqM=";
|
||||
hash = "sha256-oXSgh2Vuq8SPdLagKz2gAwgg+GFhBRhd/8FnY7hxxJc=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "particl-core";
|
||||
version = "23.0.3.0";
|
||||
version = "23.2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "particl";
|
||||
repo = "particl-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jrIsErKeHP9CMUWsrD42RmfmApP7J091OLA5JNY0fe0=";
|
||||
hash = "sha256-RxkLt+7u+r5jNwEWiArTUpZ8ykYwWtvIDFXTSKhGN/w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "rust-analyzer",
|
||||
"version": "0.3.1697",
|
||||
"version": "0.3.1850",
|
||||
"dependencies": {
|
||||
"@hpcc-js/wasm": "^2.13.0",
|
||||
"anser": "^2.1.1",
|
||||
@ -9,10 +9,10 @@
|
||||
"vscode-languageclient": "^8.1.0",
|
||||
"@tsconfig/strictest": "^2.0.1",
|
||||
"@types/node": "~16.11.7",
|
||||
"@types/vscode": "~1.75",
|
||||
"@types/vscode": "~1.78.1",
|
||||
"@typescript-eslint/eslint-plugin": "^6.0.0",
|
||||
"@typescript-eslint/parser": "^6.0.0",
|
||||
"@vscode/test-electron": "^2.3.3",
|
||||
"@vscode/test-electron": "^2.3.8",
|
||||
"@vscode/vsce": "^2.19.0",
|
||||
"eslint": "^8.44.0",
|
||||
"eslint-config-prettier": "^8.8.0",
|
||||
|
||||
@ -20,13 +20,13 @@ let
|
||||
# Use the plugin version as in vscode marketplace, updated by update script.
|
||||
inherit (vsix) version;
|
||||
|
||||
releaseTag = "2023-10-16";
|
||||
releaseTag = "2024-02-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = releaseTag;
|
||||
sha256 = "sha256-PWEdqI+iiHbx4dkIwWHZCGJuTpRfJI3MLSHf3gQEJt4=";
|
||||
sha256 = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE=";
|
||||
};
|
||||
|
||||
build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps";
|
||||
@ -39,9 +39,12 @@ let
|
||||
inherit releaseTag;
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq moreutils esbuild
|
||||
jq
|
||||
moreutils
|
||||
esbuild
|
||||
# Required by `keytar`, which is a dependency of `vsce`.
|
||||
pkg-config libsecret
|
||||
pkg-config
|
||||
libsecret
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0nd9hipz1jhjdv6hrm6q2jpppanh8nmkpy9zpayymy4dwif8a49q";
|
||||
x86_64-darwin = "1fk146dikiy8dab83v4j6jrnzdg8dxnjvwmdddif130jrpxsp875";
|
||||
aarch64-linux = "0zqm8zl3vhisp6rlb2vhc2i0z4rln38858l07r70jr76zxbbs5xv";
|
||||
aarch64-darwin = "0i0bsrygdg2ij3wf0jm9n6fci5zrghnvzdw0p528c08rjgkhrmrb";
|
||||
armv7l-linux = "0h0v5irf23ijn21j4sll2ynj12wclm17bh46s1dlpzy73f4h17jb";
|
||||
x86_64-linux = "0mnblhg4mfj2231v344h7m9gm3pd7v79jarifcpskxh23gry3scy";
|
||||
x86_64-darwin = "0iv5hgf60nmfli0w4h3as41bhmsmp8kiynnsjrxp915v6im3jxxj";
|
||||
aarch64-linux = "01w3x7syi0m1hk2xm80h3vz4grz462c0fqmgvbflcgdib88wlmj7";
|
||||
aarch64-darwin = "0gzha0rp4mdkk23065a17pqjbz3i4p98i4cmfwz476sqssax8sha";
|
||||
armv7l-linux = "05i6x23h6mmaxx2gchb9p928l6mcs69pwxg5mqvi8aq719gr7kd4";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
|
||||
@ -29,7 +29,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.85.2.24019";
|
||||
version = "1.86.2.24054";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, alsa-lib
|
||||
, darwin
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, gtksourceview3
|
||||
, libGL
|
||||
@ -10,26 +10,25 @@
|
||||
, libX11
|
||||
, libXv
|
||||
, libao
|
||||
, libicns
|
||||
, libpulseaudio
|
||||
, openal
|
||||
, pkg-config
|
||||
, runtimeShell
|
||||
, stdenv
|
||||
, udev
|
||||
# Darwin dependencies
|
||||
, libicns
|
||||
, darwin
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "higan";
|
||||
version = "115-unstable-2023-11-13";
|
||||
version = "115-unstable-2024-02-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "higan-emu";
|
||||
repo = "higan";
|
||||
rev = "993368d917cb750107390effe2cd394ba8710208";
|
||||
hash = "sha256-D21DFLnYl2J4JhwmVmEKHhtglZWxVBrl/kOcvxJYbnA=";
|
||||
rev = "ba4b918c0bbcc302e0d5d2ed70f2c56214d62681";
|
||||
hash = "sha256-M8WaPrOPSRKxhYcf6ffNkDzITkCltNF9c/zl0GmfJrI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -71,14 +70,34 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildPhase = ''
|
||||
buildPhase = let
|
||||
platform =
|
||||
if stdenv.isLinux
|
||||
then "linux"
|
||||
else if stdenv.isDarwin
|
||||
then "macos"
|
||||
else if stdenv.isBSD
|
||||
then "bsd"
|
||||
else if stdenv.isWindows
|
||||
then "windows"
|
||||
else throw "Unknown platform for higan: ${stdenv.hostPlatform.system}";
|
||||
in ''
|
||||
runHook preBuild
|
||||
|
||||
make -j $NIX_BUILD_CORES compiler=${stdenv.cc.targetPrefix}c++ \
|
||||
platform=linux openmp=true hiro=gtk3 build=accuracy local=false \
|
||||
cores="cv fc gb gba md ms msx ngp pce sfc sg ws" -C higan-ui
|
||||
make -j $NIX_BUILD_CORES compiler=${stdenv.cc.targetPrefix}c++ \
|
||||
platform=linux openmp=true hiro=gtk3 -C icarus
|
||||
make -C higan-ui -j$NIX_BUILD_CORES \
|
||||
compiler=${stdenv.cc.targetPrefix}c++ \
|
||||
platform=${platform} \
|
||||
openmp=true \
|
||||
hiro=gtk3 \
|
||||
build=accuracy \
|
||||
local=false \
|
||||
cores="cv fc gb gba md ms msx ngp pce sfc sg ws"
|
||||
|
||||
make -C icarus -j$NIX_BUILD_CORES \
|
||||
compiler=${stdenv.cc.targetPrefix}c++ \
|
||||
platform=${platform} \
|
||||
openmp=true \
|
||||
hiro=gtk3
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@ -154,5 +173,5 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
# TODO: select between Qt, GTK2 and GTK3
|
||||
})
|
||||
# TODO: select between Qt and GTK3
|
||||
|
||||
@ -20,17 +20,21 @@
|
||||
, librsvg
|
||||
, libcanberra-gtk3
|
||||
, gtk-mac-integration
|
||||
, exiv2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rawtherapee";
|
||||
version = "5.9";
|
||||
version = "5.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Beep6581";
|
||||
repo = "RawTherapee";
|
||||
rev = version;
|
||||
hash = "sha256-kdctfjss/DHEcaSDPXcmT20wXTwkI8moRX/i/5wT5Hg=";
|
||||
hash = "sha256-rIwwKNm7l7oPEt95sHyRj4aF3mtnvM4KAu8oVaIMwyE=";
|
||||
# The developpers ask not to use the tarball from Github releases, see
|
||||
# https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers
|
||||
forceFetchGit = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -61,6 +65,7 @@ stdenv.mkDerivation rec {
|
||||
libsigcxx
|
||||
lensfun
|
||||
librsvg
|
||||
exiv2
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libcanberra-gtk3
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
|
||||
@ -9,43 +9,43 @@
|
||||
let
|
||||
|
||||
pname = "1password";
|
||||
version = if channel == "stable" then "8.10.24" else "8.10.26-38.BETA";
|
||||
version = if channel == "stable" then "8.10.26" else "8.10.28-1.BETA";
|
||||
|
||||
sources = {
|
||||
stable = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||
hash = "sha256-vYk7WHGVOzrrep6vmA58ELa6aDsZFUw5D2StCYP0Ioc=";
|
||||
hash = "sha256-w2Msl8eSQGX6euRcNJY4rET2yJpLWyfWzqvf0veFDU0=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
|
||||
hash = "sha256-HuhoGG2aQ2NcbZlQfUmGUl0IvhXPO5uV7x4WKJRR7Ew=";
|
||||
hash = "sha256-3Hq202h2BOUnk1XiAgeW2Tc2BBq3ZCN0EXTh8u3OQ6o=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
hash = "sha256-RHn1JJoRLWfqOTx0Di0nfHM7fbLs54DdWlI+PTQs1sQ=";
|
||||
hash = "sha256-PXlmJfcMiTHdUoXfnk2Za86xUHozQF8cpKMJ75SmCjg=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
hash = "sha256-ZjmgkGTY6KQ0vv7ILMMLYsK7N2YLmJGCBS6954v0JX8=";
|
||||
hash = "sha256-Wd5rsln8itagb/F5ZaDenBiBjJc8SlRxtlWD+JCDrVY=";
|
||||
};
|
||||
};
|
||||
beta = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
|
||||
hash = "sha256-7+rwEX/BP5KD77djrJXCl41zviwHfiEi+WZfQeOQksc=";
|
||||
hash = "sha256-2XwSBJHvv0YYMQUHw2baiMJm5FizmxbaKoQaCIRc5UY=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
|
||||
hash = "sha256-ELnO6cRgyZQHWTdB0143Z37Tdkc2iZUauFWTf3eL8AE=";
|
||||
hash = "sha256-pxEGRpzMaxxJ+W2lSDZ7jNKHLQ22pgOKqD/Bt6ot2lk=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
hash = "sha256-fTpz1POmnqWcMtKCfkwyEFoyrZcpV5y7UP4DamsKbzU=";
|
||||
hash = "sha256-WoitPHQ6yW5jmCGL976am73TTGbcqBfCvYnDKUORAVU=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
hash = "sha256-vAWPcOrjrcY8rC0N9PuNe+vivOkWvB6etW2QQWJJz1k=";
|
||||
hash = "sha256-YE0TvbA7jXpISywC/AWFBfV09jjgY+DLHhRUYbxpaXE=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
buildDotnetModule rec {
|
||||
pname = "ArchiSteamFarm";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "5.5.0.11";
|
||||
version = "5.5.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JustArchiNET";
|
||||
repo = "ArchiSteamFarm";
|
||||
rev = version;
|
||||
hash = "sha256-VlJiTCdoH6hlVtQgECIlbsQvg3S58B5IIy1zRxh1eOg=";
|
||||
hash = "sha256-9ISEIKrAK6UTDM3TPizBRMU+wfiinhnaWmS5CkXpkYo=";
|
||||
};
|
||||
|
||||
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
|
||||
@ -76,6 +76,6 @@ buildDotnetModule rec {
|
||||
homepage = "https://github.com/JustArchiNET/ArchiSteamFarm";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "ArchiSteamFarm";
|
||||
maintainers = with maintainers; [ SuperSandro2000 lom ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
37
pkgs/applications/misc/ArchiSteamFarm/deps.nix
generated
37
pkgs/applications/misc/ArchiSteamFarm/deps.nix
generated
@ -58,10 +58,11 @@
|
||||
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; })
|
||||
(fetchNuGet { pname = "Markdig.Signed"; version = "0.34.0"; sha256 = "1jrs5fc8k99mh1kipvvlgwm0qlacrsh82bbpdclb84xz0h6nwwrh"; })
|
||||
(fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; })
|
||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; sha256 = "1gljgi69k0fz8vy8bn6xlyxabj6q4vls2zza9wz7ng6ix3irm89r"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; })
|
||||
@ -71,19 +72,25 @@
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.3"; sha256 = "0njmg2lygnirnfjv9gck2f5lq4ly5rgws9cpf8qj3kwcwxfp0b9s"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.1"; sha256 = "0dvknvmnzi3jn2kz0fbcb3ilryd75dwyiwqn6cwc6nd5gdz4mdlm"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.1"; sha256 = "03pd6b35a5j1qxmcf9552rp43fwddn1z3czyb6wlf1w1f95b5fqb"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.1"; sha256 = "0368p59kf6r9dyk511phl65wvk76n8885d2m9812fpj0ifqcdqg8"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.1"; sha256 = "0i8mqrvzx9xi9pg1c92iy6cr756nnc3lr5cdawj0yh1x919wvx59"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; sha256 = "1drbgqdcvbpisjn8mqfgba1pwb6yri80qc4mfvyczqwrcsj5k2ja"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
|
||||
(fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; })
|
||||
(fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.0"; sha256 = "1b52s7z01wkg83dpkpyg7girjflm84zr65pacsfwm2hvhb9xa2w6"; })
|
||||
(fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.0.0"; sha256 = "0pvr4yga99fqr4z8s8js9hxki5c92qy7scvpqwslws5mri625m38"; })
|
||||
(fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.0.0"; sha256 = "0zzrwp5in56fhc2cdmn4i44v2jf13frbjwpb9v8s7fkr9ky4wh5w"; })
|
||||
(fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.0"; sha256 = "1qbf922frk4c0cam57d98f3d5q5226pgrgjm7pfcamwy5whvx5sh"; })
|
||||
(fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.0"; sha256 = "0my1fihyh86rckfzbrvl5kdcq34yp0ywl8azs2gx3c27sg4pjrp2"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
|
||||
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.1.1"; sha256 = "0y3ic8jv5jhld6gan2qfa2wyk4z57f7y4y5a47njr0jvxxnarg2c"; })
|
||||
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.1.1"; sha256 = "1lbgkrbrkmw4c54g61cwbmwc4zl8hyqmp283ymvj93lq7chbxasn"; })
|
||||
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.0"; sha256 = "0n7iw8ppjyps4sg0rfh5pags4wq58yg1g9vnxfwa73z38jws2c10"; })
|
||||
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.0"; sha256 = "0n9aab1cxf8w23dl4yw7rqpi47v7gd02csq3zisc5whsrb9i0xbq"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })
|
||||
@ -91,10 +98,10 @@
|
||||
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
|
||||
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
|
||||
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
|
||||
(fetchNuGet { pname = "NLog"; version = "5.2.7"; sha256 = "1gq5l9qv3vnl0rvxa110bbqsq6m43h8h912xijqab1hsjdpb46q3"; })
|
||||
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.7"; sha256 = "1hv2v4hqqq86vjvxa0cbk4klaii8n8h1wjrlsfzbp9nnxnzg9pzi"; })
|
||||
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.7"; sha256 = "1jifwnvkfi3jankan7543q985gzrywddvajlqrf573aa2dbp5n1f"; })
|
||||
(fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; })
|
||||
(fetchNuGet { pname = "NLog"; version = "5.2.8"; sha256 = "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12"; })
|
||||
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; })
|
||||
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.8"; sha256 = "05a6bzvdf63lbnn6sj3yfggxcgv96j91kdbcw0ac5hxl58df58r6"; })
|
||||
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
|
||||
(fetchNuGet { pname = "protobuf-net"; version = "3.2.26"; sha256 = "1mcg46xnhgqwjacy6j8kvp3rylpi26wjnmhwv8mh5cwjya9nynqb"; })
|
||||
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.26"; sha256 = "1wrr38ygdanf121bkl8b1d4kz1pawm064z69bqf3qbr46h4j575w"; })
|
||||
(fetchNuGet { pname = "SteamKit2"; version = "2.5.0"; sha256 = "06rdagrxqws5yq1nrsd8chv3n9kgrb8rg894vcc40a8w6v27222w"; })
|
||||
@ -112,7 +119,7 @@
|
||||
(fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; })
|
||||
(fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; })
|
||||
(fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; })
|
||||
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.3"; sha256 = "1fls88ffq34j1gr6zay1crm27v3sjs5fa4mvj9akqjq05bxanlhk"; })
|
||||
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; })
|
||||
(fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; })
|
||||
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
|
||||
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "asf-ui";
|
||||
version = "f84a296f0ab029e56baba3cca45e5cf21129fd76";
|
||||
version = "7406f7126a8351db67aad9f3a0f90c9dc123d80d";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JustArchiNET";
|
||||
@ -10,10 +10,10 @@ buildNpmPackage rec {
|
||||
# updated by the update script
|
||||
# this is always the commit that should be used with asf-ui from the latest asf version
|
||||
rev = version;
|
||||
hash = "sha256-NISUhxClFAzLQp4o9AzMzasPV9+aBAyDd1tuNT7HJw4=";
|
||||
hash = "sha256-yTBJoihDc4z4+a03S56MQORvz/l6aqBDzLEi0UrM1N4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-kI7kgSw0xs8Hsa/5lhLteDo8TgwyxIxKE1QK92D1Qio=";
|
||||
npmDepsHash = "sha256-S/OwjmfAyEVZfWQ7vqKFctbJRqED0HVJlWEGXrqB1Ys=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cotp";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "replydev";
|
||||
repo = "cotp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-S2658xkaDshQBYfy8mwuuBAKWGF4j+UYtapqPEf1wP4=";
|
||||
hash = "sha256-q0SI/y4pSNoU+4aQzpkUNioqrxmLxiA2GD1pmyLUISw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DGx/LsKzoITA4extStjULiuiHJx0sTlPloE8h8MvnXQ=";
|
||||
cargoHash = "sha256-pwhihmrFzb7y4ztXnzJVeMbo5VBoyjJTEDh5ogECLrA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libxcb ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, lib
|
||||
, fetchzip
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, runCommand
|
||||
, appimageTools
|
||||
@ -24,6 +23,13 @@ let
|
||||
}
|
||||
''
|
||||
appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname}
|
||||
|
||||
# JetBrains ship a broken desktop file. Despite registering a custom
|
||||
# scheme handler for jetbrains:// URLs, they never mark the command as
|
||||
# being suitable for passing URLs to. Ergo, the handler never receives
|
||||
# its payload. This causes various things to break, including login.
|
||||
# Reported upstream at: https://youtrack.jetbrains.com/issue/TBX-11478/
|
||||
sed -Ei '/^Exec=/s/( %U)?$/ %U/' $out/jetbrains-toolbox.desktop
|
||||
'';
|
||||
|
||||
appimage = appimageTools.wrapAppImage {
|
||||
@ -31,19 +37,6 @@ let
|
||||
src = appimageContents;
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs);
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "JetBrains Toolbox";
|
||||
exec = "jetbrains-toolbox";
|
||||
comment = "JetBrains Toolbox";
|
||||
desktopName = "JetBrains Toolbox";
|
||||
type = "Application";
|
||||
icon = "jetbrains-toolbox";
|
||||
terminal = false;
|
||||
categories = [ "Development" ];
|
||||
startupWMClass = "jetbrains-toolbox";
|
||||
startupNotify = false;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src appimage;
|
||||
@ -61,7 +54,7 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
desktopItems = [ "${appimageContents}/jetbrains-toolbox.desktop" ];
|
||||
|
||||
# Disabling the tests, this seems to be very difficult to test this app.
|
||||
doCheck = false;
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.5.3";
|
||||
version = "1.5.8";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
@ -25,7 +25,7 @@ let
|
||||
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
hash = if stdenv.isDarwin then "sha256-AXjzQwZxyRaI8mMU2EsNK0fRcXS7UNNBWPXeJzgomlY=" else "sha256-F7nqWOeBGGSmSVNTpcx3lHRejSjNeM2BBqS9tsasTvg=";
|
||||
hash = if stdenv.isDarwin then "sha256-5olNmOLE9AgVUyRY8PylUPGYIMS+KoDG3g2BMCySdyE=" else "sha256-oc2iA2E3ac/uUNv6unzfac5meHqQzmzDVl/M9jNpS/M=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/src/gui/src/OSXHelpers.mm b/src/gui/src/OSXHelpers.mm
|
||||
index 0c98afc1..38c190a6 100644
|
||||
--- a/src/gui/src/OSXHelpers.mm
|
||||
+++ b/src/gui/src/OSXHelpers.mm
|
||||
@@ -20,10 +20,6 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <CoreData/CoreData.h>
|
||||
#import <Cocoa/Cocoa.h>
|
||||
-#import <UserNotifications/UNNotification.h>
|
||||
-#import <UserNotifications/UNUserNotificationCenter.h>
|
||||
-#import <UserNotifications/UNNotificationContent.h>
|
||||
-#import <UserNotifications/UNNotificationTrigger.h>
|
||||
|
||||
#import <QtGlobal>
|
||||
|
||||
@ -27,12 +27,12 @@
|
||||
, avahi-compat
|
||||
|
||||
# MacOS / darwin
|
||||
, darwin
|
||||
, ApplicationServices
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, CoreServices
|
||||
, ScreenSaver
|
||||
, UserNotifications
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -50,10 +50,6 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
# Without this OpenSSL from nixpkgs is not detected
|
||||
./darwin-non-static-openssl.patch
|
||||
] ++ lib.optionals (stdenv.isDarwin && !(darwin.apple_sdk.frameworks ? UserNotifications)) [
|
||||
# We cannot include UserNotifications because of a build failure in the Apple SDK.
|
||||
# The functions used from it are already implicitly included anyways.
|
||||
./darwin-no-UserNotifications-includes.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -79,8 +75,7 @@ stdenv.mkDerivation rec {
|
||||
Cocoa
|
||||
CoreServices
|
||||
ScreenSaver
|
||||
] ++ lib.optionals (stdenv.isDarwin && darwin.apple_sdk.frameworks ? UserNotifications) [
|
||||
darwin.apple_sdk.frameworks.UserNotifications
|
||||
UserNotifications
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
util-linux
|
||||
libselinux
|
||||
@ -110,6 +105,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# filter out tests failing with sandboxing on darwin
|
||||
export GTEST_FILTER=-ServerConfigTests.serverconfig_will_deem_equal_configs_with_same_cell_names:NetworkAddress.hostname_valid_parsing
|
||||
'' + ''
|
||||
bin/unittests
|
||||
runHook postCheck
|
||||
'';
|
||||
@ -126,7 +125,7 @@ stdenv.mkDerivation rec {
|
||||
cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
|
||||
substitute ../res/synergy.desktop $out/share/applications/synergy.desktop \
|
||||
--replace "/usr/bin" "$out/bin"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString (stdenv.isDarwin && withGUI) ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r bundle/Synergy.app $out/Applications
|
||||
ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From 04933c578f51aa1f536991318dc5aede57f81c0d Mon Sep 17 00:00:00 2001
|
||||
From: Attila Lendvai <attila@lendvai.name>
|
||||
Date: Sat, 30 Jan 2021 14:02:02 +0100
|
||||
Subject: [PATCH 1/2] clef-service: accept default CONFIGDIR from the
|
||||
environment
|
||||
|
||||
---
|
||||
packaging/bee-clef-service | 15 ++++++++++-----
|
||||
1 file changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/packaging/bee-clef-service b/packaging/bee-clef-service
|
||||
index 10bcd92..34c7edd 100755
|
||||
--- a/packaging/bee-clef-service
|
||||
+++ b/packaging/bee-clef-service
|
||||
@@ -1,16 +1,21 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
start() {
|
||||
- KEYSTORE=/var/lib/bee-clef/keystore
|
||||
- CONFIGDIR=/var/lib/bee-clef
|
||||
+ if [ -z "$CONFIGDIR" ]; then
|
||||
+ CONFIGDIR=/var/lib/bee-clef
|
||||
+ fi
|
||||
+ if [ -z "$PASSWORD_FILE" ]; then
|
||||
+ PASSWORD_FILE=${CONFIGDIR}/password
|
||||
+ fi
|
||||
+ KEYSTORE=${CONFIGDIR}/keystore
|
||||
+ SECRET=$(cat ${PASSWORD_FILE})
|
||||
CHAINID=5
|
||||
- SECRET=$(cat /var/lib/bee-clef/password)
|
||||
# clef with every start sets permissions back to 600
|
||||
- (sleep 4; chmod 660 /var/lib/bee-clef/clef.ipc) &
|
||||
+ (sleep 4; chmod 660 ${CONFIGDIR}/clef.ipc) &
|
||||
( sleep 2; cat << EOF
|
||||
{ "jsonrpc": "2.0", "id":1, "result": { "text":"$SECRET" } }
|
||||
EOF
|
||||
-) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath /var/lib/bee-clef
|
||||
+) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR}
|
||||
}
|
||||
|
||||
stop() {
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 1a1ab986245e8b74648a1a0adb5d1c7019561d18 Mon Sep 17 00:00:00 2001
|
||||
From: Attila Lendvai <attila@lendvai.name>
|
||||
Date: Sat, 30 Jan 2021 15:24:57 +0100
|
||||
Subject: [PATCH 2/2] nix diff for substituteAll
|
||||
|
||||
---
|
||||
packaging/bee-clef-service | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/packaging/bee-clef-service b/packaging/bee-clef-service
|
||||
index 34c7edd..31e9d95 100755
|
||||
--- a/packaging/bee-clef-service
|
||||
+++ b/packaging/bee-clef-service
|
||||
@@ -15,7 +15,7 @@ start() {
|
||||
( sleep 2; cat << EOF
|
||||
{ "jsonrpc": "2.0", "id":1, "result": { "text":"$SECRET" } }
|
||||
EOF
|
||||
-) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR}
|
||||
+) | @clefBinary@ --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules @out@/share/bee-clef/rules.js --nousb --4bytedb-custom @out@/share/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR}
|
||||
}
|
||||
|
||||
stop() {
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
{ version ? "release", stdenv, lib, fetchFromGitHub, go-ethereum }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bee-clef";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethersphere";
|
||||
repo = "bee-clef";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1sfwql0kvnir8b9ggpqcyc0ar995gxgfbhqb1xpfzp6wl0g3g4zz";
|
||||
};
|
||||
|
||||
buildInputs = [ go-ethereum ];
|
||||
|
||||
clefBinary = "${go-ethereum}/bin/clef";
|
||||
|
||||
patches = [
|
||||
./0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch
|
||||
./0002-nix-diff-for-substituteAll.patch
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin/
|
||||
mkdir -p $out/share/bee-clef/
|
||||
mkdir -p $out/lib/systemd/system/
|
||||
cp packaging/bee-clef.service $out/lib/systemd/system/
|
||||
substituteAll packaging/bee-clef-service $out/share/bee-clef/bee-clef-service
|
||||
substituteAll ${./ensure-clef-account} $out/share/bee-clef/ensure-clef-account
|
||||
substituteAll packaging/bee-clef-keys $out/bin/bee-clef-keys
|
||||
cp packaging/rules.js packaging/4byte.json $out/share/bee-clef/
|
||||
chmod +x $out/bin/bee-clef-keys
|
||||
chmod +x $out/share/bee-clef/bee-clef-service
|
||||
chmod +x $out/share/bee-clef/ensure-clef-account
|
||||
patchShebangs $out/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# homepage = "https://gateway.ethswarm.org/bzz/docs.swarm.eth/docs/installation/bee-clef/";
|
||||
homepage = "https://docs.ethswarm.org/docs/installation/bee-clef";
|
||||
description = "External signer for Ethereum Swarm Bee";
|
||||
longDescription = ''
|
||||
clef is go-ethereum's external signer.
|
||||
|
||||
bee-clef is a package that starts up a vanilla clef instance as a systemd service,
|
||||
but configured in such a way that is suitable for bee (relaxed security for
|
||||
automated operation).
|
||||
|
||||
This package contains the files necessary to run the bee-clef service.
|
||||
'';
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ attila-lendvai ];
|
||||
platforms = go-ethereum.meta.platforms;
|
||||
};
|
||||
}
|
||||
@ -1,55 +1,34 @@
|
||||
{ version ? "release", lib, fetchFromGitHub, buildGoModule }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
versionSpec = rec {
|
||||
unstable = rec {
|
||||
pname = "bee-unstable";
|
||||
version = "2021-01-30";
|
||||
rev = "824636a2c2629c329ab10275cef6a0b7395343ad";
|
||||
goVersionString = "g" + builtins.substring 0 7 rev; # this seems to be some kind of standard of git describe...
|
||||
sha256 = "0ly1yqjq29arbak8lchdradf39l5bmxpbfir6ljjc7nyqdxz0sxg";
|
||||
vendorHash = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA=";
|
||||
};
|
||||
release = rec {
|
||||
pname = "bee";
|
||||
version = "0.5.0";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-3Oy9RhgMPRFjUs3Dj8XUhAqoxx5BTi32OiK4Y8YEG2Q=";
|
||||
vendorHash = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA=";
|
||||
};
|
||||
"0.5.0" = release;
|
||||
"0.4.1" = rec {
|
||||
pname = "bee";
|
||||
version = "0.4.1";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1bmgbav52pcb5p7cgq9756512fzfqhjybyr0dv538plkqx47mpv7";
|
||||
vendorHash = "sha256-UGxiCXWlIfnhRZZBMYcWXFj77pqvJkb5wOllSdQeaUg=";
|
||||
};
|
||||
}.${version};
|
||||
|
||||
in
|
||||
|
||||
buildGoModule {
|
||||
inherit (versionSpec) pname version vendorHash;
|
||||
buildGoModule rec {
|
||||
pname = "bee";
|
||||
version = "1.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethersphere";
|
||||
repo = "bee";
|
||||
inherit (versionSpec) rev sha256;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LUOKF1073GmQWG2q4w0cTErSHw7ok5N6PQZ45xpjYx4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UdsF/otjXqS1NY3PkCimRiD93hGntHG3Xhw6avFtHog=";
|
||||
|
||||
subPackages = [ "cmd/bee" ];
|
||||
|
||||
# no symbol table, no debug info, and pass the commit for the version string
|
||||
ldflags = lib.optionals ( lib.hasAttr "goVersionString" versionSpec)
|
||||
[ "-s" "-w" "-X=github.com/ethersphere/bee.commit=${versionSpec.goVersionString}" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/ethersphere/bee.version=${version}"
|
||||
"-X github.com/ethersphere/bee/pkg/api.Version=5.2.0"
|
||||
"-X github.com/ethersphere/bee/pkg/api.DebugVersion=4.1.0"
|
||||
"-X github.com/ethersphere/bee/pkg/p2p/libp2p.reachabilityOverridePublic=false"
|
||||
"-X github.com/ethersphere/bee/pkg/postage/listener.batchFactorOverridePublic=5"
|
||||
];
|
||||
|
||||
# Mimic the bee Makefile: without disabling CGO, two (transitive and
|
||||
# unused) dependencies would fail to compile.
|
||||
preBuild = ''
|
||||
export CGO_ENABLED=0
|
||||
'';
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/systemd/system
|
||||
@ -65,11 +44,13 @@ buildGoModule {
|
||||
longDescription = ''
|
||||
A decentralised storage and communication system for a sovereign digital society.
|
||||
|
||||
Swarm is a system of peer-to-peer networked nodes that create a decentralised storage and communication service. The system is economically self-sustaining due to a built-in incentive system enforced through smart contracts on the Ethereum blockchain.
|
||||
Swarm is a system of peer-to-peer networked nodes that create a decentralised storage
|
||||
and communication service. The system is economically self-sustaining due to a built-in
|
||||
incentive system enforced through smart contracts on the Ethereum blockchain.
|
||||
|
||||
Bee is a Swarm node implementation, written in Go.
|
||||
'';
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ attila-lendvai ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
set -e
|
||||
|
||||
# NOTE This file is called by the systemd service in its preStart
|
||||
# hook, but it's not Nix specific in any way. Ideally, the same file
|
||||
# should be called from the postinst scripts of the other packages,
|
||||
# but... the world is not ideal.
|
||||
|
||||
# What follows was extracted from, and should be in sync with
|
||||
# https://github.com/ethersphere/bee-clef/tree/master/packaging
|
||||
|
||||
DATA_DIR="$1"
|
||||
CONFIG_DIR="$2"
|
||||
PASSWORD_FILE=${DATA_DIR}/password
|
||||
MASTERSEED=${DATA_DIR}/masterseed.json
|
||||
KEYSTORE=${DATA_DIR}/keystore
|
||||
|
||||
echo "ensure-clef-account $DATA_DIR $CONFIG_DIR"
|
||||
|
||||
if ! test -f ${PASSWORD_FILE}; then
|
||||
< /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 > ${PASSWORD_FILE}
|
||||
chmod 0400 ${PASSWORD_FILE}
|
||||
echo "Initialized ${PASSWORD_FILE} from /dev/urandom"
|
||||
fi
|
||||
|
||||
if ! test -f ${MASTERSEED}; then
|
||||
parse_json() { echo $1|sed -e 's/[{}]/''/g'|sed -e 's/", "/'\",\"'/g'|sed -e 's/" ,"/'\",\"'/g'|sed -e 's/" , "/'\",\"'/g'|sed -e 's/","/'\"---SEPERATOR---\"'/g'|awk -F=':' -v RS='---SEPERATOR---' "\$1~/\"$2\"/ {print}"|sed -e "s/\"$2\"://"|tr -d "\n\t"|sed -e 's/\\"/"/g'|sed -e 's/\\\\/\\/g'|sed -e 's/^[ \t]*//g'|sed -e 's/^"//' -e 's/"$//' ; }
|
||||
SECRET=$(cat ${PASSWORD_FILE})
|
||||
CLEF="@clefBinary@ --configdir ${DATA_DIR} --keystore ${KEYSTORE} --stdio-ui"
|
||||
$CLEF init >/dev/null << EOF
|
||||
$SECRET
|
||||
$SECRET
|
||||
EOF
|
||||
$CLEF newaccount >/dev/null << EOF
|
||||
$SECRET
|
||||
EOF
|
||||
$CLEF setpw 0x$(parse_json $(cat ${KEYSTORE}/*) address) >/dev/null << EOF
|
||||
$SECRET
|
||||
$SECRET
|
||||
$SECRET
|
||||
EOF
|
||||
$CLEF attest $(sha256sum ${CONFIG_DIR}/rules.js | cut -d' ' -f1 | tr -d '\n') >/dev/null << EOF
|
||||
$SECRET
|
||||
EOF
|
||||
echo "Clef data dir initialized"
|
||||
fi
|
||||
@ -93,11 +93,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.62.165";
|
||||
version = "1.63.161";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-FyTHFoPP4u5BF3vrgBnM5aFLPfijMzmkq06HXMDvv4k=";
|
||||
hash = "sha256-FAoQ/b88HtrtTq+yEiUzlsZAnUbps9bb0V9Iy3IIMR0=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -90,7 +90,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.9";
|
||||
version = "13.0.10";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@ -102,7 +102,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-TAtBlSkfpqsROq3bV9kwDYIJQAXSVkwxQwj3wIYEI7k=";
|
||||
hash = "sha256-+8b3K3XLSPlndR12KNUH0lsPquhTupxQrLBuSEGac7Y=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.9";
|
||||
version = "13.0.10";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-qcB3DLVt2J4WNJLunDSnZdyflMY9/NIsGrj+TkQeJEg=";
|
||||
hash = "sha256-/Lpz8R2NvMuV+3NzBy7gC/vWheHliNm9thQQw/9bkuw=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-aq2WffQ3ZUL0vopbDU5n9bWb8MC7rHoaz54kz2oaXz8=";
|
||||
hash = "sha256-zDiXXNRik/R3DBQEWBuXD31MI+Kg4UL1KK6em+JtyCs=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -54,15 +54,15 @@
|
||||
|
||||
let
|
||||
version = {
|
||||
corporate = "23.9.1.1016-1";
|
||||
beta = "23.9.1.1028-1";
|
||||
stable = "23.9.1.962-1";
|
||||
corporate = "23.11.1.822-1";
|
||||
beta = "24.1.1.939-1";
|
||||
stable = "24.1.1.940-1";
|
||||
}.${edition};
|
||||
|
||||
hash = {
|
||||
corporate = "sha256-A/MjphA6vefDzPmShpPbgjDTl4WnCiZWuHofy1Djrzc=";
|
||||
beta = "sha256-vnz1weMwR3V/mBNzrJ0iqnA/aifYTCucW+9kyy/0SnA=";
|
||||
stable = "sha256-VrDqFLvK7RdnV6Yt1DILu7mV1WFcilOH5+VKlCdpXjc=";
|
||||
corporate = "sha256-OOcz2dQeVea0vBjF1FyrCsnRR+WrCzfLTd+YXpLJCsI=";
|
||||
beta = "sha256-Meswp1aeNTBr79l7XGWqJT9qqUdOfSzIpdL1L29UfJw=";
|
||||
stable = "sha256-FZHoCRedpHHVwibSXts2DncUN83PZ9UlVOSXPjgAaNs=";
|
||||
}.${edition};
|
||||
|
||||
app = {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atmos";
|
||||
version = "1.63.0";
|
||||
version = "1.64.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudposse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3XmRTboq8DSIV4w6EFsbgl21eY3QA5DicE9nM5sAZOQ=";
|
||||
sha256 = "sha256-wNsyZ0Y3siSZ+i/G3bH/S8wkrmK+FZ2sn5XByDkZ80c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-i7m9YXPlWqHtvC4Df7v5bLWt2tqeT933t2+Xit5RQxg=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeshark";
|
||||
version = "52.1.45";
|
||||
version = "52.1.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshark";
|
||||
repo = "kubeshark";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XxdOXcdXkMedhhuVbWNnW0ONVmEhsXyFqyN2moj46Nc=";
|
||||
hash = "sha256-Nefi/FgIrUqCu+46sedZSirrEEJJ2OnOE1PXTQM+y2o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo=";
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "opentofu";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wEDxZtmC+SLIYbN+mGTmefcD6VZu87E9E0XhiJPGmK0=";
|
||||
hash = "sha256-CYiwn2NDIAx30J8tmbrV45dbCIGoA3U+yBdMj4RX5Ho=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk=";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.55.3";
|
||||
version = "0.55.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FwLL2/V8LIihsr3/JBIuzUH37sRX2xw7nk+KlIIhzxs=";
|
||||
hash = "sha256-6ffPHam6dFPurlm+VWCI+Z6m3eG+NX/ii8ANCbjtF5Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uFSkolmQV11cY+3ZWrlByHDFolpr2E+9/R95bhBn6zo=";
|
||||
vendorHash = "sha256-gXqpBi89VVxHSuHzzcxVRAsdu7TRsNo/vQgI1tMVuaM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix {} rec {
|
||||
pname = "signal-desktop-beta";
|
||||
dir = "Signal Beta";
|
||||
version = "6.48.0-beta.1";
|
||||
version = "7.0.0-beta.1";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
|
||||
hash = "sha256-lDiab7XMXcg0XI4+7DJr5PWBAWes3cnL6oxiLy63eqY=";
|
||||
hash = "sha256-mMwOQVPihko/+ukEsaSu8l2u7obuY6gkTLAhSoWAVLo=";
|
||||
}
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
gnuradio.pkgs.mkDerivation rec {
|
||||
pname = "gnss-sdr";
|
||||
version = "0.0.17";
|
||||
version = "0.0.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnss-sdr";
|
||||
repo = "gnss-sdr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0aAjkrVAswoRL/KANBSZ5Jq4Y9VwOHZKUKLpXDdKtk8=";
|
||||
sha256 = "sha256-IbkYdw1pwI+FMnZMChsxMz241Kv4EzMcBb0mm6/jq1k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -75,27 +75,27 @@ gnuradio.pkgs.mkDerivation rec {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGFlags_INCLUDE_DIRS=${gflags}/include"
|
||||
"-DGLOG_INCLUDE_DIR=${glog}/include"
|
||||
(lib.cmakeFeature "GFlags_INCLUDE_DIRS" "${gflags}/include")
|
||||
(lib.cmakeFeature "GLOG_INCLUDE_DIR" "${glog}/include")
|
||||
# Should use .dylib if darwin support is requested
|
||||
"-DGFlags_LIBS=${gflags}/lib/libgflags.so"
|
||||
"-DGLOG_LIBRARIES=${glog}/lib/libglog.so"
|
||||
(lib.cmakeFeature "GFlags_LIBS" "${gflags}/lib/libgflags.so")
|
||||
(lib.cmakeFeature "-DGLOG_LIBRARIES" "${glog}/lib/libglog.so")
|
||||
# Use our dependencies glog, gflags and armadillo dependencies
|
||||
"-DENABLE_OWN_GLOG=OFF"
|
||||
"-DENABLE_OWN_ARMADILLO=OFF"
|
||||
"-DENABLE_ORC=ON"
|
||||
"-DENABLE_LOG=ON"
|
||||
"-DENABLE_RAW_UDP=${if enableRawUdp then "ON" else "OFF"}"
|
||||
"-DENABLE_UHD=${if (gnuradio.hasFeature "gr-uhd") then "ON" else "OFF"}"
|
||||
"-DENABLE_FMCOMMS2=${if (gnuradio.hasFeature "gr-iio" && gnuradio.hasFeature "gr-pdu") then "ON" else "OFF"}"
|
||||
"-DENABLE_PLUTOSDR=${if (gnuradio.hasFeature "gr-iio") then "ON" else "OFF"}"
|
||||
"-DENABLE_AD9361=${if (gnuradio.hasFeature "gr-pdu") then "ON" else "OFF"}"
|
||||
"-DENABLE_UNIT_TESTING=OFF"
|
||||
(lib.cmakeBool "ENABLE_OWN_GLOG" false)
|
||||
(lib.cmakeBool "ENABLE_OWN_ARMADILLO" false)
|
||||
(lib.cmakeBool "ENABLE_ORC" true)
|
||||
(lib.cmakeBool "ENABLE_LOG" true)
|
||||
(lib.cmakeBool "ENABLE_RAW_UDP" enableRawUdp)
|
||||
(lib.cmakeBool "ENABLE_UHD" (gnuradio.hasFeature "gr-uhd"))
|
||||
(lib.cmakeBool "ENABLE_FMCOMMS2" (gnuradio.hasFeature "gr-iio" && gnuradio.hasFeature "gr-pdu"))
|
||||
(lib.cmakeBool "ENABLE_PLUTOSDR" (gnuradio.hasFeature "gr-iio"))
|
||||
(lib.cmakeBool "ENABLE_AD9361" (gnuradio.hasFeature "gr-pdu"))
|
||||
(lib.cmakeBool "ENABLE_UNIT_TESTING" false)
|
||||
|
||||
# gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as
|
||||
# armadillo is built using both, so skip checking for them.
|
||||
"-DBLAS_LIBRARIES=-lblas"
|
||||
"-DLAPACK_LIBRARIES=-llapack"
|
||||
(lib.cmakeFeature "BLAS_LIBRARIES" "-lblas")
|
||||
(lib.cmakeFeature "LAPACK_LIBRARIES" "-llapack")
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
--- i/CMakeLists.txt
|
||||
+++ w/CMakeLists.txt
|
||||
@@ -1210,7 +1210,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
|
||||
@@ -1233,7 +1233,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build
|
||||
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
|
||||
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
|
||||
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
|
||||
@ -9,17 +9,17 @@
|
||||
DOWNLOAD_COMMAND ""
|
||||
UPDATE_COMMAND ""
|
||||
PATCH_COMMAND ""
|
||||
@@ -1248,7 +1248,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
@@ -1274,7 +1274,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
)
|
||||
set(VOLK_GNSSSDR_BUILD_BYPRODUCTS
|
||||
${VOLK_GNSSSDR_BUILD_BYPRODUCTS}
|
||||
- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
+ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
- ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
+ ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
@@ -1261,7 +1261,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
|
||||
@@ -1287,7 +1287,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build
|
||||
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
|
||||
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
|
||||
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
|
||||
@ -27,8 +27,8 @@
|
||||
DOWNLOAD_COMMAND ""
|
||||
UPDATE_COMMAND ""
|
||||
PATCH_COMMAND ""
|
||||
@@ -1280,7 +1280,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build
|
||||
@@ -1306,7 +1306,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build
|
||||
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
|
||||
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
|
||||
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
|
||||
@ -36,12 +36,12 @@
|
||||
DOWNLOAD_COMMAND ""
|
||||
UPDATE_COMMAND ""
|
||||
PATCH_COMMAND ""
|
||||
@@ -1319,7 +1319,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
@@ -1346,7 +1346,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH)
|
||||
if(NOT CPUFEATURES_FOUND AND ENABLE_CPUFEATURES)
|
||||
set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
|
||||
- INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
+ INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
- INTERFACE_LINK_LIBRARIES ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
+ INTERFACE_LINK_LIBRARIES ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elan";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leanprover";
|
||||
repo = "elan";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IC/xb4tZer2cbwIusdCwXxJS3K7kN/XFoU4mxKW4dVc=";
|
||||
hash = "sha256-/g5bO3UQcg0XYm62KdoWcVQqOV3SIedWUYLufEcblmE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F80iiXb0UpV+N9q7Msef6/Uzas1DGjMKPWuOKrk8tqU=";
|
||||
cargoHash = "sha256-f8YVUTxHX1FY2p73DlnLDtCJaG/0JImUtJFraV6ErNM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "8.4.8";
|
||||
version = "8.4.12";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iF5+slcPTRK/3SmqR+4KK5KAK5LhKAe+nt+U/B5C3/8=";
|
||||
hash = "sha256-ehQIrTw1+klFW+Hu4WsWaCJ0YoN2hIqryqqaoNQb1us=";
|
||||
# https://github.com/python-versioneer/python-versioneer/issues/217
|
||||
postFetch = ''
|
||||
sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'
|
||||
|
||||
@ -20,12 +20,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitea";
|
||||
version = "1.21.5";
|
||||
version = "1.21.6";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz";
|
||||
hash = "sha256-VnJF6CSssQYs8yIKmXvxYHh2CfLiJhuKtjRdqKIQGxw=";
|
||||
hash = "sha256-tixWipiVHugacTzBurdgfiLnKyVDDcqCPlysj2DoWjg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-vertical-canvas";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aitum";
|
||||
repo = "obs-vertical-canvas";
|
||||
rev = version;
|
||||
sha256 = "sha256-kJJepKUH/tc6iV/zFDtrAa4bM9Gaqc9M7IItytknkGA=";
|
||||
sha256 = "sha256-80yqyfbSFBDLgGzSC8ktJRHFhbD5REWH0Rwrghcu6KY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -41,14 +41,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gamescope";
|
||||
version = "3.14.1";
|
||||
version = "3.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValveSoftware";
|
||||
repo = "gamescope";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-lJt6JVolorQdrhumkW9yjyItxqpw6ZtEUbkjNqzHfb8=";
|
||||
hash = "sha256-Ym1kl9naAm1MGlxCk32ssvfiOlstHiZPy7Ga8EZegus=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -5,17 +5,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "action-validator";
|
||||
version = "0.5.4";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpalmer";
|
||||
repo = "action-validator";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-roWmks+AgRf2ACoI7Vc/QEyqgQ0bR/XhRwLk9VaLEdY=";
|
||||
hash = "sha256-lJHGx/GFddIwVVXRj75Z/l5CH/yuw/uIhr02Qkjruww=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WUtFWuk2y/xXe39doMqANaIr0bbxmLDpT4/H2GRGH6k=";
|
||||
cargoHash = "sha256-mBY+J6JcIhV++tO6Dhw5JvYLSwoYZR3lB3l0KTjkcQM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to validate GitHub Action and Workflow YAML files";
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.19.1";
|
||||
version = "0.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-uRAWcEG4+8tkfHe9bmVSWsRp3A35+5PRPdGuXuDm210=";
|
||||
hash = "sha256-u9VoLGf8Qfy6wtU+rWZvIxOj1Q3RUKjE+LKISKtTKfA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-U7W3Ila75XQDwtcVDEzooLxdbcGZCrUU/Ijcx/xhRaM=";
|
||||
cargoHash = "sha256-IPZ0R7SMdZi/h51lInXhRZFBAyEu/D8fwnUUkWV9Ivg=";
|
||||
|
||||
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
|
||||
44
pkgs/by-name/ca/cavalier/deps.nix
generated
Normal file
44
pkgs/by-name/ca/cavalier/deps.nix
generated
Normal file
@ -0,0 +1,44 @@
|
||||
# This file was automatically generated by passthru.fetch-deps.
|
||||
# Please dont edit it manually, your changes might get overwritten!
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Ace4896.DBus.Services.Secrets"; version = "1.2.0"; sha256 = "1i1rwv8z2dx0mjib7vair2w7ylngmrcpbd012sdlpvdjpx0af0bn"; })
|
||||
(fetchNuGet { pname = "Cake.Tool"; version = "4.0.0"; sha256 = "11vc5fimi6w465081sqxs4zhw7grr6v8ga7nl1mscdl43wv33ql2"; })
|
||||
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
|
||||
(fetchNuGet { pname = "GetText.NET"; version = "1.9.14"; sha256 = "18z4cf0dldcf41z8xgj3gdlvj9w5a9ikgj72623r0i740ndnl094"; })
|
||||
(fetchNuGet { pname = "GirCore.Adw-1"; version = "0.5.0-preview.3"; sha256 = "090kg5v99myd7hi49cz933cl36hk5n586ywy78gf5djn5im3v19l"; })
|
||||
(fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.5.0-preview.3"; sha256 = "0bh1h2hr6givrq6096bvzcsg4lab1hlm7r7h4bqifbw0zmmcfb7k"; })
|
||||
(fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.5.0-preview.3"; sha256 = "194p44gd7r69x70j3qynv5v8awlyxmdazmzpwzgj5ayy2xpdk3hy"; })
|
||||
(fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.5.0-preview.3"; sha256 = "09p097nvs7vi7l14l024m39qyhg1gyqihanq7zv66xqys4hzim1g"; })
|
||||
(fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.5.0-preview.3"; sha256 = "0lspyra1g1rd8hj3f3daxspin5dhgplzgjh4jwhlgzzn648942j0"; })
|
||||
(fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.5.0-preview.3"; sha256 = "090svrddgpliks5r29yncih3572w7gdc552nl16qbviqbmhr0lbs"; })
|
||||
(fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.5.0-preview.3"; sha256 = "1wxwf24gabd69yxpnhv30rn7pcv49w885jdw3nqbrakl7pvv9fza"; })
|
||||
(fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.5.0-preview.3"; sha256 = "0iajydyx79f3khx0fhv8izbxlzxwn6gpps2xzmi9c4v98ly221j3"; })
|
||||
(fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.5.0-preview.3"; sha256 = "114fbgxils50jdy891nwj70yr43lnwgbq9fzxqzywd1kk70k7mww"; })
|
||||
(fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.5.0-preview.3"; sha256 = "0f5s6f6pwc9vc3nm7xfaa06z2klgpg4rv5cdf0cwis3vlncd7dnj"; })
|
||||
(fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.5.0-preview.3"; sha256 = "1fn0b8lwlrmjm9phjq4amqnq3q70fl214115652cap5rz4rjmpgg"; })
|
||||
(fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.5.0-preview.3"; sha256 = "0xska2l44l0j38mlgmrwly1qal9wzbv2w2jjj8gn90sxbygb8zky"; })
|
||||
(fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.5.0-preview.3"; sha256 = "0ccw3bd3kl24mnxbjzhya11i0ln6g1g7q876pyy54cwh48x4mdia"; })
|
||||
(fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.5.0-preview.3"; sha256 = "0lds340p5cci7sjp58nh94jxkjvzfky9cbs2h4q98hglxndjm7r9"; })
|
||||
(fetchNuGet { pname = "Markdig"; version = "0.33.0"; sha256 = "1dj06wgdqmjji4nfr1dysz7hwp5bjgsrk9qjkdq82d7gk6nmhs9r"; })
|
||||
(fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.5"; sha256 = "1ikjxj6wir2jcjwlmd4q7zz0b4g40808gx59alvad31sb2aqp738"; })
|
||||
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.0"; sha256 = "05qjnzk1fxybks92y93487l3mj5nghjcwiy360xjgk3jykz3rv39"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; sha256 = "05392f41ijgn17y8pbjcx535l1k09krnq3xdp60kyq568sn6xk2i"; })
|
||||
(fetchNuGet { pname = "Nickvision.Aura"; version = "2023.11.4"; sha256 = "0gasyglp1pgi0s6zqzmbm603j3j36vvr68grv6g93fdj2vjlmkxs"; })
|
||||
(fetchNuGet { pname = "Octokit"; version = "9.0.0"; sha256 = "0kw49w1hxk4d2x9598012z9q1yr3ml5rm06fy1jnmhy44s3d3jp5"; })
|
||||
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; sha256 = "0cg38xgddww1y93xrnbfn40sin63yl39j5zm7gm5pdgp5si0cf2n"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; sha256 = "1fp9h8c8k6sbsh48b69dc6461isd4dajq7yw5i7j6fhkas78q4zf"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.6"; sha256 = "15v2x7y4k7cl47a9jccbvgbwngwi5dz6qhv0cxpcasx4v5i9aila"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.6"; sha256 = "0dl5an15whs4yl5hm2wibzbfigzck0flah8a07k99y1bhbmv080z"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.6"; sha256 = "1jx8d4dq5w2951b7w722gnxbfgdklwazc48kcbdzylkglwkrqgrq"; })
|
||||
(fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.0"; sha256 = "1j4rsm36bnwqmh5br9mzmj0ikjnc39k26q6l9skjlrnw8hlngwy4"; })
|
||||
(fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
|
||||
(fetchNuGet { pname = "Tmds.DBus"; version = "0.15.0"; sha256 = "1bz5j6wfp9hn4fg5vjxl6mr9lva4gx6zqncqyqxrcb8lw7hvhwc6"; })
|
||||
(fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; })
|
||||
]
|
||||
74
pkgs/by-name/ca/cavalier/package.nix
Normal file
74
pkgs/by-name/ca/cavalier/package.nix
Normal file
@ -0,0 +1,74 @@
|
||||
{ lib
|
||||
, buildDotnetModule
|
||||
, dotnetCorePackages
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, blueprint-compiler
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, wrapGAppsHook4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, cava
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "cavalier";
|
||||
version = "2024.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NickvisionApps";
|
||||
repo = "Cavalier";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SFhEKtYrlnkbLMnxU4Uf4jnFsw0MJHstgZgLLnGC2d8=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_8_0;
|
||||
|
||||
projectFile = "NickvisionCavalier.GNOME/NickvisionCavalier.GNOME.csproj";
|
||||
nugetDeps = ./deps.nix;
|
||||
executables = "NickvisionCavalier.GNOME";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
blueprint-compiler
|
||||
wrapGAppsHook4
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
runtimeDeps = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace NickvisionCavalier.Shared/Linux/org.nickvision.cavalier.desktop.in \
|
||||
--replace-fail '@EXEC@' "NickvisionCavalier.GNOME"
|
||||
install -Dm444 NickvisionCavalier.Shared/Linux/org.nickvision.cavalier.desktop.in -T $out/share/applications/org.nickvision.cavalier.desktop
|
||||
install -Dm444 NickvisionCavalier.Shared/Resources/org.nickvision.cavalier.svg -t $out/share/icons/hicolor/scalable/apps/
|
||||
install -Dm444 NickvisionCavalier.Shared/Resources/org.nickvision.cavalier-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ cava ]}" ];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Visualize audio with CAVA";
|
||||
homepage = "https://github.com/NickvisionApps/Cavalier";
|
||||
mainProgram = "NickvisionCavalier.GNOME";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
18
pkgs/by-name/ca/cavalier/update.sh
Executable file
18
pkgs/by-name/ca/cavalier/update.sh
Executable file
@ -0,0 +1,18 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
|
||||
#shellcheck shell=bash
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
|
||||
https://api.github.com/repos/NickvisionApps/Cavalier/releases/latest | jq -e -r .tag_name)
|
||||
old_version=$(nix-instantiate --eval -A cavalier.version | jq -e -r)
|
||||
|
||||
if [[ $version == "$old_version" ]]; then
|
||||
echo "New version same as old version, nothing to do." >&2
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version cavalier "$version"
|
||||
|
||||
$(nix-build -A cavalier.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.nix"
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cosmic-icons";
|
||||
version = "unstable-2024-02-07";
|
||||
version = "unstable-2024-02-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = "edd405ed84186ee24307deb7da6f25efc85986e9";
|
||||
sha256 = "sha256-qz39vI9bRac9ZQg8FPrwv3/TW5zGlsvs2me5aE5vvZo=";
|
||||
rev = "ee87327736728a9fb5a70c8688e9000f72829343";
|
||||
sha256 = "sha256-W4t5uTkiOVGGHZEqD5tGbEPhHbNZp5qnYYHDG8N70vQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ just ];
|
||||
|
||||
@ -1,29 +1,36 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, testers
|
||||
, cringify
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cringify";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sansyrox";
|
||||
repo = "cringify";
|
||||
rev = "dd753818f8dd4b343be9370d2c29a6be070ad791";
|
||||
hash = "sha256-6hSgOk9DzDfGtZX1vt6AQsKSLdPdqy2Mz3UtK6d2AuA=";
|
||||
rev = "857c2620ac9f1f53139d3a599e55679a75e77053";
|
||||
hash = "sha256-U0tKYFRZToMALSeItn9yia7Dl7omETDTkuRlWJ8EZEo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-w6lqPyUCaXZBQ1EmMyj0sVnEHugMD6JugIIK0rEa19Y=";
|
||||
cargoHash = "sha256-OQXGn6m6VdSlxaCPRonjvEo/GOpsEiZkqL12UdoLu0Q=";
|
||||
|
||||
postPatch = ''
|
||||
# Upstream forgot to update the version value
|
||||
substituteInPlace src/main.rs --replace '0.1.0' ${version}
|
||||
# Upstream doesn't set the version string itself
|
||||
substituteInPlace src/main.rs --replace '0.0.1' ${version}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
# No tests are present in the repository
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = cringify; };
|
||||
|
||||
meta = {
|
||||
description = "Annoy your friends with the cringified text";
|
||||
homepage = "https://github.com/sansyrox/cringify";
|
||||
@ -21,29 +21,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "delfin";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "avery42";
|
||||
repo = "delfin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1Q3Aywf80CCXxorWSymwxJwMU1I4k7juDoWG5J18AXY=";
|
||||
hash = "sha256-QwxdNPLL7PBokq5WaPylD4bBmXmJWyEQsWKN7DM2utk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-/RZD4b7hrbC1Z5MtHDdib5TFEmxAh9odjNPo4m+FqK4=";
|
||||
hash = "sha256-ElB9TbfmYn/A1Y3+oQ752zHqkC+f2RJPxfGXH0m5C/E=";
|
||||
};
|
||||
|
||||
# upstream pinned the linker to clang/mold through 0.3.0, unnecessarily.
|
||||
# remove this patch for version > 0.3.0.
|
||||
# see: <https://codeberg.org/avery42/delfin/commit/e6deee77e9a6a6ba2425d1cc88dcbdeb471d1fdc>
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "doublecmd";
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doublecmd";
|
||||
repo = "doublecmd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-NgCN72yACSzsnQdDxBM4QQCE8m5+FT31Ia51yEiXBfY=";
|
||||
hash = "sha256-vRB4qUws3kqCf7gp8Lzt8e9p68FaAfQyFHj4oJS9QtI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.171.0";
|
||||
version = "0.172.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-+kM/RKC/HxGRH3qOzlhkzaxj1l60D+6aNGIkrDuTk7A=";
|
||||
hash = "sha256-DzbCtTXeoERV9ceUsZ+srATIyviJp+oNyB7EE/iHe6g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cuLzn0OZ5VC+RWGsJ8DCdJN8wm0DrsjH55K/cnyuqB8=";
|
||||
vendorHash = "sha256-P+T+ynSkG3KEmJsrzJusCPBD1ClaVK/VIHD+2xkGswQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -17,16 +17,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eza";
|
||||
version = "0.18.3";
|
||||
version = "0.18.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gxJajnq9VU9SDjClEV7QPAvI5dX3flTzyK228Iy0Mhk=";
|
||||
hash = "sha256-G8Ow38vNSMMYINYhGp33rls5AV4EFZDEJhkNn5H64LA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-p6r0sR32M0/3GoybA2N1qs0M4Bmtq+s97GT5PMAolcg=";
|
||||
cargoHash = "sha256-A/EIkWSdMqSdrnjMTfIdg0scSBK/xsI5PPsOn+cRogA=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
|
||||
buildInputs = [ zlib ]
|
||||
|
||||
@ -10,27 +10,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastcdr";
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eProsima";
|
||||
repo = "Fast-CDR";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-eSf6LNTVsGEBXjTmTBjjWKBqs68pbnVcw1p2bi1Asgg=";
|
||||
hash = "sha256-hhYNgBLJCTZV/fgHEH7rxlTy+qpShAykxHLbPtPA/Uw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Do-not-require-wget-and-unzip.patch
|
||||
];
|
||||
|
||||
# Fix doc generation error with doxygen >= 1.10.0
|
||||
# see https://github.com/eProsima/Fast-CDR/issues/193
|
||||
postPatch = ''
|
||||
substituteInPlace ./doxyfile.in --replace \
|
||||
"WARN_AS_ERROR = YES" \
|
||||
"WARN_AS_ERROR = NO"
|
||||
'';
|
||||
|
||||
cmakeFlags = lib.optional (stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=OFF"
|
||||
# upstream turns BUILD_TESTING=OFF by default and doesn't honor cmake's default (=ON)
|
||||
++ lib.optional (finalAttrs.finalPackage.doCheck) "-DBUILD_TESTING=ON"
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gickup";
|
||||
version = "0.10.26";
|
||||
version = "0.10.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cooperspencer";
|
||||
repo = "gickup";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GYYmoGNYiwarMZw1w8tdH8zKl19XQ2R+EaJFK8iacwI=";
|
||||
hash = "sha256-ExSTvIq5u5Zmep/tipAJOHcXMxtESLQlEVMWnD8/rSI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vyDzGho9vcdCmBP7keccp5w3tXWHlSaFoncS1hqnBoc=";
|
||||
vendorHash = "sha256-riRFDhVOMdqwgGd6wowSDNgt8lZPzagCvKPWTHSqm6U=";
|
||||
|
||||
ldflags = ["-X main.version=${version}"];
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.123.1";
|
||||
version = "0.123.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hT4yFyf6j3KW9e8rYEbd2h9HtflGmPv0C44YDUkuHZw=";
|
||||
hash = "sha256-/FtRPRVmSRA/QcvQtzFm3PF9vDrt2uJPfAai3Q39/bA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1cd0w9eIPSlhznOQaIiaPoIBnQ4DycVUbZwLOlJ+t8o=";
|
||||
|
||||
45
pkgs/by-name/in/influxdb-cxx/package.nix
Normal file
45
pkgs/by-name/in/influxdb-cxx/package.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, catch2_3, libcpr, trompeloeil }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "influxdb-cxx";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offa";
|
||||
repo = "influxdb-cxx";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-DFslPrbgqS3JGx62oWlsC+AN5J2CsFjGcDaDRCadw7E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix unclosed test case tag
|
||||
(fetchpatch {
|
||||
url = "https://github.com/offa/influxdb-cxx/commit/b31f94982fd1d50e89ce04f66c694bec108bf470.patch";
|
||||
hash = "sha256-oSdpNlWV744VpzfiWzp0ziNKaReLTlyfJ+SF2qyH+TU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace "-Werror" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ boost libcpr ]
|
||||
++ lib.optionals finalAttrs.doCheck [ catch2_3 trompeloeil ];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "INFLUXCXX_TESTING" finalAttrs.doCheck)
|
||||
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "-E;BoostSupportTest") # requires network access
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "InfluxDB C++ client library";
|
||||
homepage = "https://github.com/offa/influxdb-cxx";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
45
pkgs/by-name/li/libdjinterop/package.nix
Normal file
45
pkgs/by-name/li/libdjinterop/package.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, boost
|
||||
, cmake
|
||||
, ninja
|
||||
, pkg-config
|
||||
, sqlite
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libdjinterop";
|
||||
|
||||
version = "unstable";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xsco";
|
||||
repo = "libdjinterop";
|
||||
rev = "0.20.1";
|
||||
hash = "sha256-/iXSRJVFPWqUTVz7z0BNWCq5LOqdNuTI+wx/34JAZfc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
sqlite
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/xsco/libdjinterop";
|
||||
description = "C++ library for access to DJ record libraries";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ benley ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -31,13 +31,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "2212";
|
||||
version = "2249";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-lB+/iA0b5JmIgpmQ0/M32Q52Y0VVOCoeiBpLe4owYsc=";
|
||||
hash = "sha256-ikJUToUbA60u/8azR6dPmPyodq/nQe5L2aotlYBclaE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
56
pkgs/by-name/lo/logiops/package.nix
Normal file
56
pkgs/by-name/lo/logiops/package.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
cmake,
|
||||
glib,
|
||||
udev,
|
||||
libevdev,
|
||||
libconfig,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (oldAttrs: {
|
||||
pname = "logiops";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PixlOne";
|
||||
repo = "logiops";
|
||||
rev = "v${oldAttrs.version}";
|
||||
sha256 = "sha256-9nFTud5szQN8jpG0e/Bkp+I9ELldfo66SdfVCUTuekg=";
|
||||
# In v0.3.0, the `ipcgull` submodule was added as a dependency
|
||||
# https://github.com/PixlOne/logiops/releases/tag/v0.3.0
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./pkgs0001-Make-DBUS_SYSTEM_POLICY_INSTALL_DIR-externally-overr.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
udev
|
||||
libevdev
|
||||
libconfig
|
||||
glib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLOGIOPS_VERSION=${oldAttrs.version}"
|
||||
"-DDBUS_SYSTEM_POLICY_INSTALL_DIR=${placeholder "out"}/share/dbus-1/system.d"
|
||||
];
|
||||
|
||||
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial userspace driver for HID++ Logitech devices";
|
||||
homepage = "https://github.com/PixlOne/logiops";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,30 @@
|
||||
From b7588376e20661c8d79e7472732244c70b8e7d3f Mon Sep 17 00:00:00 2001
|
||||
From: ckie <git-525ff67@ckie.dev>
|
||||
Date: Mon, 16 Oct 2023 02:02:38 +0300
|
||||
Subject: [PATCH] Make DBUS_SYSTEM_POLICY_INSTALL_DIR externally overrideable
|
||||
|
||||
---
|
||||
src/logid/CMakeLists.txt | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/logid/CMakeLists.txt b/src/logid/CMakeLists.txt
|
||||
index b2616c8..58d6719 100644
|
||||
--- a/src/logid/CMakeLists.txt
|
||||
+++ b/src/logid/CMakeLists.txt
|
||||
@@ -111,9 +111,11 @@ elseif (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR)
|
||||
endif ()
|
||||
|
||||
# Install DBus conf
|
||||
-# TODO: Is there a better way of setting the system policy directory?
|
||||
-set(DBUS_SYSTEM_POLICY_INSTALL_DIR "/usr/share/dbus-1/system.d")
|
||||
configure_file(logiops-dbus.conf.in ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf)
|
||||
+if (NOT DEFINED DBUS_SYSTEM_POLICY_INSTALL_DIR)
|
||||
+ # TODO: Is there a better way of setting the system policy directory?
|
||||
+ set(DBUS_SYSTEM_POLICY_INSTALL_DIR "/usr/share/dbus-1/system.d")
|
||||
+endif ()
|
||||
message(STATUS "dbus system policy will be installed at ${DBUS_SYSTEM_POLICY_INSTALL_DIR}")
|
||||
install(FILES ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf
|
||||
DESTINATION ${DBUS_SYSTEM_POLICY_INSTALL_DIR}
|
||||
--
|
||||
2.42.0
|
||||
|
||||
@ -27,15 +27,15 @@ let
|
||||
++ optionals jpgSupport [ graphicsmagick exiftool ]
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "megapixels";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "postmarketOS";
|
||||
repo = "megapixels";
|
||||
rev = version;
|
||||
hash = "sha256-ejTCYZMDkqz8P3vroq8XAl+pUGgcS56cm3tzOTE3rfc=";
|
||||
owner = "megapixels-org";
|
||||
repo = "Megapixels";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-J94kDSqQkfdltbYbzvJofd5o/Dhivtld475CaQs7+Ok=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -64,12 +64,15 @@ stdenv.mkDerivation rec {
|
||||
)
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "GTK4 camera application that knows how to deal with the media request api";
|
||||
homepage = "https://gitlab.com/postmarketOS/megapixels";
|
||||
changelog = "https://gitlab.com/postmarketOS/megapixels/-/tags/${version}";
|
||||
homepage = "https://gitlab.com/megapixels-org/Megapixels";
|
||||
changelog = "https://gitlab.com/megapixels-org/Megapixels/-/tags/${finalAttrs.version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
maintainers = with maintainers; [ dotlambda Luflosi ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "megapixels";
|
||||
};
|
||||
}
|
||||
})
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mystmd";
|
||||
version = "1.1.42";
|
||||
version = "1.1.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "executablebooks";
|
||||
repo = "mystmd";
|
||||
rev = "mystmd@${version}";
|
||||
hash = "sha256-oVdZ2U1h1BFjo82IDFFHlQHR/V/GNLx4qWtSLhWm3ck=";
|
||||
hash = "sha256-NKb62xhmdqA/fLF2HIm/t+eiIiSLKvPDLlAdjWBKJrQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ucw9ayyIocF/AKkXrzvBDaQ5Mv2edQdiYbX+G3bcHrs=";
|
||||
npmDepsHash = "sha256-5PcGD5La3g9Gd9Me31nLZA+Pi9k+x0s8APXYVa6QSH8=";
|
||||
|
||||
dontNpmInstall = true;
|
||||
|
||||
|
||||
2
pkgs/by-name/ne/neocities-cli/Gemfile
Normal file
2
pkgs/by-name/ne/neocities-cli/Gemfile
Normal file
@ -0,0 +1,2 @@
|
||||
source 'https://rubygems.org'
|
||||
gem 'neocities'
|
||||
48
pkgs/by-name/ne/neocities-cli/Gemfile.lock
Normal file
48
pkgs/by-name/ne/neocities-cli/Gemfile.lock
Normal file
@ -0,0 +1,48 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
equatable (0.5.0)
|
||||
httpclient-fixcerts (2.8.5)
|
||||
necromancer (0.4.0)
|
||||
neocities (0.0.18)
|
||||
httpclient-fixcerts (~> 2.8, >= 2.8.5)
|
||||
pastel (~> 0.7, = 0.7.2)
|
||||
rake (~> 12.3, >= 12.3.1)
|
||||
tty-prompt (~> 0.12, = 0.12.0)
|
||||
tty-table (~> 0.10, = 0.10.0)
|
||||
pastel (0.7.2)
|
||||
equatable (~> 0.5.0)
|
||||
tty-color (~> 0.4.0)
|
||||
rake (12.3.3)
|
||||
strings (0.1.8)
|
||||
strings-ansi (~> 0.1)
|
||||
unicode-display_width (~> 1.5)
|
||||
unicode_utils (~> 1.4)
|
||||
strings-ansi (0.2.0)
|
||||
tty-color (0.4.3)
|
||||
tty-cursor (0.4.0)
|
||||
tty-prompt (0.12.0)
|
||||
necromancer (~> 0.4.0)
|
||||
pastel (~> 0.7.0)
|
||||
tty-cursor (~> 0.4.0)
|
||||
wisper (~> 1.6.1)
|
||||
tty-screen (0.6.5)
|
||||
tty-table (0.10.0)
|
||||
equatable (~> 0.5.0)
|
||||
necromancer (~> 0.4.0)
|
||||
pastel (~> 0.7.2)
|
||||
strings (~> 0.1.0)
|
||||
tty-screen (~> 0.6.4)
|
||||
unicode-display_width (1.8.0)
|
||||
unicode_utils (1.4.0)
|
||||
wisper (1.6.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
x86_64-linux
|
||||
|
||||
DEPENDENCIES
|
||||
neocities
|
||||
|
||||
BUNDLED WITH
|
||||
2.5.5
|
||||
169
pkgs/by-name/ne/neocities-cli/gemset.nix
Normal file
169
pkgs/by-name/ne/neocities-cli/gemset.nix
Normal file
@ -0,0 +1,169 @@
|
||||
{
|
||||
equatable = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
};
|
||||
httpclient-fixcerts = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1zfszylh51y8ic8sbff3mwf30jb0gj270r5nxkcm1ydxad19w6sl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.5";
|
||||
};
|
||||
necromancer = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.0";
|
||||
};
|
||||
neocities = {
|
||||
dependencies =
|
||||
[ "httpclient-fixcerts" "pastel" "rake" "tty-prompt" "tty-table" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1hfvy4gc7rzxkgl2dbrjs2fqzi5mphmr22rjfhk6n0i3bd0wazbw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.18";
|
||||
};
|
||||
pastel = {
|
||||
dependencies = [ "equatable" "tty-color" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.2";
|
||||
};
|
||||
rake = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "12.3.3";
|
||||
};
|
||||
strings = {
|
||||
dependencies = [ "strings-ansi" "unicode-display_width" "unicode_utils" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.8";
|
||||
};
|
||||
strings-ansi = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
};
|
||||
tty-color = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.3";
|
||||
};
|
||||
tty-cursor = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.0";
|
||||
};
|
||||
tty-prompt = {
|
||||
dependencies = [ "necromancer" "pastel" "tty-cursor" "wisper" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.12.0";
|
||||
};
|
||||
tty-screen = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.5";
|
||||
};
|
||||
tty-table = {
|
||||
dependencies =
|
||||
[ "equatable" "necromancer" "pastel" "strings" "tty-screen" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.0";
|
||||
};
|
||||
unicode-display_width = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.0";
|
||||
};
|
||||
unicode_utils = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
};
|
||||
wisper = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.1";
|
||||
};
|
||||
}
|
||||
22
pkgs/by-name/ne/neocities-cli/package.nix
Normal file
22
pkgs/by-name/ne/neocities-cli/package.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib
|
||||
, bundlerApp
|
||||
, bundlerUpdateScript
|
||||
}:
|
||||
|
||||
bundlerApp {
|
||||
pname = "neocities";
|
||||
gemdir = ./.;
|
||||
exes = [ "neocities" ];
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "neocities";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Neocities Gem - A CLI and library for using the Neocities web site API.";
|
||||
homepage = "https://github.com/neocities/neocities-ruby";
|
||||
license = licenses.mit;
|
||||
mainProgram = "neocities";
|
||||
maintainers = with maintainers; [ dawoox ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/RicterZ/nhentai";
|
||||
description = "nHentai is a CLI tool for downloading doujinshi from <http://nhentai.net>";
|
||||
description = "CLI tool for downloading doujinshi from adult site(s)";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "nhentai";
|
||||
101
pkgs/by-name/no/nosql-workbench/package.nix
Normal file
101
pkgs/by-name/no/nosql-workbench/package.nix
Normal file
@ -0,0 +1,101 @@
|
||||
{
|
||||
appimageTools,
|
||||
lib,
|
||||
fetchurl,
|
||||
jdk21,
|
||||
stdenv,
|
||||
undmg
|
||||
}:
|
||||
let
|
||||
pname = "nosql-workbench";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
x86_64-darwin = {
|
||||
url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg";
|
||||
hash = "sha256-KM3aDDsQGZwUKU/or0eOoP8okAOPH7q8KL46RwfqhzM=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg";
|
||||
hash = "sha256-LzHiCMrDOWDuMNkkojLgKn+UG7x76wSAz0BapyWkAzU=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage";
|
||||
hash = "sha256-cDOSbhAEFBHvAluxTxqVpva1GJSlFhiozzRfuM4MK5c=";
|
||||
};
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
|
||||
meta = {
|
||||
description = "Visual tool that provides data modeling, data visualization, and query development features to help you design, create, query, and manage DynamoDB tables";
|
||||
homepage = "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/workbench.html";
|
||||
changelog = "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkbenchDocumentHistory.html";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ DataHearth ];
|
||||
platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
|
||||
};
|
||||
in
|
||||
if stdenv.isDarwin then stdenv.mkDerivation {
|
||||
inherit pname version src meta;
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
buildInputs = [ jdk21 ];
|
||||
|
||||
# DMG file is using APFS which is unsupported by "undmg".
|
||||
# Fix found: https://discourse.nixos.org/t/help-with-error-only-hfs-file-systems-are-supported-on-ventura/25873/8
|
||||
# "undmg" issue: https://github.com/matthewbauer/undmg/issues/4
|
||||
unpackCmd = ''
|
||||
echo "Creating temp directory"
|
||||
mnt=$(TMPDIR=/tmp mktemp -d -t nix-XXXXXXXXXX)
|
||||
|
||||
function finish {
|
||||
echo "Ejecting temp directory"
|
||||
/usr/bin/hdiutil detach $mnt -force
|
||||
rm -rf $mnt
|
||||
}
|
||||
# Detach volume when receiving SIG "0"
|
||||
trap finish EXIT
|
||||
|
||||
# Mount DMG file
|
||||
echo "Mounting DMG file into \"$mnt\""
|
||||
/usr/bin/hdiutil attach -nobrowse -mountpoint $mnt $curSrc
|
||||
|
||||
# Copy content to local dir for later use
|
||||
echo 'Copying extracted content into "sourceRoot"'
|
||||
cp -a $mnt/NoSQL\ Workbench.app $PWD/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/Applications"
|
||||
mv NoSQL\ Workbench.app $out/Applications/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
} else appimageTools.wrapType2 {
|
||||
inherit pname version src meta;
|
||||
|
||||
extraPkgs = ps: (appimageTools.defaultFhsEnvArgs.multiPkgs ps) ++ [
|
||||
# Required to run DynamoDB locally
|
||||
ps.jdk21
|
||||
];
|
||||
|
||||
extraInstallCommands = let
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
};
|
||||
in ''
|
||||
# Replace version from binary name
|
||||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
|
||||
# Install XDG Desktop file and its icon
|
||||
install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications
|
||||
install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps
|
||||
|
||||
# Replace wrong exec statement in XDG Desktop file
|
||||
substituteInPlace $out/share/applications/nosql-workbench.desktop \
|
||||
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench'
|
||||
'';
|
||||
}
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, clipper
|
||||
@ -10,14 +9,11 @@
|
||||
, gdal
|
||||
, ninja
|
||||
, proj
|
||||
, qtimageformats
|
||||
, qtlocation
|
||||
, qtsensors
|
||||
, qttools
|
||||
, qt5
|
||||
, zlib
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "OpenOrienteering-Mapper";
|
||||
version = "0.9.5";
|
||||
|
||||
@ -36,11 +32,19 @@ mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "find_package(ClangTidy" "#find_package(ClangTidy"
|
||||
substituteInPlace packaging/custom_install.cmake.in \
|
||||
--replace "fixup_bundle_portable(" "#fixup_bundle_portable("
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
ninja
|
||||
qttools
|
||||
qt5.qttools
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -48,35 +52,34 @@ mkDerivation rec {
|
||||
cups
|
||||
gdal
|
||||
proj
|
||||
qtimageformats
|
||||
qtlocation
|
||||
qtsensors
|
||||
qt5.qtimageformats
|
||||
qt5.qtlocation
|
||||
qt5.qtsensors
|
||||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Building the manual and bundling licenses fails
|
||||
# See https://github.com/NixOS/nixpkgs/issues/85306
|
||||
"-DLICENSING_PROVIDER:BOOL=OFF"
|
||||
"-DMapper_MANUAL_QTHELP:BOOL=OFF"
|
||||
(lib.cmakeBool "LICENSING_PROVIDER" false)
|
||||
(lib.cmakeBool "Mapper_MANUAL_QTHELP" false)
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# FindGDAL is broken and always finds /Library/Framework unless this is
|
||||
# specified
|
||||
"-DGDAL_INCLUDE_DIR=${gdal}/include"
|
||||
"-DGDAL_CONFIG=${gdal}/bin/gdal-config"
|
||||
"-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib"
|
||||
(lib.cmakeFeature "GDAL_INCLUDE_DIR" "${gdal}/include")
|
||||
(lib.cmakeFeature "GDAL_CONFIG" "${gdal}/bin/gdal-config")
|
||||
(lib.cmakeFeature "GDAL_LIBRARY" "${gdal}/lib/libgdal.dylib")
|
||||
# Don't bundle libraries
|
||||
"-DMapper_PACKAGE_PROJ=0"
|
||||
"-DMapper_PACKAGE_QT=0"
|
||||
"-DMapper_PACKAGE_ASSISTANT=0"
|
||||
"-DMapper_PACKAGE_GDAL=0"
|
||||
(lib.cmakeBool "Mapper_PACKAGE_PROJ" false)
|
||||
(lib.cmakeBool "Mapper_PACKAGE_QT" false)
|
||||
(lib.cmakeBool "Mapper_PACKAGE_ASSISTANT" false)
|
||||
(lib.cmakeBool "Mapper_PACKAGE_GDAL" false)
|
||||
];
|
||||
|
||||
postInstall = with stdenv; lib.optionalString isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv $out/Mapper.app $out/Applications
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper
|
||||
ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/Mapper
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -86,7 +89,6 @@ mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ mpickering sikmir ];
|
||||
platforms = with platforms; unix;
|
||||
broken = stdenv.isDarwin;
|
||||
mainProgram = "Mapper";
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "11.0.2";
|
||||
version = "11.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-k0ox4/Djpu6DoWGzQdo7wYSZHSeaCtNVuEwK3bhBgQQ=";
|
||||
hash = "sha256-ASeALfqcDUoK2PSl88AJ3UgrLdesuH1o5UNq+ceGbxI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2rG0ERgI5oVW3MuU8yFwgssoWX6zwUwXpro2IVkX7ac=";
|
||||
|
||||
@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"botocore"
|
||||
"google-api-python-client"
|
||||
"slack-sdk"
|
||||
"pydantic"
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -7,10 +7,10 @@
|
||||
inherit buildUnstable;
|
||||
}).overrideAttrs (finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.14.0+20240219gitea2784757";
|
||||
version = "1.14.0+20240222git83285cc63";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
|
||||
hash = "sha256-ODf2vWQ0ZeYYmia5BgQvLm+BFCX/GjVvRqVAPPW/sq8=";
|
||||
hash = "sha256-RFZdl2t1356h4Hvab6Gn3LZZnCWlQlK6C0otlXzVlMI=";
|
||||
};
|
||||
})
|
||||
|
||||
@ -71,37 +71,32 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
env.CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";
|
||||
|
||||
addBuildInputRunpathsPhase = ''
|
||||
declare _extraRunpaths
|
||||
_sep=
|
||||
for p in "''${pkgsHostTarget[@]}" ; do
|
||||
if [[ -d "$p/lib" ]] ; then
|
||||
_extraRunpaths+="$_sep$p/lib"
|
||||
if [[ -z "$_sep" ]] ; then
|
||||
_sep=:
|
||||
fi
|
||||
fi
|
||||
done
|
||||
addDlopenRunpaths = map (p: "${lib.getLib p}/lib") (
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libxkbcommon
|
||||
vulkan-loader
|
||||
wayland
|
||||
]
|
||||
);
|
||||
|
||||
addDlopenRunpathsPhase = ''
|
||||
elfHasDynamicSection() {
|
||||
patchelf --print-rpath "$1" >& /dev/null
|
||||
}
|
||||
|
||||
while IFS= read -r -d $'\0' path ; do
|
||||
if elfHasDynamicSection "$path" ; then
|
||||
patchelf "$path" --add-rpath "''${_extraRunpaths}"
|
||||
fi
|
||||
elfHasDynamicSection "$path" || continue
|
||||
for dep in $addDlopenRunpaths ; do
|
||||
patchelf "$path" --add-rpath "$dep"
|
||||
done
|
||||
done < <(
|
||||
for o in $(getAllOutputNames) ; do
|
||||
find "''${!o}" -type f -and "(" -executable -or -iname '*.so' ")" -print0
|
||||
done
|
||||
)
|
||||
|
||||
unset _extraRunpaths
|
||||
unset _sep
|
||||
'';
|
||||
|
||||
postPhases = lib.optionals stdenv.isLinux [ "addBuildInputRunpathsPhase" ];
|
||||
postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ];
|
||||
|
||||
cargoTestFlags = [
|
||||
"-p"
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
let
|
||||
pname = "simplex-chat-desktop";
|
||||
version = "5.4.4";
|
||||
version = "5.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
|
||||
hash = "sha256-f4P31e099bKBKsavP5f+xBGsqQfM6CYgUtUIOLe+cAE=";
|
||||
hash = "sha256-MD1AbpHlpaMaPlpJmGp0oPbOYPmJEhhIXmexkpCr1wY=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
35
pkgs/by-name/sv/svndumpsanitizer/package.nix
Normal file
35
pkgs/by-name/sv/svndumpsanitizer/package.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "svndumpsanitizer";
|
||||
version = "2.0.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dsuni";
|
||||
repo = "svndumpsanitizer";
|
||||
# https://github.com/dsuni/svndumpsanitizer/issues/22
|
||||
rev = "cbf917c000ee42fbb31a8667014a4357bbfdd6a6";
|
||||
hash = "sha256-lkVX11t0AF4y1EQQFXjPTrJmsfJhgx5Y1xj1VDlsbH0=";
|
||||
};
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cc svndumpsanitizer.c -o svndumpsanitizer
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 svndumpsanitizer -t $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Alternative to svndumpfilter that discovers which nodes should actually be kept";
|
||||
homepage = "https://miria.homelinuxserver.org/svndumpsanitizer";
|
||||
downloadPage = "https://github.com/dsuni/svndumpsanitizer";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lafrenierejm ];
|
||||
mainProgram = "svndumpsanitizer";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "umpire";
|
||||
version = "2023.06.0";
|
||||
version = "2024.02.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LLNL";
|
||||
repo = "umpire";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gdwr0ACCfkrtlVROPhxM7zT7SaCo2Eg1etrPFN4JHaA=";
|
||||
hash = "sha256-0xJrICpGHQCLXfhDfS0/6gD3wrM9y6XB4XxyjG3vWGw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
70
pkgs/by-name/un/units/package.nix
Normal file
70
pkgs/by-name/un/units/package.nix
Normal file
@ -0,0 +1,70 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, python3
|
||||
, readline
|
||||
, stdenv
|
||||
, enableCurrenciesUpdater ? true
|
||||
}:
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages(p: [
|
||||
p.requests
|
||||
]);
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "units";
|
||||
version = "2.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/units/units-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-2Ve0USRZJcnmFMRRM5dEljDq+SvWK4SVugm741Ghc3A=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "info" "man" ];
|
||||
|
||||
buildInputs = [
|
||||
readline
|
||||
] ++ lib.optionals enableCurrenciesUpdater [
|
||||
pythonEnv
|
||||
];
|
||||
|
||||
prePatch = lib.optionalString enableCurrenciesUpdater ''
|
||||
substituteInPlace units_cur \
|
||||
--replace "#!/usr/bin/env python" ${pythonEnv}/bin/python
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString enableCurrenciesUpdater ''
|
||||
cp units_cur ${placeholder "out"}/bin/
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/units/";
|
||||
description = "Unit conversion tool";
|
||||
longDescription = ''
|
||||
GNU Units converts quantities expressed in various systems of measurement
|
||||
to their equivalents in other systems of measurement. Like many similar
|
||||
programs, it can handle multiplicative scale changes. It can also handle
|
||||
nonlinear conversions such as Fahrenheit to Celsius or wire gauge, and it
|
||||
can convert from and to sums of units, such as converting between meters
|
||||
and feet plus inches.
|
||||
|
||||
Beyond simple unit conversions, GNU Units can be used as a general-purpose
|
||||
scientific calculator that keeps track of units in its calculations. You
|
||||
can form arbitrary complex mathematical expressions of dimensions
|
||||
including sums, products, quotients, powers, and even roots of
|
||||
dimensions. Thus you can ensure accuracy and dimensional consistency when
|
||||
working with long expressions that involve many different units that may
|
||||
combine in complex ways.
|
||||
|
||||
The units are defined in an external data file. You can use the extensive
|
||||
data file that comes with this program, or you can provide your own data
|
||||
file to suit your needs. You can also use your own data file to supplement
|
||||
the standard data file.
|
||||
'';
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
mainProgram = "units";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
96
pkgs/by-name/uv/uv/Cargo.lock
generated
96
pkgs/by-name/uv/uv/Cargo.lock
generated
@ -876,7 +876,7 @@ name = "distribution-filename"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"insta",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"platform-tags",
|
||||
"rkyv",
|
||||
"serde",
|
||||
@ -896,7 +896,7 @@ dependencies = [
|
||||
"fs-err",
|
||||
"itertools 0.12.1",
|
||||
"once_cell",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"platform-tags",
|
||||
"pypi-types",
|
||||
@ -906,8 +906,10 @@ dependencies = [
|
||||
"serde_json",
|
||||
"sha2",
|
||||
"thiserror",
|
||||
"tracing",
|
||||
"url",
|
||||
"urlencoding",
|
||||
"uv-auth",
|
||||
"uv-fs",
|
||||
"uv-git",
|
||||
"uv-normalize",
|
||||
@ -1292,6 +1294,7 @@ dependencies = [
|
||||
"tracing",
|
||||
"tracing-subscriber",
|
||||
"uv-cache",
|
||||
"uv-fs",
|
||||
"uv-interpreter",
|
||||
"which",
|
||||
]
|
||||
@ -1588,7 +1591,7 @@ dependencies = [
|
||||
"indoc",
|
||||
"mailparse",
|
||||
"once_cell",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"platform-host",
|
||||
"platform-info",
|
||||
"plist",
|
||||
@ -2156,16 +2159,6 @@ dependencies = [
|
||||
"parking_lot_core 0.8.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
|
||||
dependencies = [
|
||||
"lock_api",
|
||||
"parking_lot_core 0.9.9",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.8.6"
|
||||
@ -2201,19 +2194,7 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
|
||||
|
||||
[[package]]
|
||||
name = "pep440_rs"
|
||||
version = "0.3.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "887f66cc62717ea72caac4f1eb4e6f392224da3ffff3f40ec13ab427802746d6"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"regex",
|
||||
"serde",
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pep440_rs"
|
||||
version = "0.4.0"
|
||||
version = "0.5.0"
|
||||
dependencies = [
|
||||
"indoc",
|
||||
"once_cell",
|
||||
@ -2228,13 +2209,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pep508_rs"
|
||||
version = "0.2.3"
|
||||
version = "0.4.2"
|
||||
dependencies = [
|
||||
"derivative",
|
||||
"indoc",
|
||||
"log",
|
||||
"once_cell",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pyo3",
|
||||
"pyo3-log",
|
||||
"regex",
|
||||
@ -2477,7 +2458,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "pubgrub"
|
||||
version = "0.2.1"
|
||||
source = "git+https://github.com/zanieb/pubgrub?rev=9b6d89cb8a0c7902815c8b2ae99106ba322ffb14#9b6d89cb8a0c7902815c8b2ae99106ba322ffb14"
|
||||
source = "git+https://github.com/zanieb/pubgrub?rev=aab132a3d4d444dd8dd41d8c4e605abd69dacfe1#aab132a3d4d444dd8dd41d8c4e605abd69dacfe1"
|
||||
dependencies = [
|
||||
"indexmap 2.2.3",
|
||||
"log",
|
||||
@ -2496,7 +2477,7 @@ dependencies = [
|
||||
"indoc",
|
||||
"libc",
|
||||
"memoffset",
|
||||
"parking_lot 0.12.1",
|
||||
"parking_lot",
|
||||
"pyo3-build-config",
|
||||
"pyo3-ffi",
|
||||
"pyo3-macros",
|
||||
@ -2567,7 +2548,7 @@ dependencies = [
|
||||
"insta",
|
||||
"mailparse",
|
||||
"once_cell",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"regex",
|
||||
"rkyv",
|
||||
@ -2583,12 +2564,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pyproject-toml"
|
||||
version = "0.8.1"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46d4a5e69187f23a29f8aa0ea57491d104ba541bc55f76552c2a74962aa20e04"
|
||||
checksum = "3b80f889b6d413c3f8963a2c7db03f95dd6e1d85e1074137cb2013ea2faa8898"
|
||||
dependencies = [
|
||||
"indexmap 2.2.3",
|
||||
"pep440_rs 0.3.12",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"serde",
|
||||
"toml",
|
||||
@ -2793,7 +2774,7 @@ dependencies = [
|
||||
"insta",
|
||||
"itertools 0.10.5",
|
||||
"once_cell",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"regex",
|
||||
"serde",
|
||||
@ -2882,7 +2863,7 @@ dependencies = [
|
||||
"getrandom",
|
||||
"http",
|
||||
"hyper",
|
||||
"parking_lot 0.11.2",
|
||||
"parking_lot",
|
||||
"reqwest",
|
||||
"reqwest-middleware",
|
||||
"retry-policies",
|
||||
@ -3510,17 +3491,6 @@ version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
|
||||
|
||||
[[package]]
|
||||
name = "tar"
|
||||
version = "0.4.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
|
||||
dependencies = [
|
||||
"filetime",
|
||||
"libc",
|
||||
"xattr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "target-lexicon"
|
||||
version = "0.12.13"
|
||||
@ -4158,12 +4128,13 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
|
||||
|
||||
[[package]]
|
||||
name = "uv"
|
||||
version = "0.1.6"
|
||||
version = "0.1.9"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anyhow",
|
||||
"assert_cmd",
|
||||
"assert_fs",
|
||||
"base64 0.21.7",
|
||||
"chrono",
|
||||
"clap",
|
||||
"clap_complete_command",
|
||||
@ -4185,7 +4156,7 @@ dependencies = [
|
||||
"miette",
|
||||
"mimalloc",
|
||||
"owo-colors 4.0.0",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"platform-host",
|
||||
"platform-tags",
|
||||
@ -4223,6 +4194,14 @@ dependencies = [
|
||||
"which",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "uv-auth"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"tracing",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "uv-build"
|
||||
version = "0.0.1"
|
||||
@ -4292,7 +4271,7 @@ dependencies = [
|
||||
"http",
|
||||
"insta",
|
||||
"install-wheel-rs",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"platform-tags",
|
||||
"pypi-types",
|
||||
@ -4314,6 +4293,7 @@ dependencies = [
|
||||
"tracing",
|
||||
"url",
|
||||
"urlencoding",
|
||||
"uv-auth",
|
||||
"uv-cache",
|
||||
"uv-fs",
|
||||
"uv-normalize",
|
||||
@ -4338,7 +4318,7 @@ dependencies = [
|
||||
"itertools 0.12.1",
|
||||
"mimalloc",
|
||||
"owo-colors 4.0.0",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"petgraph",
|
||||
"platform-host",
|
||||
@ -4410,7 +4390,7 @@ dependencies = [
|
||||
"futures",
|
||||
"install-wheel-rs",
|
||||
"nanoid",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"platform-tags",
|
||||
"pypi-types",
|
||||
@ -4445,7 +4425,6 @@ dependencies = [
|
||||
"futures",
|
||||
"rayon",
|
||||
"rustc-hash",
|
||||
"tar",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
"tokio-tar",
|
||||
@ -4502,7 +4481,7 @@ dependencies = [
|
||||
"futures",
|
||||
"install-wheel-rs",
|
||||
"once-map",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"platform-tags",
|
||||
"pypi-types",
|
||||
@ -4536,7 +4515,7 @@ dependencies = [
|
||||
"insta",
|
||||
"itertools 0.12.1",
|
||||
"once_cell",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"platform-host",
|
||||
"platform-tags",
|
||||
@ -4586,7 +4565,7 @@ dependencies = [
|
||||
"once-map",
|
||||
"once_cell",
|
||||
"owo-colors 4.0.0",
|
||||
"pep440_rs 0.4.0",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"petgraph",
|
||||
"platform-host",
|
||||
@ -4621,9 +4600,12 @@ name = "uv-traits"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
"distribution-types",
|
||||
"once-map",
|
||||
"pep508_rs",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
"uv-cache",
|
||||
"uv-interpreter",
|
||||
@ -4812,7 +4794,7 @@ checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"js-sys",
|
||||
"parking_lot 0.11.2",
|
||||
"parking_lot",
|
||||
"pin-utils",
|
||||
"wasm-bindgen",
|
||||
"wasm-bindgen-futures",
|
||||
|
||||
@ -15,21 +15,21 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "uv";
|
||||
version = "0.1.6";
|
||||
version = "0.1.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
rev = version;
|
||||
hash = "sha256-cwnZBKJcMgdSkOV0rojxF8kLQH59iOxjaE5yZkkY2/4=";
|
||||
hash = "sha256-N9m0dvJXABAY7dFTE5i7KXIHF9AMEFptEwKFoBsxmyE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0=";
|
||||
"pubgrub-0.2.1" = "sha256-yCeUJp0Cy5Fe0g3Ba9ZFqTJ7IzSFqrX8Dv3+N8DAEZs=";
|
||||
"pubgrub-0.2.1" = "sha256-p6RQ0pmatTnwp1s37ZktkhwakPTTehMlI3H5JUzwVrI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -14,12 +14,12 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "weasis";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
|
||||
# Their build instructions indicate to use the packaging script
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nroduit/Weasis/releases/download/v${version}/weasis-native.zip";
|
||||
hash = "sha256-HDlylpe8cHZRaIXndfGh6XmUn8o2PQB1Av7hLCp679U=";
|
||||
hash = "sha256-4Ew7RG8eM8pa6AiblREgt03fGOQVKVzkQMR87GIJIVM=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ let
|
||||
++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zxtune";
|
||||
version = "5055";
|
||||
version = "5056";
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "zxtune";
|
||||
repo = "zxtune";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-ABXGbzjdsPUuQnwZQOho4s2xRSDGzbZdA6/hCkBb7zE=";
|
||||
hash = "sha256-zvLbgS8AFW4kkvTccGXcr1KEw3EH47XcHwzq6CKzusQ=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user