diff options
Diffstat (limited to 'pkgs/by-name/do')
-rw-r--r-- | pkgs/by-name/do/docker-credential-gcr/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/do/doggo/package.nix | 18 | ||||
-rw-r--r-- | pkgs/by-name/do/donpapi/package.nix | 1 | ||||
-rw-r--r-- | pkgs/by-name/do/dooit/package.nix | 27 | ||||
-rw-r--r-- | pkgs/by-name/do/dopamine/package.nix | 39 | ||||
-rw-r--r-- | pkgs/by-name/do/doppler/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/do/dorion/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/do/dotenv-cli/package.json | 26 | ||||
-rw-r--r-- | pkgs/by-name/do/dotenv-cli/package.nix | 19 | ||||
-rw-r--r-- | pkgs/by-name/do/dotenvx/package.nix | 40 | ||||
-rw-r--r-- | pkgs/by-name/do/downonspot/Cargo.lock.patch | 32 | ||||
-rw-r--r-- | pkgs/by-name/do/downonspot/package.nix | 8 |
12 files changed, 148 insertions, 76 deletions
diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix index 620cce7743743..5f656f14eaad6 100644 --- a/pkgs/by-name/do/docker-credential-gcr/package.nix +++ b/pkgs/by-name/do/docker-credential-gcr/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.22"; + version = "2.1.23"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "refs/tags/v${version}"; - sha256 = "sha256-vGX6Jhh91dUqZ+y+h1SlPiFE3dL0UO3iJyyzvQVoUsQ="; + sha256 = "sha256-ViZxxqRZQPevuK/yueHKmg4CwnNpgfyXszGalzWucko="; }; postPatch = '' diff --git a/pkgs/by-name/do/doggo/package.nix b/pkgs/by-name/do/doggo/package.nix index 2fe817010bf3b..cf8c3ae362281 100644 --- a/pkgs/by-name/do/doggo/package.nix +++ b/pkgs/by-name/do/doggo/package.nix @@ -1,35 +1,39 @@ { buildGoModule , fetchFromGitHub , installShellFiles +, nix-update-script , lib }: buildGoModule rec { pname = "doggo"; - version = "0.5.7"; + version = "1.0.4"; src = fetchFromGitHub { owner = "mr-karan"; - repo = pname; + repo = "doggo"; rev = "v${version}"; - hash = "sha256-hzl7BE3vsE2G9O2nwN/gkqQTJ+9aDfNIjmpmgN1AYq8="; + hash = "sha256-SD/BcJxoc5Oi8+nAs+CWBEcbgtaohykNlZ14jJvEWew="; }; - vendorHash = "sha256-uonybBLABPj9CPtc+y82ajvQI7kubK+lKi4eLcZIUqA="; + vendorHash = "sha256-JIc6/G1hMf8+oIe4OMc+b0th5MCgi5Mwp3AxW4OD1lg="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/doggo" ]; ldflags = [ - "-w -s" + "-s" "-X main.buildVersion=v${version}" ]; postInstall = '' installShellCompletion --cmd doggo \ - --fish --name doggo.fish completions/doggo.fish \ - --zsh --name _doggo completions/doggo.zsh + --bash <($out/bin/doggo completions bash) \ + --fish <($out/bin/doggo completions fish) \ + --zsh <($out/bin/doggo completions zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/mr-karan/doggo"; description = "Command-line DNS Client for Humans. Written in Golang"; diff --git a/pkgs/by-name/do/donpapi/package.nix b/pkgs/by-name/do/donpapi/package.nix index 1271d67d398f6..c2a777b3dc431 100644 --- a/pkgs/by-name/do/donpapi/package.nix +++ b/pkgs/by-name/do/donpapi/package.nix @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix index b8fae74dd85e6..b55e7481e5598 100644 --- a/pkgs/by-name/do/dooit/package.nix +++ b/pkgs/by-name/do/dooit/package.nix @@ -1,11 +1,14 @@ -{ lib -, fetchFromGitHub -, dooit -, python3 -, testers -, nix-update-script +{ + lib, + fetchFromGitHub, + dooit, + python311, + testers, + nix-update-script, }: - +let + python3 = python311; +in python3.pkgs.buildPythonApplication rec { pname = "dooit"; version = "2.2.0"; @@ -18,10 +21,7 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-GtXRzj+o+FClleh73kqelk0JrSyafZhf847lX1BiS9k="; }; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = with python3.pkgs; [ poetry-core ]; pythonRelaxDeps = [ "textual" @@ -54,7 +54,10 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/kraanzu/dooit"; changelog = "https://github.com/kraanzu/dooit/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ khaneliman wesleyjrz ]; + maintainers = with maintainers; [ + khaneliman + wesleyjrz + ]; mainProgram = "dooit"; }; } diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix new file mode 100644 index 0000000000000..0d74a3a6f2eda --- /dev/null +++ b/pkgs/by-name/do/dopamine/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchurl, + appimageTools, + nix-update-script, +}: +appimageTools.wrapType2 rec { + pname = "dopamine"; + version = "3.0.0-preview.29"; + + src = fetchurl { + url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage"; + hash = "sha256-VBqnqDMLDC5XJIXygENWagXllq1P090EtumADDd2I8w="; + }; + + extraInstallCommands = + let + contents = appimageTools.extract { inherit pname version src; }; + in + '' + install -Dm644 ${contents}/dopamine.desktop $out/share/applications/dopamine.desktop + substituteInPlace $out/share/applications/dopamine.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=dopamine' + cp -r ${contents}/usr/share/icons $out/share + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; + + meta = { + changelog = "https://github.com/digimezzo/dopamine/blob/${version}/CHANGELOG.md"; + description = "Audio player that keeps it simple"; + homepage = "https://github.com/digimezzo/dopamine"; + license = lib.licenses.gpl3Only; + mainProgram = "dopamine"; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index 29537bcb9abb3..f3fbfe1caf209 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -4,6 +4,7 @@ , installShellFiles , lib , testers +, stdenv }: buildGoModule rec { @@ -28,6 +29,9 @@ buildGoModule rec { postInstall = '' mv $out/bin/cli $out/bin/doppler + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export HOME=$TMPDIR + mkdir $HOME/.doppler # to avoid race conditions below installShellCompletion --cmd doppler \ --bash <($out/bin/doppler completion bash) \ --fish <($out/bin/doppler completion fish) \ diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index f31256ad85811..1ed9382bef8f2 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "dorion"; - version = "4.3.0"; + version = "5.0.1"; src = fetchurl { url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb"; - hash = "sha256-bVanhJqHQxe3imP07EsRuDu0Isj9rf4VoIjmoAPfaQk="; + hash = "sha256-cCZikTZ+IU3mq/FkJfeggXLyWIsWG+a2qu1GbgW93WQ="; }; unpackCmd = '' @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tiny alternative Discord client"; license = lib.licenses.gpl3Only; mainProgram = "dorion"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.intersectLists (lib.platforms.linux) (lib.platforms.x86_64); sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/do/dotenv-cli/package.json b/pkgs/by-name/do/dotenv-cli/package.json deleted file mode 100644 index 3ad9bff441a1b..0000000000000 --- a/pkgs/by-name/do/dotenv-cli/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "dotenv-cli", - "description": "A global executable to run applications with the ENV variables loaded by dotenv", - "version": "7.4.3", - "author": "entropitor", - "bin": { - "dotenv": "./cli.js" - }, - "dependencies": { - "cross-spawn": "^7.0.3", - "dotenv": "^16.3.0", - "dotenv-expand": "^10.0.0", - "minimist": "^1.2.6" - }, - "devDependencies": { - "standard": "^16.0.4" - }, - "license": "MIT", - "main": "index.js", - "preferGlobal": true, - "repository": "entropitor/dotenv-cli", - "scripts": { - "lint": "standard" - }, - "resolutions": {} -} diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix index 298fb07118c17..8ca6297020bc6 100644 --- a/pkgs/by-name/do/dotenv-cli/package.nix +++ b/pkgs/by-name/do/dotenv-cli/package.nix @@ -1,10 +1,14 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, - nix-update-script -}: mkYarnPackage rec { + yarnConfigHook, + npmHooks, + nodejs, + nix-update-script, +}: +stdenv.mkDerivation rec { pname = "dotenv-cli"; version = "7.4.3"; @@ -15,12 +19,17 @@ hash = "sha256-kR9LSHvbvKLuJBGrsmYMeqF3s8SF+/99OeNlKp9azI8="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { + yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; hash = "sha256-Sx5DHUAXquqMqJgvhvHcRPqkfWN49+6icUQIos6OHCg="; }; + nativeBuildInputs = [ + yarnConfigHook + npmHooks.npmInstallHook + nodejs + ]; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix new file mode 100644 index 0000000000000..a2dae9664cb96 --- /dev/null +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + testers, + dotenvx, +}: + +buildNpmPackage rec { + pname = "dotenvx"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "dotenvx"; + repo = "dotenvx"; + rev = "refs/tags/v${version}"; + hash = "sha256-AEgf46LCqQCKdq7yEvvumtVVZltPUn8ktLuFiLJar3g="; + }; + + npmDepsHash = "sha256-TdMGkw5/aP9Ki65Ik7286fH5FD5VAfFgATul9ZOHWxA="; + + dontNpmBuild = true; + + passthru.tests = { + version = testers.testVersion { + package = dotenvx; + # access to the home directory + command = "HOME=$TMPDIR dotenvx --version"; + }; + }; + + meta = { + description = "Better dotenv–from the creator of `dotenv"; + homepage = "https://github.com/dotenvx/dotenvx"; + changelog = "https://github.com/dotenvx/dotenvx/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "dotenvx"; + }; +} diff --git a/pkgs/by-name/do/downonspot/Cargo.lock.patch b/pkgs/by-name/do/downonspot/Cargo.lock.patch index e224603a30708..692c03967b887 100644 --- a/pkgs/by-name/do/downonspot/Cargo.lock.patch +++ b/pkgs/by-name/do/downonspot/Cargo.lock.patch @@ -1,8 +1,8 @@ diff --git a/Cargo.lock b/Cargo.lock -index e6f1267..3bf16a5 100644 +index cccafd9..75d2a85 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1632,7 +1632,8 @@ dependencies = [ +@@ -1655,7 +1655,8 @@ dependencies = [ [[package]] name = "librespot" version = "0.4.2" @@ -12,7 +12,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "base64 0.13.1", "env_logger", -@@ -1658,7 +1659,8 @@ dependencies = [ +@@ -1681,7 +1682,8 @@ dependencies = [ [[package]] name = "librespot-audio" version = "0.4.2" @@ -22,7 +22,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "aes-ctr", "byteorder", -@@ -1673,7 +1675,8 @@ dependencies = [ +@@ -1696,7 +1698,8 @@ dependencies = [ [[package]] name = "librespot-connect" version = "0.4.2" @@ -32,7 +32,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "form_urlencoded", "futures-util", -@@ -1693,7 +1696,8 @@ dependencies = [ +@@ -1716,7 +1719,8 @@ dependencies = [ [[package]] name = "librespot-core" version = "0.4.2" @@ -42,7 +42,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "aes", "base64 0.13.1", -@@ -1733,7 +1737,8 @@ dependencies = [ +@@ -1756,7 +1760,8 @@ dependencies = [ [[package]] name = "librespot-discovery" version = "0.4.2" @@ -52,7 +52,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "aes-ctr", "base64 0.13.1", -@@ -1754,7 +1759,8 @@ dependencies = [ +@@ -1777,7 +1782,8 @@ dependencies = [ [[package]] name = "librespot-metadata" version = "0.4.2" @@ -62,7 +62,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "async-trait", "byteorder", -@@ -1767,7 +1773,8 @@ dependencies = [ +@@ -1790,7 +1796,8 @@ dependencies = [ [[package]] name = "librespot-playback" version = "0.4.2" @@ -72,7 +72,7 @@ index e6f1267..3bf16a5 100644 dependencies = [ "byteorder", "cpal", -@@ -1792,7 +1799,8 @@ dependencies = [ +@@ -1815,7 +1822,8 @@ dependencies = [ [[package]] name = "librespot-protocol" version = "0.4.2" @@ -83,15 +83,15 @@ index e6f1267..3bf16a5 100644 "glob", "protobuf 2.28.0", diff --git a/Cargo.toml b/Cargo.toml -index 40ca2c1..734a3fb 100644 +index c7e2fe2..28e895a 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -29,7 +29,7 @@ reqwest = "0.11" +@@ -30,7 +30,7 @@ reqwest = "0" colored = "2" - lame = "0.1" - aspotify = "0.7.1" + lame = "0" + aspotify = "0" -librespot = { git = "ssh://git@github.com/oSumAtrIX/free-librespot.git" } +librespot = "0.4.2" - async-std = { version = "1.12", features = ["attributes", "tokio1"] } - serde_json = "1.0" - async-stream = "0.3" + async-std = { version = "1", features = ["attributes", "tokio1"] } + serde_json = "1" + async-stream = "0" diff --git a/pkgs/by-name/do/downonspot/package.nix b/pkgs/by-name/do/downonspot/package.nix index 10574358a869c..5d115404c240d 100644 --- a/pkgs/by-name/do/downonspot/package.nix +++ b/pkgs/by-name/do/downonspot/package.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "downonspot"; - version = "unstable-2024-04-30"; + version = "0.5.1"; src = fetchFromGitHub { owner = "oSumAtrIX"; repo = "DownOnSpot"; - rev = "669dbb18e105129fff4886ba3710596d54a5f33a"; - hash = "sha256-sUptn+tmQoI2i9WBpJU23MkdQ9h+Lmx590+2+0XXC7w="; + rev = "refs/tags/v${version}"; + hash = "sha256-F0SW/qce7eEEDC4FQvO6eW9V4POkRK/WP8bMUBtzGIw="; }; # Use official public librespot version cargoPatches = [ ./Cargo.lock.patch ]; - cargoHash = "sha256-GHhijwgTge7jzdkn0qynQIBNYeqtY26C5BaLpQ/UWgQ="; + cargoHash = "sha256-kLMV8jDadb2BryOqXGkiunQvZRjzjbVTh9Z+jHSSHbU="; nativeBuildInputs = [ pkg-config |