Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
commit
e0b2b6b172
@ -2102,6 +2102,14 @@ Note this method is preferred over adding parameters to builders, as that can
|
|||||||
result in packages depending on different variants and thereby causing
|
result in packages depending on different variants and thereby causing
|
||||||
collisions.
|
collisions.
|
||||||
|
|
||||||
|
::: {.note}
|
||||||
|
The `optional-dependencies` attribute should only be used for dependency groups
|
||||||
|
as defined in package metadata. If a package gracefully handles missing
|
||||||
|
dependencies in runtime but doesn't advertise it through package metadata, then
|
||||||
|
these dependencies should not be listed at all. (One may still have to list
|
||||||
|
them in `nativeCheckInputs` to pass test suite.)
|
||||||
|
:::
|
||||||
|
|
||||||
### How to contribute a Python package to nixpkgs? {#tools}
|
### How to contribute a Python package to nixpkgs? {#tools}
|
||||||
|
|
||||||
Packages inside nixpkgs must use the [`buildPythonPackage`](#buildpythonpackage-function) or [`buildPythonApplication`](#buildpythonapplication-function) function directly,
|
Packages inside nixpkgs must use the [`buildPythonPackage`](#buildpythonpackage-function) or [`buildPythonApplication`](#buildpythonapplication-function) function directly,
|
||||||
|
|||||||
@ -8,7 +8,10 @@ let
|
|||||||
cfg = config.programs.nh;
|
cfg = config.programs.nh;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
meta.maintainers = [ lib.maintainers.viperML ];
|
meta.maintainers = with lib.maintainers; [
|
||||||
|
NotAShelf
|
||||||
|
viperML
|
||||||
|
];
|
||||||
|
|
||||||
options.programs.nh = {
|
options.programs.nh = {
|
||||||
enable = lib.mkEnableOption "nh, yet another Nix CLI helper";
|
enable = lib.mkEnableOption "nh, yet another Nix CLI helper";
|
||||||
@ -19,9 +22,18 @@ in
|
|||||||
type = lib.types.nullOr lib.types.path;
|
type = lib.types.nullOr lib.types.path;
|
||||||
default = null;
|
default = null;
|
||||||
description = ''
|
description = ''
|
||||||
The path that will be used for the `FLAKE` environment variable.
|
The path that will be used for the `NH_FLAKE` environment variable.
|
||||||
|
|
||||||
`FLAKE` is used by nh as the default flake for performing actions, like `nh os switch`.
|
`NH_FLAKE` is used by nh as the default flake for performing actions, such as
|
||||||
|
`nh os switch`. This behaviour can be overriden per-command with environment
|
||||||
|
variables that will take priority.
|
||||||
|
|
||||||
|
- `NH_OS_FLAKE`: will take priority for `nh os` commands.
|
||||||
|
- `NH_HOME_FLAKE`: will take priority for `nh home` commands.
|
||||||
|
- `NH_DARWIN_FLAKE`: will take priority for `nh darwin` commands.
|
||||||
|
|
||||||
|
The formerly valid `FLAKE` is now deprecated by nh, and will cause hard errors
|
||||||
|
in future releases if `NH_FLAKE` is not set.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -77,7 +89,7 @@ in
|
|||||||
environment = lib.mkIf cfg.enable {
|
environment = lib.mkIf cfg.enable {
|
||||||
systemPackages = [ cfg.package ];
|
systemPackages = [ cfg.package ];
|
||||||
variables = lib.mkIf (cfg.flake != null) {
|
variables = lib.mkIf (cfg.flake != null) {
|
||||||
FLAKE = cfg.flake;
|
NH_FLAKE = cfg.flake;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -20,6 +20,7 @@ let
|
|||||||
filter
|
filter
|
||||||
filterAttrsRecursive
|
filterAttrsRecursive
|
||||||
flatten
|
flatten
|
||||||
|
getAttr
|
||||||
hasAttrByPath
|
hasAttrByPath
|
||||||
isAttrs
|
isAttrs
|
||||||
isDerivation
|
isDerivation
|
||||||
@ -111,7 +112,9 @@ let
|
|||||||
hasAttrByPath (splitString "." component) cfg.config
|
hasAttrByPath (splitString "." component) cfg.config
|
||||||
|| useComponentPlatform component
|
|| useComponentPlatform component
|
||||||
|| useExplicitComponent component
|
|| useExplicitComponent component
|
||||||
|| builtins.elem component (cfg.extraComponents ++ cfg.defaultIntegrations);
|
|| builtins.elem component (
|
||||||
|
cfg.extraComponents ++ cfg.defaultIntegrations ++ map (getAttr "domain") cfg.customComponents
|
||||||
|
);
|
||||||
|
|
||||||
# Final list of components passed into the package to include required dependencies
|
# Final list of components passed into the package to include required dependencies
|
||||||
extraComponents = filter useComponent availableComponents;
|
extraComponents = filter useComponent availableComponents;
|
||||||
@ -842,6 +845,7 @@ in
|
|||||||
|
|
||||||
# Custom components, maintained manually.
|
# Custom components, maintained manually.
|
||||||
"amshan"
|
"amshan"
|
||||||
|
"benqprojector"
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|||||||
@ -2,7 +2,6 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
fetchpatch2,
|
|
||||||
autoreconfHook,
|
autoreconfHook,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
util-linux,
|
util-linux,
|
||||||
@ -26,21 +25,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
|
pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
|
||||||
version = "26.1.knots20240325";
|
version = "28.1.knots20250305";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://bitcoinknots.org/files/26.x/${version}/bitcoin-${version}.tar.gz";
|
url = "https://bitcoinknots.org/files/28.x/${version}/bitcoin-${version}.tar.gz";
|
||||||
hash = "sha256-PqpePDna2gpCzF2K43N4h6cV5Y9w/e5ZcUvaNEaFaIk=";
|
hash = "sha256-DKO3+43Tn/BTKQVrLrCkeMtzm8SfbaJD8rPlb6lDA8A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# upnp: add compatibility for miniupnpc 2.2.8
|
|
||||||
(fetchpatch2 {
|
|
||||||
url = "https://github.com/bitcoinknots/bitcoin/commit/643014424359a4783cf9c73bee3346ac2f04e713.patch?full_index=1";
|
|
||||||
hash = "sha256-FdLoNH3+ZZTbqrwRvhbAeJuGz4SgnIvoWUBzRxjfzs8=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
[
|
[
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
|
|||||||
@ -18,13 +18,13 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "gpxsee";
|
pname = "gpxsee";
|
||||||
version = "13.38";
|
version = "13.40";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tumic0";
|
owner = "tumic0";
|
||||||
repo = "GPXSee";
|
repo = "GPXSee";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-ftVuFuoseXtpeXzOMZA66O2Z6wxKd7G6l3Kx8WOgor0=";
|
hash = "sha256-xxMnqUsYfmTD1ZNAm+lFMLvXvo6qRrq88m234ZtYiuA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
(callPackage ./generic.nix { }) {
|
(callPackage ./generic.nix { }) {
|
||||||
channel = "edge";
|
channel = "edge";
|
||||||
version = "25.4.2";
|
version = "25.4.4";
|
||||||
sha256 = "0i0z2x9x2sf9lpkvw9pnvwp74hxm9rqbdhx9v91qwlsnw8clc950";
|
sha256 = "1zdi6ziz8ys231xszzildi1rk0pz15cp27xf7zpy6hl0n2b1vbij";
|
||||||
vendorHash = "sha256-jIL/08mSvz6xLlB1Iyj2F9vnfOkadeYf92CeXXx0Otw=";
|
vendorHash = "sha256-xr/RMfVYYXtfWpnPmm3tG/TwJITIyRRFzoZwbBQwSc8=";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -317,13 +317,13 @@
|
|||||||
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
|
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
|
||||||
},
|
},
|
||||||
"datadog": {
|
"datadog": {
|
||||||
"hash": "sha256-7V4nSuksCvy2fSyQbzVo0RlEaevUwCIlX61y3GEBqVk=",
|
"hash": "sha256-bRC17BNrJYaEcqRUuuywhCAJSHe/NLJ5syayQGk8k6k=",
|
||||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||||
"owner": "DataDog",
|
"owner": "DataDog",
|
||||||
"repo": "terraform-provider-datadog",
|
"repo": "terraform-provider-datadog",
|
||||||
"rev": "v3.59.1",
|
"rev": "v3.60.0",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-vOg972dcpX9MEZ/GaPGcm0OIC1xu+p6KMcflEUPx0hU="
|
"vendorHash": "sha256-Q3D0YEJkDKiDOqUIewATOrctHbLDEn85EFEgyUW9W+8="
|
||||||
},
|
},
|
||||||
"deno": {
|
"deno": {
|
||||||
"hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
|
"hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
|
||||||
@ -534,13 +534,13 @@
|
|||||||
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
|
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
|
||||||
},
|
},
|
||||||
"grafana": {
|
"grafana": {
|
||||||
"hash": "sha256-uWRFi0jYGwlZ1b8qvVoL/NslI6e5bv76QmlWL5C7fA8=",
|
"hash": "sha256-uPvG2/miG5CCZkSinFwGUj1wmGBPyI2jCkYS31559NY=",
|
||||||
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
||||||
"owner": "grafana",
|
"owner": "grafana",
|
||||||
"repo": "terraform-provider-grafana",
|
"repo": "terraform-provider-grafana",
|
||||||
"rev": "v3.22.2",
|
"rev": "v3.22.3",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-wqGNczKE2IFq/wLb8fj5+k07Vh1dR1oXwW06fIWV6Eg="
|
"vendorHash": "sha256-8KsQan5KxNj3/NSzj/M+IR44PiQ5E7PL/K4vVC5KovA="
|
||||||
},
|
},
|
||||||
"gridscale": {
|
"gridscale": {
|
||||||
"hash": "sha256-Ygt3L/dzwycccQZmuwbcaLHp9FBGNHgU19wSNmY8PzQ=",
|
"hash": "sha256-Ygt3L/dzwycccQZmuwbcaLHp9FBGNHgU19wSNmY8PzQ=",
|
||||||
@ -831,13 +831,13 @@
|
|||||||
"vendorHash": "sha256-1nm2Y4T9/mCWMXMjXEzBz3w08AYHjQJeb9mYPQeWPs0="
|
"vendorHash": "sha256-1nm2Y4T9/mCWMXMjXEzBz3w08AYHjQJeb9mYPQeWPs0="
|
||||||
},
|
},
|
||||||
"mongodbatlas": {
|
"mongodbatlas": {
|
||||||
"hash": "sha256-V1kQPFNW0/C1Rw6gbHpQ1+yK5L8dO+zFIHkQs93a56Y=",
|
"hash": "sha256-9fgaBOzly/B1kTvTmevoaEHs6s3/i3kGokFqzKWKwwg=",
|
||||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||||
"owner": "mongodb",
|
"owner": "mongodb",
|
||||||
"repo": "terraform-provider-mongodbatlas",
|
"repo": "terraform-provider-mongodbatlas",
|
||||||
"rev": "v1.32.0",
|
"rev": "v1.33.0",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-VznDrCvaY6O8n1bl/fx/PIdKfFD32pQaGn5Ti1sJucU="
|
"vendorHash": "sha256-yKNhCFxs2BRU4X9P7ZREmR64u5/8QFFGMk8khXyqUsA="
|
||||||
},
|
},
|
||||||
"namecheap": {
|
"namecheap": {
|
||||||
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
|
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
|
||||||
@ -1102,11 +1102,11 @@
|
|||||||
"vendorHash": "sha256-lkooWo0DbpL4zjNQ20TRw+hsHXWZP9u7u95n1WyzTQk="
|
"vendorHash": "sha256-lkooWo0DbpL4zjNQ20TRw+hsHXWZP9u7u95n1WyzTQk="
|
||||||
},
|
},
|
||||||
"rootly": {
|
"rootly": {
|
||||||
"hash": "sha256-bIn3TshuK06MCNznghPeFS5jfFMshz2Zmc9DKoHUEWs=",
|
"hash": "sha256-HvUvRDoRalOzHHnCM0uBR+xc0i0ItfglgoJ0H1QLovg=",
|
||||||
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
|
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
|
||||||
"owner": "rootlyhq",
|
"owner": "rootlyhq",
|
||||||
"repo": "terraform-provider-rootly",
|
"repo": "terraform-provider-rootly",
|
||||||
"rev": "v2.26.5",
|
"rev": "v2.26.8",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-IJJjA7SCQib5GdqbS2rnZtbBNB8sYYPYH+vHMGf1Bfk="
|
"vendorHash": "sha256-IJJjA7SCQib5GdqbS2rnZtbBNB8sYYPYH+vHMGf1Bfk="
|
||||||
},
|
},
|
||||||
|
|||||||
@ -17,17 +17,17 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
rev = 3546;
|
rev = 3627;
|
||||||
jre' = if preferZulu then zulu else jre;
|
jre' = if preferZulu then zulu else jre;
|
||||||
gtk' = if preferGtk3 then gtk3 else gtk2;
|
gtk' = if preferGtk3 then gtk3 else gtk2;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "davmail";
|
pname = "davmail";
|
||||||
version = "6.2.2";
|
version = "6.3.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
|
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
|
||||||
hash = "sha256-45paGy6SfUFXK6vY8L4tHFYiio1/5ah9vTyGImdgwHI=";
|
hash = "sha256-Yh61ZHsEMF6SchLEyBV3rRI7pJ/bvR2K4G8U6jrPa3A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|||||||
@ -51,13 +51,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "remmina";
|
pname = "remmina";
|
||||||
version = "1.4.39";
|
version = "1.4.40";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "Remmina";
|
owner = "Remmina";
|
||||||
repo = "Remmina";
|
repo = "Remmina";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-gsQtPa6NLQC3nMfemmZv416hyqFg8Z1GDMALhNaPAOw=";
|
hash = "sha256-AfZ9tWoaZTRs7GZOdli74e7/X/OMgbvfez9BipoZ/ng=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@ -81,14 +81,12 @@ lib.makeOverridable (
|
|||||||
inherit scriptName;
|
inherit scriptName;
|
||||||
}
|
}
|
||||||
// lib.optionalAttrs (runtime-dependencies != [ ]) {
|
// lib.optionalAttrs (runtime-dependencies != [ ]) {
|
||||||
extraWrapperArgs =
|
extraWrapperArgs = [
|
||||||
[
|
"--prefix"
|
||||||
"--prefix"
|
"PATH"
|
||||||
"PATH"
|
":"
|
||||||
":"
|
(lib.makeBinPath runtime-dependencies)
|
||||||
]
|
] ++ args.passthru.extraWrapperArgs or [ ];
|
||||||
++ (map lib.makeBinPath runtime-dependencies)
|
|
||||||
++ args.passthru.extraWrapperArgs or [ ];
|
|
||||||
};
|
};
|
||||||
meta =
|
meta =
|
||||||
{
|
{
|
||||||
|
|||||||
@ -9,21 +9,21 @@
|
|||||||
|
|
||||||
buildLua (finalAttrs: {
|
buildLua (finalAttrs: {
|
||||||
pname = "uosc";
|
pname = "uosc";
|
||||||
version = "5.6.2";
|
version = "5.8.0";
|
||||||
scriptPath = "src/uosc";
|
scriptPath = "src/uosc";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tomasklaen";
|
owner = "tomasklaen";
|
||||||
repo = "uosc";
|
repo = "uosc";
|
||||||
rev = finalAttrs.version;
|
rev = finalAttrs.version;
|
||||||
hash = "sha256-UbSEJGlLSX5wZpfj+Cb3LfWw17pnjxIJUNtP8dclKoU=";
|
hash = "sha256-O8GLYsFoDQmYvHWLwfWo1zcQvCsV2RqAe/m+R5cOITI=";
|
||||||
};
|
};
|
||||||
passthru.updateScript = gitUpdater { };
|
passthru.updateScript = gitUpdater { };
|
||||||
|
|
||||||
tools = buildGoModule {
|
tools = buildGoModule {
|
||||||
pname = "uosc-bin";
|
pname = "uosc-bin";
|
||||||
inherit (finalAttrs) version src;
|
inherit (finalAttrs) version src;
|
||||||
vendorHash = "sha256-nkY0z2GiDxfNs98dpe+wZNI3dAXcuHaD/nHiZ2XnZ1Y=";
|
vendorHash = "sha256-oRXChHeVQj6nXvKOVV125sM8wD33Dxxv0r/S7sl6SxQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# the script uses custom "texture" fonts as the background for ui elements.
|
# the script uses custom "texture" fonts as the background for ui elements.
|
||||||
|
|||||||
@ -43,17 +43,17 @@ in
|
|||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = binName;
|
pname = binName;
|
||||||
|
|
||||||
version = "0.21.2";
|
version = "0.21.4";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "toeverything";
|
owner = "toeverything";
|
||||||
repo = "AFFiNE";
|
repo = "AFFiNE";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-d5dHHiiCXhzn8qJlCqJVw0qC86PvKyDZstPivX9bpCI=";
|
hash = "sha256-Xd8b+JXL46r9Jv5Uv5wdtvSKwnHafEo52v1aERmyxrI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
hash = "sha256-0vhUeqCStM7P8+sDs3ZI+JlEzPAreoP+1X8x5zKOJUo=";
|
hash = "sha256-1BTSvHaSPE55v6awnvRry1Exms+zeGug3PNldZ2v2HY=";
|
||||||
};
|
};
|
||||||
yarnOfflineCache = stdenvNoCC.mkDerivation {
|
yarnOfflineCache = stdenvNoCC.mkDerivation {
|
||||||
name = "yarn-offline-cache";
|
name = "yarn-offline-cache";
|
||||||
@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
'';
|
'';
|
||||||
dontInstall = true;
|
dontInstall = true;
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
outputHash = "sha256-pJiMCyBJSuTaxix3kKnSCrURL2+t26zB4Y59gGdxalo=";
|
outputHash = "sha256-w9Lz8wFq34VXInoE5pUeg1B7N92D+TnBWbL2qJ/q8ik=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = lib.optionals hostPlatform.isDarwin [
|
buildInputs = lib.optionals hostPlatform.isDarwin [
|
||||||
|
|||||||
@ -4,31 +4,34 @@
|
|||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule (finalAttrs: {
|
||||||
pname = "ain";
|
pname = "ain";
|
||||||
version = "1.4.1";
|
version = "1.6.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jonaslu";
|
owner = "jonaslu";
|
||||||
repo = "ain";
|
repo = "ain";
|
||||||
rev = "v${version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-JEavBPnF3WW6oCZ1OC8g1dZev4qC7bi74/q2nvXK3mo=";
|
hash = "sha256-jZTdFA3ZNb0xIN7+ne5bz6jMpj4jqZ/JHxz2x83fBm8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-+72Y8SKvx7KBK5AIBWKlDqQYpHnZc9CNxCdo4yakPb0=";
|
vendorHash = "sha256-VLn7JPYYFmQ/9c0zKHWJBqtxwCbWgsN4FHlXrQiKMj4=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
"-w"
|
"-w"
|
||||||
"-X=main.gitSha=${src.rev}"
|
"-X=main.gitSha=${finalAttrs.src.tag}"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
# need network
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
meta = {
|
||||||
description = "HTTP API client for the terminal";
|
description = "HTTP API client for the terminal";
|
||||||
homepage = "https://github.com/jonaslu/ain";
|
homepage = "https://github.com/jonaslu/ain";
|
||||||
changelog = "https://github.com/jonaslu/ain/releases/tag/${src.rev}";
|
changelog = "https://github.com/jonaslu/ain/releases/tag/v${finalAttrs.version}";
|
||||||
license = licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with maintainers; [ figsoda ];
|
maintainers = with lib.maintainers; [ figsoda ];
|
||||||
mainProgram = "ain";
|
mainProgram = "ain";
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|||||||
@ -53,7 +53,7 @@ let
|
|||||||
|
|
||||||
vcvRackSdk = srcOnly vcv-rack;
|
vcvRackSdk = srcOnly vcv-rack;
|
||||||
pname = "airwin2rack";
|
pname = "airwin2rack";
|
||||||
version = "2.13.0";
|
version = "2.13.0-unstable-2025-04-07";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
inherit pname;
|
inherit pname;
|
||||||
@ -62,8 +62,8 @@ stdenv.mkDerivation {
|
|||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "baconpaul";
|
owner = "baconpaul";
|
||||||
repo = "airwin2rack";
|
repo = "airwin2rack";
|
||||||
tag = "DAWPlugin";
|
rev = "595eb7c7ccec5f9e662f8d620579a91dab60c1ff";
|
||||||
hash = "sha256-xjE9M5fMeOOYncq7xe+v++XvfUL6QZc2tF0jnYWSwKQ=";
|
hash = "sha256-gBphJ6WSPw6DOQk64w8GmLrtuYSF7NFEf6xK1oxOF3w=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -7,12 +7,12 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "altus";
|
pname = "altus";
|
||||||
version = "5.7.0";
|
version = "5.7.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
name = "altus-${version}.AppImage";
|
name = "altus-${version}.AppImage";
|
||||||
url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage";
|
url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage";
|
||||||
hash = "sha256-75mNEXH+C/gRptq3Cx2GUdm3+goDbIvHzpYl0tU3WoU=";
|
hash = "sha256-G0jKBnobMKJWZmLtyYLpdruNxEVGt5rZHPFJYJkY8Y4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
appimageContents = appimageTools.extractType2 {
|
appimageContents = appimageTools.extractType2 {
|
||||||
|
|||||||
@ -34,14 +34,14 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "anydesk";
|
pname = "anydesk";
|
||||||
version = "6.4.3";
|
version = "7.0.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
urls = [
|
urls = [
|
||||||
"https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
|
"https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
|
||||||
"https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
|
"https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
|
||||||
];
|
];
|
||||||
hash = "sha256-P90BPUayKG+uYszIQkbYcBg1vObQvueq67HU+su+GSI=";
|
hash = "sha256-AEj4/S4k6mnCb/CagEDhpCtExB8pIqv7V2b/br4nC/8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
|||||||
@ -6,17 +6,17 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
snapshot = "20240601172844";
|
snapshot = "20250105225747";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "apparency";
|
pname = "apparency";
|
||||||
version = "2.0";
|
version = "2.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
# Use externally archived download URL because
|
# Use externally archived download URL because
|
||||||
# upstream does not provide stable URLs for versioned releases
|
# upstream does not provide stable URLs for versioned releases
|
||||||
url = "https://web.archive.org/web/${snapshot}/https://www.mothersruin.com/software/downloads/Apparency.dmg";
|
url = "https://web.archive.org/web/${snapshot}/https://www.mothersruin.com/software/downloads/Apparency.dmg";
|
||||||
hash = "sha256-XKxWxqfxy9AQneILLrN9XqLt4/k2N8yumZ5mrSvczFk=";
|
hash = "sha256-nktNbyJOXDydQPwb43Uq3nQv65XcwrqZTKu5OCcLyfU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ undmg ];
|
nativeBuildInputs = [ undmg ];
|
||||||
@ -34,10 +34,10 @@ stdenv.mkDerivation {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "App That Opens Apps";
|
description = "Toolkit for analysing macOS applications";
|
||||||
homepage = "https://www.mothersruin.com/software/Apparency/";
|
homepage = "https://www.mothersruin.com/software/Apparency/";
|
||||||
license = lib.licenses.unfreeRedistributable;
|
license = lib.licenses.unfreeRedistributable;
|
||||||
maintainers = [ ];
|
maintainers = with lib.maintainers; [ andre4ik3 ];
|
||||||
mainProgram = "appy";
|
mainProgram = "appy";
|
||||||
platforms = lib.platforms.darwin;
|
platforms = lib.platforms.darwin;
|
||||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||||
|
|||||||
@ -12,18 +12,18 @@
|
|||||||
aptly,
|
aptly,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule (finalAttrs: {
|
||||||
pname = "aptly";
|
pname = "aptly";
|
||||||
version = "1.5.0";
|
version = "1.6.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aptly-dev";
|
owner = "aptly-dev";
|
||||||
repo = "aptly";
|
repo = "aptly";
|
||||||
rev = "v${version}";
|
tag = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk=";
|
hash = "sha256-oGogOK0oQTdmlQUrIOo2BT/8wEk9kZ3mJbj0K5s9tiU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-6l3OFKFTtFWT68Ylav6woczBlMhD75C9ZoQ6OeLz0Cs=";
|
vendorHash = "sha256-4z0JFC+Cz72e48ygfgA4DYJVkpInPIyA5yh//eedt8Q=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
installShellFiles
|
installShellFiles
|
||||||
@ -33,21 +33,24 @@ buildGoModule rec {
|
|||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
"-w"
|
"-w"
|
||||||
"-X main.Version=${version}"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
echo ${finalAttrs.version} > VERSION
|
||||||
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
installShellCompletion --bash --name aptly completion.d/aptly
|
installShellCompletion --bash --name aptly completion.d/aptly
|
||||||
installShellCompletion --zsh --name _aptly completion.d/_aptly
|
installShellCompletion --zsh --name _aptly completion.d/_aptly
|
||||||
wrapProgram "$out/bin/aptly" \
|
wrapProgram $out/bin/aptly \
|
||||||
--prefix PATH ":" "${
|
--prefix PATH : ${
|
||||||
lib.makeBinPath [
|
lib.makeBinPath [
|
||||||
gnupg
|
gnupg
|
||||||
bzip2
|
bzip2
|
||||||
xz
|
xz
|
||||||
graphviz
|
graphviz
|
||||||
]
|
]
|
||||||
}"
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
@ -57,12 +60,12 @@ buildGoModule rec {
|
|||||||
command = "aptly version";
|
command = "aptly version";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
homepage = "https://www.aptly.info";
|
homepage = "https://www.aptly.info";
|
||||||
description = "Debian repository management tool";
|
description = "Debian repository management tool";
|
||||||
license = licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with maintainers; [ montag451 ] ++ teams.bitnomial.members;
|
maintainers = [ lib.maintainers.montag451 ] ++ lib.teams.bitnomial.members;
|
||||||
changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${version}";
|
changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${finalAttrs.version}";
|
||||||
mainProgram = "aptly";
|
mainProgram = "aptly";
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|||||||
@ -4,16 +4,17 @@
|
|||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
jdk,
|
jdk,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
|
nix-update-script,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "async-profiler";
|
pname = "async-profiler";
|
||||||
version = "3.0";
|
version = "4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jvm-profiling-tools";
|
owner = "jvm-profiling-tools";
|
||||||
repo = "async-profiler";
|
repo = "async-profiler";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-0CCJoRjRLq4LpiRD0ibzK8So9qSQymePCTYUI60Oy2k=";
|
hash = "sha256-4S5Lbhqu2V7TzrbFf3G3G4OEYLU6w5lcgUl49k9YqSA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
@ -35,6 +36,8 @@ stdenv.mkDerivation rec {
|
|||||||
wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]}
|
wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Low overhead sampling profiler for Java that does not suffer from Safepoint bias problem";
|
description = "Low overhead sampling profiler for Java that does not suffer from Safepoint bias problem";
|
||||||
homepage = "https://github.com/jvm-profiling-tools/async-profiler";
|
homepage = "https://github.com/jvm-profiling-tools/async-profiler";
|
||||||
|
|||||||
@ -8,19 +8,19 @@
|
|||||||
|
|
||||||
buildGoModule (finalAttrs: {
|
buildGoModule (finalAttrs: {
|
||||||
pname = "atlas";
|
pname = "atlas";
|
||||||
version = "0.32.0";
|
version = "0.32.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ariga";
|
owner = "ariga";
|
||||||
repo = "atlas";
|
repo = "atlas";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-iM+Qy8tQAjonXpt36WWIEIAmtqnR0wWtMMxIh76Fv0U=";
|
hash = "sha256-1uPOS5r13nGNAPxCCphrmWyvxg+OoopMP0U/VhR+gDQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
modRoot = "cmd/atlas";
|
modRoot = "cmd/atlas";
|
||||||
|
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
vendorHash = "sha256-kSKxZmguHasRlxI3h2Gm/0sj8dQwUd8F9bL1yp6stRE=";
|
vendorHash = "sha256-K94zOisolCplE/cFrWmv4/MWl5DD27lRekPTl+o4Jwk=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|||||||
@ -9,10 +9,10 @@
|
|||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
pname = "beeper";
|
pname = "beeper";
|
||||||
version = "4.0.623";
|
version = "4.0.640";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
|
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
|
||||||
hash = "sha256-K043RQ5BoS1ysnmY+LpRixBmMx2XCbRzhWnWsxg26dg=";
|
hash = "sha256-hYbTYvfrTpRPRwXXgNCqKeEtiRpuLj6sYIYnfJ3aMv4=";
|
||||||
};
|
};
|
||||||
appimageContents = appimageTools.extract {
|
appimageContents = appimageTools.extract {
|
||||||
inherit version pname src;
|
inherit version pname src;
|
||||||
|
|||||||
@ -10,13 +10,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bustools";
|
pname = "bustools";
|
||||||
version = "0.44.1";
|
version = "0.45.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "BUStools";
|
owner = "BUStools";
|
||||||
repo = "bustools";
|
repo = "bustools";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-0Y+9T9V+l20hqxpKbSWsEB0tt8A/ctYcoPN2n/roxvg=";
|
sha256 = "sha256-Af2WUryx4HQuAlNJ1RWJK1Mj2M7X+4Ckap3rqEJ3vto=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|||||||
@ -7,12 +7,12 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "cables";
|
pname = "cables";
|
||||||
version = "0.5.11";
|
version = "0.5.12";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
|
url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
|
||||||
sha256 = "sha256-d6IKORuySXrVk5ifevtPlposSuxk7n9b/dxD8CRfdMQ=";
|
sha256 = "sha256-uQWfll9aYVNmR9Sw0PnupxY6n/gv+nV0pIttsmzGM9A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
appimageContents = appimageTools.extract {
|
appimageContents = appimageTools.extract {
|
||||||
|
|||||||
@ -10,11 +10,11 @@
|
|||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "camunda-modeler";
|
pname = "camunda-modeler";
|
||||||
version = "5.33.1";
|
version = "5.34.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
|
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
|
||||||
hash = "sha256-YZSekLBjyADmBauGn5gonJ98bpW7ubHeKDS7J0IxsJo=";
|
hash = "sha256-3A8f371zyfx2GWJSwL0e+pD9M1Nitk4P7voq+V8Fojs=";
|
||||||
};
|
};
|
||||||
sourceRoot = "camunda-modeler-${version}-linux-x64";
|
sourceRoot = "camunda-modeler-${version}-linux-x64";
|
||||||
|
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
diff --git a/cargo-geiger/src/lib.rs b/cargo-geiger/src/lib.rs
|
|
||||||
index cc08146..d220ad9 100644
|
|
||||||
--- a/cargo-geiger/src/lib.rs
|
|
||||||
+++ b/cargo-geiger/src/lib.rs
|
|
||||||
@@ -5,7 +5,6 @@
|
|
||||||
#![deny(clippy::cargo)]
|
|
||||||
#![deny(clippy::doc_markdown)]
|
|
||||||
#![forbid(unsafe_code)]
|
|
||||||
-#![deny(warnings)]
|
|
||||||
|
|
||||||
/// Argument parsing
|
|
||||||
pub mod args;
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
diff --git a/Cargo.lock b/Cargo.lock
|
|
||||||
index 48c5606f..4c796675 100644
|
|
||||||
--- a/Cargo.lock
|
|
||||||
+++ b/Cargo.lock
|
|
||||||
@@ -2238,6 +2238,12 @@ dependencies = [
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
+[[package]]
|
|
||||||
+name = "num-conv"
|
|
||||||
+version = "0.1.0"
|
|
||||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
|
||||||
+
|
|
||||||
[[package]]
|
|
||||||
name = "num-traits"
|
|
||||||
version = "0.2.17"
|
|
||||||
@@ -3148,13 +3154,14 @@ dependencies = [
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "time"
|
|
||||||
-version = "0.3.30"
|
|
||||||
+version = "0.3.36"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
|
|
||||||
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
|
||||||
dependencies = [
|
|
||||||
"deranged",
|
|
||||||
"itoa",
|
|
||||||
"libc",
|
|
||||||
+ "num-conv",
|
|
||||||
"num_threads",
|
|
||||||
"powerfmt",
|
|
||||||
"serde",
|
|
||||||
@@ -3170,10 +3177,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "time-macros"
|
|
||||||
-version = "0.2.15"
|
|
||||||
+version = "0.2.18"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
|
|
||||||
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
|
||||||
dependencies = [
|
|
||||||
+ "num-conv",
|
|
||||||
"time-core",
|
|
||||||
]
|
|
||||||
|
|
||||||
@ -4,34 +4,28 @@
|
|||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
# darwin dependencies
|
|
||||||
openssl,
|
openssl,
|
||||||
|
# darwin dependencies
|
||||||
libiconv,
|
libiconv,
|
||||||
curl,
|
curl,
|
||||||
|
# testing
|
||||||
|
testers,
|
||||||
|
cargo-geiger,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-geiger";
|
pname = "cargo-geiger";
|
||||||
version = "0.11.7";
|
version = "0.12.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rust-secure-code";
|
owner = "geiger-rs";
|
||||||
repo = "cargo-geiger";
|
repo = "cargo-geiger";
|
||||||
rev = "cargo-geiger@v${version}";
|
tag = "cargo-geiger-${version}";
|
||||||
hash = "sha256-/5yuayqneZV6aVQ6YFgqNS2XY3W6yETRQ0kE5ovc7p8=";
|
hash = "sha256-OW/LOZUCGOIl7jeWnzt4SXTo3gplJx/wbC21S1TdZx0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoPatches = [
|
|
||||||
# https://github.com/geiger-rs/cargo-geiger/pull/528
|
|
||||||
./fix-build-with-rust-1.80.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-n6RfulzrK9QebC1tgVVd/YnBc21Jf0OSfHApRO1c0ew=";
|
cargoHash = "sha256-aDgpEfX0QRkQD6c4ant6uSN18WLHVnZISRr7lyu9IzA=";
|
||||||
|
|
||||||
patches = [
|
|
||||||
./allow-warnings.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ openssl ]
|
[ openssl ]
|
||||||
@ -44,43 +38,50 @@ rustPlatform.buildRustPackage rec {
|
|||||||
# curl-sys wants to run curl-config on darwin
|
# curl-sys wants to run curl-config on darwin
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ curl.dev ];
|
++ lib.optionals stdenv.hostPlatform.isDarwin [ curl.dev ];
|
||||||
|
|
||||||
|
preCheck = ''
|
||||||
|
export HOME=$(mktemp -d)
|
||||||
|
'';
|
||||||
|
|
||||||
# skip tests with networking or other failures
|
# skip tests with networking or other failures
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
"--skip serialize_test1_quick_report"
|
# panics
|
||||||
"--skip serialize_test2_quick_report"
|
"--skip serialize_test2_quick_report"
|
||||||
"--skip serialize_test3_quick_report"
|
"--skip serialize_test3_quick_report"
|
||||||
"--skip serialize_test4_quick_report"
|
|
||||||
"--skip serialize_test6_quick_report"
|
"--skip serialize_test6_quick_report"
|
||||||
"--skip serialize_test7_quick_report"
|
|
||||||
"--skip serialize_test1_report"
|
|
||||||
"--skip serialize_test2_report"
|
"--skip serialize_test2_report"
|
||||||
"--skip serialize_test3_report"
|
"--skip serialize_test3_report"
|
||||||
"--skip serialize_test4_report"
|
|
||||||
"--skip serialize_test6_report"
|
"--skip serialize_test6_report"
|
||||||
"--skip serialize_test7_report"
|
# requires networking
|
||||||
# multiple test cases that time-out or cause memory leaks
|
"--skip test_package::case_2"
|
||||||
"--skip test_package"
|
"--skip test_package::case_3"
|
||||||
|
"--skip test_package::case_6"
|
||||||
|
"--skip test_package::case_9"
|
||||||
|
# panics, snapshot assertions fails
|
||||||
"--skip test_package_update_readme::case_2"
|
"--skip test_package_update_readme::case_2"
|
||||||
"--skip test_package_update_readme::case_3"
|
"--skip test_package_update_readme::case_3"
|
||||||
"--skip test_package_update_readme::case_5"
|
"--skip test_package_update_readme::case_5"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
passthru.tests.version = testers.testVersion {
|
||||||
homepage = "https://github.com/rust-secure-code/cargo-geiger";
|
package = cargo-geiger;
|
||||||
changelog = "https://github.com/rust-secure-code/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md";
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
description = "Detects usage of unsafe Rust in a Rust crate and its dependencies";
|
description = "Detects usage of unsafe Rust in a Rust crate and its dependencies";
|
||||||
mainProgram = "cargo-geiger";
|
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
A cargo plugin that detects the usage of unsafe Rust in a Rust crate and
|
A cargo plugin that detects the usage of unsafe Rust in a Rust crate and
|
||||||
its dependencies. It provides information to aid auditing and guide
|
its dependencies. It provides information to aid auditing and guide
|
||||||
dependency selection but it can not help you decide when and why unsafe
|
dependency selection but it can not help you decide when and why unsafe
|
||||||
code is appropriate.
|
code is appropriate.
|
||||||
'';
|
'';
|
||||||
license = with licenses; [
|
homepage = "https://github.com/geiger-rs/cargo-geiger";
|
||||||
|
changelog = "https://github.com/geiger-rs/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md";
|
||||||
|
mainProgram = "cargo-geiger";
|
||||||
|
license = with lib.licenses; [
|
||||||
asl20 # or
|
asl20 # or
|
||||||
mit
|
mit
|
||||||
];
|
];
|
||||||
maintainers = with maintainers; [
|
maintainers = with lib.maintainers; [
|
||||||
evanjs
|
evanjs
|
||||||
gepbird
|
gepbird
|
||||||
jk
|
jk
|
||||||
|
|||||||
@ -18,18 +18,18 @@
|
|||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "cartero";
|
pname = "cartero";
|
||||||
version = "0.1.5";
|
version = "0.2.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "danirod";
|
owner = "danirod";
|
||||||
repo = "cartero";
|
repo = "cartero";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-1pSOyVGGl+G6mspdzzYP/BoQueVvAHTP6Vwqt6zL80c=";
|
hash = "sha256-EJhp/UQmD5Otf3n7wpd3s4oKt9g02q29tZA6bGKMQc8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||||
inherit (finalAttrs) pname version src;
|
inherit (finalAttrs) pname version src;
|
||||||
hash = "sha256-qqxoP/T9de4w2wQJaCtQGRsoD+/dF7ir4iwYY69R+/I=";
|
hash = "sha256-szzQNFF+jMn7YLMjbmpM624T+qK0I++dNnZnJcPKZrw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@ -25,14 +25,14 @@ with py.pkgs;
|
|||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "checkov";
|
pname = "checkov";
|
||||||
version = "3.2.407";
|
version = "3.2.408";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bridgecrewio";
|
owner = "bridgecrewio";
|
||||||
repo = "checkov";
|
repo = "checkov";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-xVscXBrgaJhQDmtuvQ/eQsWS3Z7rpaOJSptWXaMsby0=";
|
hash = "sha256-QvM45kgRnzmDjYLnO3g1gMYEJpof7W9z/gCPwXExdgc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
|
|||||||
@ -8,16 +8,16 @@
|
|||||||
let
|
let
|
||||||
argset = {
|
argset = {
|
||||||
pname = "chezmoi";
|
pname = "chezmoi";
|
||||||
version = "2.62.1";
|
version = "2.62.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "twpayne";
|
owner = "twpayne";
|
||||||
repo = "chezmoi";
|
repo = "chezmoi";
|
||||||
rev = "v${argset.version}";
|
rev = "v${argset.version}";
|
||||||
hash = "sha256-2n8ePR5WzV6RtfI9ySIy5Zqg8jKXltUNq572kVUyLWY=";
|
hash = "sha256-Bma7w/Nhpht02eOVyVJDJq+JDUXR7svD8TdMZhuNw10=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-7OD/yRI0TD8PM1IoMazN2W5b8AwKs64068ZectGXFtU=";
|
vendorHash = "sha256-L089chsoaEDo2+ahTKs9w0Np3S2fWVtt9jWRJmBrP3w=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
installShellFiles
|
installShellFiles
|
||||||
|
|||||||
@ -6,13 +6,13 @@
|
|||||||
fuse,
|
fuse,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
version = "0.7";
|
|
||||||
pname = "chunkfs";
|
pname = "chunkfs";
|
||||||
|
version = "0.8";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz";
|
url = "https://chunkfs.florz.de/chunkfs_${finalAttrs.version}.tar.xz";
|
||||||
sha256 = "4c168fc2b265a6ba34afc565707ea738f34375325763c0596f2cfa1c9b8d40f1";
|
hash = "sha256-HFv51ta2eNW9Qt9CUp2oTTlC8Lpwc1XKR/uYzMDfd88=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa";
|
description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa";
|
||||||
homepage = "http://chunkfs.florz.de/";
|
homepage = "http://chunkfs.florz.de";
|
||||||
license = lib.licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
platforms = with lib.platforms; linux;
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|||||||
@ -7,12 +7,12 @@
|
|||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
pname = "clickup";
|
pname = "clickup";
|
||||||
version = "3.3.79";
|
version = "3.5.87";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
# Using archive.org because the website doesn't store older versions of the software.
|
# Using archive.org because the website doesn't store older versions of the software.
|
||||||
url = "https://web.archive.org/web/20240601173958/https%3A%2F%2Fdesktop.clickup.com%2Flinux";
|
url = "https://web.archive.org/web/20250419020454/https://desktop.clickup.com/linux";
|
||||||
hash = "sha256-jAOYDX9j+ZTqWsSg0rEckKZnErgsIV6+CtUv3M3wNqM=";
|
hash = "sha256-+Et+N8ZR5pJ8dvsU/tZa+LLpatooTnq3D24c6t1NS18=";
|
||||||
};
|
};
|
||||||
|
|
||||||
appimage = appimageTools.wrapType2 {
|
appimage = appimageTools.wrapType2 {
|
||||||
|
|||||||
@ -6,27 +6,24 @@
|
|||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "cloudflare-dyndns";
|
pname = "cloudflare-dyndns";
|
||||||
version = "5.0";
|
version = "5.3";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kissgyorgy";
|
owner = "kissgyorgy";
|
||||||
repo = "cloudflare-dyndns";
|
repo = "cloudflare-dyndns";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-tI6qdNxIMEuAR+BcqsRi2EBXTQnfdDLKW7Y+fbcmlao=";
|
hash = "sha256-t0MqH9lDfl+cAnPYSG7P32OGO8Qpo1ep0Hj3Xl76lhU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = with python3.pkgs; [
|
build-system = with python3.pkgs; [
|
||||||
poetry-core
|
hatchling
|
||||||
];
|
];
|
||||||
|
|
||||||
dependencies = with python3.pkgs; [
|
dependencies = with python3.pkgs; [
|
||||||
attrs
|
|
||||||
click
|
click
|
||||||
cloudflare
|
|
||||||
pydantic
|
|
||||||
requests
|
|
||||||
httpx
|
httpx
|
||||||
|
pydantic
|
||||||
truststore
|
truststore
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@ -6,18 +6,18 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cnquery";
|
pname = "cnquery";
|
||||||
version = "11.49.0";
|
version = "11.51.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mondoohq";
|
owner = "mondoohq";
|
||||||
repo = "cnquery";
|
repo = "cnquery";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-e/tD/yo7tV2JkQER1KW9qO9YIo2TQR3jt8uYup/wEt4=";
|
hash = "sha256-Vc6ucWZf/n/joscFEVuQEfsg2fu860thmlppVItFDnE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
subPackages = [ "apps/cnquery" ];
|
subPackages = [ "apps/cnquery" ];
|
||||||
|
|
||||||
vendorHash = "sha256-M3pRUXAwXgdWLaEMXRd6hkH4Z2hh4z38SzO6BeOzjeo=";
|
vendorHash = "sha256-gvRsEIYEj5D+P8gFlGdfHC/3Pho5YYZxKm6Mkq8lwQw=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-w"
|
"-w"
|
||||||
|
|||||||
@ -9,18 +9,18 @@
|
|||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "codeberg-cli";
|
pname = "codeberg-cli";
|
||||||
version = "0.4.9";
|
version = "0.4.11";
|
||||||
|
|
||||||
src = fetchFromGitea {
|
src = fetchFromGitea {
|
||||||
domain = "codeberg.org";
|
domain = "codeberg.org";
|
||||||
owner = "Aviac";
|
owner = "Aviac";
|
||||||
repo = "codeberg-cli";
|
repo = "codeberg-cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-uifLgXwKcdZ8Q2GjVIa/EA5iq+T9pm821aKsXPbPL34=";
|
hash = "sha256-wf9Ve7focNBo6fGsjBQpTIx+DtxOo73AIQ9uoV8Q88Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-nKI0bIKocTjodZ6O1VTTTrlzeeueaH6crF9jdTnx5lI=";
|
cargoHash = "sha256-LmLMTnNwxih5HcrMUmQpVdIVz4KeHxcOFtOrNqgGPkA=";
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
installShellFiles
|
installShellFiles
|
||||||
|
|||||||
@ -1,22 +1,29 @@
|
|||||||
{
|
{
|
||||||
fetchPypi,
|
|
||||||
lib,
|
lib,
|
||||||
python3Packages,
|
python3Packages,
|
||||||
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "codecov-cli";
|
pname = "codecov-cli";
|
||||||
version = "9.1.1";
|
version = "10.4.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src =
|
||||||
inherit pname version;
|
(fetchFromGitHub {
|
||||||
hash = "sha256-jaljYA2x2nZUOn9vy/CdtxfGjQKHtrtY13WmBdsICTA=";
|
owner = "codecov";
|
||||||
};
|
repo = "codecov-cli";
|
||||||
|
tag = "v${version}";
|
||||||
|
hash = "sha256-R1GFQ81N/e2OX01oSs8Xs+PM0JKVZofiUPADVdxCzWk=";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
}).overrideAttrs
|
||||||
|
(_: {
|
||||||
|
GIT_CONFIG_COUNT = 1;
|
||||||
|
GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
|
||||||
|
GIT_CONFIG_VALUE_0 = "git@github.com:";
|
||||||
|
});
|
||||||
|
|
||||||
build-system = with python3Packages; [
|
build-system = with python3Packages; [ setuptools ];
|
||||||
setuptools
|
|
||||||
];
|
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
"httpx"
|
"httpx"
|
||||||
@ -33,6 +40,8 @@ python3Packages.buildPythonApplication rec {
|
|||||||
responses
|
responses
|
||||||
test-results-parser
|
test-results-parser
|
||||||
tree-sitter
|
tree-sitter
|
||||||
|
sentry-sdk
|
||||||
|
wrapt
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "containerd";
|
pname = "containerd";
|
||||||
version = "2.0.4";
|
version = "2.0.5";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
@ -27,7 +27,7 @@ buildGoModule rec {
|
|||||||
owner = "containerd";
|
owner = "containerd";
|
||||||
repo = "containerd";
|
repo = "containerd";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-KW2fKdsJ590UPGcu2O3IGyJ+/iY0c8GQLirL8zK3F14=";
|
hash = "sha256-BY6lIzTlJbBbeIxCtSd7NcYVEWta3VNMmHmH97ksGsE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = "patchShebangs .";
|
postPatch = "patchShebangs .";
|
||||||
|
|||||||
@ -1,32 +1,27 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
python3,
|
python3Packages,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
mpv,
|
mpv,
|
||||||
pulseaudio,
|
pulseaudio,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "cplay-ng";
|
pname = "cplay-ng";
|
||||||
version = "5.3.1";
|
version = "5.4.0";
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "xi";
|
owner = "xi";
|
||||||
repo = "cplay-ng";
|
repo = "cplay-ng";
|
||||||
rev = version;
|
tag = version;
|
||||||
hash = "sha256-6mphhoLDkGZ2r+elzLlPl3B8fNz3loqrQB8x8276AHI=";
|
hash = "sha256-ob5wX+Q5XKB/fTYG5phLU61imonpk2A/fk5cg/dfr1Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
makeWrapper
|
|
||||||
];
|
|
||||||
|
|
||||||
build-system = [
|
build-system = [ python3Packages.setuptools ];
|
||||||
python3.pkgs.setuptools
|
|
||||||
];
|
|
||||||
|
|
||||||
pyproject = true;
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram $out/bin/cplay-ng \
|
wrapProgram $out/bin/cplay-ng \
|
||||||
@ -38,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
homepage = "https://github.com/xi/cplay-ng";
|
homepage = "https://github.com/xi/cplay-ng";
|
||||||
description = "Simple curses audio player";
|
description = "Simple curses audio player";
|
||||||
mainProgram = "cplay-ng";
|
mainProgram = "cplay-ng";
|
||||||
@ -55,7 +50,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||||||
maintained. This is a rewrite that aims to stay true to the original
|
maintained. This is a rewrite that aims to stay true to the original
|
||||||
design while evolving with a shifting environment.
|
design while evolving with a shifting environment.
|
||||||
'';
|
'';
|
||||||
license = licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ fgaz ];
|
maintainers = with lib.maintainers; [ fgaz ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,12 +9,12 @@
|
|||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cwe-client-cli";
|
pname = "cwe-client-cli";
|
||||||
version = "0.3.2";
|
version = "0.3.3";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NotBalds";
|
owner = "NotBalds";
|
||||||
repo = "cwe-client-cli";
|
repo = "cwe-client-cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-7zzmYwuQ+Sg8hf1zuKtKUMgk0Is1YJB4WdOKdxtWRA0=";
|
hash = "sha256-3ehzERWV0/hV0Suy9LtCcp+xmaD13Chgu4a0gPT7cHs=";
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
|||||||
openssl_3
|
openssl_3
|
||||||
];
|
];
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-ctcsO7HRs3wWcOFW+ewQbKGCSEBlVzT/enAEjFIAaPU=";
|
cargoHash = "sha256-ml6anuAJru2zVIHNf/z4gdQjplRrXL4FO44cxfaDRns=";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Simple command line client for CWE";
|
description = "Simple command line client for CWE";
|
||||||
|
|||||||
@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
stdenvNoCC.mkDerivation {
|
stdenvNoCC.mkDerivation {
|
||||||
pname = "cyberpunk-neon";
|
pname = "cyberpunk-neon";
|
||||||
version = "0-unstable-2025-02-01";
|
version = "0-unstable-2025-04-17";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Roboron3042";
|
owner = "Roboron3042";
|
||||||
repo = "Cyberpunk-Neon";
|
repo = "Cyberpunk-Neon";
|
||||||
rev = "eb7595459c0d4164262e0ccaf8d6e5c1936a6f67";
|
rev = "84f4817bf6e84fc24c3a93371f8de36613d76fa1";
|
||||||
hash = "sha256-whHBIxEGGvTPVUaE/HQDb/Qyl5sPMGlOmofgNCBaNng=";
|
hash = "sha256-aCQ0BfDrKUH+ati9oiLh4iGc0eoyt2d7Zyg5yXwZe30=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|||||||
@ -6,14 +6,14 @@
|
|||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "cyclonedx-python";
|
pname = "cyclonedx-python";
|
||||||
version = "5.3.0";
|
version = "5.5.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "CycloneDX";
|
owner = "CycloneDX";
|
||||||
repo = "cyclonedx-python";
|
repo = "cyclonedx-python";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-H3r/ypD3aEkrCnclf+zh0BK4ZzDQBMNvWS7V7xKX43g=";
|
hash = "sha256-6sWDUuABGDgaim3YSrRNedu5z2XOIY0ERgit78ZM1+E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = with python3Packages; [ poetry-core ];
|
build-system = with python3Packages; [ poetry-core ];
|
||||||
|
|||||||
@ -1,15 +1,13 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mkDerivation,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
cmake,
|
cmake,
|
||||||
|
libsForQt5,
|
||||||
file,
|
file,
|
||||||
qtbase,
|
|
||||||
qttools,
|
|
||||||
solid,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "dfilemanager";
|
pname = "dfilemanager";
|
||||||
version = "unstable-2021-02-20";
|
version = "unstable-2021-02-20";
|
||||||
|
|
||||||
@ -17,15 +15,18 @@ mkDerivation {
|
|||||||
owner = "probonopd";
|
owner = "probonopd";
|
||||||
repo = "dfilemanager";
|
repo = "dfilemanager";
|
||||||
rev = "61179500a92575e05cf9a71d401c388726bfd73d";
|
rev = "61179500a92575e05cf9a71d401c388726bfd73d";
|
||||||
sha256 = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc=";
|
hash = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
libsForQt5.wrapQtAppsHook
|
||||||
|
];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
qtbase
|
libsForQt5.qtbase
|
||||||
qttools
|
libsForQt5.qttools
|
||||||
|
libsForQt5.solid
|
||||||
file
|
file
|
||||||
solid
|
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [ "-DQT5BUILD=true" ];
|
cmakeFlags = [ "-DQT5BUILD=true" ];
|
||||||
@ -36,5 +37,6 @@ mkDerivation {
|
|||||||
mainProgram = "dfm";
|
mainProgram = "dfm";
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2;
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
|
maintainers = [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -30,16 +30,18 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "domination";
|
pname = "domination";
|
||||||
version = "1.3.1";
|
version = "1.3.3";
|
||||||
|
|
||||||
# The .zip releases do not contain the build.xml file
|
# The .zip releases do not contain the build.xml file
|
||||||
src = fetchsvn {
|
src = fetchsvn {
|
||||||
url = "https://svn.code.sf.net/p/domination/code/Domination";
|
url = "https://svn.code.sf.net/p/domination/code/Domination";
|
||||||
# There are no tags in the repository.
|
# There are no tags in the repository.
|
||||||
# Look for commits like "new version x.y.z info on website"
|
# Look for "(svn rev X)" at
|
||||||
# or "website update for x.y.z".
|
# https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt
|
||||||
rev = "2538";
|
# Alternatively, look for revs like "changelog update",
|
||||||
hash = "sha256-wsLBHkQc1SW+PToyCXIek6qRrRga2nLLkM+5msrnsBo=";
|
# "new version x.y.z info on website", or "website update for x.y.z".
|
||||||
|
rev = "2616";
|
||||||
|
hash = "sha256-/h9TstRxMpeoEsIeSN0MRmyRsiBHomguIPch1Zda8s8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -96,6 +98,8 @@ stdenv.mkDerivation {
|
|||||||
domination-starts = nixosTests.domination;
|
domination-starts = nixosTests.domination;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
passthru.updateScript = ./update.tcl;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://domination.sourceforge.net/";
|
homepage = "https://domination.sourceforge.net/";
|
||||||
downloadPage = "https://domination.sourceforge.net/download.shtml";
|
downloadPage = "https://domination.sourceforge.net/download.shtml";
|
||||||
|
|||||||
8
pkgs/by-name/do/domination/update.tcl
Executable file
8
pkgs/by-name/do/domination/update.tcl
Executable file
@ -0,0 +1,8 @@
|
|||||||
|
#!/usr/bin/env nix-shell
|
||||||
|
#!nix-shell -i tclsh -p tcl common-updater-scripts curl
|
||||||
|
|
||||||
|
set changelog_url https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt?format=raw
|
||||||
|
|
||||||
|
set changelog [exec -ignorestderr curl -Ls $changelog_url]
|
||||||
|
regexp {(\d+(\.\d+)*) \(\d+\.\d+\.\d+\) \(svn rev (\d+)\)} $changelog _ version _ rev
|
||||||
|
exec -ignorestderr update-source-version domination $version --rev=$rev
|
||||||
@ -10,13 +10,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "doppler";
|
pname = "doppler";
|
||||||
version = "3.73.1";
|
version = "3.74.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dopplerhq";
|
owner = "dopplerhq";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-9UF9ZMQWfhncJkRFieYIawtv0EnfngeS7Sw5uPtyheI=";
|
hash = "sha256-mT6AB3Xtjm7AHtdF3eKn7dfnd/3ul1nCiZ5e4cHUXbc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-tSRtgkDPvDlEfwuNhahvs3Pvt4h7QAJrJtb1XQXGaFM=";
|
vendorHash = "sha256-tSRtgkDPvDlEfwuNhahvs3Pvt4h7QAJrJtb1XQXGaFM=";
|
||||||
|
|||||||
@ -1,11 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
SDL2,
|
SDL2,
|
||||||
SDL2_image,
|
|
||||||
SDL2_net,
|
SDL2_net,
|
||||||
alsa-lib,
|
alsa-lib,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch,
|
|
||||||
fluidsynth,
|
fluidsynth,
|
||||||
gitUpdater,
|
gitUpdater,
|
||||||
glib,
|
glib,
|
||||||
@ -33,23 +31,16 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "dosbox-staging";
|
pname = "dosbox-staging";
|
||||||
version = "0.81.1";
|
version = "0.82.1";
|
||||||
|
shortRev = "13441a2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dosbox-staging";
|
owner = "dosbox-staging";
|
||||||
repo = "dosbox-staging";
|
repo = "dosbox-staging";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-XGssEyX+AVv7/ixgGTRtPFjsUSX0FT0fhP+TXsFl2fY=";
|
hash = "sha256-BVeFBKqTQiEftWVvMkSYBjC6dCYI4juWD4A6Bx8E8/Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "darwin-allow-bypass-wraps.patch";
|
|
||||||
url = "https://github.com/dosbox-staging/dosbox-staging/commit/9f0fc1dc762010e5f7471d01c504d817a066cae3.patch";
|
|
||||||
hash = "sha256-IzxRE1Vr+M8I5hdy80UwebjJ5R1IlH9ymaYgs6VwAO4=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gtest
|
gtest
|
||||||
makeWrapper
|
makeWrapper
|
||||||
@ -60,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
SDL2
|
SDL2
|
||||||
SDL2_image
|
|
||||||
SDL2_net
|
SDL2_net
|
||||||
fluidsynth
|
fluidsynth
|
||||||
glib
|
glib
|
||||||
@ -84,8 +74,18 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
"man"
|
"man"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# replace instances of the get-version.sh script that uses git in meson.build with manual values
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace meson.build \
|
||||||
|
--replace-fail "meson.project_source_root() + '/scripts/get-version.sh'," "'printf'," \
|
||||||
|
--replace-fail "'version', check: true," "'${finalAttrs.version}', check: true," \
|
||||||
|
--replace-fail "'./scripts/get-version.sh', 'hash'," "'printf', '${
|
||||||
|
builtins.substring 0 5 finalAttrs.shortRev
|
||||||
|
}',"
|
||||||
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -Dm644 $src/contrib/linux/dosbox-staging.desktop $out/share/applications/
|
install -Dm644 $src/contrib/linux/org.dosbox-staging.dosbox-staging.desktop $out/share/applications/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Rename binary, add a wrapper, and copy manual to avoid conflict with
|
# Rename binary, add a wrapper, and copy manual to avoid conflict with
|
||||||
@ -125,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
license = lib.licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
maintainers = with lib.maintainers; [
|
maintainers = with lib.maintainers; [
|
||||||
joshuafern
|
joshuafern
|
||||||
|
Zaechus
|
||||||
];
|
];
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
priority = 101;
|
priority = 101;
|
||||||
|
|||||||
@ -4,39 +4,52 @@
|
|||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "ecos";
|
pname = "ecos";
|
||||||
version = "2.0.7";
|
version = "2.0.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "embotech";
|
owner = "embotech";
|
||||||
repo = "ecos";
|
repo = "ecos";
|
||||||
rev = version;
|
tag = "v${finalAttrs.version}";
|
||||||
sha256 = "1hsndim5kjvcwk5svqa4igawzahj982180xj1d7yd0dbjlgxc7w7";
|
hash = "sha256-WMgqDc+XAY3g2wwlefjJ0ATxR5r/jL971FZKtxsunnU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
|
||||||
make all shared
|
make all shared
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
|
|
||||||
make test
|
make test
|
||||||
./runecos
|
./runecos
|
||||||
|
|
||||||
|
runHook postCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
mkdir -p $out/lib
|
mkdir -p $out/lib
|
||||||
cp lib*.a lib*.so $out/lib
|
cp lib*.a lib*.so $out/lib
|
||||||
cp -r include $out/
|
cp -r include $out/
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Lightweight conic solver for second-order cone programming";
|
description = "Lightweight conic solver for second-order cone programming";
|
||||||
homepage = "https://www.embotech.com/ECOS";
|
homepage = "https://www.embotech.com/ECOS";
|
||||||
downloadPage = "https://github.com/embotech/ecos/releases";
|
downloadPage = "https://github.com/embotech/ecos/releases";
|
||||||
license = licenses.gpl3;
|
license = lib.licenses.gpl3;
|
||||||
platforms = platforms.all;
|
platforms = lib.platforms.all;
|
||||||
maintainers = with maintainers; [ bhipple ];
|
maintainers = with lib.maintainers; [ bhipple ];
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|||||||
@ -26,14 +26,14 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "eduke32";
|
pname = "eduke32";
|
||||||
version = "0-unstable-2024-07-26";
|
version = "0-unstable-2025-04-11";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "voidpoint.io";
|
domain = "voidpoint.io";
|
||||||
owner = "terminx";
|
owner = "terminx";
|
||||||
repo = "eduke32";
|
repo = "eduke32";
|
||||||
rev = "19c21b9ab10b0c17147c9ad951cc15279ed33f77";
|
rev = "b8759847124c2c53a165a02efef4a0c778674baf";
|
||||||
hash = "sha256-lwnx2tVjbHouB0vaT7Dh1Ozea8+7Az6e4Wn6HmxDxCo=";
|
hash = "sha256-PudO6EKCh6UpoY6GT/J0hkVteKNIAO4Q454jIzaegMg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
makeFlags = [
|
makeFlags = [
|
||||||
"SDLCONFIG=${SDL2}/bin/sdl2-config"
|
"SDLCONFIG=${SDL2}/bin/sdl2-config"
|
||||||
# git rev-list --count HEAD
|
# git rev-list --count HEAD
|
||||||
"VC_REV=10593"
|
"VC_REV=10619"
|
||||||
"VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}"
|
"VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}"
|
||||||
"VC_BRANCH=master"
|
"VC_BRANCH=master"
|
||||||
];
|
];
|
||||||
|
|||||||
71
pkgs/by-name/eq/equalx/package.nix
Normal file
71
pkgs/by-name/eq/equalx/package.nix
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitLab,
|
||||||
|
|
||||||
|
# nativeBuildInputs
|
||||||
|
protobuf,
|
||||||
|
qt5,
|
||||||
|
libsForQt5,
|
||||||
|
pkg-config,
|
||||||
|
installShellFiles,
|
||||||
|
|
||||||
|
# buildInputs
|
||||||
|
ghostscript,
|
||||||
|
poppler-utils,
|
||||||
|
exempi,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "equalx";
|
||||||
|
version = "0.7.1-unstable-2020-02-26";
|
||||||
|
|
||||||
|
src = fetchFromGitLab {
|
||||||
|
owner = "q-quark";
|
||||||
|
repo = "equalx";
|
||||||
|
rev = "b7175a574379d86c43cabbdb6071f0b6d40d8e79";
|
||||||
|
hash = "sha256-3KIJk5bTmFjaojjHDurJjEgyvuIf0LHcSi+MrmsRPcg=";
|
||||||
|
};
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace equalx.pro \
|
||||||
|
--replace-fail 'git describe --abbrev=0 --tags' 'echo ${finalAttrs.version}'
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
protobuf
|
||||||
|
qt5.qmake
|
||||||
|
qt5.wrapQtAppsHook
|
||||||
|
pkg-config
|
||||||
|
installShellFiles
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
qt5.qtbase
|
||||||
|
qt5.qtmultimedia
|
||||||
|
libsForQt5.poppler
|
||||||
|
ghostscript
|
||||||
|
poppler-utils
|
||||||
|
exempi
|
||||||
|
];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
installBin equalx
|
||||||
|
installManPage equalx.1
|
||||||
|
install -Dm644 equalx.appdata.xml $out/share/metainfo/eqaulx.appdata.xml
|
||||||
|
install -Dm644 resources/equalx.ico $out/share/icons/hicolor/256x256/apps/equalx.ico
|
||||||
|
install -Dm644 resources/equalx.desktop $out/share/applications/equalx.desktop
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Graphical interface to latex and a bunch of conversion programs";
|
||||||
|
homepage = "https://equalx.sourceforge.io/";
|
||||||
|
mainProgram = "equalx";
|
||||||
|
downloadPage = "https://gitlab.com/q-quark/equalx";
|
||||||
|
license = lib.licenses.gpl3Plus;
|
||||||
|
maintainers = with lib.maintainers; [ doronbehar ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -8,7 +8,7 @@
|
|||||||
libnet,
|
libnet,
|
||||||
zlib,
|
zlib,
|
||||||
curl,
|
curl,
|
||||||
pcre,
|
pcre2,
|
||||||
openssl,
|
openssl,
|
||||||
ncurses,
|
ncurses,
|
||||||
glib,
|
glib,
|
||||||
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||||||
libnet
|
libnet
|
||||||
zlib
|
zlib
|
||||||
curl
|
curl
|
||||||
pcre
|
pcre2
|
||||||
openssl
|
openssl
|
||||||
ncurses
|
ncurses
|
||||||
glib
|
glib
|
||||||
|
|||||||
@ -7,16 +7,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "fabric-ai";
|
pname = "fabric-ai";
|
||||||
version = "1.4.171";
|
version = "1.4.183";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "danielmiessler";
|
owner = "danielmiessler";
|
||||||
repo = "fabric";
|
repo = "fabric";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-NHsgsK7h+PeunGKAgkIOmINPJugkx7nuNvAU4jwsrAI=";
|
hash = "sha256-40HOm7T8jwNuEdU+vCfg2eQUh72B67fQaHNLzT6QAN0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-ax0ZLvLfbmpzO93xRqonHJz1zHs6u0+Mu0WegR1eW60=";
|
vendorHash = "sha256-ZrIzCKhEa00KOS8tauYEGLR4o7gGVVZ9pdfEQbAGDkI=";
|
||||||
|
|
||||||
# Fabric introduced plugin tests that fail in the nix build sandbox.
|
# Fabric introduced plugin tests that fail in the nix build sandbox.
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|||||||
@ -20,13 +20,13 @@ let
|
|||||||
in
|
in
|
||||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
pname = "freetube";
|
pname = "freetube";
|
||||||
version = "0.23.3";
|
version = "0.23.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "FreeTubeApp";
|
owner = "FreeTubeApp";
|
||||||
repo = "FreeTube";
|
repo = "FreeTube";
|
||||||
tag = "v${finalAttrs.version}-beta";
|
tag = "v${finalAttrs.version}-beta";
|
||||||
hash = "sha256-EpcYNUtGbEFvetroo1zAyfKxW70vD1Lk0aJKWcaV39I=";
|
hash = "sha256-JQob4NyZ00iOnRbSyNWjL4xyNQ14ixyZDXsJ7KBd9ZM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Darwin requires writable Electron dist
|
# Darwin requires writable Electron dist
|
||||||
@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
yarnOfflineCache = fetchYarnDeps {
|
yarnOfflineCache = fetchYarnDeps {
|
||||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||||
hash = "sha256-xiJGzvmfrvvB6/rdwALOxhWSWAZ31cbySYygtG8+QpQ=";
|
hash = "sha256-F1YcdshWGRCO7kHsCK0Ejs0aMR7BFXd5M9ITdRVcpbk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@ -1,54 +0,0 @@
|
|||||||
#!@shell@
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
GARGDIST=build/macosx.release
|
|
||||||
BUNDLE=${out}/Applications/Gargoyle.app/Contents
|
|
||||||
TERPS="
|
|
||||||
advsys/advsys
|
|
||||||
agility/agility
|
|
||||||
alan2/alan2
|
|
||||||
alan3/alan3
|
|
||||||
bocfel/bocfel
|
|
||||||
frotz/frotz
|
|
||||||
garglk/gargoyle
|
|
||||||
geas/geas
|
|
||||||
git/git
|
|
||||||
glulxe/glulxe
|
|
||||||
hugo/hugo
|
|
||||||
jacl/jacl
|
|
||||||
level9/level9
|
|
||||||
magnetic/magnetic
|
|
||||||
nitfol/nitfol
|
|
||||||
scare/scare
|
|
||||||
scott/scott
|
|
||||||
tads/tadsr
|
|
||||||
"
|
|
||||||
|
|
||||||
mkdir -p $BUNDLE/MacOS
|
|
||||||
mkdir -p $BUNDLE/Frameworks
|
|
||||||
mkdir -p $BUNDLE/Resources
|
|
||||||
mkdir -p $BUNDLE/PlugIns
|
|
||||||
|
|
||||||
install_name_tool -id @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/garglk/libgarglk.dylib
|
|
||||||
for file in $TERPS
|
|
||||||
do
|
|
||||||
install_name_tool -change @executable_path/libgarglk.dylib @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/$file || true
|
|
||||||
cp -f $GARGDIST/$file $BUNDLE/PlugIns
|
|
||||||
done
|
|
||||||
|
|
||||||
cp -f garglk/launcher.plist $BUNDLE/Info.plist
|
|
||||||
cp -f $GARGDIST/garglk/gargoyle $BUNDLE/MacOS/Gargoyle
|
|
||||||
cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/Frameworks
|
|
||||||
cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/PlugIns
|
|
||||||
cp -f garglk/launchmac.nib $BUNDLE/Resources/MainMenu.nib
|
|
||||||
cp -f garglk/garglk.ini $BUNDLE/Resources
|
|
||||||
cp -f garglk/*.icns $BUNDLE/Resources
|
|
||||||
cp -f licenses/* $BUNDLE/Resources
|
|
||||||
|
|
||||||
mkdir $BUNDLE/Resources/Fonts
|
|
||||||
cp fonts/LiberationMono*.ttf $BUNDLE/Resources/Fonts
|
|
||||||
cp fonts/LinLibertine*.otf $BUNDLE/Resources/Fonts
|
|
||||||
|
|
||||||
mkdir -p ${out}/bin
|
|
||||||
ln -s $BUNDLE/MacOS/Gargoyle ${out}/bin/gargoyle
|
|
||||||
@ -2,104 +2,83 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
replaceVarsWith,
|
fetchDebianPatch,
|
||||||
jam,
|
cmake,
|
||||||
cctools,
|
|
||||||
pkg-config,
|
pkg-config,
|
||||||
SDL,
|
fluidsynth,
|
||||||
SDL_mixer,
|
fmt,
|
||||||
SDL_sound,
|
freetype,
|
||||||
gtk2,
|
libjpeg,
|
||||||
|
libopenmpt,
|
||||||
|
libpng,
|
||||||
|
libsndfile,
|
||||||
libvorbis,
|
libvorbis,
|
||||||
smpeg,
|
mpg123,
|
||||||
|
qt6,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
jamenv =
|
|
||||||
''
|
|
||||||
unset AR
|
|
||||||
''
|
|
||||||
+ (
|
|
||||||
if stdenv.hostPlatform.isDarwin then
|
|
||||||
''
|
|
||||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${lib.getDev SDL}/include/SDL"
|
|
||||||
export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini"
|
|
||||||
''
|
|
||||||
else
|
|
||||||
''
|
|
||||||
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/libexec/gargoyle"
|
|
||||||
export DESTDIR="$out"
|
|
||||||
export _BINDIR=libexec/gargoyle
|
|
||||||
export _APPDIR=libexec/gargoyle
|
|
||||||
export _LIBDIR=libexec/gargoyle
|
|
||||||
export GARGLKINI="$out/etc/garglk.ini"
|
|
||||||
''
|
|
||||||
);
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gargoyle";
|
pname = "gargoyle";
|
||||||
version = "2019.1.1";
|
version = "2023.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "garglk";
|
owner = "garglk";
|
||||||
repo = "garglk";
|
repo = "garglk";
|
||||||
rev = version;
|
tag = version;
|
||||||
sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz";
|
hash = "sha256-XsN5FXWJb3DSOjipxr/HW9R7QS+7iEaITERTrbGEMwA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchDebianPatch {
|
||||||
|
pname = "gargoyle-free";
|
||||||
|
version = "2023.1+dfsg";
|
||||||
|
debianRevision = "4";
|
||||||
|
patch = "ftbfs_gcc14.patch";
|
||||||
|
hash = "sha256-eMx/RlUpq5Ez+1L8VZo40Y3h2ZKkqiQEmKTlkZRMXnI=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace garglk/garglk.pc.in \
|
||||||
|
--replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" \
|
||||||
|
--replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
jam
|
cmake
|
||||||
pkg-config
|
pkg-config
|
||||||
] ++ lib.optional stdenv.hostPlatform.isDarwin cctools;
|
qt6.wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[
|
[
|
||||||
SDL
|
fluidsynth
|
||||||
SDL_mixer
|
fmt
|
||||||
SDL_sound
|
freetype
|
||||||
gtk2
|
libjpeg
|
||||||
]
|
libopenmpt
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
libpng
|
||||||
smpeg
|
libsndfile
|
||||||
libvorbis
|
libvorbis
|
||||||
|
mpg123
|
||||||
|
qt6.qtbase
|
||||||
|
qt6.qtmultimedia
|
||||||
|
]
|
||||||
|
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||||
|
qt6.qtwayland
|
||||||
];
|
];
|
||||||
|
|
||||||
# Workaround build failure on -fno-common toolchains:
|
cmakeFlags = [
|
||||||
# ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of
|
(lib.cmakeFeature "INTERFACE" "QT")
|
||||||
# `logFile'; build/linux.release/alan3/act.o:(.bss+0x0): first defined here
|
(lib.cmakeFeature "SOUND" "QT")
|
||||||
# TODO: drop once updated to 2022.1 or later.
|
(lib.cmakeBool "WITH_QT6" true)
|
||||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
# fatal error: 'macglk_startup.h' file not found
|
||||||
|
(lib.cmakeBool "WITH_AGILITY" (!stdenv.hostPlatform.isDarwin))
|
||||||
buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";
|
(lib.cmakeBool "WITH_LEVEL9" (!stdenv.hostPlatform.isDarwin))
|
||||||
|
(lib.cmakeBool "WITH_MAGNETIC" (!stdenv.hostPlatform.isDarwin))
|
||||||
installPhase =
|
];
|
||||||
if stdenv.hostPlatform.isDarwin then
|
|
||||||
(replaceVarsWith {
|
|
||||||
replacements = { inherit (stdenv) shell; };
|
|
||||||
isExecutable = true;
|
|
||||||
src = ./darwin.sh;
|
|
||||||
})
|
|
||||||
else
|
|
||||||
jamenv
|
|
||||||
+ ''
|
|
||||||
jam -j$NIX_BUILD_CORES install
|
|
||||||
mkdir -p "$out/bin"
|
|
||||||
ln -s ../libexec/gargoyle/gargoyle "$out/bin"
|
|
||||||
mkdir -p "$out/etc"
|
|
||||||
cp garglk/garglk.ini "$out/etc"
|
|
||||||
mkdir -p "$out/share/applications"
|
|
||||||
cp garglk/gargoyle.desktop "$out/share/applications"
|
|
||||||
mkdir -p "$out/share/icons/hicolor/32x32/apps"
|
|
||||||
cp garglk/gargoyle-house.png "$out/share/icons/hicolor/32x32/apps"
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
broken = stdenv.hostPlatform.isDarwin;
|
|
||||||
homepage = "http://ccxvii.net/gargoyle/";
|
homepage = "http://ccxvii.net/gargoyle/";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
description = "Interactive fiction interpreter GUI";
|
description = "Interactive fiction interpreter GUI";
|
||||||
|
|||||||
@ -35,13 +35,13 @@ in
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "gitbutler";
|
pname = "gitbutler";
|
||||||
version = "0.14.16";
|
version = "0.14.18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gitbutlerapp";
|
owner = "gitbutlerapp";
|
||||||
repo = "gitbutler";
|
repo = "gitbutler";
|
||||||
tag = "release/${version}";
|
tag = "release/${version}";
|
||||||
hash = "sha256-SbxoLlXa6ZouZPY4P29ol9caDrM9XyJyBl35Wemmh9Y=";
|
hash = "sha256-lYC7thGiCAW6snGyE+qQteS1WfY9k3aez84U8PEjmjg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Let Tauri know what version we're building
|
# Let Tauri know what version we're building
|
||||||
@ -60,11 +60,11 @@ rustPlatform.buildRustPackage rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-VlGHexsNOwipyKiotWYgt8E+x6C22a7xW2Zft39FeJE=";
|
cargoHash = "sha256-VVGdZxfBLj1kKEJjck5jhOsoW4KRUWiup6w6wpRto7Q=";
|
||||||
|
|
||||||
pnpmDeps = pnpm_9.fetchDeps {
|
pnpmDeps = pnpm_9.fetchDeps {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
hash = "sha256-Zf/n49nb1PcE3RMeBoN3EAershxQh1AO8Hx9m3NV9XM=";
|
hash = "sha256-v+nW5C4an5Yx6Kfd1iErNiXRofPubgLSNFZu/Ae1DFc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@ -34,6 +34,29 @@ buildNpmPackage rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
NODE_MODULES=$out/lib/node_modules/gitlab-ci-local/node_modules
|
||||||
|
|
||||||
|
# Remove intermediate build files for re2 to reduce dependencies.
|
||||||
|
#
|
||||||
|
# This does not affect the behavior. On npm `re2` does not ship
|
||||||
|
# the build directory and downloads a prebuilt version of the
|
||||||
|
# `re2.node` binary. This method produces the same result.
|
||||||
|
find $NODE_MODULES/re2/build -type f ! -path "*/Release/re2.node" -delete
|
||||||
|
strip -x $NODE_MODULES/re2/build/Release/re2.node
|
||||||
|
|
||||||
|
# Remove files that depend on python3
|
||||||
|
#
|
||||||
|
# The node-gyp package is only used for building re2, so it is
|
||||||
|
# not needed at runtime. I did not remove the whole directory
|
||||||
|
# because of some dangling links to the node-gyp directory which
|
||||||
|
# is not required. It is possible to remove the directory and all
|
||||||
|
# the files that link to it, but I figured it was not worth
|
||||||
|
# tracking down the files.
|
||||||
|
#
|
||||||
|
# The re2/vendor directory is used for building the re2.node
|
||||||
|
# binary, so it is not needed at runtime.
|
||||||
|
rm -rf $NODE_MODULES/{node-gyp/gyp,re2/vendor}
|
||||||
|
|
||||||
wrapProgram $out/bin/gitlab-ci-local \
|
wrapProgram $out/bin/gitlab-ci-local \
|
||||||
--prefix PATH : "${
|
--prefix PATH : "${
|
||||||
lib.makeBinPath [
|
lib.makeBinPath [
|
||||||
|
|||||||
@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "glooctl";
|
pname = "glooctl";
|
||||||
version = "1.18.14";
|
version = "1.18.16";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "solo-io";
|
owner = "solo-io";
|
||||||
repo = "gloo";
|
repo = "gloo";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-NFcUSvtoXTXGLOGKsf6620R80b19ce++gfG5njDyvI0=";
|
hash = "sha256-+GQLmmIU+b7GczeypHZ+Z3UyOafWrAUBgtVFMJV+WSE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-lcnsmeZ2XobBE95KqIhUZCKmevg2WEGuZC4qUVkdafM=";
|
vendorHash = "sha256-lcnsmeZ2XobBE95KqIhUZCKmevg2WEGuZC4qUVkdafM=";
|
||||||
|
|||||||
@ -6,17 +6,17 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "go-migrate";
|
pname = "go-migrate";
|
||||||
version = "4.18.2";
|
version = "4.18.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "golang-migrate";
|
owner = "golang-migrate";
|
||||||
repo = "migrate";
|
repo = "migrate";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-DRWJ5USabSQtNkyDjz8P7eOS2QBE1KaD8K8XYORBVGo=";
|
sha256 = "sha256-aM8okSrLj2oIb3Ey2KkHu3UQY7mSnPjMfwNsdL2Fz28=";
|
||||||
};
|
};
|
||||||
|
|
||||||
proxyVendor = true; # darwin/linux hash mismatch
|
proxyVendor = true; # darwin/linux hash mismatch
|
||||||
vendorHash = "sha256-0SbhHA5gKzODW8rHCEuZXWs8vMsVDMqJsRDPs4V1gGc=";
|
vendorHash = "sha256-H3FBO6RFoXzwk/9bkSVuIlDbfd4AATzbgLmEvbtahFM=";
|
||||||
|
|
||||||
subPackages = [ "cmd/migrate" ];
|
subPackages = [ "cmd/migrate" ];
|
||||||
|
|
||||||
|
|||||||
@ -171,11 +171,11 @@ let
|
|||||||
|
|
||||||
linux = stdenv.mkDerivation (finalAttrs: {
|
linux = stdenv.mkDerivation (finalAttrs: {
|
||||||
inherit pname meta passthru;
|
inherit pname meta passthru;
|
||||||
version = "135.0.7049.84";
|
version = "135.0.7049.114";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||||
hash = "sha256-ZygM2YuML23KPJQ8Kl5f2YqI+0vbXnC3fYk8l8R/nXk=";
|
hash = "sha256-1YdXtlEY6icyPMngvfthLdhSaMGbpI0lifFkZSZc2a4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# With strictDeps on, some shebangs were not being patched correctly
|
# With strictDeps on, some shebangs were not being patched correctly
|
||||||
@ -274,11 +274,11 @@ let
|
|||||||
|
|
||||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
inherit pname meta passthru;
|
inherit pname meta passthru;
|
||||||
version = "135.0.7049.85";
|
version = "135.0.7049.115";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://dl.google.com/release2/chrome/adtorua7m5iaphuubpwxkpgb7qwa_135.0.7049.85/GoogleChrome-135.0.7049.85.dmg";
|
url = "http://dl.google.com/release2/chrome/ba5pqpswpjr5iyzekrawihvjey_135.0.7049.115/GoogleChrome-135.0.7049.115.dmg";
|
||||||
hash = "sha256-NvCVflxCbMyx4wnbg+3IlO01xZuvzKAVPgg/S629Xls=";
|
hash = "sha256-0J1qJ8i141RsmDGGcMM4UvVlT9tBtyn3cOFTz1XIxSk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontPatch = true;
|
dontPatch = true;
|
||||||
|
|||||||
@ -7,18 +7,18 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "google-cloud-sql-proxy";
|
pname = "google-cloud-sql-proxy";
|
||||||
version = "2.15.2";
|
version = "2.15.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "GoogleCloudPlatform";
|
owner = "GoogleCloudPlatform";
|
||||||
repo = "cloud-sql-proxy";
|
repo = "cloud-sql-proxy";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-IZSWJhA3M+d16KKOY6MULibvTNrf7InuNR/ahYznQHY=";
|
hash = "sha256-B9r4It6YQVBJ4tVX7IUI5jc6X3WgkgdzAcP0EWKUkeE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
vendorHash = "sha256-iFCM1goZSYCCPC+14diCeK7AqLC+tRRSG10C8Nn0Lp0=";
|
vendorHash = "sha256-7QGetVfoDw59Mw1ZZh5wKEmqwxEgn3QP9kML+822dLc=";
|
||||||
|
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
"-short"
|
"-short"
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
# https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.15/internal/jsonapi/manifest/manifest_path_linux.go
|
# https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.16/internal/jsonapi/manifest/manifest_path_linux.go
|
||||||
manifestPaths = {
|
manifestPaths = {
|
||||||
firefox = "$out/lib/mozilla/native-messaging-hosts/com.justwatch.gopass.json";
|
firefox = "$out/lib/mozilla/native-messaging-hosts/com.justwatch.gopass.json";
|
||||||
chrome = "$out/etc/opt/chrome/native-messaging-hosts/com.justwatch.gopass.json";
|
chrome = "$out/etc/opt/chrome/native-messaging-hosts/com.justwatch.gopass.json";
|
||||||
@ -27,16 +27,16 @@ let
|
|||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gopass-jsonapi";
|
pname = "gopass-jsonapi";
|
||||||
version = "1.15.15";
|
version = "1.15.16";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gopasspw";
|
owner = "gopasspw";
|
||||||
repo = "gopass-jsonapi";
|
repo = "gopass-jsonapi";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-nayg7NTJH6bAPiguyuN37JivfWkpOUX/xI/+PHDi3UI=";
|
hash = "sha256-Nl69SSqs18zG7eYhBafXFGBVNQglSeffg7Z0Y8zuLmc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-khX1CdzN+5T8q2hA3NyCxtz7uw9uDd9u61q3UslTtqs=";
|
vendorHash = "sha256-zncWJSA6cUthwcFZQXtJmwJZujaXt0Rubcga8D0+ZQc=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
@ -72,7 +72,7 @@ buildGoModule rec {
|
|||||||
# `gopass-jsonapi configure` will ask for them. (`--libpath` and `--global`
|
# `gopass-jsonapi configure` will ask for them. (`--libpath` and `--global`
|
||||||
# are overriden by `--manifest-path`. `--libpath` is only used to
|
# are overriden by `--manifest-path`. `--libpath` is only used to
|
||||||
# compute Firefox's global manifest path. See
|
# compute Firefox's global manifest path. See
|
||||||
# https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.15/setup_others.go#L33-L46)
|
# https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.16/setup_others.go#L33-L46)
|
||||||
#
|
#
|
||||||
# `gopass-jsonapi configure` ask for confirmation before writing any files,
|
# `gopass-jsonapi configure` ask for confirmation before writing any files,
|
||||||
# `echo y` gives it.
|
# `echo y` gives it.
|
||||||
|
|||||||
35
pkgs/by-name/gz/gz-utils/package.nix
Normal file
35
pkgs/by-name/gz/gz-utils/package.nix
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
cmake,
|
||||||
|
gz-cmake,
|
||||||
|
spdlog,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "gz-utils";
|
||||||
|
version = "3.1.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "gazebosim";
|
||||||
|
repo = "gz-utils";
|
||||||
|
tag = "gz-utils${lib.versions.major finalAttrs.version}_${finalAttrs.version}";
|
||||||
|
hash = "sha256-fYzysdB608jfMb/EbqiGD4hXmPxcaVTUrt9Wx0dBlto=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
gz-cmake
|
||||||
|
spdlog
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "General purpose utility classes and functions for the Gazebo libraries";
|
||||||
|
homepage = "https://gazebosim.org/home";
|
||||||
|
changelog = "https://github.com/gazebosim/gz-utils/blob/${finalAttrs.src.tag}/Changelog.md";
|
||||||
|
license = lib.licenses.asl20;
|
||||||
|
platforms = lib.platforms.unix ++ lib.platforms.windows;
|
||||||
|
maintainers = with lib.maintainers; [ guelakais ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -1,39 +1,40 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
buildPerlPackage,
|
perlPackages,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
openssh,
|
openssh,
|
||||||
GitRepository,
|
|
||||||
URI,
|
|
||||||
XMLParser,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPerlPackage {
|
perlPackages.buildPerlPackage {
|
||||||
pname = "ham-unstable";
|
pname = "ham-unstable";
|
||||||
version = "2023-10-06";
|
version = "2025-02-25";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kernkonzept";
|
owner = "kernkonzept";
|
||||||
repo = "ham";
|
repo = "ham";
|
||||||
rev = "90d104ce481ee8f9b770be4b37d97f34eef5f82f";
|
rev = "81b6f05fd91865c7d42b94a683388504489356dc";
|
||||||
hash = "sha256-DeHH7k9K7CmQW6eOyf8TCV/HNYS30oFnI1b8ztBDk/o=";
|
hash = "sha256-a1JaUD/jrF7Yf+vyUoKQFjojxenmsCVw3Uo8u7RjPiQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" ];
|
outputs = [ "out" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [
|
||||||
propagatedBuildInputs = [
|
makeWrapper
|
||||||
openssh
|
];
|
||||||
|
buildInputs = with perlPackages; [
|
||||||
GitRepository
|
GitRepository
|
||||||
URI
|
URI
|
||||||
XMLParser
|
XMLParser
|
||||||
];
|
];
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
openssh
|
||||||
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
patchShebangs .
|
|
||||||
touch Makefile.PL
|
|
||||||
rm -f Makefile
|
rm -f Makefile
|
||||||
|
touch Makefile.PL
|
||||||
|
patchShebangs .
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
@ -8,7 +8,7 @@
|
|||||||
python3,
|
python3,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
# Upstream uses EOL Electron 31. Use next oldest version.
|
# Upstream uses EOL Electron 31. Use next oldest version.
|
||||||
electron_33,
|
electron_34,
|
||||||
vulkan-helper,
|
vulkan-helper,
|
||||||
gogdl,
|
gogdl,
|
||||||
legendary-heroic,
|
legendary-heroic,
|
||||||
@ -17,7 +17,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
electron = electron_33;
|
electron = electron_34;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "heroic-unwrapped";
|
pname = "heroic-unwrapped";
|
||||||
@ -53,11 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
runHook preBuild
|
runHook preBuild
|
||||||
|
|
||||||
# set nodedir to prevent node-gyp from downloading headers
|
# set nodedir to prevent node-gyp from downloading headers
|
||||||
# taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific
|
export npm_config_nodedir=${electron.headers}
|
||||||
mkdir -p $HOME/.node-gyp/${nodejs.version}
|
|
||||||
echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
|
|
||||||
ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
|
|
||||||
export npm_config_nodedir=${nodejs}
|
|
||||||
|
|
||||||
pnpm --offline electron-vite build
|
pnpm --offline electron-vite build
|
||||||
pnpm --offline electron-builder \
|
pnpm --offline electron-builder \
|
||||||
|
|||||||
@ -11,6 +11,7 @@
|
|||||||
SDL2,
|
SDL2,
|
||||||
SDL2_image,
|
SDL2_image,
|
||||||
SDL2_ttf,
|
SDL2_ttf,
|
||||||
|
SDL2_mixer,
|
||||||
libmpeg2,
|
libmpeg2,
|
||||||
libvorbis,
|
libvorbis,
|
||||||
libzip,
|
libzip,
|
||||||
@ -19,13 +20,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "hypseus-singe";
|
pname = "hypseus-singe";
|
||||||
version = "2.11.3";
|
version = "2.11.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "DirtBagXon";
|
owner = "DirtBagXon";
|
||||||
repo = "hypseus-singe";
|
repo = "hypseus-singe";
|
||||||
rev = "refs/tags/v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-hLl+/tJrBXo6m/cJxmn2bSLXcNLM8B6SKrM702Z8K8E=";
|
hash = "sha256-04WC0fO/eNUz4muwDAbjDy5AA53QPpX5dq5Xgt8qeBI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./use-shared-mpeg2.patch ];
|
patches = [ ./use-shared-mpeg2.patch ];
|
||||||
@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
SDL2
|
SDL2
|
||||||
SDL2_image
|
SDL2_image
|
||||||
SDL2_ttf
|
SDL2_ttf
|
||||||
|
SDL2_mixer
|
||||||
libmpeg2
|
libmpeg2
|
||||||
libvorbis
|
libvorbis
|
||||||
libzip
|
libzip
|
||||||
@ -55,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
env.NIX_CFLAGS_COMPILE = toString [
|
env.NIX_CFLAGS_COMPILE = toString [
|
||||||
"-I${lib.getDev SDL2_image}/include/SDL2"
|
"-I${lib.getDev SDL2_image}/include/SDL2"
|
||||||
"-I${lib.getDev SDL2_ttf}/include/SDL2"
|
"-I${lib.getDev SDL2_ttf}/include/SDL2"
|
||||||
|
"-I${lib.getDev SDL2_mixer}/include/SDL2"
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||||
index 6a85063..73dbd39 100644
|
index 780b802..2f0b489 100644
|
||||||
--- a/src/CMakeLists.txt
|
--- a/src/CMakeLists.txt
|
||||||
+++ b/src/CMakeLists.txt
|
+++ b/src/CMakeLists.txt
|
||||||
@@ -50,13 +50,12 @@ include(GetGitRevisionDescription)
|
@@ -53,14 +53,13 @@ include(GetGitRevisionDescription)
|
||||||
include(InstallRequiredSystemLibraries)
|
include(InstallRequiredSystemLibraries)
|
||||||
include(FindPkgConfig)
|
include(FindPkgConfig)
|
||||||
include(ExternalProject)
|
include(ExternalProject)
|
||||||
@ -12,12 +12,13 @@ index 6a85063..73dbd39 100644
|
|||||||
|
|
||||||
PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
|
PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
|
||||||
PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf)
|
PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf)
|
||||||
|
PKG_SEARCH_MODULE(SDL2_MIXER REQUIRED SDL2_mixer)
|
||||||
-build_libmpeg2( )
|
-build_libmpeg2( )
|
||||||
+PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2)
|
+PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2)
|
||||||
|
|
||||||
message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}")
|
message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}")
|
||||||
|
|
||||||
@@ -110,7 +109,6 @@ add_subdirectory(timer)
|
@@ -114,7 +113,6 @@ add_subdirectory(timer)
|
||||||
add_subdirectory(video)
|
add_subdirectory(video)
|
||||||
add_subdirectory(vldp)
|
add_subdirectory(vldp)
|
||||||
|
|
||||||
|
|||||||
@ -13,16 +13,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "jira-cli-go";
|
pname = "jira-cli-go";
|
||||||
version = "1.5.2";
|
version = "1.6.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ankitpokhrel";
|
owner = "ankitpokhrel";
|
||||||
repo = "jira-cli";
|
repo = "jira-cli";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-Wp6uDvnTiNixn8GyEn8SeKPdXanUNN3b7yr9dT1D6uo=";
|
hash = "sha256-+7R0yf7YVUnJErvhDm6dVskAJdyd7DHM0JJ6V9gzj/Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-a11ZO/iV/Yhaq/cu504p2C/OkKJ04PeMMSoHrl7edvM=";
|
vendorHash = "sha256-cl+Sfi9WSPy8qOtB13rRiKtQdDC+HC0+FMKpsWbtU2w=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|||||||
@ -19,13 +19,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "junction";
|
pname = "junction";
|
||||||
version = "1.8";
|
version = "1.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sonnyp";
|
owner = "sonnyp";
|
||||||
repo = "junction";
|
repo = "junction";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-0zY6Dp0aKHtBHSTiGbI5o6876BsARbo8/BbArl0RaMY=";
|
hash = "sha256-gnFig8C46x73gAUl9VVx3Y3hrhEVeP/DvaYHYuv9RTg=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1,20 +1,20 @@
|
|||||||
{
|
{
|
||||||
stdenv,
|
|
||||||
lib,
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchurl,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
libevent,
|
libevent,
|
||||||
libressl,
|
libressl,
|
||||||
libbsd,
|
|
||||||
fetchurl,
|
|
||||||
readline,
|
readline,
|
||||||
|
libbsd,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "kamid";
|
pname = "kamid";
|
||||||
version = "0.2";
|
version = "0.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/omar-polo/kamid/releases/download/${version}/${pname}-${version}.tar.gz";
|
url = "https://github.com/omar-polo/kamid/releases/download/${finalAttrs.version}/kamid-${finalAttrs.version}.tar.gz";
|
||||||
sha256 = "sha256-23LgcZ+R6wcUz1fZA+IbhyshfQOTyiFPZ+uKVwOh680=";
|
sha256 = "sha256-23LgcZ+R6wcUz1fZA+IbhyshfQOTyiFPZ+uKVwOh680=";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -29,13 +29,20 @@ stdenv.mkDerivation rec {
|
|||||||
libbsd
|
libbsd
|
||||||
];
|
];
|
||||||
|
|
||||||
|
env.NIX_CFLAGS_COMPILE = toString [
|
||||||
|
# client.c:381:13: error: implicit declaration of function 'setgroups'; did you mean 'getgroups'?
|
||||||
|
"-Wno-error=implicit-function-declaration"
|
||||||
|
# ftp.c:1585:22: error: passing argument 1 of 'log_procinit' makes pointer from integer without a cast
|
||||||
|
"-Wno-error=int-conversion"
|
||||||
|
];
|
||||||
|
|
||||||
makeFlags = [ "AR:=$(AR)" ];
|
makeFlags = [ "AR:=$(AR)" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "FREE, easy-to-use and portable implementation of a 9p file server daemon for UNIX-like systems";
|
description = "FREE, easy-to-use and portable implementation of a 9p file server daemon for UNIX-like systems";
|
||||||
homepage = "https://kamid.omarpolo.com";
|
homepage = "https://kamid.omarpolo.com";
|
||||||
license = licenses.isc;
|
license = lib.licenses.isc;
|
||||||
maintainers = with maintainers; [ heph2 ];
|
maintainers = with lib.maintainers; [ heph2 ];
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|||||||
@ -11,13 +11,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "kargo";
|
pname = "kargo";
|
||||||
version = "1.4.1";
|
version = "1.4.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "akuity";
|
owner = "akuity";
|
||||||
repo = "kargo";
|
repo = "kargo";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-yLBq3zc9GcuLaS/Muup+15vpj99bHV2ImGvL4UuMuj4=";
|
hash = "sha256-qrMvEVKOUsRjIfnY/u7o56oPxCWXZbj+XU6c8/7fugQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-1J/9AXKU6jLZh6B5jWCoQeStborTOGjxFkZ1Vk2Yw+8=";
|
vendorHash = "sha256-1J/9AXKU6jLZh6B5jWCoQeStborTOGjxFkZ1Vk2Yw+8=";
|
||||||
|
|||||||
@ -6,16 +6,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "kubecm";
|
pname = "kubecm";
|
||||||
version = "0.32.3";
|
version = "0.33.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sunny0826";
|
owner = "sunny0826";
|
||||||
repo = "kubecm";
|
repo = "kubecm";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-z0uQhAfyrK2LKs4hwnHGE7hKQwhLGCmp7yN58ehDn/w=";
|
hash = "sha256-osyxgwJIHsnTW8uDKPFO174ImUntKHmW61v6KPY1E9M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-2GFZ++7H0ii+9WJKPxtDBHikJTQQyDFqJ6qzwVvA84g=";
|
vendorHash = "sha256-rSha+Fd8vohRnLjECqRn3Zg4DYxGgXc4M7mUAgvW+Gw=";
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
"-w"
|
"-w"
|
||||||
|
|||||||
@ -10,16 +10,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "mautrix-discord";
|
pname = "mautrix-discord";
|
||||||
version = "0.7.2";
|
version = "0.7.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mautrix";
|
owner = "mautrix";
|
||||||
repo = "discord";
|
repo = "discord";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-KRfbxPblOL4JznnGx9Jj5XXEWEKzan5xWvAwYmP7yGc=";
|
hash = "sha256-q6FpeGWoeIVVeomKMHpXUntMWsMJMV73FDiBfbMQ6Oc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-8SW2q4Svfe8X9qwzYBa5HhHyQZDsPJqig/V1/Wp+avo=";
|
vendorHash = "sha256-6R5ryzjAAAI3YtTMlHjrLOXkid2kCe8+ZICnNUjtxaQ=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "mautrix-meta";
|
pname = "mautrix-meta";
|
||||||
version = "0.4.5";
|
version = "0.4.6";
|
||||||
|
|
||||||
subPackages = [ "cmd/mautrix-meta" ];
|
subPackages = [ "cmd/mautrix-meta" ];
|
||||||
|
|
||||||
@ -23,13 +23,13 @@ buildGoModule rec {
|
|||||||
owner = "mautrix";
|
owner = "mautrix";
|
||||||
repo = "meta";
|
repo = "meta";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-UWW5h4e6usxVkMH1TDGt62/ThlAhbeqivnYFIKPOqXE=";
|
hash = "sha256-FRK32NBtAro/+StacBa/jMg31xkxOKx791RBmuG61z8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = lib.optional (!withGoolm) olm;
|
buildInputs = lib.optional (!withGoolm) olm;
|
||||||
tags = lib.optional withGoolm "goolm";
|
tags = lib.optional withGoolm "goolm";
|
||||||
|
|
||||||
vendorHash = "sha256-fJuCNhbm6930zPyfXA8mbjyJmRdv0Zn0ZZ+ULImXjKU=";
|
vendorHash = "sha256-nFxWPMNV0La21W03WNDZNktcHYLFVzPY/SkAyp0AVxs=";
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
tests = {
|
tests = {
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
withGoolm ? false,
|
withGoolm ? false,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "0.2.0";
|
version = "0.2.1";
|
||||||
in
|
in
|
||||||
buildGoModule {
|
buildGoModule {
|
||||||
pname = "mautrix-slack";
|
pname = "mautrix-slack";
|
||||||
@ -23,10 +23,10 @@ buildGoModule {
|
|||||||
owner = "mautrix";
|
owner = "mautrix";
|
||||||
repo = "slack";
|
repo = "slack";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-y6DsojQQAQkAB4puhk3DLheVvjn0puoYvzoX1H7gBEM=";
|
hash = "sha256-1/OuwyQU68tsg9WOl0Eg4ZM28sD6JDMQN9i1LZLYOuE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-1aYg6wDG2hzUshtHs9KiJDAFb4OM1oupUJAh3LR4KxY=";
|
vendorHash = "sha256-YjM2ZpXm3DGNRtCGvj7+0+bXAnb7HXYzQvxCSL4+hHo=";
|
||||||
|
|
||||||
buildInputs = lib.optional (!withGoolm) olm;
|
buildInputs = lib.optional (!withGoolm) olm;
|
||||||
tags = lib.optional withGoolm "goolm";
|
tags = lib.optional withGoolm "goolm";
|
||||||
|
|||||||
45
pkgs/by-name/md/mdsf/package.nix
Normal file
45
pkgs/by-name/md/mdsf/package.nix
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
rustPlatform,
|
||||||
|
fetchFromGitHub,
|
||||||
|
versionCheckHook,
|
||||||
|
nix-update-script,
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
pname = "mdsf";
|
||||||
|
version = "0.5.1";
|
||||||
|
in
|
||||||
|
rustPlatform.buildRustPackage {
|
||||||
|
inherit pname version;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "hougesen";
|
||||||
|
repo = "mdsf";
|
||||||
|
tag = "v${version}";
|
||||||
|
hash = "sha256-KHTWE3ENRc/VHrgwAag6DsnEU3c8Nqw15jR5jWlNrk4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
useFetchCargoVendor = true;
|
||||||
|
cargoHash = "sha256-kgqRwYjDc/eV9wv1G6aAhfrGpoYDPCFfqaTm+T2p7uw=";
|
||||||
|
|
||||||
|
checkFlags = [
|
||||||
|
"--skip=tests::it_should_add_go_package_if_missing"
|
||||||
|
"--skip=tests::it_should_format_the_code"
|
||||||
|
"--skip=tests::it_should_format_the_codeblocks_that_start_with_whitespace"
|
||||||
|
"--skip=tests::it_should_not_care_if_go_package_is_set"
|
||||||
|
"--skip=tests::it_should_not_modify_outside_blocks"
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||||
|
doInstallCheck = true;
|
||||||
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Tool for formatting a linting markdown code snippets using language specific tools";
|
||||||
|
homepage = "https://github.com/hougesen/mdsf";
|
||||||
|
changelog = "https://github.com/hougesen/mdsf/releases";
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
|
||||||
|
mainProgram = "mdsf";
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "melange";
|
pname = "melange";
|
||||||
version = "0.23.6";
|
version = "0.23.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "chainguard-dev";
|
owner = "chainguard-dev";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-ahvYLj80fT93F2w22W7oD45mt3NAVpAhqKxqj4Hb1wY=";
|
hash = "sha256-HJNB3SCy54v9Tvc6qXT3jisWcqhUCT0evjJxjCltazc=";
|
||||||
# populate values that require us to use git. By doing this in postFetch we
|
# populate values that require us to use git. By doing this in postFetch we
|
||||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
@ -26,7 +26,7 @@ buildGoModule rec {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-hmbdq4h1+8rIn8rbG0ZYNaimSiFROk3rTX1VhPPE200=";
|
vendorHash = "sha256-uxEQR6NuNJDtjXY5nPBkVU/1ExpdvTGOIpMTRjz68I8=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,8 @@
|
|||||||
luaSupport ? false,
|
luaSupport ? false,
|
||||||
lua5,
|
lua5,
|
||||||
perl,
|
perl,
|
||||||
|
fetchpatch,
|
||||||
|
versionCheckHook,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -20,15 +22,15 @@ let
|
|||||||
optional = lib.optional;
|
optional = lib.optional;
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "modsecurity";
|
pname = "modsecurity";
|
||||||
version = "2.9.7";
|
version = "2.9.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "owasp-modsecurity";
|
owner = "owasp-modsecurity";
|
||||||
repo = "modsecurity";
|
repo = "modsecurity";
|
||||||
rev = "v${version}";
|
tag = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-hJ8wYeC83dl85bkUXGZKHpHzw9QRgtusj1/+Coxsx0k=";
|
hash = "sha256-fJ5XeO5m5LlImAuzIvXVVWkc9awbaRI3NWWOOwGrshI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -56,13 +58,40 @@ stdenv.mkDerivation rec {
|
|||||||
"--with-lua=${luaValue}"
|
"--with-lua=${luaValue}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
env.NIX_CFLAGS_COMPILE = toString [
|
||||||
|
# msc_test.c:86:5: error: initialization of 'int' from 'void *' makes integer from pointer without a cast []
|
||||||
|
"-Wno-error=int-conversion"
|
||||||
|
];
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
"nginx"
|
"nginx"
|
||||||
];
|
];
|
||||||
# by default modsecurity's install script copies compiled output to httpd's modules folder
|
patches = [
|
||||||
# this patch removes those lines
|
# by default modsecurity's install script copies compiled output to httpd's modules folder
|
||||||
patches = [ ./Makefile.am.patch ];
|
# this patch removes those lines
|
||||||
|
./Makefile.am.patch
|
||||||
|
# remove when 2.9.9 is released
|
||||||
|
(fetchpatch {
|
||||||
|
name = "move-id_log";
|
||||||
|
url = "https://github.com/owasp-modsecurity/ModSecurity/commit/149376377ecef9ecc36ee81d5b666fc0ac7e249b.patch";
|
||||||
|
hash = "sha256-KjQGqSBt/u9zPZY1aSIupnYHleJbsOAOk3Y2bNOyRxk=";
|
||||||
|
})
|
||||||
|
# remove when 2.9.9 is released
|
||||||
|
(fetchpatch {
|
||||||
|
name = "gcc-format-security";
|
||||||
|
url = "https://github.com/owasp-modsecurity/ModSecurity/commit/cddd9a7eb5585a9b3be1f9bdcadcace8f60f5808.patch";
|
||||||
|
hash = "sha256-H1wkZQ5bTQIRhlEvvvj7YCBi9qndRgHgKTnE9Cusq3I=";
|
||||||
|
})
|
||||||
|
# remove when 2.9.9 is released
|
||||||
|
(fetchpatch {
|
||||||
|
name = "gcc-incompatible-pointer-type";
|
||||||
|
url = "https://github.com/owasp-modsecurity/ModSecurity/commit/4919814a5cf0e7911f71856ed872b0e73b659a0a.patch";
|
||||||
|
hash = "sha256-9JzCtiLf43xw6i4NqQpok37es+kuWXZWKdJum28Hx4M=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
nativeCheckInputs = [ perl ];
|
nativeCheckInputs = [ perl ];
|
||||||
@ -72,11 +101,18 @@ stdenv.mkDerivation rec {
|
|||||||
cp -R * $nginx
|
cp -R * $nginx
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
doInstallCheck = true;
|
||||||
|
nativeInstallCheckInputs = [
|
||||||
|
versionCheckHook
|
||||||
|
];
|
||||||
|
versionCheckProgramArg = "-v";
|
||||||
|
versionCheckProgram = "${placeholder "out"}/bin/mlogc";
|
||||||
|
|
||||||
|
meta = {
|
||||||
description = "Open source, cross-platform web application firewall (WAF)";
|
description = "Open source, cross-platform web application firewall (WAF)";
|
||||||
license = licenses.asl20;
|
license = lib.licenses.asl20;
|
||||||
homepage = "https://github.com/owasp-modsecurity/ModSecurity";
|
homepage = "https://github.com/owasp-modsecurity/ModSecurity";
|
||||||
maintainers = with maintainers; [ offline ];
|
maintainers = with lib.maintainers; [ offline ];
|
||||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|||||||
@ -49,21 +49,16 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "nanomq";
|
pname = "nanomq";
|
||||||
version = "0.22.1";
|
version = "0.23.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "emqx";
|
owner = "emqx";
|
||||||
repo = "nanomq";
|
repo = "nanomq";
|
||||||
rev = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-aB1gEzo2dX8NY+e0Dq4ELgkUpL/NtvvuY/l539BPIng=";
|
hash = "sha256-Fy/9ASpQ/PHGItYhad69DdHWqCr/Wa+Xdm53Q573Pfc=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace CMakeLists.txt \
|
|
||||||
--replace "DESTINATION /etc" "DESTINATION $out/etc"
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
ninja
|
ninja
|
||||||
@ -90,8 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
(lib.cmakeBool "NNG_ENABLE_TLS" true)
|
(lib.cmakeBool "NNG_ENABLE_TLS" true)
|
||||||
];
|
];
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion";
|
|
||||||
|
|
||||||
# disabled by default - not 100% reliable and making nanomq depend on
|
# disabled by default - not 100% reliable and making nanomq depend on
|
||||||
# mosquitto would annoy people
|
# mosquitto would annoy people
|
||||||
doInstallCheck = false;
|
doInstallCheck = false;
|
||||||
@ -133,11 +126,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Ultra-lightweight and blazing-fast MQTT broker for IoT edge";
|
description = "Ultra-lightweight and blazing-fast MQTT broker for IoT edge";
|
||||||
homepage = "https://nanomq.io/";
|
homepage = "https://nanomq.io/";
|
||||||
license = licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with maintainers; [ sikmir ];
|
maintainers = with lib.maintainers; [ sikmir ];
|
||||||
platforms = platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@ -12,13 +12,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "ncbi-vdb";
|
pname = "ncbi-vdb";
|
||||||
version = "3.1.1";
|
version = "3.2.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ncbi";
|
owner = "ncbi";
|
||||||
repo = "ncbi-vdb";
|
repo = "ncbi-vdb";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-HBiheN8XfYYwmY5gw7j8qTczn6WZZNTzY2/fGtpgs/8=";
|
hash = "sha256-ccKJF6Ank/hyADnDwN0qoQbb0BniXlz/Fgnc1IXq0P0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "nvitop";
|
pname = "nvitop";
|
||||||
version = "1.4.2";
|
version = "1.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "XuehaiPan";
|
owner = "XuehaiPan";
|
||||||
repo = "nvitop";
|
repo = "nvitop";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-2l/VfqgV2UmMVad3UYASjYFu/Mzp2K2XNQFUDq1XM9k=";
|
hash = "sha256-1WL1S6jUbCLtuAe223AAmCcOcLZ0rStE04uCd0L9gVw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [ "nvidia-ml-py" ];
|
pythonRelaxDeps = [ "nvidia-ml-py" ];
|
||||||
|
|||||||
@ -123,24 +123,25 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
passthru = lib.optionalAttrs enableMpi { inherit mpi; };
|
passthru = lib.optionalAttrs enableMpi { inherit mpi; };
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DOPENMP=ON"
|
||||||
|
"-DTOOLS=ON"
|
||||||
|
"-DHDF5=ON"
|
||||||
|
"-DFDE=ON"
|
||||||
|
"-DEXTERNAL_LIBXC=${lib.getDev libxc}"
|
||||||
|
(lib.strings.cmakeBool "DMRG" enableQcmaquis)
|
||||||
|
(lib.strings.cmakeBool "NEVPT2" enableQcmaquis)
|
||||||
|
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||||
|
(lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
|
||||||
|
(lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||||
|
"-DLINALG=Manual"
|
||||||
|
(lib.strings.cmakeBool "DGA" enableMpi)
|
||||||
|
(lib.strings.cmakeBool "MPI" enableMpi)
|
||||||
|
];
|
||||||
|
|
||||||
preConfigure =
|
preConfigure =
|
||||||
''
|
''
|
||||||
cmakeFlagsArray+=(
|
cmakeFlagsArray+=("-DLINALG_LIBRARIES=-lblas -llapack")
|
||||||
"-DOPENMP=ON"
|
|
||||||
"-DTOOLS=ON"
|
|
||||||
"-DHDF5=ON"
|
|
||||||
"-DFDE=ON"
|
|
||||||
"-DEXTERNAL_LIBXC=${lib.getDev libxc}"
|
|
||||||
${lib.strings.cmakeBool "DMRG" enableQcmaquis}
|
|
||||||
${lib.strings.cmakeBool "NEVPT2" enableQcmaquis}
|
|
||||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
|
||||||
${lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic}
|
|
||||||
${lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)}
|
|
||||||
"-DLINALG=Manual"
|
|
||||||
"-DLINALG_LIBRARIES=-lblas -llapack"
|
|
||||||
${lib.strings.cmakeBool "DGA" enableMpi}
|
|
||||||
${lib.strings.cmakeBool "MPI" enableMpi}
|
|
||||||
)
|
|
||||||
''
|
''
|
||||||
+ lib.optionalString enableMpi ''
|
+ lib.optionalString enableMpi ''
|
||||||
export GAROOT=${globalarrays};
|
export GAROOT=${globalarrays};
|
||||||
|
|||||||
@ -15,16 +15,16 @@
|
|||||||
let
|
let
|
||||||
package = buildGoModule rec {
|
package = buildGoModule rec {
|
||||||
pname = "opentofu";
|
pname = "opentofu";
|
||||||
version = "1.9.0";
|
version = "1.9.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "opentofu";
|
owner = "opentofu";
|
||||||
repo = "opentofu";
|
repo = "opentofu";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-e0ZzbQdex0DD7Bj9WpcVI5roh0cMbJuNr5nsSVaOSu4=";
|
hash = "sha256-YZMv17fnvzgzm35MXFkvMc5JAuPnyapa41H8Ob4t88c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-fMTbLSeW+pw6GK8/JLZzG2ER90ss2g1FSDX5+f292do=";
|
vendorHash = "sha256-avfyMwYv8nKLCUHSExsPvYQrt9sMKZNPHFB/YFGQs2s=";
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
"-w"
|
"-w"
|
||||||
|
|||||||
@ -85,6 +85,15 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
|
ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
|
||||||
|
|
||||||
|
# Regrettably, we need to compile this version or else ovftool complains about unknown symbols.
|
||||||
|
ovftool-xercesc = xercesc.overrideAttrs (prev: rec {
|
||||||
|
version = "3.2.5";
|
||||||
|
src = fetchurl {
|
||||||
|
url = lib.replaceStrings [ prev.version ] [ version ] prev.src.url;
|
||||||
|
hash = "sha256-VFz8zmxOdVIHvR8n4xkkHlDjfAwnJQ8RzaEWAY8e8PU=";
|
||||||
|
};
|
||||||
|
});
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (final: {
|
stdenv.mkDerivation (final: {
|
||||||
pname = "ovftool";
|
pname = "ovftool";
|
||||||
@ -111,7 +120,7 @@ stdenv.mkDerivation (final: {
|
|||||||
icu60
|
icu60
|
||||||
libiconv
|
libiconv
|
||||||
libxcrypt-legacy
|
libxcrypt-legacy
|
||||||
xercesc
|
ovftool-xercesc
|
||||||
zlib
|
zlib
|
||||||
curl
|
curl
|
||||||
]
|
]
|
||||||
@ -123,10 +132,14 @@ stdenv.mkDerivation (final: {
|
|||||||
libxml2
|
libxml2
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs =
|
||||||
unzip
|
[
|
||||||
makeWrapper
|
unzip
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
makeWrapper
|
||||||
|
]
|
||||||
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
|
autoPatchelfHook
|
||||||
|
];
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
# The linux package wraps ovftool.bin with ovftool. Wrapping
|
# The linux package wraps ovftool.bin with ovftool. Wrapping
|
||||||
@ -238,7 +251,7 @@ stdenv.mkDerivation (final: {
|
|||||||
change_args+=(-change @loader_path/lib/libexpat.dylib ${expat}/lib/libexpat.dylib)
|
change_args+=(-change @loader_path/lib/libexpat.dylib ${expat}/lib/libexpat.dylib)
|
||||||
change_args+=(-change @loader_path/lib/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib)
|
change_args+=(-change @loader_path/lib/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib)
|
||||||
change_args+=(-change @loader_path/lib/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib)
|
change_args+=(-change @loader_path/lib/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib)
|
||||||
change_args+=(-change @loader_path/lib/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib)
|
change_args+=(-change @loader_path/lib/libxerces-c-3.2.dylib ${ovftool-xercesc}/lib/libxerces-c.dylib)
|
||||||
|
|
||||||
# lolwut
|
# lolwut
|
||||||
change_args+=(-change @GOBUILD_CAYMAN_CURL_ROOT@/apple_mac64/lib/libcurl.4.dylib ${curl.out}/lib/libcurl.4.dylib)
|
change_args+=(-change @GOBUILD_CAYMAN_CURL_ROOT@/apple_mac64/lib/libcurl.4.dylib ${curl.out}/lib/libcurl.4.dylib)
|
||||||
@ -253,7 +266,7 @@ stdenv.mkDerivation (final: {
|
|||||||
change_args+=(-change @loader_path/libexpat.dylib ${expat}/lib/libexpat.dylib)
|
change_args+=(-change @loader_path/libexpat.dylib ${expat}/lib/libexpat.dylib)
|
||||||
change_args+=(-change @loader_path/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib)
|
change_args+=(-change @loader_path/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib)
|
||||||
change_args+=(-change @loader_path/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib)
|
change_args+=(-change @loader_path/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib)
|
||||||
change_args+=(-change @loader_path/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib)
|
change_args+=(-change @loader_path/libxerces-c-3.2.dylib ${ovftool-xercesc}/lib/libxerces-c.dylib)
|
||||||
|
|
||||||
# Add new absolute paths for other libs to all libs
|
# Add new absolute paths for other libs to all libs
|
||||||
for lib in $out/lib/*.dylib; do
|
for lib in $out/lib/*.dylib; do
|
||||||
|
|||||||
@ -7,12 +7,12 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "pavolctld";
|
pname = "pavolctld";
|
||||||
version = "1.0.1";
|
version = "1.0.2";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://git.tjkeller.xyz/pavolctld";
|
url = "https://git.tjkeller.xyz/pavolctld";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-nmN8bQKQNGpCGvHQnZK9YQgB80SxRSds0V9Y7h/Guh8=";
|
hash = "sha256-gNEXED+9BkCCLi8oW2GZi9Azd/zOWUvu/bY0a1WbE/A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libpulseaudio ];
|
buildInputs = [ libpulseaudio ];
|
||||||
|
|||||||
@ -14,17 +14,17 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "pixi";
|
pname = "pixi";
|
||||||
version = "0.45.0";
|
version = "0.46.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "prefix-dev";
|
owner = "prefix-dev";
|
||||||
repo = "pixi";
|
repo = "pixi";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-nOSwGR0V6dOaF5pCmYch6EJN87XCs0atSaWshH6Pwqs=";
|
hash = "sha256-HkaDc7RauVhuuu4R88xlgiAM9pv6RPgyvaVoPO0PHqA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-vSyo7j+HCWUgXxPAxOGiOGQQwVhHOWJhGyM92KDIeC4=";
|
cargoHash = "sha256-0X+3/fQLgUSSnDVAociKqk4rJfKHJtKdXIIaSUzI18g=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|||||||
@ -7,13 +7,13 @@
|
|||||||
}:
|
}:
|
||||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
pname = "plasmusic-toolbar";
|
pname = "plasmusic-toolbar";
|
||||||
version = "2.3.0";
|
version = "2.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ccatterina";
|
owner = "ccatterina";
|
||||||
repo = "plasmusic-toolbar";
|
repo = "plasmusic-toolbar";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-YxhZ4XhHCbEPVrc+qqO+phGnEf0nnKiDVRB5K4wjR/Q=";
|
hash = "sha256-bf7dFLQD3JQZtB3GH0aMK9U2D+bOv9mF8NbxUn7oOlQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "prefect";
|
pname = "prefect";
|
||||||
version = "3.3.4";
|
version = "3.3.5";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
# Trying to install from source is challenging
|
# Trying to install from source is challenging
|
||||||
@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
|
|||||||
# Source will be missing sdist, uv.lock, ui artefacts ...
|
# Source will be missing sdist, uv.lock, ui artefacts ...
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-ii5AqUeo2asSY3oA2PYqGhRev42KInSrn/plDp4Q90Q=";
|
hash = "sha256-L5L1ldEpOHJPE9K8UPvpUZlF/85mm5llN912LIlvs9k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
|
|||||||
@ -10,17 +10,17 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "proto";
|
pname = "proto";
|
||||||
version = "0.47.11";
|
version = "0.48.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "moonrepo";
|
owner = "moonrepo";
|
||||||
repo = "proto";
|
repo = "proto";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-2Lyd2wa47VhBz4HHHw2qG2RgUlPDWZPvVTIPAknaIVE=";
|
hash = "sha256-nvcewUlMIfvL/qiBl23cdRfa3IFcCm7ncCSATW4607I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-3zN7t3yplRm4/P0m316uSooDftgJicvWIvz34jzOmBY=";
|
cargoHash = "sha256-oyATT8lEzBltT6+jXMAHvhPTdXGO4Hm5WwEjy/2bgmE=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
libiconv
|
libiconv
|
||||||
|
|||||||
@ -5,13 +5,13 @@
|
|||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "puffin";
|
pname = "puffin";
|
||||||
version = "2.1.3";
|
version = "2.1.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "siddhantac";
|
owner = "siddhantac";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-1qF5KOu2Se49Dw8QrSeUYIx9Yf0MCY/nbLu9IFnHxpA=";
|
hash = "sha256-cXhnCCg5A/G/FKWfCpq130qSD1iTGpgidqzGGnIPqO8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-ZxAqR3D5VUtbntktrpnywPG3m9rq1utO4fdum0Qe6TU=";
|
vendorHash = "sha256-ZxAqR3D5VUtbntktrpnywPG3m9rq1utO4fdum0Qe6TU=";
|
||||||
|
|||||||
@ -6,18 +6,18 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "pulumi-esc";
|
pname = "pulumi-esc";
|
||||||
version = "0.13.0";
|
version = "0.13.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pulumi";
|
owner = "pulumi";
|
||||||
repo = "esc";
|
repo = "esc";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-hQYA8j0fmVdlRuUfZy4NT5oYYot2lHrTqFCPe255F2k=";
|
hash = "sha256-EmlZLtlioBbXX71TiqZF9bH2VxLT6u4X7CQQsV0ioeY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
subPackages = "cmd/esc";
|
subPackages = "cmd/esc";
|
||||||
|
|
||||||
vendorHash = "sha256-J4ozpVm177DR+a35ckMtLY/4rFIPU6MsI5ewXz/wYGc=";
|
vendorHash = "sha256-v2+fisMMNUZVcDbUhXDGAUU6rC+Clrh/rb3cuuSCLF0=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
|||||||
@ -17,11 +17,11 @@
|
|||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "qownnotes";
|
pname = "qownnotes";
|
||||||
appname = "QOwnNotes";
|
appname = "QOwnNotes";
|
||||||
version = "25.4.3";
|
version = "25.4.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
|
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
|
||||||
hash = "sha256-BjtRrRRV7Rs4PTa7DZ3+fFfpx7sH7xtvsf1ALUUvjd0=";
|
hash = "sha256-9xRituPXmGQ1fFHp4JvXkQ9Rvoj535UP53G6vDMl1L4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
diff --git i/CMakeLists.txt w/CMakeLists.txt
|
diff --git i/CMakeLists.txt w/CMakeLists.txt
|
||||||
index 10a8fb6..dcab540 100644
|
index 364f72b..2d5070d 100644
|
||||||
--- i/CMakeLists.txt
|
--- i/CMakeLists.txt
|
||||||
+++ w/CMakeLists.txt
|
+++ w/CMakeLists.txt
|
||||||
@@ -6,16 +6,8 @@ set(CMAKE_AUTOMOC ON)
|
@@ -7,16 +7,8 @@ project(qzdl LANGUAGES C CXX)
|
||||||
project(qzdl LANGUAGES C CXX)
|
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Widgets)
|
||||||
find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
|
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Widgets REQUIRED)
|
||||||
|
|
||||||
-include(FetchContent)
|
-include(FetchContent)
|
||||||
-FetchContent_Declare(
|
-FetchContent_Declare(
|
||||||
@ -14,14 +14,14 @@ index 10a8fb6..dcab540 100644
|
|||||||
-)
|
-)
|
||||||
-FetchContent_GetProperties(inih)
|
-FetchContent_GetProperties(inih)
|
||||||
-if (NOT inih_POPULATED)
|
-if (NOT inih_POPULATED)
|
||||||
- FetchContent_Populate(inih)
|
- FetchContent_MakeAvailable(inih)
|
||||||
-endif()
|
-endif()
|
||||||
+find_package(PkgConfig)
|
+find_package(PkgConfig)
|
||||||
+pkg_check_modules(INIH inih)
|
+pkg_check_modules(INIH inih)
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
zdl
|
zdl
|
||||||
@@ -45,9 +37,8 @@ add_executable(
|
@@ -46,9 +38,9 @@ add_executable(
|
||||||
libwad.cpp
|
libwad.cpp
|
||||||
qzdl.cpp
|
qzdl.cpp
|
||||||
${PROJECT_SOURCE_DIR}/zdlconf/zdlconf.cpp
|
${PROJECT_SOURCE_DIR}/zdlconf/zdlconf.cpp
|
||||||
@ -30,7 +30,8 @@ index 10a8fb6..dcab540 100644
|
|||||||
|
|
||||||
-target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf)
|
-target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf)
|
||||||
-target_include_directories(zdl PRIVATE ${inih_SOURCE_DIR})
|
-target_include_directories(zdl PRIVATE ${inih_SOURCE_DIR})
|
||||||
-target_link_libraries(zdl Qt5::Core Qt5::Widgets)
|
-target_link_libraries(zdl Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets)
|
||||||
+target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf ${INIH_INCLUDEDIR})
|
+target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf ${inih_INCLUDE_DIR})
|
||||||
+target_link_libraries(zdl Qt5::Core Qt5::Widgets ${INIH_LDFLAGS})
|
+target_link_libraries(zdl Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets ${INIH_LDFLAGS})
|
||||||
|
+
|
||||||
+install(TARGETS zdl RUNTIME DESTINATION "bin")
|
+install(TARGETS zdl RUNTIME DESTINATION "bin")
|
||||||
@ -3,28 +3,26 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
cmake,
|
cmake,
|
||||||
|
copyDesktopItems,
|
||||||
inih,
|
inih,
|
||||||
|
libsForQt5,
|
||||||
|
makeDesktopItem,
|
||||||
ninja,
|
ninja,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
qtbase,
|
|
||||||
wrapQtAppsHook,
|
|
||||||
makeDesktopItem,
|
|
||||||
copyDesktopItems,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "qzdl";
|
pname = "qzdl";
|
||||||
version = "unstable-2023-04-04";
|
version = "3.3.0.0-unstable-2025-01-04";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qbasicer";
|
owner = "qbasicer";
|
||||||
repo = "qzdl";
|
repo = "qzdl";
|
||||||
rev = "44aaec0182e781a3cef373e5c795c9dbd9cd61bb";
|
rev = "a03191777152b932b9bf15f45d439bf38e8c7679";
|
||||||
hash = "sha256-K/mJQb7uO2H94krWJIJtFRYd6BAe2TX1xBt6fGBb1tA=";
|
hash = "sha256-YRWJBuYY1QI/liiGw5zYFqsrK+DyvW1Lpava6CkmVnQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./non-bundled-inih.patch
|
./cmake.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -32,12 +30,12 @@ stdenv.mkDerivation {
|
|||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
wrapQtAppsHook
|
libsForQt5.wrapQtAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
inih
|
inih
|
||||||
qtbase
|
libsForQt5.qtbase
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
@ -55,12 +53,12 @@ stdenv.mkDerivation {
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "ZDoom WAD Launcher";
|
description = "ZDoom WAD Launcher";
|
||||||
homepage = "https://zdl.vectec.net";
|
homepage = "https://zdl.vectec.net";
|
||||||
license = licenses.gpl3Only;
|
license = lib.licenses.gpl3Only;
|
||||||
inherit (qtbase.meta) platforms;
|
inherit (libsForQt5.qtbase.meta) platforms;
|
||||||
maintainers = with maintainers; [ azahi ];
|
maintainers = [ lib.maintainers.azahi ];
|
||||||
mainProgram = "zdl";
|
mainProgram = "zdl";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -7,17 +7,17 @@
|
|||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "railway";
|
pname = "railway";
|
||||||
version = "4.0.0";
|
version = "4.0.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "railwayapp";
|
owner = "railwayapp";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-o3AWcUKeOBiNsDSDV0XFzQ0rWpj7el4qX6iQKnqMPgg=";
|
hash = "sha256-2qVib63l+NSiHPD9qDoZiRG1t7SCyqJEUpUI60UMneA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-F+1ELwvtjnaQlvkfdKk7hnuEEde4NL/sUjPBExU+zds=";
|
cargoHash = "sha256-p9KH8UhblE4+bKJrkiHvAg77WI2f6KVbIJ4wuUniqDU=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|||||||
@ -35,7 +35,7 @@ in
|
|||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "refine";
|
pname = "refine";
|
||||||
version = "0.5.6";
|
version = "0.5.7";
|
||||||
pyproject = false; # uses meson
|
pyproject = false; # uses meson
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
|
|||||||
owner = "TheEvilSkeleton";
|
owner = "TheEvilSkeleton";
|
||||||
repo = "Refine";
|
repo = "Refine";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-cIJWTzeLm2YP8Pm/nzcYHIGzBOmQlPe0lQ+b6BufIMg=";
|
hash = "sha256-Ew/FCCJxgc5ybc/o6tEYP65G24sEmVLoeMTu9/cCjVQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
36
pkgs/by-name/re/repro-env/package.nix
Normal file
36
pkgs/by-name/re/repro-env/package.nix
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
rustPlatform,
|
||||||
|
fetchFromGitHub,
|
||||||
|
versionCheckHook,
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
|
pname = "repro-env";
|
||||||
|
version = "0.4.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "kpcyrd";
|
||||||
|
repo = "repro-env";
|
||||||
|
tag = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-ViOUS7prwLl2C2BOlwqshFks+q+xeiAD4ONdKUcDgWU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-0ljIt84CqcdC01YXU6J7RlvkN/nlU6Thige8TricFus=";
|
||||||
|
|
||||||
|
doInstallCheck = true;
|
||||||
|
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||||
|
versionCheckProgramArg = "--version";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
changelog = "https://github.com/kpcyrd/repro-env/releases/tag/v${finalAttrs.version}";
|
||||||
|
description = "Dependency lockfiles for reproducible build environments";
|
||||||
|
homepage = "https://github.com/kpcyrd/repro-env";
|
||||||
|
license = with lib.licenses; [
|
||||||
|
asl20
|
||||||
|
mit
|
||||||
|
];
|
||||||
|
maintainers = with lib.maintainers; [ drupol ];
|
||||||
|
mainProgram = "repro-env";
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -21,12 +21,14 @@
|
|||||||
python3,
|
python3,
|
||||||
pugixml,
|
pugixml,
|
||||||
flatbuffers,
|
flatbuffers,
|
||||||
llvm_16,
|
llvm_18,
|
||||||
cubeb,
|
cubeb,
|
||||||
|
opencv,
|
||||||
enableDiscordRpc ? false,
|
enableDiscordRpc ? false,
|
||||||
faudioSupport ? true,
|
faudioSupport ? true,
|
||||||
faudio,
|
faudio,
|
||||||
SDL2,
|
SDL2,
|
||||||
|
sdl3,
|
||||||
waylandSupport ? true,
|
waylandSupport ? true,
|
||||||
wayland,
|
wayland,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
@ -34,10 +36,10 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
# Keep these separate so the update script can regex them
|
# Keep these separate so the update script can regex them
|
||||||
rpcs3GitVersion = "17323-92d070729";
|
rpcs3GitVersion = "17736-c86a25079";
|
||||||
rpcs3Version = "0.0.34-17323-92d070729";
|
rpcs3Version = "0.0.36-17736-c86a25079";
|
||||||
rpcs3Revision = "92d07072915b99917892dd7833c06eb44a09e234";
|
rpcs3Revision = "c86a25079518032d73395a79979970acb2581a91";
|
||||||
rpcs3Hash = "sha256-GH2sXw1AYdqwzxucXFhVS0nM0eRhC+XDHS6RTZY8pYY=";
|
rpcs3Hash = "sha256-e+mT3qn1oz1fh2bqu5YM+m774Can34If57Kd1T1EGbk=";
|
||||||
|
|
||||||
inherit (qt6Packages)
|
inherit (qt6Packages)
|
||||||
qtbase
|
qtbase
|
||||||
@ -82,9 +84,11 @@ stdenv.mkDerivation {
|
|||||||
(lib.cmakeBool "USE_SYSTEM_CURL" true)
|
(lib.cmakeBool "USE_SYSTEM_CURL" true)
|
||||||
(lib.cmakeBool "USE_SYSTEM_WOLFSSL" true)
|
(lib.cmakeBool "USE_SYSTEM_WOLFSSL" true)
|
||||||
(lib.cmakeBool "USE_SYSTEM_FAUDIO" true)
|
(lib.cmakeBool "USE_SYSTEM_FAUDIO" true)
|
||||||
|
(lib.cmakeBool "USE_SYSTEM_OPENAL" true)
|
||||||
(lib.cmakeBool "USE_SYSTEM_PUGIXML" true)
|
(lib.cmakeBool "USE_SYSTEM_PUGIXML" true)
|
||||||
(lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true)
|
(lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true)
|
||||||
(lib.cmakeBool "USE_SYSTEM_SDL" true)
|
(lib.cmakeBool "USE_SYSTEM_SDL" true)
|
||||||
|
(lib.cmakeBool "USE_SYSTEM_OPENCV" true)
|
||||||
(lib.cmakeBool "USE_SDL" true)
|
(lib.cmakeBool "USE_SDL" true)
|
||||||
(lib.cmakeBool "WITH_LLVM" true)
|
(lib.cmakeBool "WITH_LLVM" true)
|
||||||
(lib.cmakeBool "BUILD_LLVM" false)
|
(lib.cmakeBool "BUILD_LLVM" false)
|
||||||
@ -120,10 +124,12 @@ stdenv.mkDerivation {
|
|||||||
wolfssl
|
wolfssl
|
||||||
python3
|
python3
|
||||||
pugixml
|
pugixml
|
||||||
SDL2
|
SDL2 # Still needed by FAudio's CMake
|
||||||
|
sdl3
|
||||||
flatbuffers
|
flatbuffers
|
||||||
llvm_16
|
llvm_18
|
||||||
libSM
|
libSM
|
||||||
|
opencv
|
||||||
]
|
]
|
||||||
++ cubeb.passthru.backendLibs
|
++ cubeb.passthru.backendLibs
|
||||||
++ lib.optional faudioSupport faudio
|
++ lib.optional faudioSupport faudio
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "rust-analyzer-unwrapped";
|
pname = "rust-analyzer-unwrapped";
|
||||||
version = "2025-04-14";
|
version = "2025-04-21";
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-6HKx3zm6RaixTiioij/PI2KvgWGhPFfVQsbECm4LtEc=";
|
cargoHash = "sha256-6HKx3zm6RaixTiioij/PI2KvgWGhPFfVQsbECm4LtEc=";
|
||||||
|
|
||||||
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
|||||||
owner = "rust-lang";
|
owner = "rust-lang";
|
||||||
repo = "rust-analyzer";
|
repo = "rust-analyzer";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-NPUnfDAwLD69aKetxjC7lV5ysrvs1IKC0Sy4Zai10Mw=";
|
hash = "sha256-Gw627dJW6/IJydIUCQnI8c2oilpMxhZIwHb7ppGX7hk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoBuildFlags = [
|
cargoBuildFlags = [
|
||||||
|
|||||||
@ -24,6 +24,7 @@
|
|||||||
rustc,
|
rustc,
|
||||||
rustfmt,
|
rustfmt,
|
||||||
xdotool,
|
xdotool,
|
||||||
|
xdg-user-dirs,
|
||||||
pipewire,
|
pipewire,
|
||||||
cargo-expand,
|
cargo-expand,
|
||||||
yq,
|
yq,
|
||||||
@ -205,6 +206,10 @@ flutter.buildFlutterApplication rec {
|
|||||||
cp ../res/scalable.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg
|
cp ../res/scalable.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
extraWrapProgramArgs = ''
|
||||||
|
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
|
||||||
|
'';
|
||||||
|
|
||||||
desktopItems = [
|
desktopItems = [
|
||||||
(makeDesktopItem {
|
(makeDesktopItem {
|
||||||
name = "rustdesk";
|
name = "rustdesk";
|
||||||
|
|||||||
@ -15,19 +15,19 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "rustls-ffi";
|
pname = "rustls-ffi";
|
||||||
version = "0.14.1";
|
version = "0.15.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rustls";
|
owner = "rustls";
|
||||||
repo = "rustls-ffi";
|
repo = "rustls-ffi";
|
||||||
rev = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-ZKAyKcKwhnPE6PrfBFjLJKkTlGbdLcmW1EP/xSv2cpM=";
|
hash = "sha256-m92kWH+J8wuGmI0msrp2aginY1K51iqgi3+u4ncmfts=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||||
src = finalAttrs.src;
|
src = finalAttrs.src;
|
||||||
name = "${finalAttrs.pname}-${finalAttrs.version}";
|
name = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||||
hash = "sha256-cZ92wSKoygt9x6O/ginOEiCiarlR5qGVFOHrIFdWOWE=";
|
hash = "sha256-gqc6en59QQpD14hOgRuGEPWLvrkyGn9tPR9vQmRAxIg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user