Compare commits
16 Commits
5dd7824e05
...
9b9ed7dad0
| Author | SHA1 | Date | |
|---|---|---|---|
|
9b9ed7dad0
|
|||
|
|
6a8176d2a1 | ||
|
|
baf277e1c2 | ||
|
|
6bca2883d8 | ||
|
|
568735719b | ||
|
|
91f79eec17 | ||
|
|
27b3cce3f2 | ||
|
|
5ecffc5205 | ||
|
|
f28d6ffd9d | ||
|
|
12d2b050f1 | ||
|
|
542f16f85f | ||
|
|
5d41406ecf | ||
|
|
ce38be4442 | ||
|
|
63c6dfb7ec | ||
|
|
4cbbf6da55 | ||
|
|
b08c058249 |
@@ -63,13 +63,13 @@
|
||||
"vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
|
||||
},
|
||||
"auth0_auth0": {
|
||||
"hash": "sha256-59GW5hWNTWc1OyoEuHLSRRw5HFYfTV+Tp6vB5Jj5Gtw=",
|
||||
"hash": "sha256-+Bd+Nc16DqKcO6srCyNjYoEWvckJA8z5GyoGYylh2rg=",
|
||||
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
|
||||
"owner": "auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v1.32.0",
|
||||
"rev": "v1.33.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-z0YJIZ3PSZany4acKYOIP575qg8iaBJcDhlhzr+RptU="
|
||||
"vendorHash": "sha256-xeng27kJrugxYZfZatrTLG0gql3xDJlnDWJ9pNFOp0c="
|
||||
},
|
||||
"aviatrixsystems_aviatrix": {
|
||||
"hash": "sha256-V1JRVOMHQu5KlPFw7q/qZuHlJjdVSQotI9w7s88v8GM=",
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
{
|
||||
"stable": {
|
||||
"linux": {
|
||||
"version": "8.11.14",
|
||||
"version": "8.11.16",
|
||||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.14.x64.tar.gz",
|
||||
"hash": "sha256-LdGw2AVDiQXwGAz9abEeoCosQUdr5q978OMo+kXATIc="
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.16.x64.tar.gz",
|
||||
"hash": "sha256-LZ0V296GLLdeokj3mgD0LnQCHqlMHnMwPLHlwI5b1K0="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.14.arm64.tar.gz",
|
||||
"hash": "sha256-U+wJEH5NwWuPV+Oy6RJ+dki4lJB2A9aOVjvRSkm6zfY="
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.16.arm64.tar.gz",
|
||||
"hash": "sha256-itykcOtXCtODeJ7CtasN8M4Aq8DCV2pumpy646PADiE="
|
||||
}
|
||||
}
|
||||
},
|
||||
"darwin": {
|
||||
"version": "8.11.14",
|
||||
"version": "8.11.16",
|
||||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.14-x86_64.zip",
|
||||
"hash": "sha256-GXbwYxFNw6R8UdKxPL6k2lQF4uabFRgaEKNaFzecnZ0="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.16-x86_64.zip",
|
||||
"hash": "sha256-puVz4k5jSFgkExE78sdxawCtVJzAqtP9jEEc+H4geMY="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.14-aarch64.zip",
|
||||
"hash": "sha256-rViZC9b6kOaqkNNJibABmWu0Z5PEtBQE0jGtaUdd4LY="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.16-aarch64.zip",
|
||||
"hash": "sha256-xuN6l5ejj7SZp1uGhAIaha+qMUfStZm2kTkPJU9pnos="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fetchmail";
|
||||
version = "6.5.7";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
|
||||
hash = "sha256-c+trHUIbWYaGatSmt3fBFAo5AFKYxjv4R95TeXbL+9s=";
|
||||
hash = "sha256-e5wZ5mg+gn1VZ1GqXbXUS5Yeh76LMIdTW0kJuhtZMhw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fna3d";
|
||||
version = "25.10";
|
||||
version = "25.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FNA-XNA";
|
||||
repo = "FNA3D";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Hbj1GGKSFaP2C7V0II6x6euxRDc/BYSK00cVsFMKGEw=";
|
||||
hash = "sha256-4+bJWmNagUtKJJHIHefQM7Tiu39+l4OE9q51c34DiEk=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sqlite3-to-mysql";
|
||||
version = "2.5.1";
|
||||
version = "2.5.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "techouse";
|
||||
repo = "sqlite3-to-mysql";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2SoLiqOLuGcB4IV2CPud+mjc5s8mqobD72kkx0WCwVU=";
|
||||
hash = "sha256-+J2Kat+t8BUFM7ORpnzQDsmEhVlg0uz6J7di8TgSRk0=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -41,6 +41,7 @@ python3Packages.buildPythonApplication rec {
|
||||
packaging
|
||||
mysql80
|
||||
python-dateutil
|
||||
sqlglot
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "topgrade";
|
||||
version = "16.0.4";
|
||||
version = "16.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "topgrade-rs";
|
||||
repo = "topgrade";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-b/xzmC49ETGtcf9ekrSkq75cKxSL4ZrvKPkparwz6zU=";
|
||||
hash = "sha256-oDIEvBM7TDJlnkZSHkbtIUGRJ+RK48u9S4tuMeKSwO0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-d6jX+3ZcCswhKy5SsSpvXZL9el70+OyIa7lYQ3B/o8M=";
|
||||
cargoHash = "sha256-9jfKnjCbxo47qUWYdqBHoObxth3pporRZ0oauCkWwkc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -13,51 +13,26 @@
|
||||
libao,
|
||||
speex,
|
||||
nix-update-script,
|
||||
|
||||
audaciousSupport ? stdenv.hostPlatform.isLinux,
|
||||
}:
|
||||
|
||||
let
|
||||
# https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake
|
||||
atrac9-src = fetchFromGitHub {
|
||||
owner = "Thealexbarney";
|
||||
repo = "LibAtrac9";
|
||||
rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049";
|
||||
hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc=";
|
||||
};
|
||||
assert lib.assertMsg (
|
||||
audaciousSupport -> stdenv.hostPlatform.isLinux
|
||||
) "Only Linux supports building the Audacious plugin.";
|
||||
|
||||
# https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake
|
||||
celt-0_6_1-src = fetchzip {
|
||||
url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz";
|
||||
hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw=";
|
||||
};
|
||||
celt-0_11_0-src = fetchzip {
|
||||
url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz";
|
||||
hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vgmstream";
|
||||
version = "2055";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vgmstream";
|
||||
repo = "vgmstream";
|
||||
tag = "r${version}";
|
||||
tag = "r${finalAttrs.version}";
|
||||
hash = "sha256-GNsoWCTLDd49T639lKkLoyBWpWYocDP6gZB2e8ZUyEU=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = "vgmstream";
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"r(.*)"
|
||||
];
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"audacious"
|
||||
];
|
||||
outputs = [ "out" ] ++ lib.optional audaciousSupport "audacious";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -71,8 +46,8 @@ stdenv.mkDerivation rec {
|
||||
libvorbis
|
||||
libao
|
||||
speex
|
||||
audacious-bare
|
||||
];
|
||||
]
|
||||
++ lib.optional audaciousSupport audacious-bare;
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace cmake/dependencies/audacious.cmake \
|
||||
@@ -83,20 +58,49 @@ stdenv.mkDerivation rec {
|
||||
# Therefore, CELT_0110_PATH needs to point to a mutable directory.
|
||||
lib.optionalString (stdenv.system == "x86_64-linux") ''
|
||||
mkdir -p dependencies/celt-0.11.0/
|
||||
cp -r ${celt-0_11_0-src}/* dependencies/celt-0.11.0/
|
||||
cp -r ${finalAttrs.passthru.sources.celt-0_11_0-src}/* dependencies/celt-0.11.0/
|
||||
chmod -R +w dependencies/celt-0.11.0/
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DATRAC9_PATH=${atrac9-src}"
|
||||
"-DATRAC9_PATH=${finalAttrs.passthru.sources.atrac9-src}"
|
||||
(lib.cmakeBool "BUILD_AUDACIOUS" audaciousSupport)
|
||||
]
|
||||
# Only supported on x86_64-linux
|
||||
++ lib.optionals (stdenv.system == "x86_64-linux") [
|
||||
"-DCELT_0061_PATH=${celt-0_6_1-src}"
|
||||
"-DCELT_0061_PATH=${finalAttrs.passthru.sources.celt-0_6_1-src}"
|
||||
"-DCELT_0110_PATH=../dependencies/celt-0.11.0"
|
||||
# libg719_decode omitted because it doesn't have a free software license
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "vgmstream";
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"r(.*)"
|
||||
];
|
||||
};
|
||||
sources = {
|
||||
# https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake
|
||||
atrac9-src = fetchFromGitHub {
|
||||
owner = "Thealexbarney";
|
||||
repo = "LibAtrac9";
|
||||
rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049";
|
||||
hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc=";
|
||||
};
|
||||
# https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake
|
||||
celt-0_6_1-src = fetchzip {
|
||||
url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz";
|
||||
hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw=";
|
||||
};
|
||||
celt-0_11_0-src = fetchzip {
|
||||
url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz";
|
||||
hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for playback of various streamed audio formats used in video games";
|
||||
homepage = "https://vgmstream.org";
|
||||
@@ -110,4 +114,4 @@ stdenv.mkDerivation rec {
|
||||
++ optional (stdenv.system == "x86_64-linux") bsd2;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10951,9 +10951,6 @@ with pkgs;
|
||||
];
|
||||
};
|
||||
|
||||
fetchmail = callPackage ../applications/misc/fetchmail { };
|
||||
fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };
|
||||
|
||||
firewalld-gui = firewalld.override { withGui = true; };
|
||||
|
||||
fldigi = callPackage ../applications/radio/fldigi {
|
||||
|
||||
Reference in New Issue
Block a user