mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 22:43:01 +00:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
commit
b29cb6c1f9
2
.github/workflows/backport.yml
vendored
2
.github/workflows/backport.yml
vendored
@ -20,7 +20,7 @@ jobs:
|
||||
if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
ref: ${{ github.event.pull_request.head.sha }}
|
||||
- name: Create backport PRs
|
||||
|
2
.github/workflows/basic-eval.yml
vendored
2
.github/workflows/basic-eval.yml
vendored
@ -19,7 +19,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
# we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
- uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29
|
||||
- uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
|
||||
with:
|
||||
|
2
.github/workflows/check-cherry-picks.yml
vendored
2
.github/workflows/check-cherry-picks.yml
vendored
@ -14,7 +14,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository_owner == 'NixOS'
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
fetch-depth: 0
|
||||
filter: blob:none
|
||||
|
@ -13,7 +13,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository_owner == 'NixOS'
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
|
2
.github/workflows/check-nix-format.yml
vendored
2
.github/workflows/check-nix-format.yml
vendored
@ -18,7 +18,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: "!contains(github.event.pull_request.title, '[skip treewide]')"
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
|
2
.github/workflows/check-nixf-tidy.yml
vendored
2
.github/workflows/check-nixf-tidy.yml
vendored
@ -12,7 +12,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: "!contains(github.event.pull_request.title, '[skip treewide]')"
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
|
4
.github/workflows/check-shell.yml
vendored
4
.github/workflows/check-shell.yml
vendored
@ -10,7 +10,7 @@ jobs:
|
||||
name: shell-check-x86_64-linux
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
@ -22,7 +22,7 @@ jobs:
|
||||
name: shell-check-aarch64-darwin
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
|
2
.github/workflows/editorconfig.yml
vendored
2
.github/workflows/editorconfig.yml
vendored
@ -25,7 +25,7 @@ jobs:
|
||||
- name: print list of changed files
|
||||
run: |
|
||||
cat "$HOME/changed_files"
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
|
2
.github/workflows/manual-nixos.yml
vendored
2
.github/workflows/manual-nixos.yml
vendored
@ -15,7 +15,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository_owner == 'NixOS'
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
|
2
.github/workflows/manual-nixpkgs.yml
vendored
2
.github/workflows/manual-nixpkgs.yml
vendored
@ -17,7 +17,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository_owner == 'NixOS'
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
|
2
.github/workflows/nix-parse.yml
vendored
2
.github/workflows/nix-parse.yml
vendored
@ -25,7 +25,7 @@ jobs:
|
||||
if [[ -s "$HOME/changed_files" ]]; then
|
||||
echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV"
|
||||
fi
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
|
2
.github/workflows/nixpkgs-vet.yml
vendored
2
.github/workflows/nixpkgs-vet.yml
vendored
@ -72,7 +72,7 @@ jobs:
|
||||
else
|
||||
echo "The PR cannot be merged, it has a merge conflict, skipping the rest.."
|
||||
fi
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
if: env.mergedSha
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
|
2
.github/workflows/periodic-merge-24h.yml
vendored
2
.github/workflows/periodic-merge-24h.yml
vendored
@ -41,7 +41,7 @@ jobs:
|
||||
into: staging-24.05
|
||||
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
|
||||
- name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
|
||||
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
|
||||
|
2
.github/workflows/periodic-merge-6h.yml
vendored
2
.github/workflows/periodic-merge-6h.yml
vendored
@ -39,7 +39,7 @@ jobs:
|
||||
into: staging
|
||||
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
|
||||
- name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
|
||||
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
|
||||
|
@ -16,7 +16,7 @@ jobs:
|
||||
if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
|
||||
- uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixpkgs-unstable
|
||||
|
@ -18958,6 +18958,12 @@
|
||||
githubId = 11320;
|
||||
name = "Sergiu Ivanov";
|
||||
};
|
||||
scraptux = {
|
||||
email = "git@thomasjasny.de";
|
||||
github = "scraptux";
|
||||
githubId = 12714892;
|
||||
name = "Thomas Jasny";
|
||||
};
|
||||
screendriver = {
|
||||
email = "nix@echooff.de";
|
||||
github = "screendriver";
|
||||
|
@ -581,6 +581,8 @@
|
||||
|
||||
- `restic` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.restic.backups.<name>.inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep).
|
||||
|
||||
- The arguments from [](#opt-services.postgresql.initdbArgs) now get shell-escaped.
|
||||
|
||||
- Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872)
|
||||
in `gitlab-runner` 15.6 and is expected to be removed in `gitlab-runner` 18.0. Configuration of existing runners
|
||||
should be changed to using *runner authentication tokens* by configuring
|
||||
|
@ -1385,6 +1385,7 @@
|
||||
./services/web-apps/atlassian/crowd.nix
|
||||
./services/web-apps/atlassian/jira.nix
|
||||
./services/web-apps/audiobookshelf.nix
|
||||
./services/web-apps/bluemap.nix
|
||||
./services/web-apps/bookstack.nix
|
||||
./services/web-apps/c2fmzq-server.nix
|
||||
./services/web-apps/calibre-web.nix
|
||||
@ -1516,7 +1517,6 @@
|
||||
./services/web-apps/zitadel.nix
|
||||
./services/web-servers/agate.nix
|
||||
./services/web-servers/apache-httpd/default.nix
|
||||
./services/web-servers/bluemap.nix
|
||||
./services/web-servers/caddy/default.nix
|
||||
./services/web-servers/darkhttpd.nix
|
||||
./services/web-servers/fcgiwrap.nix
|
||||
|
@ -187,7 +187,7 @@ $ nix-instantiate --eval -A postgresql_13.psqlSchema
|
||||
```
|
||||
For an upgrade, a script like this can be used to simplify the process:
|
||||
```nix
|
||||
{ config, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [
|
||||
(let
|
||||
@ -211,7 +211,7 @@ For an upgrade, a script like this can be used to simplify the process:
|
||||
|
||||
install -d -m 0700 -o postgres -g postgres "$NEWDATA"
|
||||
cd "$NEWDATA"
|
||||
sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" ${builtins.concatStringsSep " " cfg.initdbArgs}
|
||||
sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" ${lib.escapeShellArgs cfg.initdbArgs}
|
||||
|
||||
sudo -u postgres $NEWBIN/pg_upgrade \
|
||||
--old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \
|
||||
|
@ -7,6 +7,7 @@ let
|
||||
concatStringsSep
|
||||
const
|
||||
elem
|
||||
escapeShellArgs
|
||||
filterAttrs
|
||||
isString
|
||||
literalExpression
|
||||
@ -545,7 +546,7 @@ in
|
||||
rm -f ${cfg.dataDir}/*.conf
|
||||
|
||||
# Initialise the database.
|
||||
initdb -U ${cfg.superUser} ${concatStringsSep " " cfg.initdbArgs}
|
||||
initdb -U ${cfg.superUser} ${escapeShellArgs cfg.initdbArgs}
|
||||
|
||||
# See postStart!
|
||||
touch "${cfg.dataDir}/.first_startup"
|
||||
|
@ -74,7 +74,7 @@ in
|
||||
/*uid = config.ids.uids.radius;*/
|
||||
description = "Radius daemon user";
|
||||
isSystemUser = true;
|
||||
groups = "radius";
|
||||
group = "radius";
|
||||
};
|
||||
groups.radius = {};
|
||||
};
|
||||
|
@ -4166,6 +4166,23 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
sas.sas-lsp = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "sas-lsp";
|
||||
publisher = "SAS";
|
||||
version = "1.10.2";
|
||||
hash = "sha256-mf0q80UX4FxqHAHJBQlhkF/nqvTnfgTR8GuYBoWSswU=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog";
|
||||
description = "Official SAS Language Extension";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=SAS.sas-lsp";
|
||||
homepage = "https://github.com/sassoftware/vscode-sas-extension";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.scraptux ];
|
||||
};
|
||||
};
|
||||
|
||||
scala-lang.scala = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "scala";
|
||||
|
@ -32,9 +32,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
rich-pixels
|
||||
textual
|
||||
textual-universal-directorytree
|
||||
] ++ lib.attrVals extras passthru.optional-dependencies;
|
||||
] ++ lib.attrVals extras optional-dependencies;
|
||||
|
||||
passthru.optional-dependencies = with python3.pkgs; {
|
||||
optional-dependencies = with python3.pkgs; {
|
||||
all = [
|
||||
pyarrow
|
||||
textual-universal-directorytree.optional-dependencies.remote
|
||||
|
@ -52,7 +52,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
watchdog
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = with python3.pkgs; {
|
||||
optional-dependencies = with python3.pkgs; {
|
||||
aws = [ boto3 ];
|
||||
azure = [
|
||||
azure-storage-blob
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery-dl";
|
||||
version = "1.27.4";
|
||||
version = "1.27.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "gallery_dl";
|
||||
hash = "sha256-28y5sU9onPHIqlTIYzIQ+J2KElJocbuwKQN/E50JGI8=";
|
||||
hash = "sha256-q/byWRvbzrV6KjPIDjJJWl0fkrluGEcvrISPKz8SJ+4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -36,9 +36,9 @@ python3Packages.buildPythonApplication rec {
|
||||
setuptools
|
||||
wxpython
|
||||
]
|
||||
++ lib.flatten (lib.attrValues passthru.optional-dependencies);
|
||||
++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
passthru.optional-dependencies = with python3Packages; {
|
||||
optional-dependencies = with python3Packages; {
|
||||
cam = [
|
||||
opencv4
|
||||
];
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mob";
|
||||
version = "5.2.0";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "remotemobprogramming";
|
||||
repo = "mob";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LktA7GMOWAl12PRLgX8VTyYZ00sh6AHsgw9NdyjAJ64=";
|
||||
hash = "sha256-+zNlxIvIvPyz0vA9IPaMzP8wfEXwNyRcvp45ohzoxQQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -1,20 +1,20 @@
|
||||
{
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "129.0.2792.52";
|
||||
version = "130.0.2849.5";
|
||||
revision = "1";
|
||||
hash = "sha256-KurkG/OxoKOcBcFXj9xhQVSidc2L6bzrDY8c2OmSQro=";
|
||||
hash = "sha256-chvB84+zu6/xgRHyUk33aicc44QJLxxdOOu0ngqmsFM=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "130.0.2835.2";
|
||||
version = "130.0.2849.1";
|
||||
revision = "1";
|
||||
hash = "sha256-szxMnqw7tUvASsxsYacrQ3StofUJHBWHIhF3EfGIVAs=";
|
||||
hash = "sha256-JObqtaaUR6J4rZ90WWw7Ku5Ntl/QBWHo23T7Ohu5p1s=";
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "129.0.2792.52";
|
||||
version = "129.0.2792.65";
|
||||
revision = "1";
|
||||
hash = "sha256-tiq6PwDrH8ZctfyDza9W3WOsj7NArv4XyMPGWU7fW7A=";
|
||||
hash = "sha256-xuCtHptE2CG4aiY7gu2sWW3Km4qfB0E/L/PBACIaKOc=";
|
||||
};
|
||||
}
|
||||
|
@ -24,7 +24,7 @@ let
|
||||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "6.9.3447.46";
|
||||
version = "6.9.3447.48";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "arm64";
|
||||
@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
|
||||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-r0u7u5R0lMI65zsTxIU0y5A+swJYLAj42ptJWVvFdxs=";
|
||||
x86_64-linux = "sha256-hIdgyh6c+SbeeT6uY1aN7OCPY+U2GGX6V7eHdwgyuzc=";
|
||||
aarch64-linux = "sha256-pl6vZwIPqfYi/nO/PDEwUyi4CdVP9ciTAbVg0d+DX1w=";
|
||||
x86_64-linux = "sha256-mhJCCYXP9eyA8YquSZsnm5o04VmY5NRwVM5vKqbdkZs=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20240924-2";
|
||||
version = "20240929";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = "signalbackup-tools";
|
||||
rev = version;
|
||||
hash = "sha256-YnblQjZpKsnphbaRQ6FyHhssnns7U5VoNe/r3goQ0g8=";
|
||||
hash = "sha256-OXn/RMc2v099S8/atQTYz1YwSH0sD7o7ZImlrBmUlSE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -23,13 +23,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f-koehler";
|
||||
repo = "KTailctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tZnwn94qZyQ8JAC6Y1dDTmc7Cob+kMZnEaP7+EytbH8=";
|
||||
hash = "sha256-hlpxim4Vm/C37ts+Q/t9swCejKEE97R1QlP+Y2jNWoM=";
|
||||
};
|
||||
|
||||
goDeps = (buildGo123Module {
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.14.0";
|
||||
version = "3.14.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "nextcloud-releases";
|
||||
repo = "desktop";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/jRD0swNs59xugsXLbesGcTtyGdc/y/iwiDVoErW+d4=";
|
||||
hash = "sha256-bUqHegW38NQJn4TnEQt9wRJFqR6fbLpvQvmWF3akekc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -27,13 +27,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xdg-desktop-portal-hyprland";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "xdg-desktop-portal-hyprland";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-xTqnMoJsEojuvqJLuM+U7EZ7q71efaj3pbvjutq4TXc=";
|
||||
hash = "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
@ -1,15 +1,16 @@
|
||||
{ stdenvNoCC, breezy }:
|
||||
{ url, rev, sha256 }:
|
||||
{ lib, stdenvNoCC, breezy }:
|
||||
lib.fetchers.withNormalizedHash { } (
|
||||
{ url, rev, outputHash, outputHashAlgo }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "bzr-export";
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "bzr-export";
|
||||
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [ breezy ];
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [ breezy ];
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = sha256;
|
||||
inherit outputHash outputHashAlgo;
|
||||
outputHashMode = "recursive";
|
||||
|
||||
inherit url rev;
|
||||
}
|
||||
inherit url rev;
|
||||
}
|
||||
)
|
||||
|
@ -9,7 +9,7 @@ if test -z "$hashType"; then
|
||||
hashType=sha256
|
||||
fi
|
||||
if test -z "$hashFormat"; then
|
||||
hashFormat=--base32
|
||||
hashFormat=--sri
|
||||
fi
|
||||
|
||||
if test -z "$url"; then
|
||||
|
@ -6,17 +6,18 @@
|
||||
{stdenvNoCC, cvs, openssh, lib}:
|
||||
|
||||
lib.makeOverridable (
|
||||
{cvsRoot, module, tag ? null, date ? null, sha256}:
|
||||
lib.fetchers.withNormalizedHash { } (
|
||||
{cvsRoot, module, tag ? null, date ? null, outputHash, outputHashAlgo}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "cvs-export";
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [cvs openssh];
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "cvs-export";
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [cvs openssh];
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = sha256;
|
||||
inherit outputHash outputHashAlgo;
|
||||
outputHashMode = "recursive";
|
||||
|
||||
inherit cvsRoot module sha256 tag date;
|
||||
}
|
||||
inherit cvsRoot module tag date;
|
||||
}
|
||||
)
|
||||
)
|
||||
|
@ -59,7 +59,7 @@ if test -z "$finalPath"; then
|
||||
(cd "$tmpPath" && cvs -f -z0 -d $cvsRoot export "${args[*]}" -d cvs-export $module >&2)
|
||||
|
||||
# Compute the hash.
|
||||
hash=$(nix-hash --type $hashType $hashFormat $tmpFile)
|
||||
hash=$(nix-hash --type $hashType ${hashFormat:-"--sri"} $tmpFile)
|
||||
if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
|
||||
|
||||
# Add the downloaded file to the Nix store.
|
||||
|
@ -1,21 +1,23 @@
|
||||
{stdenvNoCC, darcs, cacert, lib}:
|
||||
|
||||
lib.makeOverridable (
|
||||
{ url
|
||||
, rev ? null
|
||||
, context ? null
|
||||
, sha256 ? ""
|
||||
, name ? "fetchdarcs"
|
||||
}:
|
||||
lib.fetchers.withNormalizedHash { } (
|
||||
{ url
|
||||
, rev ? null
|
||||
, context ? null
|
||||
, outputHash ? lib.fakeHash
|
||||
, outputHashAlgo ? null
|
||||
, name ? "fetchdarcs"
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [cacert darcs];
|
||||
stdenvNoCC.mkDerivation {
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [cacert darcs];
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = sha256;
|
||||
inherit outputHash outputHashAlgo;
|
||||
outputHashMode = "recursive";
|
||||
|
||||
inherit url rev context name;
|
||||
}
|
||||
inherit url rev context name;
|
||||
}
|
||||
)
|
||||
)
|
||||
|
@ -1,33 +1,26 @@
|
||||
{stdenv, lib, fossil, cacert}:
|
||||
|
||||
{ name ? null
|
||||
, url
|
||||
, rev
|
||||
, sha256 ? ""
|
||||
, hash ? ""
|
||||
}:
|
||||
lib.fetchers.withNormalizedHash { } (
|
||||
{ name ? null
|
||||
, url
|
||||
, rev
|
||||
, outputHash ? lib.fakeHash
|
||||
, outputHashAlgo ? null
|
||||
}:
|
||||
|
||||
if hash != "" && sha256 != "" then
|
||||
throw "Only one of sha256 or hash can be set"
|
||||
else
|
||||
stdenv.mkDerivation {
|
||||
name = "fossil-archive" + (lib.optionalString (name != null) "-${name}");
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [fossil cacert];
|
||||
stdenv.mkDerivation {
|
||||
name = "fossil-archive" + (lib.optionalString (name != null) "-${name}");
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [fossil cacert];
|
||||
|
||||
# Envvar docs are hard to find. A link for the future:
|
||||
# https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md
|
||||
impureEnvVars = [ "http_proxy" ];
|
||||
# Envvar docs are hard to find. A link for the future:
|
||||
# https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md
|
||||
impureEnvVars = [ "http_proxy" ];
|
||||
|
||||
outputHashAlgo = if hash != "" then null else "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = if hash != "" then
|
||||
hash
|
||||
else if sha256 != "" then
|
||||
sha256
|
||||
else
|
||||
lib.fakeSha256;
|
||||
inherit outputHash outputHashAlgo;
|
||||
outputHashMode = "recursive";
|
||||
|
||||
inherit url rev;
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
inherit url rev;
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
)
|
||||
|
@ -1,30 +1,31 @@
|
||||
{ stdenvNoCC, gx, gx-go, go, cacert }:
|
||||
{ lib, stdenvNoCC, gx, gx-go, go, cacert }:
|
||||
|
||||
{ name, src, sha256 }:
|
||||
lib.fetchers.withNormalizedHash { } (
|
||||
{ name, src, outputHash, outputHashAlgo }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "${name}-gxdeps";
|
||||
inherit src;
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "${name}-gxdeps";
|
||||
inherit src;
|
||||
|
||||
nativeBuildInputs = [ cacert go gx gx-go ];
|
||||
nativeBuildInputs = [ cacert go gx gx-go ];
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = sha256;
|
||||
inherit outputHash outputHashAlgo;
|
||||
outputHashMode = "recursive";
|
||||
|
||||
dontConfigure = true;
|
||||
doCheck = false;
|
||||
doInstallCheck = false;
|
||||
dontConfigure = true;
|
||||
doCheck = false;
|
||||
doInstallCheck = false;
|
||||
|
||||
buildPhase = ''
|
||||
export GOPATH=$(pwd)/vendor
|
||||
mkdir -p vendor
|
||||
gx install
|
||||
'';
|
||||
buildPhase = ''
|
||||
export GOPATH=$(pwd)/vendor
|
||||
mkdir -p vendor
|
||||
gx install
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mv vendor $out
|
||||
'';
|
||||
installPhase = ''
|
||||
mv vendor $out
|
||||
'';
|
||||
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
)
|
||||
|
@ -1,50 +1,36 @@
|
||||
{ stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, curl
|
||||
}:
|
||||
lib.fetchers.withNormalizedHash { hashTypes = [ "sha1" "sha256" "sha512" ]; } (
|
||||
{ ipfs
|
||||
, url ? ""
|
||||
, curlOpts ? ""
|
||||
, outputHash
|
||||
, outputHashAlgo
|
||||
, meta ? {}
|
||||
, port ? "8080"
|
||||
, postFetch ? ""
|
||||
, preferLocalBuild ? true
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = ipfs;
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [ curl ];
|
||||
|
||||
{ ipfs
|
||||
, url ? ""
|
||||
, curlOpts ? ""
|
||||
, outputHash ? ""
|
||||
, outputHashAlgo ? ""
|
||||
, md5 ? ""
|
||||
, sha1 ? ""
|
||||
, sha256 ? ""
|
||||
, sha512 ? ""
|
||||
, meta ? {}
|
||||
, port ? "8080"
|
||||
, postFetch ? ""
|
||||
, preferLocalBuild ? true
|
||||
}:
|
||||
# New-style output content requirements.
|
||||
inherit outputHash outputHashAlgo;
|
||||
outputHashMode = "recursive";
|
||||
|
||||
let
|
||||
inherit curlOpts
|
||||
postFetch
|
||||
ipfs
|
||||
url
|
||||
port
|
||||
meta;
|
||||
|
||||
hasHash = (outputHash != "" && outputHashAlgo != "")
|
||||
|| md5 != "" || sha1 != "" || sha256 != "" || sha512 != "";
|
||||
|
||||
in
|
||||
|
||||
if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation {
|
||||
name = ipfs;
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [ curl ];
|
||||
|
||||
# New-style output content requirements.
|
||||
outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
|
||||
if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
|
||||
outputHash = if outputHash != "" then outputHash else
|
||||
if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
|
||||
|
||||
outputHashMode = "recursive";
|
||||
|
||||
inherit curlOpts
|
||||
postFetch
|
||||
ipfs
|
||||
url
|
||||
port
|
||||
meta;
|
||||
|
||||
# Doing the download on a remote machine just duplicates network
|
||||
# traffic, so don't do that.
|
||||
inherit preferLocalBuild;
|
||||
}
|
||||
# Doing the download on a remote machine just duplicates network
|
||||
# traffic, so don't do that.
|
||||
inherit preferLocalBuild;
|
||||
}
|
||||
)
|
||||
|
@ -1,25 +1,24 @@
|
||||
# You can specify some extra mirrors and a cache DB via options
|
||||
{lib, stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}:
|
||||
# dbs is a list of strings
|
||||
# each is an url for sync
|
||||
|
||||
# selector is mtn selector, like h:org.example.branch
|
||||
#
|
||||
{name ? "mtn-checkout", dbs ? [], sha256
|
||||
, selector ? "h:" + branch, branch}:
|
||||
lib.fetchers.withNormalizedHash { } (
|
||||
# dbs is a list of strings, each is an url for sync
|
||||
# selector is mtn selector, like h:org.example.branch
|
||||
{name ? "mtn-checkout", dbs ? []
|
||||
, outputHash, outputHashAlgo
|
||||
, selector ? "h:" + branch, branch}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [monotone];
|
||||
stdenvNoCC.mkDerivation {
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [monotone];
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = sha256;
|
||||
inherit outputHash outputHashAlgo;
|
||||
outputHashMode = "recursive";
|
||||
|
||||
dbs = defaultDBMirrors ++ dbs;
|
||||
inherit branch cacheDB name selector;
|
||||
dbs = defaultDBMirrors ++ dbs;
|
||||
inherit branch cacheDB name selector;
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
}
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
}
|
||||
)
|
||||
|
@ -45,12 +45,12 @@ else
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
outputHashAlgo = if hash != "" then null else "sha256";
|
||||
outputHashAlgo = null;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = if hash != "" then
|
||||
hash
|
||||
else
|
||||
lib.fakeSha256;
|
||||
lib.fakeHash;
|
||||
|
||||
inherit url change state channel;
|
||||
|
||||
|
@ -1,36 +1,37 @@
|
||||
{ lib, runCommand, awscli }:
|
||||
lib.fetchers.withNormalizedHash { } (
|
||||
{ s3url
|
||||
, name ? builtins.baseNameOf s3url
|
||||
, outputHash
|
||||
, outputHashAlgo
|
||||
, region ? "us-east-1"
|
||||
, credentials ? null # Default to looking at local EC2 metadata service
|
||||
, recursiveHash ? false
|
||||
, postFetch ? null
|
||||
}:
|
||||
|
||||
{ s3url
|
||||
, name ? builtins.baseNameOf s3url
|
||||
, sha256
|
||||
, region ? "us-east-1"
|
||||
, credentials ? null # Default to looking at local EC2 metadata service
|
||||
, recursiveHash ? false
|
||||
, postFetch ? null
|
||||
}:
|
||||
let
|
||||
mkCredentials = { access_key_id, secret_access_key, session_token ? null }: {
|
||||
AWS_ACCESS_KEY_ID = access_key_id;
|
||||
AWS_SECRET_ACCESS_KEY = secret_access_key;
|
||||
AWS_SESSION_TOKEN = session_token;
|
||||
};
|
||||
|
||||
let
|
||||
mkCredentials = { access_key_id, secret_access_key, session_token ? null }: {
|
||||
AWS_ACCESS_KEY_ID = access_key_id;
|
||||
AWS_SECRET_ACCESS_KEY = secret_access_key;
|
||||
AWS_SESSION_TOKEN = session_token;
|
||||
};
|
||||
credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials);
|
||||
in runCommand name ({
|
||||
nativeBuildInputs = [ awscli ];
|
||||
|
||||
credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials);
|
||||
in runCommand name ({
|
||||
nativeBuildInputs = [ awscli ];
|
||||
inherit outputHash outputHashAlgo;
|
||||
outputHashMode = if recursiveHash then "recursive" else "flat";
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = sha256;
|
||||
outputHashMode = if recursiveHash then "recursive" else "flat";
|
||||
preferLocalBuild = true;
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
AWS_DEFAULT_REGION = region;
|
||||
} // credentialAttrs) (if postFetch != null then ''
|
||||
downloadedFile="$(mktemp)"
|
||||
aws s3 cp ${s3url} $downloadedFile
|
||||
${postFetch}
|
||||
'' else ''
|
||||
aws s3 cp ${s3url} $out
|
||||
'')
|
||||
AWS_DEFAULT_REGION = region;
|
||||
} // credentialAttrs) (if postFetch != null then ''
|
||||
downloadedFile="$(mktemp)"
|
||||
aws s3 cp ${s3url} $downloadedFile
|
||||
${postFetch}
|
||||
'' else ''
|
||||
aws s3 cp ${s3url} $out
|
||||
'')
|
||||
)
|
||||
|
@ -1,17 +1,19 @@
|
||||
{stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}:
|
||||
{username, password, url, rev ? "HEAD", sha256 ? ""}:
|
||||
{lib, stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}:
|
||||
{username, password
|
||||
, url, rev ? "HEAD"
|
||||
, outputHash ? lib.fakeHash, outputHashAlgo ? null}:
|
||||
|
||||
lib.fetchers.withNormalizedHash { } (
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "svn-export-ssh";
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [subversion expect];
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "svn-export-ssh";
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [subversion expect];
|
||||
inherit outputHash outputHashAlgo;
|
||||
outputHashMode = "recursive";
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = sha256;
|
||||
sshSubversion = ./sshsubversion.exp;
|
||||
|
||||
sshSubversion = ./sshsubversion.exp;
|
||||
|
||||
inherit username password url rev sshSupport openssh;
|
||||
}
|
||||
inherit username password url rev sshSupport openssh;
|
||||
}
|
||||
)
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "albert";
|
||||
version = "0.26.3";
|
||||
version = "0.26.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "albertlauncher";
|
||||
repo = "albert";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-f5dTGthT8rGPjW41BaPtQlf8C10TUBmIzkhsCTgNeg4=";
|
||||
hash = "sha256-MEpBZV1Fxoq24eT1hgyrp33qcaLqmQ+aAP974Yn8d2g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pexpect
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = with python3.pkgs; {
|
||||
optional-dependencies = with python3.pkgs; {
|
||||
dev = [
|
||||
mypy
|
||||
pytest
|
||||
|
@ -26,13 +26,13 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "bruno";
|
||||
version = "1.29.1";
|
||||
version = "1.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UXxMHTunsKXXt0NX5fuyzQbtp4AUzLXnFHqe8Is6Cmc=";
|
||||
hash = "sha256-9dH79ytqkZcdgUMbTa32VHKr2dHiNsJu6GawDtRsJx0=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
|
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, autoPatchelfHook
|
||||
, xclip
|
||||
,
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@ -27,7 +27,7 @@ buildGoModule rec {
|
||||
"-X=github.com/one2nc/cloudlens/cmd.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
|
||||
|
||||
buildInputs = [ xclip ];
|
||||
|
||||
|
@ -13,10 +13,10 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-xOP9NOcuBRrX998jF4dTpUtS9jPux4jHu057sPPjGWA=";
|
||||
aarch64-linux = "sha256-RVy/k1nUbT0MGIuSnEJZqGM+kQhBEUSD/D2uk5ZmYzs=";
|
||||
x86_64-darwin = "sha256-MtUAO6xvSDcLokjmW1CAOC8+3pTMFy1yteKmb/WUpGs=";
|
||||
aarch64-darwin = "sha256-OZf74uvuka4S8JKYcGM1f8T2RrdTxelLMmx74Ee83ek=";
|
||||
x86_64-linux = "sha256-/m+t4abPgVWeGpfDkPm5DGCIXm1LoM5znHfES9lotAo=";
|
||||
aarch64-linux = "sha256-0kR799yuxSFmyedJ14f5/EqOiFHs9cWjeJKvDIpIRl0=";
|
||||
x86_64-darwin = "sha256-7Go5qZVAe2UHn547HZG4fmh84iF2r15+0IIlJK72Fqg=";
|
||||
aarch64-darwin = "sha256-fe4GrgLRr66Qmme3p0X5BEwvKZhqG1aiE8xs5A1Dt6E=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
bin = "$out/bin/codeium_language_server";
|
||||
@ -24,7 +24,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "codeium";
|
||||
version = "1.16.11";
|
||||
version = "1.16.18";
|
||||
src = fetchurl {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
|
||||
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
|
||||
|
@ -4,8 +4,8 @@
|
||||
, withGUI ? true
|
||||
}:
|
||||
let
|
||||
mandown' = python3Packages.mandown.overrideAttrs (prev: {
|
||||
propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.passthru.optional-dependencies.gui;
|
||||
mandown' = python3Packages.mandown.overridePythonAttrs (prev: {
|
||||
propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.optional-dependencies.gui;
|
||||
});
|
||||
mandownApp = python3Packages.toPythonApplication mandown';
|
||||
in
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "doggo";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mr-karan";
|
||||
repo = "doggo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SD/BcJxoc5Oi8+nAs+CWBEcbgtaohykNlZ14jJvEWew=";
|
||||
hash = "sha256-SbTwVvE699MCgfUXifnJ1oMNN8TdLg8P03Xx5hrQxF8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JIc6/G1hMf8+oIe4OMc+b0th5MCgi5Mwp3AxW4OD1lg=";
|
||||
vendorHash = "sha256-44gBPMr6gKaRaq7W69K7OBTVXvsz9pSEL1eOKYd4fT8=";
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
subPackages = [ "cmd/doggo" ];
|
||||
|
||||
@ -43,6 +43,6 @@ buildGoModule rec {
|
||||
It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well
|
||||
'';
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ georgesalkhouri ];
|
||||
maintainers = with maintainers; [ georgesalkhouri ma27 ];
|
||||
};
|
||||
}
|
||||
|
@ -1,11 +1,14 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, darwin
|
||||
, gpgme
|
||||
, libgpg-error
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
installShellFiles,
|
||||
darwin,
|
||||
gpgme,
|
||||
libgpg-error,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
let
|
||||
@ -13,32 +16,34 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "envio";
|
||||
version = "0.5.1";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "envio-cli";
|
||||
repo = "envio";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KhjHd+1IeKdASeYP2rPtyTmtkPcBbaruylmOwTPtFgo=";
|
||||
hash = "sha256-je0DBoBIayFK//Aija5bnO/2z+hxNWgVkwOgxMyq5s4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qmJUARwsGln07RAX1Ab0cNDgJq7NkezuT0tZsyd48Mw=";
|
||||
cargoHash = "sha256-L7GgPocj32zAfR27dgKK7/OM106cATdCqufSvG3MFYQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [ libgpg-error gpgme ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
|
||||
buildInputs = [
|
||||
libgpg-error
|
||||
gpgme
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
|
||||
|
||||
# Remove postPatch when updating to the next envio release
|
||||
# For details see https://github.com/envio-cli/envio/pull/31
|
||||
postPatch = ''
|
||||
substituteInPlace build.rs\
|
||||
--replace 'fn get_version() -> String {' 'fn get_version() -> String { return "${version}".to_string();'
|
||||
postInstall = ''
|
||||
installManPage man/*.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://envio-cli.github.io/home";
|
||||
changelog = "https://github.com/envio-cli/envio/blob/${version}/CHANGELOG.md";
|
||||
homepage = "https://envio-cli.github.io/home";
|
||||
changelog = "https://github.com/envio-cli/envio/blob/${version}/CHANGELOG.md";
|
||||
description = "Modern and secure CLI tool for managing environment variables";
|
||||
mainProgram = "envio";
|
||||
longDescription = ''
|
||||
@ -47,8 +52,11 @@ rustPlatform.buildRustPackage rec {
|
||||
switch between different configurations and apply them to their current
|
||||
environment.
|
||||
'';
|
||||
license = with licenses; [ mit asl20 ];
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ afh ];
|
||||
};
|
||||
}
|
||||
|
@ -9,13 +9,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "githooks";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabyx";
|
||||
repo = "githooks";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9IsE9XGeMgOPPEyBvGLZaZKyz5HjnugiELP76+alFmU=";
|
||||
hash = "sha256-pTSC8ruNiPzQO1C6j+G+WFX3pz/mWPukuWkKUSYdfHw=";
|
||||
};
|
||||
|
||||
modRoot = "./githooks";
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glance";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glanceapp";
|
||||
repo = "glance";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-neoRuduQOC3DHeIy/sh1BWUwcwXPGQIgZRWQcL7gzlk=";
|
||||
hash = "sha256-A2EFIDwJbIzRDAxFKW7znZFYKYpqOMEixUG0yUDx7zc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BLWaYiWcLX+/DW7Zzp6/Mtw5uVxIVtfubB895hrZ+08=";
|
||||
|
79
pkgs/by-name/ha/harlequin/package.nix
Normal file
79
pkgs/by-name/ha/harlequin/package.nix
Normal file
@ -0,0 +1,79 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
harlequin,
|
||||
testers,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
withPostgresAdapter ? true,
|
||||
withBigQueryAdapter ? true,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "harlequin";
|
||||
version = "1.24.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tconbeer";
|
||||
repo = "harlequin";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3Rb47zkWsC6RJhk1btQc/kwxpFFWVnxY2PJooHB7IzQ=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
textual
|
||||
textual-fastdatatable
|
||||
textual-textarea
|
||||
click
|
||||
rich-click
|
||||
duckdb
|
||||
sqlfmt
|
||||
platformdirs
|
||||
importlib-metadata
|
||||
tomlkit
|
||||
questionary
|
||||
numpy
|
||||
packaging
|
||||
]
|
||||
++ lib.optionals withPostgresAdapter [ harlequin-postgres ]
|
||||
++ lib.optionals withBigQueryAdapter [ harlequin-bigquery ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"textual"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"harlequin"
|
||||
"harlequin_duckdb"
|
||||
"harlequin_sqlite"
|
||||
"harlequin_vscode"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
package = harlequin;
|
||||
};
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "The SQL IDE for Your Terminal";
|
||||
homepage = "https://harlequin.sh";
|
||||
mainProgram = "harlequin";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pcboy ];
|
||||
platforms = lib.platforms.unix;
|
||||
changelog = "https://github.com/tconbeer/harlequin/releases/tag/v${version}";
|
||||
};
|
||||
}
|
@ -5,10 +5,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "heptabase";
|
||||
version = "1.39.0";
|
||||
version = "1.40.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
|
||||
hash = "sha256-/uRPxmMTBr2ZkkY/Sp0FHI76ttoDDO7pID6fFckvUY8=";
|
||||
hash = "sha256-EnGn3N8dJ7bx60eY8u1LxgQaLkU/RR+ANEG817XfaS0=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
aiohttp
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
pulseaudio = with python3.pkgs; [
|
||||
pasimple
|
||||
pulsectl
|
||||
|
@ -1,4 +1,9 @@
|
||||
{ lib, stdenv, fetchurl, mpi } :
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
mpi,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hpcg";
|
||||
@ -9,19 +14,23 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ mpi ];
|
||||
|
||||
makeFlags = [ "arch=Linux_MPI" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/hpcg
|
||||
|
||||
cp bin/xhpcg $out/bin
|
||||
cp bin/hpcg.dat $out/share/hpcg
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -33,4 +42,3 @@ stdenv.mkDerivation rec {
|
||||
mainProgram = "xhpcg";
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imsprog";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bigbigmdm";
|
||||
repo = "IMSProg";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-FAvGGxw7qDuucAbyaq9gDhMvHL9mJCQApRzzQ7Kh0c8=";
|
||||
hash = "sha256-dhBg0f7pIbBS8IiUXd1UlAxgGrv6HapzooXafkHIEK8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -27,11 +27,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
jinja2
|
||||
] ++ lib.attrVals extras passthru.optional-dependencies;
|
||||
] ++ lib.attrVals extras optional-dependencies;
|
||||
|
||||
pythonImportsCheck = [ "jinja2cli" ];
|
||||
|
||||
passthru.optional-dependencies = with python3.pkgs; {
|
||||
optional-dependencies = with python3.pkgs; {
|
||||
hjson = [ hjson ];
|
||||
json5 = [ json5 ];
|
||||
toml = [ toml ];
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "lunarclient";
|
||||
version = "3.2.17";
|
||||
version = "3.2.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
|
||||
hash = "sha512-hzW7khHfWEYPtzMmedy/dXqKh7LPniqI7/0F1FtBtrlDnEIEQUq/7VUcygsVTBI6kuj8vTG5+PYcLez+cYAjqg==";
|
||||
hash = "sha512-gIkxplIDtbJSxWM4EXzXSy1G8c8x3jWWvqzGSM140Wu5pcSrVYf+QSMAPrzgBwQD7wUHdBuW92BA2X+/9Q1TmA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -27,13 +27,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "melonDS";
|
||||
version = "0.9.5-unstable-2024-09-18";
|
||||
version = "0.9.5-unstable-2024-09-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "melonDS-emu";
|
||||
repo = "melonDS";
|
||||
rev = "2179ca2a417e356f23a09cd88707b20c1bcaf66f";
|
||||
hash = "sha256-93KbpRlVVZc8JoaZiVLKOsTezLqY2Y7J2bFL7RkCcxM=";
|
||||
rev = "e9446fa9dc3ba64c22f8e5bb611ad394b5729eda";
|
||||
hash = "sha256-0YNF9NPKaaKzC3d8cXG4Od3AUc1zxVtuB5u2Q8ruwr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,17 +1,17 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch2, installShellFiles, nixosTests }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests, nix-update-script }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "miniflux";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miniflux";
|
||||
repo = "v2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-JE0sHxmvLGvbgOqH5f7OONAvP93dJLWLAbgTnlNHGHE=";
|
||||
hash = "sha256-b4slACQl+3vDsioULVKscBhS8LvTxCUPDnO7GlT46CM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y5FcKmvYMN9Q9/VpP8IWclFXt7gl61UiyPJ+Rdmlito=";
|
||||
vendorHash = "sha256-PL5tc6MQRHloc3Dfw+FpWdqrXErFPjEb8RNPmHr7jSk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -26,7 +26,10 @@ buildGoModule rec {
|
||||
installManPage miniflux.1
|
||||
'';
|
||||
|
||||
passthru.tests = nixosTests.miniflux;
|
||||
passthru = {
|
||||
tests = nixosTests.miniflux;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimalist and opinionated feed reader";
|
@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
pname = "mov-cli";
|
||||
version = "4.4.12";
|
||||
version = "4.4.14";
|
||||
in
|
||||
python3.pkgs.buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -18,7 +18,7 @@ python3.pkgs.buildPythonPackage {
|
||||
owner = "mov-cli";
|
||||
repo = "mov-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-S8IB2TRmzoSKKeTKhESWstPPbSIL8LwqV5Y2+9F0KMo=";
|
||||
hash = "sha256-c8Su215d3Lix2ft+J9zypLkolKFvO+HBFvXDibiCS14=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
165
pkgs/by-name/my/mycelium/Cargo.lock
generated
165
pkgs/by-name/my/mycelium/Cargo.lock
generated
@ -170,9 +170,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
|
||||
|
||||
[[package]]
|
||||
name = "axum"
|
||||
version = "0.7.5"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
|
||||
checksum = "8f43644eed690f5374f1af436ecd6aea01cd201f6fbdf0178adaf6907afb2cec"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"axum-core",
|
||||
@ -196,16 +196,16 @@ dependencies = [
|
||||
"serde_urlencoded",
|
||||
"sync_wrapper 1.0.1",
|
||||
"tokio",
|
||||
"tower",
|
||||
"tower 0.5.1",
|
||||
"tower-layer",
|
||||
"tower-service",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "axum-core"
|
||||
version = "0.4.3"
|
||||
version = "0.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
|
||||
checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bytes",
|
||||
@ -216,7 +216,7 @@ dependencies = [
|
||||
"mime",
|
||||
"pin-project-lite",
|
||||
"rustversion",
|
||||
"sync_wrapper 0.1.2",
|
||||
"sync_wrapper 1.0.1",
|
||||
"tower-layer",
|
||||
"tower-service",
|
||||
]
|
||||
@ -425,9 +425,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.16"
|
||||
version = "4.5.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
|
||||
checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@ -435,9 +435,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.15"
|
||||
version = "4.5.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
|
||||
checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@ -447,9 +447,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.13"
|
||||
version = "4.5.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
|
||||
checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@ -727,19 +727,20 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "etherparse"
|
||||
version = "0.15.0"
|
||||
version = "0.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "21696e6dfe1057a166a042c6d27b89a46aad2ee1003e6e1e03c49d54fd3270d7"
|
||||
checksum = "b8d8a704b617484e9d867a0423cd45f7577f008c4068e2e33378f8d3860a6d73"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "faster-hex"
|
||||
version = "0.9.0"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
|
||||
checksum = "7223ae2d2f179b803433d9c830478527e92b8117eab39460edae7f1614d9fb73"
|
||||
dependencies = [
|
||||
"heapless",
|
||||
"serde",
|
||||
]
|
||||
|
||||
@ -928,6 +929,15 @@ dependencies = [
|
||||
"tracing",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hash32"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.12.3"
|
||||
@ -949,6 +959,16 @@ version = "0.14.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
||||
|
||||
[[package]]
|
||||
name = "heapless"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
|
||||
dependencies = [
|
||||
"hash32",
|
||||
"stable_deref_trait",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.5.0"
|
||||
@ -1049,7 +1069,7 @@ dependencies = [
|
||||
"pin-project-lite",
|
||||
"socket2",
|
||||
"tokio",
|
||||
"tower",
|
||||
"tower 0.4.13",
|
||||
"tower-service",
|
||||
"tracing",
|
||||
]
|
||||
@ -1097,9 +1117,9 @@ checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d"
|
||||
|
||||
[[package]]
|
||||
name = "ipnet"
|
||||
version = "2.9.0"
|
||||
version = "2.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
|
||||
checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
|
||||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
@ -1242,12 +1262,6 @@ version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
|
||||
|
||||
[[package]]
|
||||
name = "memalloc"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.2"
|
||||
@ -1298,7 +1312,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mycelium"
|
||||
version = "0.5.4"
|
||||
version = "0.5.5"
|
||||
dependencies = [
|
||||
"aes-gcm",
|
||||
"arc-swap",
|
||||
@ -1333,7 +1347,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mycelium-api"
|
||||
version = "0.5.4"
|
||||
version = "0.5.5"
|
||||
dependencies = [
|
||||
"axum",
|
||||
"base64 0.22.1",
|
||||
@ -1346,7 +1360,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mycelium-cli"
|
||||
version = "0.5.4"
|
||||
version = "0.5.5"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"byte-unit",
|
||||
@ -1363,7 +1377,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mycelium-metrics"
|
||||
version = "0.5.4"
|
||||
version = "0.5.5"
|
||||
dependencies = [
|
||||
"axum",
|
||||
"mycelium",
|
||||
@ -1374,7 +1388,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "myceliumd"
|
||||
version = "0.5.4"
|
||||
version = "0.5.5"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"byte-unit",
|
||||
@ -1398,13 +1412,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "netdev"
|
||||
version = "0.30.0"
|
||||
version = "0.31.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7516ad2c46cc25da098ed7d6b9a0cbe9e1fbffbd04b1596148b95f2841179c83"
|
||||
checksum = "f901362e84cd407be6f8cd9d3a46bccf09136b095792785401ea7d283c79b91d"
|
||||
dependencies = [
|
||||
"dlopen2",
|
||||
"ipnet",
|
||||
"libc",
|
||||
"memalloc",
|
||||
"netlink-packet-core",
|
||||
"netlink-packet-route 0.17.1",
|
||||
"netlink-sys",
|
||||
@ -1871,15 +1885,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quinn"
|
||||
version = "0.11.3"
|
||||
version = "0.11.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
|
||||
checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"pin-project-lite",
|
||||
"quinn-proto",
|
||||
"quinn-udp",
|
||||
"rustc-hash 2.0.0",
|
||||
"rustc-hash",
|
||||
"rustls",
|
||||
"socket2",
|
||||
"thiserror",
|
||||
@ -1889,14 +1903,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quinn-proto"
|
||||
version = "0.11.2"
|
||||
version = "0.11.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08"
|
||||
checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"rand",
|
||||
"ring",
|
||||
"rustc-hash 1.2.0",
|
||||
"rustc-hash",
|
||||
"rustls",
|
||||
"slab",
|
||||
"thiserror",
|
||||
@ -2189,12 +2203,6 @@ version = "0.1.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3450ed37fe9609abb6bc3b8891b6e078404e4c53c7332350e2e15126a95229bf"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
version = "2.0.0"
|
||||
@ -2225,9 +2233,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustls"
|
||||
version = "0.23.12"
|
||||
version = "0.23.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
|
||||
checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"ring",
|
||||
@ -2245,9 +2253,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
|
||||
|
||||
[[package]]
|
||||
name = "rustls-webpki"
|
||||
version = "0.102.6"
|
||||
version = "0.102.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
|
||||
checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
|
||||
dependencies = [
|
||||
"ring",
|
||||
"rustls-pki-types",
|
||||
@ -2292,18 +2300,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.208"
|
||||
version = "1.0.210"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
|
||||
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.208"
|
||||
version = "1.0.210"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
|
||||
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -2312,9 +2320,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.125"
|
||||
version = "1.0.128"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
|
||||
checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
@ -2425,6 +2433,12 @@ version = "0.9.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
|
||||
|
||||
[[package]]
|
||||
name = "stable_deref_trait"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.11.1"
|
||||
@ -2611,9 +2625,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.39.3"
|
||||
version = "1.40.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
|
||||
checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"bytes",
|
||||
@ -2639,9 +2653,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio-stream"
|
||||
version = "0.1.15"
|
||||
version = "0.1.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
|
||||
checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"pin-project-lite",
|
||||
@ -2651,9 +2665,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio-tun"
|
||||
version = "0.11.5"
|
||||
version = "0.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68f5381752d5832fc811f89d54fc334951aa435022f494190ba7151661f206df"
|
||||
checksum = "fde69666e881ea060a36a0f39442beb843e2204beeeb2062fdfaa183add47013"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"nix 0.29.0",
|
||||
@ -2663,9 +2677,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio-util"
|
||||
version = "0.7.11"
|
||||
version = "0.7.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
|
||||
checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"futures-core",
|
||||
@ -2735,16 +2749,31 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tower-layer"
|
||||
version = "0.3.2"
|
||||
name = "tower"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
|
||||
checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-util",
|
||||
"pin-project-lite",
|
||||
"sync_wrapper 0.1.2",
|
||||
"tokio",
|
||||
"tower-layer",
|
||||
"tower-service",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tower-layer"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
|
||||
|
||||
[[package]]
|
||||
name = "tower-service"
|
||||
version = "0.3.2"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
|
||||
checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
|
||||
|
||||
[[package]]
|
||||
name = "tracing"
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mycelium";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
|
||||
sourceRoot = "${src.name}/myceliumd";
|
||||
|
||||
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "threefoldtech";
|
||||
repo = "mycelium";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sWpy6Q7Lh0AOzWKMsb/NQ6oFcxOKXB/To9+PFmcjSks=";
|
||||
hash = "sha256-IfWS7U52pviRL8oySOjBYCogwqUqoMLmvtHFSjWghHg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
@ -1,21 +1,27 @@
|
||||
{ lib
|
||||
, nix-update-script
|
||||
, python3
|
||||
, fetchPypi
|
||||
{
|
||||
lib,
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "oelint-adv";
|
||||
version = "6.0.0";
|
||||
format = "setuptools";
|
||||
version = "6.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_adv";
|
||||
hash = "sha256-tN+DHLj/sey8CipQT5nnwym0JkiIkR8WJg2jKys+4Yk=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "priv-kweihmann";
|
||||
repo = "oelint-adv";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bDttjeHcIK90W7zPrKNAS4B1L9mibaRjQdnUAU2N8as=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
anytree
|
||||
argcomplete
|
||||
colorama
|
||||
@ -23,14 +29,32 @@ python3.pkgs.buildPythonApplication rec {
|
||||
urllib3
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "urllib3" ];
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytest-cov-stub
|
||||
pytest-forked
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# requires network access
|
||||
"TestClassOelintVarsHomepagePing"
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "argcomplete" ];
|
||||
|
||||
pythonImportsCheck = [ "oelint_adv" ];
|
||||
|
||||
# Fail to run inside the code the build.
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace-fail "--random-order-bucket=global" "" \
|
||||
--replace-fail "--random-order" "" \
|
||||
--replace-fail "--force-sugar" "" \
|
||||
--replace-fail "--old-summary" ""
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Advanced bitbake-recipe linter";
|
||||
mainProgram = "oelint-adv";
|
||||
|
@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
tenacity
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
api = with python3.pkgs; [
|
||||
fastapi
|
||||
uvicorn
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openjph";
|
||||
version = "0.15.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aous72";
|
||||
repo = "openjph";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-v4rqBTS6rk5fgDQqvqPwFAYxLNxtsRhZuQsj+y3sE3o=";
|
||||
hash = "sha256-ljvdCrvKL3slVGqX97Ui65/6Doyucf2kdUEw6NWW9og=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake validatePkgConfig ];
|
||||
|
@ -33,11 +33,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plasticity";
|
||||
version = "24.2.0";
|
||||
version = "24.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
|
||||
hash = "sha256-3dHS7chTgoD35AV/q8DHIYl43KbCsoFYEqSQHXm05tg=";
|
||||
hash = "sha256-iiVh4k5r5PXN1/VJZcropTMu36N2B/ECq2L5e59QxJY=";
|
||||
};
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
tomli
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = with python3.pkgs; {
|
||||
optional-dependencies = with python3.pkgs; {
|
||||
poetry_plugin = [
|
||||
poetry
|
||||
];
|
||||
|
@ -7,7 +7,7 @@
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "achristmascarl";
|
||||
repo = "rainfrog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+jjVowyyjM344LRDl+xFPxQ7qfjIMOMVzFiDgUHBMKw=";
|
||||
hash = "sha256-yY4F5Aw+duXknESjl6hoOUV3er84DkTtIBoX3humWxA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0Wtsquus63fwaP7YUi/QelCJGU2cH1RWAYQWY9YbfMw=";
|
||||
cargoHash = "sha256-QMZUReWrOS0P+hxsV5c/eJxnwYX977+4oI7MPfz4dgg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
|
@ -12,6 +12,12 @@
|
||||
, vulkan-loader
|
||||
, glew
|
||||
, libGL
|
||||
, libICE
|
||||
, libSM
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXi
|
||||
, libXrandr
|
||||
, udev
|
||||
, SDL2
|
||||
, SDL2_mixer
|
||||
@ -49,6 +55,12 @@ buildDotnetModule rec {
|
||||
|
||||
# Avalonia UI
|
||||
glew
|
||||
libICE
|
||||
libSM
|
||||
libXcursor
|
||||
libXext
|
||||
libXi
|
||||
libXrandr
|
||||
|
||||
# Headless executable
|
||||
libGL
|
||||
|
@ -35,20 +35,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "siyuan";
|
||||
version = "3.1.6";
|
||||
version = "3.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siyuan-note";
|
||||
repo = "siyuan";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-xGxZ6xu8R/JoW4X+drEv943y1jah4ZijHB+RNN6hxig=";
|
||||
hash = "sha256-0sV3r3ETW/FeLJZQrkE95oqKeUKKiNA3vpOBPtHzeE8=";
|
||||
};
|
||||
|
||||
kernel = buildGo123Module {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/kernel";
|
||||
vendorHash = "sha256-I57T4/J0pL8/GISi22H1lpE1gkduNXdINvuo+F3YnAs=";
|
||||
vendorHash = "sha256-hxXCq03wxVLONaztZVqLjlqQ/fZNlV2iDF5JIayb5YY=";
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-3PdmCbaZZjnTCSpBcvG7nP+zTGamoY/ZXjay7c8Zx5w=";
|
||||
hash = "sha256-g6O6YE1irE3Hy+Xu7MeH97Oc4bq32IDnfP1VLSiF/U4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/app";
|
||||
|
@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
xlsxwriter
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = with python3.pkgs; {
|
||||
optional-dependencies = with python3.pkgs; {
|
||||
development = [
|
||||
invoke
|
||||
tox
|
||||
|
@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
|
||||
zeroconf
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
silerovad = with python3Packages; [
|
||||
pysilero-vad
|
||||
];
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
themeName = "Dracula";
|
||||
version = "4.0.0-unstable-2024-09-07";
|
||||
version = "4.0.0-unstable-2024-09-24";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "dracula-theme";
|
||||
@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "gtk";
|
||||
rev = "19e0dcb5d821df8948a96fef8be551f463fcf0d2";
|
||||
hash = "sha256-WfpoGEs2ki84HwE53Fh8CFiybJXZhaiP7m0sfx9Z1X4=";
|
||||
rev = "f2d2ea560a83ebdef6734b70dd9683272b47894d";
|
||||
hash = "sha256-/xgvlcMC4AHITy15dVHhdTIeu1mcA6Luhdanpr1as4Q=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
|
@ -8,16 +8,16 @@ let
|
||||
arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
|
||||
hashes =
|
||||
{
|
||||
"x86_64-linux" = "a51d5b9a011c54b0001ff3273cee027774686e233adadb20b1978d2cabfe32a6";
|
||||
"aarch64-linux" = "8904ce928f60e06df1f06b3af5ee5eb320c388922aa38b698d823df1d73e8e49";
|
||||
"x86_64-darwin" = "b4d1bb5ddc3503862750e5b241f74c22dc013792bc4f410dd914a5216e20ed2f";
|
||||
"aarch64-darwin" = "6d20e384dae90bb994c3f1e866c964124c7e8a51e9e08bad0e90a2b560bb5a18";
|
||||
"x86_64-linux" = "1v596zi4zmx88r4axrp7pmci3w9c6f1kz4izrbj65c7ch6wwa7f2";
|
||||
"aarch64-linux" = "0xf6lqm9xgph8q95h6smq6dzn5549nfsnayny5nyvm56nbmv5iw9";
|
||||
"x86_64-darwin" = "0kijrjfbr7hn469x67yya6ndfwj901m54gd96sq3yiay0jvmapga";
|
||||
"aarch64-darwin" = "1iigsd4ac0cbb1q2g02zxjxpcma6yyd7ms72ri8g2vq8i90zys9n";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lamdera";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}";
|
||||
|
@ -5,6 +5,6 @@
|
||||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
|
||||
import ./generic.nix {
|
||||
version = "3.104";
|
||||
hash = "sha256-TEGEKocapU5OTqx69n8nrn/X3SZr49d1alHM73UnDJw=";
|
||||
version = "3.105";
|
||||
hash = "sha256-Nfd7u0sdGqUCznnUxEJQFs+QuRSb+b7rZrcvKryimOQ=";
|
||||
}
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmlrpc-c";
|
||||
version = "1.51.07";
|
||||
version = "1.59.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xmlrpc-c/${pname}-${version}.tgz";
|
||||
sha256 = "sha256-hNIK4z+SdYL4IdYcC5GUrvvx15JFkKE/qdpa4WmK3tk=";
|
||||
hash = "sha256-vbcdtCqwvlFZFVWIXRFoKwRMEDTUoylkAb+SHsCyM/4=";
|
||||
};
|
||||
|
||||
buildInputs = [ curl libxml2 ];
|
||||
@ -20,7 +20,10 @@ stdenv.mkDerivation rec {
|
||||
(cd tools/xmlrpc && make && make install)
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight RPC library based on XML and HTTP";
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "signal";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-VVreL/gPcRiQk5XDNAXwoXpPvNIrxtL7nD9/Rf72SOc=";
|
||||
sha256 = "sha256-lO74/qeMiWCfjd9tX/i/wuDauTK0P4bOkRR0pYtcce4=";
|
||||
};
|
||||
|
||||
requiredOctavePackages = [
|
||||
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
dissect-target
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
full = [
|
||||
dissect-target
|
||||
minio
|
||||
@ -52,7 +52,7 @@ buildPythonPackage rec {
|
||||
] ++ dissect-target.optional-dependencies.full;
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full;
|
||||
nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full;
|
||||
|
||||
pythonImportsCheck = [ "acquire" ];
|
||||
|
||||
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
rsa
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
async = [
|
||||
aiofiles
|
||||
async-timeout
|
||||
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
||||
mock
|
||||
pycryptodome
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "adb_shell" ];
|
||||
|
||||
|
@ -48,7 +48,7 @@ buildPythonPackage rec {
|
||||
wrapt
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
awscli = [ awscli ];
|
||||
boto3 = [ boto3 ];
|
||||
};
|
||||
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
oscore = [
|
||||
cbor2
|
||||
cryptography
|
||||
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ siosocks ];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
socks = [ siosocks ];
|
||||
};
|
||||
|
||||
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
trustme
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# uses 127.0.0.2, which macos doesn't like
|
||||
|
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
aiohttp = [ aiohttp ];
|
||||
};
|
||||
|
||||
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
pytest-aiohttp
|
||||
pytest-cov-stub
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "aiojobs" ];
|
||||
|
||||
|
@ -45,9 +45,9 @@ buildPythonPackage rec {
|
||||
fastapi
|
||||
pytestCheckHook
|
||||
setproctitle
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
aiohttp = [ aiohttp ];
|
||||
#asgi = [ aiohttp-asgi ];
|
||||
cron = [ croniter ];
|
||||
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
quantile-python
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
aiohttp = [ aiohttp ];
|
||||
starlette = [ starlette ];
|
||||
quart = [ quart ];
|
||||
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
||||
httpx
|
||||
fastapi
|
||||
uvicorn
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "aioprometheus" ];
|
||||
|
||||
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
requests
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
pandas = [
|
||||
pandas
|
||||
];
|
||||
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
aioresponses
|
||||
requests-mock
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
# Starting with 3.0.0 most tests require an API key
|
||||
doCheck = false;
|
||||
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
pure-python-adb
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
async = [ aiofiles ];
|
||||
inherit (adb-shell.optional-dependencies) usb;
|
||||
};
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
] ++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.usb;
|
||||
] ++ optional-dependencies.async ++ optional-dependencies.usb;
|
||||
|
||||
disabledTests = [
|
||||
# Requires git but fails anyway
|
||||
|
@ -91,7 +91,7 @@ buildPythonPackage rec {
|
||||
unique-log-filter
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
AngrDB = [ sqlalchemy ];
|
||||
};
|
||||
|
||||
|
@ -50,7 +50,7 @@ buildPythonPackage rec {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
vertex = [ google-auth ];
|
||||
};
|
||||
|
||||
|
@ -56,7 +56,7 @@ buildPythonPackage rec {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
trio = [ trio ];
|
||||
};
|
||||
|
||||
@ -69,7 +69,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
trustme
|
||||
uvloop
|
||||
] ++ passthru.optional-dependencies.trio;
|
||||
] ++ optional-dependencies.trio;
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W"
|
||||
|
@ -22,14 +22,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-omw6znk09r2SigPfaVrtA6dd8KeSfjaPgGfK12ty23g=";
|
||||
};
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
graphql = [ graphql-core ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "apischema" ];
|
||||
|
||||
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ packaging ];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
marshmallow = [ marshmallow ];
|
||||
yaml = [ pyyaml ];
|
||||
validation = [
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "apispec" ];
|
||||
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-ucSC5aTvpnlAVQcT0afVecnoN3hIZKtzUhEQ6Qg0jQM=";
|
||||
};
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
with-fonttools = [ fonttools ];
|
||||
};
|
||||
|
||||
|
@ -106,7 +106,7 @@ buildPythonPackage rec {
|
||||
typer
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
server =
|
||||
[
|
||||
aiofiles
|
||||
@ -178,7 +178,7 @@ buildPythonPackage rec {
|
||||
pytest-mock
|
||||
pytest-asyncio
|
||||
factory-boy
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
disabledTestPaths = [ "tests/server/datasets/test_dao.py" ];
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user