Merge 62588b43e4 into haskell-updates
This commit is contained in:
@@ -58,6 +58,8 @@
|
||||
- nixos/modules/services/display-managers/cosmic-greeter.nix
|
||||
- nixos/tests/cosmic.nix
|
||||
- pkgs/by-name/co/cosmic-*/**/*
|
||||
- pkgs/by-name/li/libcosmicAppHook/*
|
||||
- pkgs/by-name/po/pop-launcher/*
|
||||
- pkgs/by-name/xd/xdg-desktop-portal-cosmic/*
|
||||
|
||||
"6.topic: crystal":
|
||||
|
||||
@@ -1,147 +0,0 @@
|
||||
# Bower {#sec-bower}
|
||||
|
||||
[Bower](https://bower.io) is a package manager for web site front-end components. Bower packages (comprising of build artifacts and sometimes sources) are stored in `git` repositories, typically on Github. The package registry is run by the Bower team with package metadata coming from the `bower.json` file within each package.
|
||||
|
||||
The end result of running Bower is a `bower_components` directory which can be included in the web app's build process.
|
||||
|
||||
Bower can be run interactively, by installing `nodePackages.bower`. More interestingly, the Bower components can be declared in a Nix derivation, with the help of `bower2nix`.
|
||||
|
||||
## bower2nix usage {#ssec-bower2nix-usage}
|
||||
|
||||
Suppose you have a `bower.json` with the following contents:
|
||||
|
||||
### Example bower.json {#ex-bowerJson}
|
||||
|
||||
```json
|
||||
"name": "my-web-app",
|
||||
"dependencies": {
|
||||
"angular": "~1.5.0",
|
||||
"bootstrap": "~3.3.6"
|
||||
}
|
||||
```
|
||||
|
||||
Running `bower2nix` will produce something like the following output:
|
||||
|
||||
```nix
|
||||
{ fetchbower, buildEnv }:
|
||||
buildEnv {
|
||||
name = "bower-env";
|
||||
ignoreCollisions = true;
|
||||
paths = [
|
||||
(fetchbower "angular" "1.5.3" "~1.5.0" "1749xb0firxdra4rzadm4q9x90v6pzkbd7xmcyjk6qfza09ykk9y")
|
||||
(fetchbower "bootstrap" "3.3.6" "~3.3.6" "1vvqlpbfcy0k5pncfjaiskj3y6scwifxygfqnw393sjfxiviwmbv")
|
||||
(fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1")
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
Using the `bower2nix` command line arguments, the output can be redirected to a file. A name like `bower-packages.nix` would be fine.
|
||||
|
||||
The resulting derivation is a union of all the downloaded Bower packages (and their dependencies). To use it, they still need to be linked together by Bower, which is where `buildBowerComponents` is useful.
|
||||
|
||||
## buildBowerComponents function {#ssec-build-bower-components}
|
||||
|
||||
The function is implemented in [pkgs/development/bower-modules/generic/default.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix).
|
||||
|
||||
### Example buildBowerComponents {#ex-buildBowerComponents}
|
||||
|
||||
```nix
|
||||
{
|
||||
bowerComponents = buildBowerComponents {
|
||||
name = "my-web-app";
|
||||
generated = ./bower-packages.nix; # note 1
|
||||
src = myWebApp; # note 2
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
In ["buildBowerComponents" example](#ex-buildBowerComponents) the following arguments are of special significance to the function:
|
||||
|
||||
1. `generated` specifies the file which was created by {command}`bower2nix`.
|
||||
2. `src` is your project's sources. It needs to contain a {file}`bower.json` file.
|
||||
|
||||
`buildBowerComponents` will run Bower to link together the output of `bower2nix`, resulting in a `bower_components` directory which can be used.
|
||||
|
||||
Here is an example of a web frontend build process using `gulp`. You might use `grunt`, or anything else.
|
||||
|
||||
### Example build script (gulpfile.js) {#ex-bowerGulpFile}
|
||||
|
||||
```javascript
|
||||
var gulp = require('gulp');
|
||||
|
||||
gulp.task('default', [], function () {
|
||||
gulp.start('build');
|
||||
});
|
||||
|
||||
gulp.task('build', [], function () {
|
||||
console.log("Just a dummy gulp build");
|
||||
gulp
|
||||
.src(["./bower_components/**/*"])
|
||||
.pipe(gulp.dest("./gulpdist/"));
|
||||
});
|
||||
```
|
||||
|
||||
### Example Full example — default.nix {#ex-buildBowerComponentsDefaultNix}
|
||||
|
||||
```nix
|
||||
{
|
||||
myWebApp ? {
|
||||
outPath = ./.;
|
||||
name = "myWebApp";
|
||||
},
|
||||
pkgs ? import <nixpkgs> { },
|
||||
}:
|
||||
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = "my-web-app-frontend";
|
||||
src = myWebApp;
|
||||
|
||||
buildInputs = [ pkgs.nodePackages.gulp ];
|
||||
|
||||
bowerComponents = pkgs.buildBowerComponents {
|
||||
# note 1
|
||||
name = "my-web-app";
|
||||
generated = ./bower-packages.nix;
|
||||
src = myWebApp;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
writableTmpDirAsHomeHook # note 3
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
cp --reflink=auto --no-preserve=mode -R $bowerComponents/bower_components . # note 2
|
||||
${pkgs.nodePackages.gulp}/bin/gulp build # note 4
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv gulpdist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
```
|
||||
|
||||
A few notes about [Full example — `default.nix`](#ex-buildBowerComponentsDefaultNix):
|
||||
|
||||
1. The result of `buildBowerComponents` is an input to the frontend build.
|
||||
2. Whether to symlink or copy the {file}`bower_components` directory depends on the build tool in use.
|
||||
In this case, a copy is used to avoid {command}`gulp` silliness with permissions.
|
||||
3. {command}`gulp` requires `HOME` to refer to a writeable directory.
|
||||
4. The actual build command in this example is {command}`gulp`. Other tools could be used instead.
|
||||
|
||||
## Troubleshooting {#ssec-bower2nix-troubleshooting}
|
||||
|
||||
### ENOCACHE errors from buildBowerComponents {#enocache-errors-from-buildbowercomponents}
|
||||
|
||||
This means that Bower was looking for a package version which doesn't exist in the generated `bower-packages.nix`.
|
||||
|
||||
If `bower.json` has been updated, then run `bower2nix` again.
|
||||
|
||||
It could also be a bug in `bower2nix` or `fetchbower`. If possible, try reformulating the version specification in `bower.json`.
|
||||
@@ -55,7 +55,6 @@ agda.section.md
|
||||
android.section.md
|
||||
astal.section.md
|
||||
beam.section.md
|
||||
bower.section.md
|
||||
chicken.section.md
|
||||
coq.section.md
|
||||
cosmic.section.md
|
||||
|
||||
+10
-28
@@ -259,7 +259,16 @@
|
||||
"release-notes.html#sec-nixpkgs-release-25.11-highlights"
|
||||
],
|
||||
"sec-nixpkgs-release-25.11-incompatibilities": [
|
||||
"release-notes.html#sec-nixpkgs-release-25.11-incompatibilities"
|
||||
"release-notes.html#sec-nixpkgs-release-25.11-incompatibilities",
|
||||
"index.html#enocache-errors-from-buildbowercomponents",
|
||||
"index.html#ex-bowerGulpFile",
|
||||
"index.html#ex-bowerJson",
|
||||
"index.html#ex-buildBowerComponents",
|
||||
"index.html#ex-buildBowerComponentsDefaultNix",
|
||||
"index.html#sec-bower",
|
||||
"index.html#ssec-bower2nix-troubleshooting",
|
||||
"index.html#ssec-bower2nix-usage",
|
||||
"index.html#ssec-build-bower-components"
|
||||
],
|
||||
"sec-nixpkgs-release-25.11-lib": [
|
||||
"release-notes.html#sec-nixpkgs-release-25.11-lib"
|
||||
@@ -2801,33 +2810,6 @@
|
||||
"elixir---phoenix-project": [
|
||||
"index.html#elixir---phoenix-project"
|
||||
],
|
||||
"sec-bower": [
|
||||
"index.html#sec-bower"
|
||||
],
|
||||
"ssec-bower2nix-usage": [
|
||||
"index.html#ssec-bower2nix-usage"
|
||||
],
|
||||
"ex-bowerJson": [
|
||||
"index.html#ex-bowerJson"
|
||||
],
|
||||
"ssec-build-bower-components": [
|
||||
"index.html#ssec-build-bower-components"
|
||||
],
|
||||
"ex-buildBowerComponents": [
|
||||
"index.html#ex-buildBowerComponents"
|
||||
],
|
||||
"ex-bowerGulpFile": [
|
||||
"index.html#ex-bowerGulpFile"
|
||||
],
|
||||
"ex-buildBowerComponentsDefaultNix": [
|
||||
"index.html#ex-buildBowerComponentsDefaultNix"
|
||||
],
|
||||
"ssec-bower2nix-troubleshooting": [
|
||||
"index.html#ssec-bower2nix-troubleshooting"
|
||||
],
|
||||
"enocache-errors-from-buildbowercomponents": [
|
||||
"index.html#enocache-errors-from-buildbowercomponents"
|
||||
],
|
||||
"sec-chicken": [
|
||||
"index.html#sec-chicken"
|
||||
],
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
|
||||
- `mono4` and `mono5` have been removed. Use `mono6` or `mono` instead.
|
||||
|
||||
- Everything related to `bower` was removed, as it is deprecated and not used by anything in nixpkgs.
|
||||
|
||||
- The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
|
||||
|
||||
- `installShellFiles`: Allow installManPage to take a piped input, add the `--name` flag for renaming the file when installed. Can also append `--` to opt-out of all subsequent parsing.
|
||||
|
||||
@@ -279,12 +279,6 @@
|
||||
githubId = 43320117;
|
||||
name = "Sebastian Marquardt";
|
||||
};
|
||||
_8aed = {
|
||||
email = "8aed@riseup.net";
|
||||
github = "8aed";
|
||||
githubId = 140662578;
|
||||
name = "Huit Aed";
|
||||
};
|
||||
_9999years = {
|
||||
email = "rbt@fastmail.com";
|
||||
github = "9999years";
|
||||
@@ -25566,11 +25560,6 @@
|
||||
github = "tfkhdyt";
|
||||
githubId = 47195537;
|
||||
};
|
||||
tfmoraes = {
|
||||
name = "Thiago Franco de Moraes";
|
||||
github = "tfmoraes";
|
||||
githubId = 351108;
|
||||
};
|
||||
tg-x = {
|
||||
email = "*@tg-x.net";
|
||||
github = "tg-x";
|
||||
|
||||
@@ -9,21 +9,26 @@ let
|
||||
|
||||
cfg = config.hardware.sensor.hddtemp;
|
||||
|
||||
wrapper = pkgs.writeShellScript "hddtemp-wrapper" ''
|
||||
script = ''
|
||||
set -eEuo pipefail
|
||||
|
||||
file=/var/lib/hddtemp/hddtemp.db
|
||||
|
||||
drives=(${toString (map (e: ''$(realpath ${lib.escapeShellArg e}) '') cfg.drives)})
|
||||
raw_drives=""
|
||||
${lib.concatStringsSep "\n" (map (drives: "raw_drives+=\"${drives} \"") cfg.drives)}
|
||||
drives=""
|
||||
for i in $raw_drives; do
|
||||
drives+=" $(realpath $i)"
|
||||
done
|
||||
|
||||
cp ${pkgs.hddtemp}/share/hddtemp/hddtemp.db $file
|
||||
${lib.concatMapStringsSep "\n" (e: "echo ${lib.escapeShellArg e} >> $file") cfg.dbEntries}
|
||||
|
||||
exec ${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \
|
||||
${pkgs.hddtemp}/bin/hddtemp ${lib.escapeShellArgs cfg.extraArgs} \
|
||||
--daemon \
|
||||
--unit=${cfg.unit} \
|
||||
--file=$file \
|
||||
''${drives[@]}
|
||||
$drives
|
||||
'';
|
||||
|
||||
in
|
||||
@@ -77,9 +82,9 @@ in
|
||||
description = "HDD/SSD temperature";
|
||||
documentation = [ "man:hddtemp(8)" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
inherit script;
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStart = wrapper;
|
||||
StateDirectory = "hddtemp";
|
||||
PrivateTmp = true;
|
||||
ProtectHome = "tmpfs";
|
||||
|
||||
@@ -52,21 +52,30 @@ in
|
||||
{
|
||||
options = {
|
||||
disks = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.path;
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Drive(s) to get temperature from
|
||||
|
||||
Can also use command substitution to automatically grab all matching drives; such as all scsi (sas) drives
|
||||
'';
|
||||
example = [ "/dev/sda" ];
|
||||
example = [
|
||||
"/dev/sda"
|
||||
"`find /dev/disk/by-id -name \"scsi*\" -and -not -name \"*-part*\" -printf \"%p \"`"
|
||||
];
|
||||
};
|
||||
|
||||
pwmPaths = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.path;
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values
|
||||
Can also use command substitution to ensure the correct hwmonX is selected on every boot
|
||||
'';
|
||||
example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ];
|
||||
example = [
|
||||
"/sys/class/hwmon/hwmon2/pwm1:30:10"
|
||||
"`echo /sys/devices/platform/nct6775.656/hwmon/hwmon[[:print:]]`/pwm4:80:20"
|
||||
];
|
||||
};
|
||||
|
||||
logVerbosity = lib.mkOption {
|
||||
@@ -151,9 +160,12 @@ in
|
||||
documentation = [ "man:hddfancontrol(1)" ];
|
||||
after = [ "hddtemp.service" ];
|
||||
wants = [ "hddtemp.service" ];
|
||||
script =
|
||||
let
|
||||
argString = lib.strings.concatStringsSep " " (args cnf);
|
||||
in
|
||||
"${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${argString}";
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${lib.escapeShellArgs (args cnf)}";
|
||||
|
||||
CPUSchedulingPolicy = "rr";
|
||||
CPUSchedulingPriority = 49;
|
||||
|
||||
|
||||
@@ -357,7 +357,6 @@ in
|
||||
"d '${cfg.stateDir}/themes' 0750 ${cfg.user} ${cfg.group} - -"
|
||||
"d '${cfg.stateDir}/tmp' 0750 ${cfg.user} ${cfg.group} - -"
|
||||
|
||||
"d /run/redmine - - - - -"
|
||||
"d /run/redmine/public - - - - -"
|
||||
"L+ /run/redmine/config - - - - ${cfg.stateDir}/config"
|
||||
"L+ /run/redmine/files - - - - ${cfg.stateDir}/files"
|
||||
@@ -456,6 +455,8 @@ in
|
||||
TimeoutSec = "300";
|
||||
WorkingDirectory = "${cfg.package}/share/redmine";
|
||||
ExecStart = "${bundle} exec rails server -u webrick -e production -b ${toString cfg.address} -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'";
|
||||
RuntimeDirectory = "redmine";
|
||||
RuntimeDirectoryMode = "0750";
|
||||
AmbientCapabilities = "";
|
||||
CapabilityBoundingSet = "";
|
||||
LockPersonality = true;
|
||||
@@ -473,7 +474,10 @@ in
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "noaccess";
|
||||
ProtectSystem = "full";
|
||||
ProtectSystem = "strict";
|
||||
ReadWritePaths = [
|
||||
cfg.stateDir
|
||||
];
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_UNIX"
|
||||
|
||||
@@ -145,7 +145,7 @@ in
|
||||
'';
|
||||
"~* ^(\\/cache\\/files.*)(\\/.*)".extraConfig = ''
|
||||
alias /var/lib/onlyoffice/documentserver/App_Data$1;
|
||||
more_set_headers Content-Disposition "attachment; filename*=UTF-8''$arg_filename";
|
||||
more_set_headers "Content-Disposition: attachment; filename*=UTF-8''$arg_filename";
|
||||
|
||||
set $secure_link_secret verysecretstring;
|
||||
secure_link $arg_md5,$arg_expires;
|
||||
|
||||
@@ -19,18 +19,6 @@ let
|
||||
enable = true;
|
||||
package = pkgs.redmine;
|
||||
database.type = type;
|
||||
plugins = {
|
||||
redmine_env_auth = pkgs.fetchurl {
|
||||
url = "https://github.com/Intera/redmine_env_auth/archive/0.7.zip";
|
||||
sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc";
|
||||
};
|
||||
};
|
||||
themes = {
|
||||
dkuk-redmine_alex_skin = pkgs.fetchurl {
|
||||
url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip";
|
||||
sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
bower2nix,
|
||||
cacert,
|
||||
}:
|
||||
let
|
||||
bowerVersion =
|
||||
version:
|
||||
let
|
||||
components = lib.splitString "#" version;
|
||||
hash = lib.last components;
|
||||
ver = if builtins.length components == 1 then (cleanName version) else hash;
|
||||
in
|
||||
ver;
|
||||
|
||||
cleanName = name: lib.replaceStrings [ "/" ":" ] [ "-" "-" ] name;
|
||||
|
||||
fetchbower =
|
||||
name: version: target: outputHash:
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "${cleanName name}-${bowerVersion version}";
|
||||
buildCommand = ''
|
||||
fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}"
|
||||
# In some cases, the result of fetchBower is different depending
|
||||
# on the output directory (e.g. if the bower package contains
|
||||
# symlinks). So use a local output directory before copying to
|
||||
# $out.
|
||||
cp -R out $out
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
inherit outputHash;
|
||||
nativeBuildInputs = [
|
||||
bower2nix
|
||||
cacert
|
||||
];
|
||||
};
|
||||
|
||||
in
|
||||
fetchbower
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ansible-doctor";
|
||||
version = "7.2.0";
|
||||
version = "7.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7SGnbcaufKWBDq5Na+s+X8RGRskl1Q1bh0xelT/IQXU=";
|
||||
hash = "sha256-2cJ1wV3hqoqSvLq3c7/J5nh1GTTcj9sexRhX3hfPoTc=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bash_unit";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgrange";
|
||||
owner = "bash-unit";
|
||||
repo = "bash_unit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n5ehN7NrWID72xP7EYOk/mpnQJaDn71esIugWrLbZr0=";
|
||||
hash = "sha256-uRUqa6sXaXXDes9JjyTsMlA+nYdTGdioM0/y2XDIiEw=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "benthos";
|
||||
version = "4.55.0";
|
||||
version = "4.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "benthos";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-i6PDTgiDEZJAobNvDxRwggIfBMsZ7gZsn6ruthVn37w=";
|
||||
hash = "sha256-TayHN6Vsp1mkDNqa6mc5HWGPIfyeJQdzOGBnE6SioZ0=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
{
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
lib,
|
||||
nix,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bower2nix";
|
||||
version = "3.2.0-unstable-2024-06-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rvl";
|
||||
repo = "bower2nix";
|
||||
rev = "b5da44f055c7561ed7a46226b3be0070e07d80e6";
|
||||
hash = "sha256-da+m2UWQ83tW1o0P1qvw35KpsXL/BDTeShg4KxL+7Ck=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-TK1sqF2J/hQuP3bgGA4MolLA7LWWuYNnqf4gDyU154k=";
|
||||
|
||||
npmBuildScript = "prepare";
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
git
|
||||
nix
|
||||
]
|
||||
}"
|
||||
];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/rvl/bower2nix/releases/tag/v${version}";
|
||||
description = "Generate nix expressions to fetch bower dependencies";
|
||||
homepage = "https://github.com/rvl/bower2nix";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "bower2nix";
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
font ? "Noto Sans",
|
||||
fontSize ? "9",
|
||||
background ? null,
|
||||
disableBackground ? false,
|
||||
loginBackground ? false,
|
||||
userIcon ? false,
|
||||
clockEnabled ? true,
|
||||
@@ -64,8 +65,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
${lib.optionalString (background != null) ''
|
||||
substituteInPlace $configFile \
|
||||
--replace-fail 'Background="backgrounds/wall.png"' 'Background="${background}"' \
|
||||
--replace-fail 'CustomBackground="false"' 'CustomBackground="true"'
|
||||
--replace-fail 'Background="backgrounds/wall.png"' 'Background="${background}"'
|
||||
''}
|
||||
|
||||
${lib.optionalString disableBackground ''
|
||||
substituteInPlace $configFile \
|
||||
--replace-fail 'CustomBackground="true"' 'CustomBackground="false"'
|
||||
''}
|
||||
|
||||
${lib.optionalString loginBackground ''
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
libnotify,
|
||||
libavif,
|
||||
kdePackages,
|
||||
autoPatchelfHook,
|
||||
libpulseaudio,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -17,7 +19,8 @@ stdenv.mkDerivation {
|
||||
cmake
|
||||
pkg-config
|
||||
kdePackages.wrapQtAppsHook
|
||||
];
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
buildInputs =
|
||||
(with kdePackages; [
|
||||
@@ -38,6 +41,8 @@ stdenv.mkDerivation {
|
||||
]
|
||||
++ lib.optional enableAvifSupport libavif;
|
||||
|
||||
runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio ];
|
||||
|
||||
preConfigure = ''
|
||||
if [[ -f "$src/GIT_HASH" ]]; then
|
||||
export GIT_HASH="$(cat $src/GIT_HASH)"
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
pname = "cljfmt";
|
||||
version = "0.13.1";
|
||||
version = "0.13.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/weavejester/cljfmt/releases/download/${finalAttrs.version}/cljfmt-${finalAttrs.version}-standalone.jar";
|
||||
hash = "sha256-Dj1g6hMzRhqm0pJggODVFgEkayB2Wdh3d0z6RglHbgY=";
|
||||
hash = "sha256-i6ZUhN7gwADw0tZFPOjiGpC/po8us5QSAJAW7n3LgIU=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
||||
@@ -150,7 +150,7 @@ let
|
||||
test -e ${lib.escapeShellArg appimageName}
|
||||
appimage-run ${lib.escapeShellArg appimageName} -i -y -n -C $out
|
||||
|
||||
mkdir -p $out/{configs,DolbyVision,easyDCP,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT}
|
||||
mkdir -p $out/{configs,DolbyVision,easyDCP,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT,Extras}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -186,6 +186,7 @@ let
|
||||
"Video"
|
||||
"Graphics"
|
||||
];
|
||||
startupWMClass = "resolve";
|
||||
})
|
||||
];
|
||||
}
|
||||
@@ -248,10 +249,12 @@ buildFHSEnv {
|
||||
|
||||
extraPreBwrapCmds = lib.optionalString studioVariant ''
|
||||
mkdir -p ~/.local/share/DaVinciResolve/license || exit 1
|
||||
mkdir -p ~/.local/share/DaVinciResolve/Extras || exit 1
|
||||
'';
|
||||
|
||||
extraBwrapArgs = lib.optionals studioVariant [
|
||||
"--bind \"$HOME\"/.local/share/DaVinciResolve/license ${davinci}/.license"
|
||||
''--bind "$HOME"/.local/share/DaVinciResolve/license ${davinci}/.license''
|
||||
''--bind "$HOME"/.local/share/DaVinciResolve/Extras ${davinci}/Extras''
|
||||
];
|
||||
|
||||
runScript = "${bash}/bin/bash ${writeText "davinci-wrapper" ''
|
||||
|
||||
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diesel-cli";
|
||||
version = "2.3.0";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
crateName = "diesel_cli";
|
||||
hash = "sha256-s/RJ83TuW42MIYgKXq5tlqJ73u0aucuXrR8bFArqT5A=";
|
||||
hash = "sha256-JNDFXBNmwCWpk+Lub453wS+7lVMZcdiJBmPoVAedpug=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XmWrXLOYm7y7+0mqT0WSmT6LhHAPA9UbGODlluBKyZw=";
|
||||
cargoHash = "sha256-qfXa6DuuhKbXCdOvhuPNx6xlDIouoDVJUMob9Fc5XgI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -112,8 +112,8 @@ stdenv.mkDerivation (
|
||||
ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
|
||||
|
||||
# icon
|
||||
mkdir -p "$out/share/icons/hicolor/icon/apps"
|
||||
ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/icon/apps/element.png"
|
||||
mkdir -p "$out/share/icons/hicolor/512x512/apps"
|
||||
ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png"
|
||||
|
||||
# desktop item
|
||||
mkdir -p "$out/share"
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ethersync";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethersync";
|
||||
repo = "ethersync";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Swh8C8FMjPdIFpHOsNb3W9W7JAZGzPXHXTwwnr1gFok=";
|
||||
hash = "sha256-GPZD/TshZMr+WeCd4WRN/Ewu7zINSzPNPci52bjsV3E=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/daemon";
|
||||
|
||||
cargoHash = "sha256-ZgbxaEtsaBQLl9PJbo1O2wA3OxEfPKRl3KkFvR4c97Q=";
|
||||
cargoHash = "sha256-F2wVRha63TOdMCWW3KNaQ8kbYjuYbdY5yKmTHOJqODA=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchFromGitLab,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exploitdb";
|
||||
version = "2025-09-18";
|
||||
@@ -22,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/share
|
||||
cp --recursive . $out/share/exploitdb
|
||||
|
||||
substituteInPlace $out/share/exploitdb/.searchsploit_rc \
|
||||
--replace-fail 'path_array+=("/opt/exploitdb")' 'path_array+=("'$out'/share/exploitdb")' \
|
||||
--replace-fail 'path_array+=("/opt/exploitdb-papers")' 'path_array+=("'$out'/share/exploitdb")'
|
||||
|
||||
makeWrapper $out/share/exploitdb/searchsploit $out/bin/searchsploit
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
ghostscript,
|
||||
libpng,
|
||||
@@ -24,6 +25,14 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
./CVE-2025-31162.patch
|
||||
./CVE-2025-31163.patch
|
||||
|
||||
# Fix build with gcc15
|
||||
# https://sourceforge.net/p/mcj/fig2dev/ci/ab4eee3cf0d0c1d861d64b9569a5d1497800cae2
|
||||
(fetchpatch {
|
||||
name = "fig2dev-prototypes.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/fig2dev/files/fig2dev-3.2.9a-prototypes.patch?id=93644497325b6df7a17f8bd05ad0495607aa5c34";
|
||||
hash = "sha256-F6z0m3Ez9JpgZg+TjVjuIZhAyTMHodB7O/l8lDTOL54=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -152,13 +152,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fish";
|
||||
version = "4.0.8";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fish-shell";
|
||||
repo = "fish-shell";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bve82WLP/mZrGZNW9JZFCnFiEy1QNB9M8+r3OVh9E3w=";
|
||||
hash = "sha256-J1/Uup/HJP2COkUaDXg6pO6pKTq/44WKqWFqbv89bZk=";
|
||||
};
|
||||
|
||||
env = {
|
||||
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src patches;
|
||||
hash = "sha256-f1nxATT2iJiqQiYc6qHrUvRscupvZa8R41W4fvrgj08=";
|
||||
hash = "sha256-9neZKkuQSOPRrBmjYQ5HYHAORNIjSaSAGN+bDqxb4wk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -195,7 +195,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace src/builtins/tests/test_tests.rs \
|
||||
--replace-fail '"/bin/ls"' '"${lib.getExe' coreutils "ls"}"'
|
||||
|
||||
substituteInPlace src/tests/highlight.rs \
|
||||
substituteInPlace src/highlight/tests.rs \
|
||||
--replace-fail '"/bin/echo"' '"${lib.getExe' coreutils "echo"}"' \
|
||||
--replace-fail '"/bin/c"' '"${lib.getExe' coreutils "c"}"' \
|
||||
--replace-fail '"/bin/ca"' '"${lib.getExe' coreutils "ca"}"' \
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
https://github.com/flintlib/flint/pull/2411
|
||||
|
||||
From 9957b17e6b08bd57790f7da1344b4d92eefc0b38 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
|
||||
Date: Sun, 21 Sep 2025 15:58:57 -0400
|
||||
Subject: [PATCH] Fix duplicate symbols linker error
|
||||
|
||||
When I run `make check` I get linker errors without
|
||||
this patch
|
||||
---
|
||||
src/double_interval.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/double_interval.h b/src/double_interval.h
|
||||
index a423257db2..5f685c283f 100644
|
||||
--- a/src/double_interval.h
|
||||
+++ b/src/double_interval.h
|
||||
@@ -13,7 +13,7 @@
|
||||
#define DOUBLE_INTERVAL_H
|
||||
|
||||
#ifdef DOUBLE_INTERVAL_INLINES_C
|
||||
-#define DOUBLE_INTERVAL_INLINE
|
||||
+#define DOUBLE_INTERVAL_INLINE static
|
||||
#else
|
||||
#define DOUBLE_INTERVAL_INLINE static inline
|
||||
#endif
|
||||
@@ -2,34 +2,45 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
gmp,
|
||||
mpfr,
|
||||
ntl,
|
||||
fetchpatch,
|
||||
windows,
|
||||
autoconf,
|
||||
automake,
|
||||
gettext,
|
||||
libtool,
|
||||
openblas ? null,
|
||||
gmp,
|
||||
mpfr,
|
||||
ntl,
|
||||
blas,
|
||||
lapack,
|
||||
boehmgc,
|
||||
openblas ? null,
|
||||
withBlas ? true,
|
||||
withNtl ? !ntl.meta.broken,
|
||||
withGc ? false,
|
||||
}:
|
||||
|
||||
assert
|
||||
withBlas
|
||||
-> openblas != null && blas.implementation == "openblas" && lapack.implementation == "openblas";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flint3";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flint";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://flintlib.org/download/flint-${version}.tar.gz";
|
||||
url = "https://flintlib.org/download/flint-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ZNcOUTB2z6lx4EELWMHaXTURKRPppWtE4saBtFnT6vs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove once/if https://github.com/flintlib/flint/pull/2411 is merged
|
||||
# Required or else during the check phase the build fails while
|
||||
# linking a test due to duplicate symbol errors
|
||||
./checkPhase.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
@@ -50,6 +61,9 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals withNtl [
|
||||
ntl
|
||||
]
|
||||
++ lib.optionals withGc [
|
||||
boehmgc
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isMinGW [
|
||||
windows.pthreads
|
||||
];
|
||||
@@ -70,19 +84,22 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals withNtl [
|
||||
"--with-ntl=${ntl}"
|
||||
]
|
||||
++ lib.optionals withGc [
|
||||
"--with-gc=${boehmgc}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
enableParallelChecking = true;
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Fast Library for Number Theory";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ smasher164 ];
|
||||
teams = [ teams.sage ];
|
||||
platforms = platforms.all;
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = [ lib.maintainers.smasher164 ];
|
||||
teams = [ lib.teams.sage ];
|
||||
platforms = lib.platforms.all;
|
||||
homepage = "https://www.flintlib.org/";
|
||||
downloadPage = "https://www.flintlib.org/downloads.html";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fluxcd-operator-mcp";
|
||||
version = "0.27.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "controlplaneio-fluxcd";
|
||||
repo = "fluxcd-operator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-haqRBK3ctQvx2VaG2PSSFnhodO5UsBv/iv4SYmO6ijQ=";
|
||||
hash = "sha256-yV8aGmY2mUAu0urIi7d1pIjhJasRX17hpmvFEQm4YpY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w7WEckmoajsR4sKCrheq34T0XC2ubnZhz6cVQmzHzN0=";
|
||||
vendorHash = "sha256-zCzMNlpBBUS2P2aywFDUp/RSl+HlfQe+L8a1+vVYbgY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gcs";
|
||||
version = "5.37.1";
|
||||
version = "5.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "richardwilkes";
|
||||
repo = "gcs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VHysS1/LxtVIJvnlw1joFPc+8uS525VK+FpmKoSikp0=";
|
||||
hash = "sha256-R0IFIGDSpKxNmcDUMVdtKV+M3I8tglBhyHj5XXe2rjg=";
|
||||
};
|
||||
|
||||
modPostBuild = ''
|
||||
@@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
sed -i 's|-lmupdf[^ ]* |-lmupdf |g' vendor/github.com/richardwilkes/pdf/pdf.go
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-T6Omz/jsk0raGM8p+G2wlMWRHzpo2qcTOtCddQoa83w=";
|
||||
vendorHash = "sha256-llbBYO1dNPm+k8WEfao6qyDtQZbcmueNwFBuIpaMvFQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -3,25 +3,22 @@
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
nodejs,
|
||||
gitUpdater,
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
asset = "gemini.js";
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gemini-cli-bin";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${owner}/${repo}/releases/download/v${finalAttrs.version}/${asset}";
|
||||
hash = "sha256-jmZvL4Rst3238H2BdZ/bQuddFkFcFLRABJ1wTHm8qPM=";
|
||||
url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
|
||||
hash = "sha256-gTd+uw5geR7W87BOiE6YmDDJ4AiFlYxbuLE2GWgg0kw=";
|
||||
};
|
||||
|
||||
phases = [
|
||||
"installPhase"
|
||||
"fixupPhase"
|
||||
"installCheckPhase"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
@@ -36,11 +33,23 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = [
|
||||
./update-asset.sh
|
||||
"${owner}/${repo}"
|
||||
"${asset}"
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
# versionCheckHook cannot be used because the reported version might be incorrect (e.g., 0.6.1 returns 0.6.0).
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
"$out/bin/gemini" -v
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
# Ignore `preview` and `nightly` tags
|
||||
extraArgs = [ "--version-regex=^v([0-9.]+)$" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "AI agent that brings the power of Gemini directly into your terminal";
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p gnugrep curl jq gnused
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
NIX_FILE="package.nix"
|
||||
|
||||
GITHUB_REPO="$1"
|
||||
ASSET_NAME="$2"
|
||||
REV_PREFIX="${3:-v}"
|
||||
|
||||
CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "${NIX_FILE}")"
|
||||
CURRENT_HASH="$(grep -oP 'hash = "\K[^"]+' "${NIX_FILE}")"
|
||||
|
||||
JQ_FILTER='[.[] | select((.tag_name | test("preview|nightly")) | not)] |
|
||||
first | .tag_name, (.assets[] | select(.name == $asset_name) | .digest)'
|
||||
|
||||
{
|
||||
read -r LATEST_VER
|
||||
read -r ASSET_DIGEST
|
||||
} < <(
|
||||
curl --fail -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} \
|
||||
"https://api.github.com/repos/${GITHUB_REPO}/releases" |
|
||||
jq -r --arg asset_name "${ASSET_NAME}" "${JQ_FILTER}"
|
||||
)
|
||||
|
||||
LATEST_VER="${LATEST_VER#"${REV_PREFIX}"}"
|
||||
|
||||
if [[ "${LATEST_VER}" == "${CURRENT_VER}" ]]; then
|
||||
echo "Up to date."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
LATEST_HASH="$(nix-hash --to-sri "${ASSET_DIGEST}")"
|
||||
|
||||
sed -i "s#hash = \"${CURRENT_HASH}\";#hash = \"${LATEST_HASH}\";#g" "${NIX_FILE}"
|
||||
sed -i "s#version = \"${CURRENT_VER}\";#version = \"${LATEST_VER}\";#g" "${NIX_FILE}"
|
||||
|
||||
echo "Successfully updated from ${CURRENT_VER} to version ${LATEST_VER}."
|
||||
@@ -25,7 +25,7 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "gixy";
|
||||
version = "0.1.20";
|
||||
version = "0.1.21";
|
||||
pyproject = true;
|
||||
|
||||
# fetching from GitHub because the PyPi source is missing the tests
|
||||
@@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
owner = "yandex";
|
||||
repo = "gixy";
|
||||
rev = "v${version}";
|
||||
sha256 = "14arz3fjidb8z37m08xcpih1391varj8s0v3gri79z3qb4zq5k6b";
|
||||
sha256 = "sha256-Ak2UTP0gDKoac/rR2h1XCUKld1b41O466ogZNQ1yQN0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -24,7 +24,7 @@ let
|
||||
in
|
||||
buildGo125Module rec {
|
||||
pname = "gotenberg";
|
||||
version = "8.23.0";
|
||||
version = "8.23.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -35,10 +35,10 @@ buildGo125Module rec {
|
||||
owner = "gotenberg";
|
||||
repo = "gotenberg";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sZALMMnOmewhhukPoW6sIw80uPHu+rAZmgYdlZdVH7A=";
|
||||
hash = "sha256-rhpeQf1c/XzVEzWuRHryLWSRyL3Ruc3xaYOd5n/hRKc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fAAaX8E4di6ppU8osLPs6wnAe+e6ogOwp6dQAr42Mes=";
|
||||
vendorHash = "sha256-ZCRA4P4z/fb8zXGIFfLtGwo9ff9tdgdMeYbBnMvYgEU=";
|
||||
|
||||
postPatch = ''
|
||||
find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \;
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpxsee";
|
||||
version = "13.47";
|
||||
version = "13.48";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-1waE0A70MsUaGttaxHcOO2aaeRdZ9ihc7ZeqJ+azH/0=";
|
||||
hash = "sha256-3MkZpTrm8WVgv9k59XqwfhR1SDxNGDaD0TFBWeH4wQY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -22,6 +22,8 @@
|
||||
luajit,
|
||||
luajitPackages,
|
||||
libpulseaudio,
|
||||
libinput,
|
||||
libevdev,
|
||||
features ? [ ],
|
||||
systemd,
|
||||
}:
|
||||
@@ -58,7 +60,11 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals (hasFeature "http") [ openssl ]
|
||||
++ lib.optionals (hasFeature "volume") [ libpulseaudio ]
|
||||
++ lib.optionals (hasFeature "cairo") [ luajit ]
|
||||
++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ];
|
||||
++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ]
|
||||
++ lib.optionals (hasFeature "keyboard") [
|
||||
libinput
|
||||
libevdev
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jsonwatch";
|
||||
version = "0.9.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbohdan";
|
||||
repo = "jsonwatch";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HSyavdH3zhzEvk5qW5fiv8wqmgYsLUyx6Q6oEIOk5to=";
|
||||
hash = "sha256-qhVqAhUAbLb5wHnLNHr6BxffyH1G5B09eOJQoqSzWEk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2CtB8TEn0bieT0S2w3cm4nLZWdFcIymvWSOnWDTXEJc=";
|
||||
cargoHash = "sha256-D29pmt97DYfpYa9EwK+IlggR3zQFGzOy/Ky01UGI3tg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Like watch -d but for JSON";
|
||||
|
||||
@@ -16,10 +16,12 @@
|
||||
# run the compiled `generate-book` utility to prepare the files for mdbook
|
||||
withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
let
|
||||
version = "1.43.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
pname = "just";
|
||||
version = "1.42.4";
|
||||
outputs = [
|
||||
"out"
|
||||
]
|
||||
@@ -32,10 +34,10 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "casey";
|
||||
repo = "just";
|
||||
tag = version;
|
||||
hash = "sha256-MLGtHMNCyhYq9OTquCc9zKmear1ts5vNAvlLxNQaOqk=";
|
||||
hash = "sha256-148bubjJYbmqugOd8crWXLqxigWfd3VVnsL0/WB2FYM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-udNHlPEwTb5S1ZypIqng7JLZ6Yl1vbYwASn+DT2SOLY=";
|
||||
cargoHash = "sha256-3DIpEPStOh/PcjoJ5dWpfSgRNMTCmN+wO2VzeNtikFU=";
|
||||
|
||||
nativeBuildInputs =
|
||||
lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "lazyjournal";
|
||||
@@ -15,7 +15,7 @@ buildGoModule {
|
||||
owner = "Lifailon";
|
||||
repo = "lazyjournal";
|
||||
tag = version;
|
||||
hash = "sha256-dQKd7u4IGQWw8ExoHLd5qRenE07UQz69GNqGIAWN7ok=";
|
||||
hash = "sha256-QHVwEesJZiySwEPeDZaU56uY+PJEJXCybvAezhwa59g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Wl8DmEBt1YtTk9QEvWybSWRQm0Lnfd5q3C/wg+gP33g=";
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/src/OdfGenerator.cxx b/src/OdfGenerator.cxx
|
||||
index adf176b0a4..79de4dd2b7 100644
|
||||
--- a/src/OdfGenerator.cxx
|
||||
+++ b/src/OdfGenerator.cxx
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <math.h>
|
||||
|
||||
#include <cctype>
|
||||
+#include <cstdint>
|
||||
#include <limits>
|
||||
#include <string>
|
||||
#include <stack>
|
||||
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-Mj5JH5VsjKKrsSyZjjUGcJMKMjF7+WYrBhXdSzkiuDE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with gcc15, based on:
|
||||
# https://sourceforge.net/p/libwpd/libodfgen/ci/4da0b148def5b40ee60d4cd79762c0f158d64cc7/
|
||||
./libodfgen-add-include-cstdint-gcc15.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost
|
||||
|
||||
@@ -177,7 +177,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
tests = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
metal = llama-cpp.override { metalSupport = true; };
|
||||
};
|
||||
updateScript = nix-update-script {
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
{ fetchbower, buildEnv }:
|
||||
buildEnv {
|
||||
name = "bower-env";
|
||||
ignoreCollisions = true;
|
||||
paths = [
|
||||
(fetchbower "jquery" "2.1.4" "~2.1.3" "1ywrpk2xsr6ghkm3j9gfnl9r3jn6xarfamp99b0bcm57kq9fm2k0")
|
||||
(fetchbower "video.js" "5.20.5" "~5.20.1" "1agvvid2valba7xxypknbb3k578jz8sa4rsmq5z2yc5010k3nkqp")
|
||||
(fetchbower "videojs-resolution-switcher" "0.4.2" "~0.4.2"
|
||||
"1bz2q1wwdglaxbb20fin9djgs1c71jywxhlrm16hm4bzg708ycaf"
|
||||
)
|
||||
(fetchbower "leaflet" "0.7.7" "~0.7.3" "0jim285bljmxxngpm3yx6bnnd10n2whwkgmmhzpcd1rdksnr5nca")
|
||||
];
|
||||
}
|
||||
@@ -1,7 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
buildBowerComponents,
|
||||
buildNpmPackage,
|
||||
fetchFromSourcehut,
|
||||
fetchpatch,
|
||||
gobject-introspection,
|
||||
gst_all_1,
|
||||
poppler-utils,
|
||||
@@ -34,16 +35,32 @@ let
|
||||
hash = "sha256-Y1VnXLHEl6TR8nt+vKSfoCwleQ+oA2WPMN9q4fW9R3s=";
|
||||
};
|
||||
|
||||
extlib = buildBowerComponents {
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://git.sr.ht/~mediagoblin/mediagoblin/commit/95a591bb2ffdeed059b926059155fd0802e6b1e6.patch";
|
||||
excludes = [ "docs/source/siteadmin/relnotes.rst" ];
|
||||
hash = "sha256-Coff02bewl6E9bHeMy/6tA2dngKcw/c33xk9nmMl/Bk=";
|
||||
})
|
||||
];
|
||||
|
||||
extlib = buildNpmPackage {
|
||||
name = "mediagoblin-extlib";
|
||||
generated = ./bower-packages.nix;
|
||||
inherit src;
|
||||
inherit src patches;
|
||||
|
||||
npmDepsHash = "sha256-wtk5MgsWEpuz3V/EcozEAMOa8UeCgdjhR5wxaiaMugY=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/node_modules/
|
||||
cp -r node_modules/{jquery,video.js,videojs-resolution-switcher,leaflet} $out/node_modules/
|
||||
'';
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
format = "setuptools";
|
||||
pname = "mediagoblin";
|
||||
inherit version src;
|
||||
inherit version src patches;
|
||||
|
||||
postPatch = ''
|
||||
# https://git.sr.ht/~mediagoblin/mediagoblin/tree/bf61d38df21748aadb480c53fdd928647285e35f/item/.guix/modules/mediagoblin-package.scm#L60-62
|
||||
@@ -128,7 +145,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
lndir -silent ${extlib}/bower_components/ $out/${python.sitePackages}/mediagoblin/static/extlib/
|
||||
lndir -silent ${extlib}/node_modules $out/${python.sitePackages}/mediagoblin/static/extlib/
|
||||
|
||||
ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/jquery/dist/jquery.js $out/${python.sitePackages}/mediagoblin/static/js/extlib/jquery.js
|
||||
ln -rs $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/dist/leaflet.css $out/${python.sitePackages}/mediagoblin/static/extlib/leaflet/leaflet.css
|
||||
@@ -151,7 +168,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
pythonImportsCheck = [ "mediagoblin" ];
|
||||
|
||||
passthru = {
|
||||
inherit python;
|
||||
inherit extlib python;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
flint3,
|
||||
flint,
|
||||
gmp,
|
||||
mpfr,
|
||||
llvmPackages,
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
flint3
|
||||
flint
|
||||
gmp
|
||||
mpfr
|
||||
]
|
||||
|
||||
@@ -21,14 +21,16 @@ buildNpmPackage {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fsevents is needed on Darwin, but its dependency "nan" in the upstream package-lock.json
|
||||
# is too old for the Node 18.x in Nixpkgs.
|
||||
# This patch is generated by checking out the upstream source and running
|
||||
# npm update nan --lockfile-version 1
|
||||
./update-nan.patch
|
||||
# Remove the dependency on "nodemon", which is only needed for interactive
|
||||
# development. This package depends on fsevents on macOS, which has
|
||||
# repeatedly caused build problems. This patch is generated by checking out
|
||||
# the upstream source and removing the "nodemon" line, and then running
|
||||
#
|
||||
# npm install --lockfile-version 1
|
||||
./remove-nodemon.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U=";
|
||||
npmDepsHash = "sha256-GyNUPgLJhdjzbIpld916/l8durIw0aQRHojjSmGgEJE=";
|
||||
nativeBuildInputs = [
|
||||
node-gyp
|
||||
python3
|
||||
@@ -43,8 +45,12 @@ buildNpmPackage {
|
||||
cp -r build_old/Release build/
|
||||
rm -rf build_old
|
||||
rm -rf build/Release/.deps
|
||||
|
||||
# Remove a development script to eliminate runtime dependency on node
|
||||
rm node_modules/node-addon-api/tools/conversion.js
|
||||
|
||||
# Remove dangling symlinks
|
||||
rm -rf $out/lib/node_modules/nodehun/node_modules/.bin
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,150 +0,0 @@
|
||||
diff --git a/package-lock.json b/package-lock.json
|
||||
index 3c577dd..64be338 100644
|
||||
--- a/package-lock.json
|
||||
+++ b/package-lock.json
|
||||
@@ -932,10 +932,6 @@
|
||||
"concat-map": "0.0.1"
|
||||
}
|
||||
},
|
||||
- "chownr": {
|
||||
- "version": "1.1.1",
|
||||
- "bundled": true
|
||||
- },
|
||||
"code-point-at": {
|
||||
"version": "1.1.0",
|
||||
"bundled": true,
|
||||
@@ -987,13 +983,6 @@
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
- "fs-minipass": {
|
||||
- "version": "1.2.5",
|
||||
- "bundled": true,
|
||||
- "requires": {
|
||||
- "minipass": "^2.2.1"
|
||||
- }
|
||||
- },
|
||||
"fs.realpath": {
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
@@ -1100,22 +1089,6 @@
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
- "minipass": {
|
||||
- "version": "2.3.5",
|
||||
- "bundled": true,
|
||||
- "optional": true,
|
||||
- "requires": {
|
||||
- "safe-buffer": "^5.1.2",
|
||||
- "yallist": "^3.0.0"
|
||||
- }
|
||||
- },
|
||||
- "minizlib": {
|
||||
- "version": "1.2.1",
|
||||
- "bundled": true,
|
||||
- "requires": {
|
||||
- "minipass": "^2.2.1"
|
||||
- }
|
||||
- },
|
||||
"mkdirp": {
|
||||
"version": "0.5.1",
|
||||
"bundled": true,
|
||||
@@ -1300,6 +1273,7 @@
|
||||
"safe-buffer": {
|
||||
"version": "5.1.2",
|
||||
"bundled": true,
|
||||
+ "dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"safer-buffer": {
|
||||
@@ -1332,24 +1306,24 @@
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
- "string-width": {
|
||||
- "version": "1.0.2",
|
||||
+ "string_decoder": {
|
||||
+ "version": "1.1.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
- "code-point-at": "^1.0.0",
|
||||
- "is-fullwidth-code-point": "^1.0.0",
|
||||
- "strip-ansi": "^3.0.0"
|
||||
+ "safe-buffer": "~5.1.0"
|
||||
}
|
||||
},
|
||||
- "string_decoder": {
|
||||
- "version": "1.1.1",
|
||||
+ "string-width": {
|
||||
+ "version": "1.0.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
- "safe-buffer": "~5.1.0"
|
||||
+ "code-point-at": "^1.0.0",
|
||||
+ "is-fullwidth-code-point": "^1.0.0",
|
||||
+ "strip-ansi": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"strip-ansi": {
|
||||
@@ -1387,11 +1361,6 @@
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
- },
|
||||
- "yallist": {
|
||||
- "version": "3.0.3",
|
||||
- "bundled": true,
|
||||
- "optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -2096,9 +2065,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"nan": {
|
||||
- "version": "2.14.0",
|
||||
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
|
||||
- "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
|
||||
+ "version": "2.17.0",
|
||||
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
|
||||
+ "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
@@ -2768,6 +2737,15 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
+ "string_decoder": {
|
||||
+ "version": "1.1.1",
|
||||
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
|
||||
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
|
||||
+ "dev": true,
|
||||
+ "requires": {
|
||||
+ "safe-buffer": "~5.1.0"
|
||||
+ }
|
||||
+ },
|
||||
"string-width": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
|
||||
@@ -2798,15 +2776,6 @@
|
||||
"function-bind": "^1.1.1"
|
||||
}
|
||||
},
|
||||
- "string_decoder": {
|
||||
- "version": "1.1.1",
|
||||
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
|
||||
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
|
||||
- "dev": true,
|
||||
- "requires": {
|
||||
- "safe-buffer": "~5.1.0"
|
||||
- }
|
||||
- },
|
||||
"strip-ansi": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
gmpxx,
|
||||
flint3,
|
||||
flint,
|
||||
nauty,
|
||||
}:
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
gmpxx
|
||||
flint3
|
||||
flint
|
||||
nauty
|
||||
];
|
||||
|
||||
|
||||
@@ -13,24 +13,24 @@
|
||||
|
||||
assert withGf2x -> gf2x != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ntl";
|
||||
version = "11.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
|
||||
sha256 = "sha256-IQ0GwxMGy8bq9oFEU8Vsd22djo3zbXTrMG9qUj0caoo=";
|
||||
url = "http://www.shoup.net/ntl/ntl-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-IQ0GwxMGy8bq9oFEU8Vsd22djo3zbXTrMG9qUj0caoo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
depsBuildBuild = [
|
||||
perl # needed for ./configure
|
||||
];
|
||||
buildInputs = [
|
||||
gmp
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl # needed for ./configure
|
||||
];
|
||||
|
||||
sourceRoot = "${pname}-${version}/src";
|
||||
sourceRoot = "ntl-${finalAttrs.version}/src";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -42,9 +42,9 @@ stdenv.mkDerivation rec {
|
||||
configurePlatforms = [ ];
|
||||
|
||||
# reference: http://shoup.net/ntl/doc/tour-unix.html
|
||||
dontAddStaticConfigureFlags = true; # perl config doesn't understand it.
|
||||
configureFlags = [
|
||||
"DEF_PREFIX=$(out)"
|
||||
"SHARED=on" # genereate a shared library (as well as static)
|
||||
"NATIVE=off" # don't target code to current hardware (reproducibility, portability)
|
||||
"TUNE=${
|
||||
if tune then
|
||||
@@ -55,15 +55,20 @@ stdenv.mkDerivation rec {
|
||||
"generic" # "chooses options that should be OK for most platforms"
|
||||
}"
|
||||
"CXX=${stdenv.cc.targetPrefix}c++"
|
||||
"AR=${stdenv.cc.targetPrefix}ar"
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isStatic) [
|
||||
"SHARED=on" # genereate a shared library
|
||||
]
|
||||
++ lib.optionals withGf2x [
|
||||
"NTL_GF2X_LIB=on"
|
||||
"GF2X_PREFIX=${gf2x}"
|
||||
];
|
||||
|
||||
enableParallelChecking = true;
|
||||
doCheck = true; # takes some time
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Library for doing Number Theory";
|
||||
longDescription = ''
|
||||
NTL is a high-performance, portable C++ library providing data
|
||||
@@ -76,11 +81,11 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.shoup.net/ntl/";
|
||||
# also locally at "${src}/doc/tour-changes.html";
|
||||
changelog = "https://www.shoup.net/ntl/doc/tour-changes.html";
|
||||
teams = [ teams.sage ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
teams = [ lib.teams.sage ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
# Does not cross compile
|
||||
# https://github.com/libntl/ntl/issues/8
|
||||
broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
xorg.libxcb
|
||||
xorg.libX11
|
||||
xorg.libXrandr
|
||||
xorg.libXcursor
|
||||
|
||||
@@ -12,13 +12,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "odin";
|
||||
version = "dev-2025-08";
|
||||
version = "dev-2025-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "odin-lang";
|
||||
repo = "Odin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-08a5MFnHiG/HsetF7V913Hozev2rm1PaXdA/QJcDXTk=";
|
||||
hash = "sha256-PxegNMEzxytZtmhmzDgb1Umzx/9aUIlc9SDojRlZfsE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
abseil-cpp_202407,
|
||||
cmake,
|
||||
cpuinfo,
|
||||
@@ -84,7 +85,15 @@ effectiveStdenv.mkDerivation rec {
|
||||
pname = "onnxruntime";
|
||||
inherit src version;
|
||||
|
||||
patches = lib.optionals cudaSupport [
|
||||
patches = [
|
||||
# https://github.com/microsoft/onnxruntime/pull/24583
|
||||
(fetchpatch {
|
||||
name = "fix-compilation-with-gcc-15.patch";
|
||||
url = "https://github.com/microsoft/onnxruntime/commit/f7619dc93f592ddfc10f12f7145f9781299163a0.patch";
|
||||
hash = "sha256-jxfMB+/Zokcu5DSfZP7QV1E8mTrsLe/sMr+ZCX/Y3m0=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
# We apply the referenced 1064.patch ourselves to our nix dependency.
|
||||
# FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0
|
||||
./nvcc-gsl.patch
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
curl,
|
||||
libtins,
|
||||
mongosh,
|
||||
usrsctp,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -75,23 +76,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libyaml
|
||||
libmicrohttpd
|
||||
libgcrypt
|
||||
lksctp-tools
|
||||
libidn
|
||||
openssl
|
||||
curl
|
||||
libtins
|
||||
gnutls
|
||||
libnghttp2.dev
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
lksctp-tools
|
||||
]
|
||||
++ lib.optionals (!stdenv.isLinux) [
|
||||
usrsctp
|
||||
];
|
||||
|
||||
# For subproject
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=array-bounds"
|
||||
"-Wno-error=stringop-overflow"
|
||||
];
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
cp -R --no-preserve=mode,ownership ${finalAttrs.diameter} subprojects/freeDiameter
|
||||
cp -R --no-preserve=mode,ownership ${finalAttrs.libtins} subprojects/libtins
|
||||
|
||||
@@ -191,6 +191,5 @@ stdenv.mkDerivation rec {
|
||||
license = with licenses; [ asl20 ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
licenses.gpl2Plus
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ _8aed ];
|
||||
mainProgram = "passt";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "podman-tui";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lTgILCaisnCXMnNL6DSGIszJBC3GiPStZzol3dCm/7s=";
|
||||
hash = "sha256-lvqitz4H10ILg2b6Mlw1DoWoByFKJaDiCo5zTlzTBQ4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
flint3,
|
||||
flint,
|
||||
gmp,
|
||||
}:
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
flint3
|
||||
flint
|
||||
gmp
|
||||
];
|
||||
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "proton-ge-bin";
|
||||
version = "GE-Proton10-16";
|
||||
version = "GE-Proton10-17";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-pwnYnO6JPoZS8w2kge98WQcTfclrx7U2vwxGc6uj9k4=";
|
||||
hash = "sha256-GMwAAKuaBhDv1TvAuW9DVcXSYPRM87NP6NnJfk8O8ZU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -42,18 +42,27 @@ stdenv.mkDerivation rec {
|
||||
yaml-cpp
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString isLinux ''
|
||||
substituteInPlace doc/docbook_man.debian.xsl \
|
||||
--replace /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook\.xsl ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl
|
||||
'';
|
||||
postPatch =
|
||||
let
|
||||
file = "doc/docbook_man.${if isLinux then "debian" else "macports"}.xsl";
|
||||
path =
|
||||
if isLinux then
|
||||
"/usr/share/xml/docbook/stylesheet/docbook-xsl"
|
||||
else
|
||||
"/opt/local/share/xsl/docbook-xsl-nons";
|
||||
in
|
||||
''
|
||||
substituteInPlace ${file} \
|
||||
--replace ${path}/manpages/docbook\.xsl ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_MAN=ON"
|
||||
"-DCMAKE_INSTALL_FULL_MANDIR=share/man"
|
||||
"-DINSTALL_UDEV_RULES=OFF"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage doc/dmrconf.1 doc/qdmr.1
|
||||
postInstall = lib.optionalString isLinux ''
|
||||
mkdir -p "$out/etc/udev/rules.d"
|
||||
cp ${src}/dist/99-qdmr.rules $out/etc/udev/rules.d/
|
||||
'';
|
||||
@@ -65,6 +74,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://dm3mat.darc.de/qdmr/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ _0x4A6F ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "radicale";
|
||||
version = "3.5.6";
|
||||
version = "3.5.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kozea";
|
||||
repo = "Radicale";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jMqy6vFT2DwF8NsANBm2Z+ApIBDUXqNaBbk+8zObQOI=";
|
||||
hash = "sha256-+vYLBd4psPxL2NkH8zriRpLUGK6cWrrkJyV230LePVE=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "25.2.4";
|
||||
version = "25.2.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "redpanda";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-atT2e5vzOKYBD3IHmgpq12ew4mxXWEmKQiwgIwW0+j4=";
|
||||
sha256 = "sha256-hSL2IsequX/gsBnk7C0JkDDPjreoPhmsNgpR+x6hFUE=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "rqlite";
|
||||
version = "9.0.1";
|
||||
version = "9.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rqlite";
|
||||
repo = "rqlite";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ll8F5doXHG3Nq3LisSpy5iuh9JhA6/HsBwrSPDGs57c=";
|
||||
hash = "sha256-q2T5Ze+rR2KfBvrtIiVa9W8DICxErdeRLA3aNKbyMCo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Mq469sUYgS19SVJ7noTUl7hml9xUAGDsr64MJM8Xq9g=";
|
||||
|
||||
Generated
+45
-45
@@ -43,9 +43,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Analyzers",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-dlQ7KyYZLqSE3D0j6ZAPBv8gbSuE+8IVQhJAeoo2K8g=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25418.8/microsoft.codeanalysis.analyzers.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-BsNPX6p08WG5unEZOq/m8c9iKQ2tcX8LiUj2Icf9Mm8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25452.2/microsoft.codeanalysis.analyzers.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
|
||||
@@ -55,27 +55,27 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Common",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-O1yCn9+EAwtxZ/GwmAcyDWDPrhjMM4jAuSHvDYCMYiI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25418.8/microsoft.codeanalysis.common.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-C5ymxF29vgwu9Jwl7CwNEf4+zpb7fFLUdBGPVnf+Ixs=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25452.2/microsoft.codeanalysis.common.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-aO1ZCPkpE0SiF1YgELlOVTe2Mq6mbdZhc8acKsgGYCM=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-foZzAkEdfdtvF3WJwUhdC51KeBHnTdBoH+JGV5XD5A0=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp.Features",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-KFlqI0142Cli+8LgWlfK1DCNO+TlFPQK8NtmCvJZz6A=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.features.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-3J+9YhYUePNRX8sWJQNbK3G/FjS+sh5ML1ix1zn5B5Q=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.features.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-TigMGogMhbbRaWR4/9Aj+o5lxmVWUoIjBtmUiBHFhxM=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25418.8/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-Wnqq7HFdRvwde+tx1fLufiVOeAZul5jDasswEKFLhdk=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Elfie",
|
||||
@@ -85,21 +85,21 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-153NrMy6dA1FuUD0XfRASHiALANMSKXIigf49pQ8emI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25418.8/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-cfOyGxroU5SZAUar6YROo2o6lsr2lVAkYMQopIsIRnc=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25452.2/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Features",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-dYmfiCnerjAArbF4LuXNi6oF9dY8lcDw2M3MX1IswhI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25418.8/microsoft.codeanalysis.features.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-3flzK3w1P+YEm93XeKyWKKu0de7uaSJhRR6CjDi2uAo=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25452.2/microsoft.codeanalysis.features.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.LanguageServer.Protocol",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-cgAS5pZY6qb2I8QlTaDWl3zLGURNBblPKf69lYHF+xc=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25418.8/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-VbfgcAULLmLjGHfqYD1ohJPLZn65b8JFaOnP0kucqJg=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25452.2/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
|
||||
@@ -109,27 +109,27 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Remote.Workspaces",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-bHlIsWZus8Ms10WTAgSsKaAsIWyxwCMLd3zfXO3eFXA=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25418.8/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-jYHylTS3OO84UFz1vfB8ST/k5G/XI6Ks4lOE5DYlPcw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25452.2/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Scripting.Common",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-jmvE90GOWoZLsHcX0SaBHXSJIfDeL/s/47k7uaG0DiE=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25418.8/microsoft.codeanalysis.scripting.common.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-dG632yqX95EwXqDfhnBwhbS1/fuex7fUjM/wUnPQaR0=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25452.2/microsoft.codeanalysis.scripting.common.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Workspaces.Common",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-+LI3eEQDmdLTGaab4gu225NblD1l+RWZ+noosDWbxFM=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25418.8/microsoft.codeanalysis.workspaces.common.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-JNadLPLKA2wuThQABqj3/PKPhMTrn72VjNumkGbkNm4=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25452.2/microsoft.codeanalysis.workspaces.common.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CommonLanguageServerProtocol.Framework",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-b5QMnPTP/+wpkD2RmS6UtaO5RNYC3PxirboyVgniG04=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25418.8/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-b/kxQt5KyluSGkkmFzy9+EGlTOW5gBv3bkM/t5PbB+8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25452.2/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CSharp",
|
||||
@@ -145,15 +145,15 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.DotNet.Arcade.Sdk",
|
||||
"version": "9.0.0-beta.25255.5",
|
||||
"hash": "sha256-AgHPYDKvoO3a2zoRSgnokC6XrF521V1lQ9KEPcKyS5E=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25255.5/microsoft.dotnet.arcade.sdk.9.0.0-beta.25255.5.nupkg"
|
||||
"version": "9.0.0-beta.25428.3",
|
||||
"hash": "sha256-imlZjZcVWjNXO0yZmSoXPOlxX/qaJ96LeN8Xb/ox+Vk=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25428.3/microsoft.dotnet.arcade.sdk.9.0.0-beta.25428.3.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.DotNet.XliffTasks",
|
||||
"version": "9.0.0-beta.25255.5",
|
||||
"hash": "sha256-yigTPcb88S+1FUal0K/fL5pu5I/dmPACAo2sPOTDfZk=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25255.5/microsoft.dotnet.xlifftasks.9.0.0-beta.25255.5.nupkg"
|
||||
"version": "9.0.0-beta.25428.3",
|
||||
"hash": "sha256-4Jgieh85GiTg8rmQb3esR0UZTuj+L2cLzwyC0ziOBDc=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25428.3/microsoft.dotnet.xlifftasks.9.0.0-beta.25428.3.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
@@ -181,9 +181,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Net.Compilers.Toolset",
|
||||
"version": "5.0.0-2.25418.8",
|
||||
"hash": "sha256-/Vr5J7ORwruP5mLMeVdbUPjUWYmCbLmZbi+aJBq8HmU=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25418.8/microsoft.net.compilers.toolset.5.0.0-2.25418.8.nupkg"
|
||||
"version": "5.0.0-2.25452.2",
|
||||
"hash": "sha256-lrjvenHm6/z8Fy37UaUdKjM36zlwe43revlQjg+aqV4=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25452.2/microsoft.net.compilers.toolset.5.0.0-2.25452.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.StringTools",
|
||||
|
||||
@@ -29,11 +29,11 @@ buildDotnetModule {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotnet";
|
||||
repo = "razor";
|
||||
rev = "f2270a5492e831864b60a8853c7435ded110ad6f";
|
||||
hash = "sha256-QMeIQmX/1W3N3r27fG5/Q6CsW/Wh+EI5+poGlJ2sbsQ=";
|
||||
rev = "bde4f70c9560811a7f25023b9d8ac42fd7d0e99f";
|
||||
hash = "sha256-wS7JKHLpX9/JluID94HXUkepaX9eoceRzuIofBICiBk=";
|
||||
};
|
||||
|
||||
version = "10.0.0-preview.25424.9";
|
||||
version = "10.0.0-preview.25464.2";
|
||||
projectFile = "src/Razor/src/rzls/rzls.csproj";
|
||||
useDotnetFromEnv = true;
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
@@ -2,29 +2,36 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "s5";
|
||||
version = "0.1.15";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvisonneau";
|
||||
repo = "s5";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QQMnzDRWdW0awwNx2vqtzrOW9Ua7EmJ9YFznQoK33J0=";
|
||||
hash = "sha256-aNNf7ntGg2A84jD6UeoF4gFv8S/FonbIhV3ZOd/P4bw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-axcZ4XzgsPVU9at/g3WS8Hv92P2hmZRb+tUfw+h9iH0=";
|
||||
vendorHash = "sha256-NmnYv0yAHmlOY9UK7GQtb5e9DwbyEbqQ2O6cpqkwtww=";
|
||||
|
||||
subPackages = [ "cmd/s5" ];
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=v${version}"
|
||||
"-X github.com/mvisonneau/s5/internal/app.Version=v${version}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cipher/decipher text within a file";
|
||||
mainProgram = "s5";
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
fetchFromGitLab,
|
||||
stdenv,
|
||||
|
||||
flint3,
|
||||
flint,
|
||||
gmp,
|
||||
libmpc,
|
||||
mpfr,
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
lib.optional withArb flint3
|
||||
lib.optional withArb flint
|
||||
++ lib.optionals withGMP [
|
||||
gmp
|
||||
mpfr
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
self: super: {
|
||||
# `sagelib`, i.e. all of sage except some wrappers and runtime dependencies
|
||||
sagelib = self.callPackage ./sagelib.nix {
|
||||
inherit flint3;
|
||||
inherit flint;
|
||||
inherit sage-src env-locations singular;
|
||||
inherit (maxima) lisp-compiler;
|
||||
linbox = pkgs.linbox;
|
||||
@@ -79,7 +79,7 @@ let
|
||||
python3
|
||||
singular
|
||||
palp
|
||||
flint3
|
||||
flint
|
||||
pythonEnv
|
||||
maxima
|
||||
;
|
||||
@@ -142,7 +142,7 @@ let
|
||||
extraLibs = pythonRuntimeDeps;
|
||||
}; # make the libs accessible
|
||||
|
||||
singular = pkgs.singular.override { inherit flint3; };
|
||||
singular = pkgs.singular.override { inherit flint; };
|
||||
|
||||
maxima = pkgs.maxima-ecl.override {
|
||||
lisp-compiler = pkgs.ecl.override {
|
||||
@@ -164,7 +164,7 @@ let
|
||||
# openblas instead of openblasCompat. Apparently other packages somehow use flints
|
||||
# blas when it is available. Alternative would be to override flint to use
|
||||
# openblasCompat.
|
||||
flint3 = pkgs.flint3.override { withBlas = false; };
|
||||
flint = pkgs.flint.override { withBlas = false; };
|
||||
|
||||
# Multiple palp dimensions need to be available and sage expects them all to be
|
||||
# in the same folder.
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
rubiks,
|
||||
blas,
|
||||
lapack,
|
||||
flint3,
|
||||
flint,
|
||||
gmp,
|
||||
mpfr,
|
||||
zlib,
|
||||
@@ -167,7 +167,7 @@ writeTextFile rec {
|
||||
export LDFLAGS='${
|
||||
lib.concatStringsSep " " (
|
||||
map (pkg: "-L${pkg}/lib") [
|
||||
flint3
|
||||
flint
|
||||
gap
|
||||
glpk
|
||||
gmp
|
||||
@@ -187,7 +187,7 @@ writeTextFile rec {
|
||||
singular
|
||||
gmp.dev
|
||||
glpk
|
||||
flint3
|
||||
flint
|
||||
gap
|
||||
mpfr.dev
|
||||
]
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
eclib,
|
||||
ecm,
|
||||
fflas-ffpack,
|
||||
flint3,
|
||||
flint,
|
||||
gap,
|
||||
giac,
|
||||
givaro,
|
||||
@@ -136,7 +136,7 @@ buildPythonPackage rec {
|
||||
eclib
|
||||
ecm
|
||||
fflas-ffpack
|
||||
flint3
|
||||
flint
|
||||
gap
|
||||
giac
|
||||
givaro
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sc-controller";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "C0rn3j";
|
||||
repo = "sc-controller";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-w7jVh0d8u6csXOQ6pjUCSD3R/qFVqTa2gcGa47pqn/0=";
|
||||
hash = "sha256-iieSKUTZwb1cInh/hz2cDvUFHf3p9Y5E4kR+YyZoNxI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "scryer-prolog";
|
||||
version = "0.9.4";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mthom";
|
||||
repo = "scryer-prolog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU=";
|
||||
hash = "sha256-RCz4zLbmWgSRR6Y5YbhidIZ1+LNR6FHyk/G0ifSDOx4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CuCVofzKd/VPBTZY+ubk5wP9akt9kQLyi221fg7yt3M=";
|
||||
cargoHash = "sha256-8uFxCLKa8hnGPpilxtV5SxHUG4Nf704A0qG2zpoIK4s=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.0.1253";
|
||||
version = "1.0.1256";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lollipopkit";
|
||||
repo = "flutter_server_box";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UflskghSx9ODQ8q2TI9DRjfmWSxp5wSDYGomUcv/Oy4=";
|
||||
hash = "sha256-V4Y4JoUsca2MmPJd1t+IWrNiIj5oslaj6736rPUT9hM=";
|
||||
};
|
||||
in
|
||||
flutter335.buildFlutterApplication {
|
||||
@@ -37,7 +37,7 @@ flutter335.buildFlutterApplication {
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "server-box";
|
||||
exec = "server-box";
|
||||
exec = "ServerBox";
|
||||
icon = "server-box";
|
||||
genericName = "ServerBox";
|
||||
desktopName = "ServerBox";
|
||||
@@ -78,9 +78,10 @@ flutter335.buildFlutterApplication {
|
||||
meta = {
|
||||
description = "Server status & toolbox";
|
||||
homepage = "https://github.com/lollipopkit/flutter_server_box";
|
||||
changelog = "https://github.com/lollipopkit/flutter_server_box/releases/tag/${src.tag}";
|
||||
mainProgram = "ServerBox";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ ulysseszhan ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simdjson";
|
||||
version = "3.13.0";
|
||||
version = "4.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdjson";
|
||||
repo = "simdjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Vzw1FpFjg3Tun1Sfk7H4h4tY7lfnjE1Wk+W82K7dcW0=";
|
||||
sha256 = "sha256-e3W5p4MUv0sE7JazWFJ3mCqo2D/A3jVHhNedSOURMv8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
sharutils,
|
||||
file,
|
||||
getconf,
|
||||
flint3,
|
||||
flint,
|
||||
ntl,
|
||||
mpfr,
|
||||
cddlib,
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"--enable-gfanlib"
|
||||
"--with-ntl=${ntl}"
|
||||
"--with-flint=${flint3}"
|
||||
"--with-flint=${flint}"
|
||||
]
|
||||
++ lib.optionals enableDocs [
|
||||
"--enable-doc-build"
|
||||
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
# necessary
|
||||
gmp
|
||||
flint3
|
||||
flint
|
||||
# by upstream recommended but optional
|
||||
ncurses
|
||||
readline
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "slumber";
|
||||
version = "3.4.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LucasPickering";
|
||||
repo = "slumber";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RI5+SbVPtIEaudNV+S/HiKDATRy93CIQX/RvNJmBoos=";
|
||||
hash = "sha256-Xr4jAQ3G5El9FU6qOJJARjkZmTZly8pb//ElQizOHSg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-i6ovc8aWgB9mABuSetdFNPKjOIRKFig2mbowY2djxWA=";
|
||||
cargoHash = "sha256-Di3Kqwa63AWwZE1VOal+mqmYe/nzPFqis1MnawW9uZo=";
|
||||
|
||||
meta = {
|
||||
description = "Terminal-based HTTP/REST client";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "smtp4dev";
|
||||
version = "3.10.1";
|
||||
version = "3.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rnwood";
|
||||
repo = "smtp4dev";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bhS2/YO7jejw6+qx6EdLH98SnxeqMWajSz8i7ocNVX8=";
|
||||
hash = "sha256-0j5r5YO1wHg3N/OX81UE2YCqhqIaQuSGZa2uh2y+zqs=";
|
||||
};
|
||||
|
||||
patches = [ ./smtp4dev-npm-packages.patch ];
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
libappindicator,
|
||||
librsvg,
|
||||
udevCheckHook,
|
||||
acl,
|
||||
}:
|
||||
|
||||
# Although we copy in the udev rules here, you probably just want to use
|
||||
@@ -62,6 +63,11 @@ python3Packages.buildPythonApplication rec {
|
||||
pytest-cov-stub
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace lib/solaar/listener.py \
|
||||
--replace-fail /usr/bin/getfacl "${lib.getExe' acl "getfacl"}"
|
||||
'';
|
||||
|
||||
# the -cli symlink is just to maintain compabilility with older versions where
|
||||
# there was a difference between the GUI and CLI versions.
|
||||
postInstall = ''
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gmp,
|
||||
flint3,
|
||||
flint,
|
||||
mpfr,
|
||||
libmpc,
|
||||
withShared ? true,
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
flint3
|
||||
flint
|
||||
mpfr
|
||||
libmpc
|
||||
];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "symfony-cli";
|
||||
version = "5.13.0";
|
||||
version = "5.14.2";
|
||||
vendorHash = "sha256-SGD8jFRvdJ5GOeQiW3Whe6EnybQ60wOsC/OureOCn7k=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symfony-cli";
|
||||
repo = "symfony-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F+OES8F2KdYuIq28z02/8HINddfbZuxY/pJtcx9V3xk=";
|
||||
hash = "sha256-qgCuerKn7R4bn3YgzpMprIUDfn2SJdIiXC+9avnzDm4=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE
|
||||
|
||||
@@ -13,19 +13,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "taze";
|
||||
version = "19.5.0";
|
||||
version = "19.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antfu-collective";
|
||||
repo = "taze";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TJ/gyqGTaaRYgx9EMFhFmzWAFrNRnESk6AvBZtQ+24k=";
|
||||
hash = "sha256-O+xeAM6sh6YK+yAtxQCTI59Dle/6Z4/ePbgqRGmZxlU=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-kTXW/KYI1ao7zIyIphMPxjfuo7RrEnmXXEK7yTRWO+U=";
|
||||
hash = "sha256-vXw5LPNcuF9wyI23rZhsvvMYTsPNOvSY3LoLntFdm3g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
udev,
|
||||
wrapGAppsHook3,
|
||||
writeScript,
|
||||
sqlite,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
|
||||
alsa-lib
|
||||
libsecret
|
||||
libgbm
|
||||
sqlite
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
alsa-lib,
|
||||
curl,
|
||||
freetype,
|
||||
gtk3,
|
||||
libGL,
|
||||
libX11,
|
||||
libXcursor,
|
||||
libXext,
|
||||
libXinerama,
|
||||
webkitgtk_4_0,
|
||||
libXrandr,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
@@ -36,12 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
alsa-lib
|
||||
curl
|
||||
freetype
|
||||
gtk3
|
||||
libGL
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXinerama
|
||||
webkitgtk_4_0
|
||||
libXrandr
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
@@ -60,11 +62,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/{lv2,vst,vst3/Tunefish4.vst3}
|
||||
mkdir -p $out/lib/{lv2,vst,vst3}
|
||||
|
||||
pushd src/tunefish4/Builds/LinuxMakefile/build
|
||||
cp -r "Tunefish4.lv2" $out/lib/lv2
|
||||
cp -r "Tunefish4.vst3/Contents/x86_64-linux"/* $out/lib/vst3/Tunefish4.vst3
|
||||
cp -r "Tunefish4.vst3" $out/lib/vst3
|
||||
cp "Tunefish4.so" $out/lib/vst
|
||||
popd
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
gdk-pixbuf,
|
||||
@@ -9,7 +10,7 @@
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
wrapGAppsHook3,
|
||||
webkitgtk_4_0,
|
||||
webkitgtk_4_1,
|
||||
libnotify,
|
||||
keybinder3,
|
||||
libappindicator,
|
||||
@@ -48,7 +49,7 @@ python3Packages.buildPythonApplication rec {
|
||||
libappindicator
|
||||
libnotify
|
||||
librsvg
|
||||
webkitgtk_4_0
|
||||
webkitgtk_4_1
|
||||
wmctrl
|
||||
];
|
||||
|
||||
@@ -80,6 +81,11 @@ python3Packages.buildPythonApplication rec {
|
||||
patches = [
|
||||
./fix-path.patch
|
||||
./fix-extensions.patch
|
||||
(fetchpatch {
|
||||
name = "support-gir1.2-webkit2-4.1.patch";
|
||||
url = "https://src.fedoraproject.org/rpms/ulauncher/raw/rawhide/f/support-gir1.2-webkit2-4.1.patch";
|
||||
hash = "sha256-w1c+Yf6SA3fyMrMn1LXzCXf5yuynRYpofkkUqZUKLS8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -198,7 +198,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Unreal Tournament GOTY (1999) with the OldUnreal patch";
|
||||
license = licenses.unfree;
|
||||
platforms = attrNames srcs;
|
||||
maintainers = with maintainers; [ eliandoran ];
|
||||
maintainers = with maintainers; [
|
||||
eliandoran
|
||||
dwt
|
||||
];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "ut1999";
|
||||
};
|
||||
|
||||
@@ -7,8 +7,15 @@
|
||||
alsa-lib,
|
||||
udev,
|
||||
shaderc,
|
||||
xorg,
|
||||
libxcb,
|
||||
libxkbcommon,
|
||||
autoPatchelfHook,
|
||||
libX11,
|
||||
libXi,
|
||||
libXcursor,
|
||||
libXrandr,
|
||||
wayland,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -47,12 +54,18 @@ rustPlatform.buildRustPackage {
|
||||
EOF
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
udev
|
||||
xorg.libxcb
|
||||
libxcb
|
||||
libxkbcommon
|
||||
shaderc
|
||||
stdenv.cc.cc # libgcc_s.so.1
|
||||
];
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
@@ -77,18 +90,20 @@ rustPlatform.buildRustPackage {
|
||||
# Some tests require internet access
|
||||
doCheck = false;
|
||||
|
||||
postFixup = ''
|
||||
# Add required but not explicitly requested libraries
|
||||
patchelf --add-rpath '${
|
||||
lib.makeLibraryPath [
|
||||
xorg.libX11
|
||||
xorg.libXi
|
||||
xorg.libXcursor
|
||||
xorg.libXrandr
|
||||
appendRunpaths = [
|
||||
(lib.makeLibraryPath (
|
||||
[
|
||||
libX11
|
||||
libXi
|
||||
libXcursor
|
||||
libXrandr
|
||||
vulkan-loader
|
||||
]
|
||||
}' "$out/bin/veloren-voxygen"
|
||||
'';
|
||||
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform wayland) [
|
||||
wayland
|
||||
]
|
||||
))
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Icons
|
||||
@@ -99,13 +114,13 @@ rustPlatform.buildRustPackage {
|
||||
mkdir -p "$out/share/veloren"; cp -ar assets "$out/share/veloren/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Open world, open source voxel RPG";
|
||||
homepage = "https://www.veloren.net";
|
||||
license = licenses.gpl3;
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "veloren-voxygen";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
rnhmjoj
|
||||
tomodachi94
|
||||
];
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
openjdk,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "visual-paradigm-ce";
|
||||
version = "17.3.20250906";
|
||||
|
||||
src =
|
||||
let
|
||||
splitted = lib.versions.splitVersion finalAttrs.version;
|
||||
majorMinor = builtins.concatStringsSep "." (lib.dropEnd 1 splitted);
|
||||
suffix = lib.last splitted;
|
||||
in
|
||||
fetchurl {
|
||||
url = "https://eu8.dl.visual-paradigm.com/visual-paradigm/vpce${majorMinor}/${suffix}/Visual_Paradigm_CE_${
|
||||
builtins.replaceStrings [ "." ] [ "_" ] majorMinor
|
||||
}_${suffix}_Linux64_InstallFree.tar.gz";
|
||||
hash = "sha256-9BaAJKzK8jjQ1W+eSyJFI2NfizNCwY7PpSZoje2Zd38=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "visualparadigm";
|
||||
desktopName = "Visual Paradigm";
|
||||
exec = "Visual_Paradigm %f";
|
||||
icon = "vpuml";
|
||||
})
|
||||
(makeDesktopItem {
|
||||
name = "visualparadigmproductselector";
|
||||
desktopName = "Visual Paradigm Product Selector";
|
||||
exec = "Visual_Paradigm_Product_Selector";
|
||||
icon = "ProductSelector";
|
||||
})
|
||||
(makeDesktopItem {
|
||||
name = "visualparadigmshapeeditor";
|
||||
desktopName = "Visual Paradigm Shape Editor";
|
||||
exec = "Visual_Paradigm_Shape_Editor";
|
||||
icon = "vpuml";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D Application/resources/vpuml.png $out/share/icons/hicolor/512x512/apps/vpuml.png
|
||||
install -D Application/resources/ProductSelector.png $out/share/icons/hicolor/512x512/apps/ProductSelector.png
|
||||
|
||||
mkdir -p $out/{bin,share/visual-paradigm-ce}
|
||||
mv {Application,.install4j} $out/share/visual-paradigm-ce/
|
||||
|
||||
for bin in Visual_Paradigm Visual_Paradigm_Product_Selector Visual_Paradigm_Shape_Editor; do
|
||||
substituteInPlace $out/share/visual-paradigm-ce/Application/bin/$bin \
|
||||
--replace-fail '# INSTALL4J_JAVA_HOME_OVERRIDE=' "INSTALL4J_JAVA_HOME_OVERRIDE=${openjdk}" \
|
||||
--replace-fail 'app_home=../../' "app_home=${placeholder "out"}/share/visual-paradigm-ce"
|
||||
ln -s $out/share/visual-paradigm-ce/Application/bin/$bin $out/bin/
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "All-in-one UML CASE tool for software development";
|
||||
homepage = "https://www.visual-paradigm.com/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
binaryBytecode
|
||||
binaryNativeCode
|
||||
];
|
||||
mainProgram = "Visual_Paradigm";
|
||||
};
|
||||
})
|
||||
@@ -45,6 +45,10 @@
|
||||
libnotify,
|
||||
buildFHSEnv,
|
||||
writeShellScript,
|
||||
runCommandLocal,
|
||||
cacert,
|
||||
coreutils,
|
||||
curl,
|
||||
}:
|
||||
let
|
||||
wechat-uos-env = stdenvNoCC.mkDerivation {
|
||||
@@ -123,66 +127,84 @@ let
|
||||
bzip2
|
||||
];
|
||||
|
||||
sources = import ./sources.nix;
|
||||
wechat =
|
||||
let
|
||||
sources = import ./sources.nix;
|
||||
|
||||
wechat = stdenvNoCC.mkDerivation rec {
|
||||
pname = "wechat-uos";
|
||||
version = sources.version;
|
||||
pname = "wechat-uos";
|
||||
version = sources.version;
|
||||
fetch =
|
||||
{
|
||||
url,
|
||||
hash,
|
||||
}:
|
||||
runCommandLocal "wechat-uos-${version}-src"
|
||||
{
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = hash;
|
||||
|
||||
src =
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = sources.amd64_url;
|
||||
hash = sources.amd64_hash;
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = sources.arm64_url;
|
||||
hash = sources.arm64_hash;
|
||||
};
|
||||
loongarch64-linux = fetchurl {
|
||||
url = sources.loongarch64_url;
|
||||
hash = sources.loongarch64_hash;
|
||||
};
|
||||
}
|
||||
.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
coreutils
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
}
|
||||
''
|
||||
curl -A "debian APT-HTTP/1.3 (1.6.11)" --retry 3 --retry-delay 3 -L "${url}" > $out
|
||||
'';
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
srcs = {
|
||||
x86_64-linux = fetch sources.amd64;
|
||||
aarch64-linux = fetch sources.arm64;
|
||||
loongarch64-linux = fetch sources.loongarch64;
|
||||
};
|
||||
|
||||
dpkg -x $src ./wechat-uos
|
||||
src =
|
||||
srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname src version;
|
||||
|
||||
# Use ln for license to prevent being garbage collection
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
cp -r wechat-uos/* $out
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
dpkg -x $src ./wechat-uos
|
||||
|
||||
meta = with lib; {
|
||||
description = "Messaging app";
|
||||
homepage = "https://weixin.qq.com/";
|
||||
license = licenses.unfree;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"loongarch64-linux"
|
||||
];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [
|
||||
pokon548
|
||||
xddxdd
|
||||
];
|
||||
mainProgram = "wechat-uos";
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
# Use ln for license to prevent being garbage collection
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
|
||||
cp -r wechat-uos/* $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Messaging app";
|
||||
homepage = "https://weixin.qq.com/";
|
||||
license = licenses.unfree;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"loongarch64-linux"
|
||||
];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [
|
||||
pokon548
|
||||
xddxdd
|
||||
];
|
||||
mainProgram = "wechat-uos";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
buildFHSEnv {
|
||||
inherit (wechat) pname version meta;
|
||||
|
||||
@@ -1,11 +1,17 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2025-02-21
|
||||
# Last updated: 2025-09-25
|
||||
{
|
||||
version = "4.0.1.12";
|
||||
amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_amd64.deb";
|
||||
arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_arm64.deb";
|
||||
loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_loongarch64.deb";
|
||||
amd64_hash = "sha256-u0NbuB06my+v8yUxQ9CKSHp4nxHAcMEhVzbAozM9nQU=";
|
||||
arm64_hash = "sha256-GZnIMikYS+TGvTrEl+PT7KyjmXOXXOc0PMxp3Xfpqo8=";
|
||||
loongarch64_hash = "sha256-dON2EW1+2aiiCTuBdc+IwRAmC/x2bEcQcZcar7WOfZo=";
|
||||
amd64 = {
|
||||
url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_amd64.deb";
|
||||
hash = "sha256-u0NbuB06my+v8yUxQ9CKSHp4nxHAcMEhVzbAozM9nQU=";
|
||||
};
|
||||
arm64 = {
|
||||
url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_arm64.deb";
|
||||
hash = "sha256-GZnIMikYS+TGvTrEl+PT7KyjmXOXXOc0PMxp3Xfpqo8=";
|
||||
};
|
||||
loongarch64 = {
|
||||
url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_loongarch64.deb";
|
||||
hash = "sha256-dON2EW1+2aiiCTuBdc+IwRAmC/x2bEcQcZcar7WOfZo=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert nix-prefetch-git gzip
|
||||
|
||||
base_url_suffix="https://pro-store-packages.uniontech.com/appstore/dists/eagle/appstore/binary-"
|
||||
base_url_suffix="https://pro-store-packages.uniontech.com/appstore/dists/eagle-pro/appstore/binary-"
|
||||
base_url_appendix="/Packages.gz"
|
||||
target_package="com.tencent.wechat"
|
||||
packages_file="Packages.gz"
|
||||
@@ -13,7 +13,7 @@ hash=()
|
||||
for i in amd64 arm64 loongarch64
|
||||
do
|
||||
current_url=$base_url_suffix$i$base_url_appendix
|
||||
curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:125.0) Gecko/20100101 Firefox/125.0" -v -L -O $current_url
|
||||
curl -A "debian APT-HTTP/1.3 (1.6.11)" -v -L -O $current_url
|
||||
current_version=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" '
|
||||
BEGIN { found = 0 }
|
||||
{
|
||||
@@ -39,8 +39,8 @@ do
|
||||
}
|
||||
}
|
||||
')
|
||||
hash+=("$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $sha256sum)")
|
||||
url+=("https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_"$version"_"$i".deb")
|
||||
hash+=("$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $sha256sum)")
|
||||
done
|
||||
|
||||
cat >sources.nix <<EOF
|
||||
@@ -48,12 +48,18 @@ cat >sources.nix <<EOF
|
||||
# Last updated: $(date +%F)
|
||||
{
|
||||
version = "${version[0]}";
|
||||
amd64_url = "${url[0]}";
|
||||
arm64_url = "${url[1]}";
|
||||
loongarch64_url = "${url[2]}";
|
||||
amd64_hash = "${hash[0]}";
|
||||
arm64_hash = "${hash[1]}";
|
||||
loongarch64_hash = "${hash[2]}";
|
||||
amd64 = {
|
||||
url = "${url[0]}";
|
||||
hash = "${hash[0]}";
|
||||
};
|
||||
arm64 = {
|
||||
url = "${url[1]}";
|
||||
hash = "${hash[1]}";
|
||||
};
|
||||
loongarch64 = {
|
||||
url = "${url[2]}";
|
||||
hash = "${hash[2]}";
|
||||
};
|
||||
}
|
||||
EOF
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ import sys, os, json, base64, re, argparse, urllib.request, time
|
||||
from typing import Dict, Optional, Tuple
|
||||
from pathlib import Path
|
||||
|
||||
DEFAULT_JSON = "https://raw.githubusercontent.com/mozilla/gecko-dev/master/toolkit/content/gmp-sources/widevinecdm.json"
|
||||
DEFAULT_JSON = "https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/main/toolkit/content/gmp-sources/widevinecdm.json"
|
||||
ARCH_PATTERNS = {
|
||||
"linux_x86_64": ["Linux_x86_64-gcc3"],
|
||||
"linux_aarch64": ["Linux_aarch64-gcc3"]
|
||||
|
||||
@@ -130,7 +130,6 @@ stdenv.mkDerivation rec {
|
||||
lgpl2Plus
|
||||
wxWindowsException31
|
||||
];
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -152,7 +152,6 @@ stdenv.mkDerivation rec {
|
||||
wxWindowsException31
|
||||
];
|
||||
maintainers = with maintainers; [
|
||||
tfmoraes
|
||||
fliegendewurst
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -132,7 +132,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wxWindowsException31
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
tfmoraes
|
||||
fliegendewurst
|
||||
wegank
|
||||
];
|
||||
|
||||
@@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch";
|
||||
hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA=";
|
||||
})
|
||||
# Fix build with gcc15
|
||||
# https://github.com/jbeder/yaml-cpp/pull/1310
|
||||
(fetchpatch {
|
||||
name = "yaml-cpp-add-include-cstdint-gcc15.patch";
|
||||
url = "https://github.com/jbeder/yaml-cpp/commit/7b469b4220f96fb3d036cf68cd7bd30bd39e61d2.patch";
|
||||
hash = "sha256-4Mua6cYD8UR+fJfFeu0fdYVFprsiuF89HvbaTByz9nI=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -2,7 +2,9 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
iana-etc,
|
||||
installShellFiles,
|
||||
libredirect,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
@@ -20,7 +22,10 @@ buildGoModule rec {
|
||||
vendorHash = "sha256-As7xDEo+bMslv9Xd6CbHTqvf2XaXmO6Gp3f9+xD3kNU=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ];
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p build/ui
|
||||
@@ -43,17 +48,17 @@ buildGoModule rec {
|
||||
"k8s.io/component-base/version.buildDate=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
# Breaks with sandbox on Darwin because it wants to read /etc/protocols
|
||||
postInstall =
|
||||
lib.optionalString
|
||||
((stdenv.buildPlatform.canExecute stdenv.hostPlatform) && !stdenv.buildPlatform.isDarwin)
|
||||
''
|
||||
export K9S_LOGS_DIR=$(mktemp -d)
|
||||
installShellCompletion --cmd zarf \
|
||||
--bash <($out/bin/zarf completion bash) \
|
||||
--fish <($out/bin/zarf completion fish) \
|
||||
--zsh <($out/bin/zarf completion zsh)
|
||||
'';
|
||||
(stdenv.buildPlatform.canExecute stdenv.hostPlatform && stdenv.hostPlatform.isDarwin)
|
||||
"export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services"
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
export K9S_LOGS_DIR=$(mktemp -d)
|
||||
installShellCompletion --cmd zarf \
|
||||
--bash <($out/bin/zarf completion bash) \
|
||||
--fish <($out/bin/zarf completion fish) \
|
||||
--zsh <($out/bin/zarf completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "DevSecOps for Air Gap & Limited-Connection Systems. https://zarf.dev";
|
||||
|
||||
@@ -42,7 +42,6 @@ appimageTools.wrapType2 rec {
|
||||
homepage = "https://www.zettlr.com";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ tfmoraes ];
|
||||
mainProgram = "zettlr";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
{ pkgs }:
|
||||
|
||||
{
|
||||
buildInputs ? [ ],
|
||||
generated,
|
||||
...
|
||||
}@attrs:
|
||||
|
||||
let
|
||||
# Fetches the bower packages. `generated` should be the result of a
|
||||
# `bower2nix` command.
|
||||
bowerPackages = import generated {
|
||||
inherit (pkgs) buildEnv fetchbower;
|
||||
};
|
||||
|
||||
in
|
||||
pkgs.stdenv.mkDerivation (
|
||||
attrs
|
||||
// {
|
||||
name = "bower_components-" + attrs.name;
|
||||
|
||||
inherit bowerPackages;
|
||||
|
||||
builder = builtins.toFile "builder.sh" ''
|
||||
# The project's bower.json is required
|
||||
cp $src/bower.json .
|
||||
|
||||
# Dereference symlinks -- bower doesn't like them
|
||||
cp --recursive --reflink=auto \
|
||||
--dereference --no-preserve=mode \
|
||||
$bowerPackages bc
|
||||
|
||||
# Bower install in offline mode -- links together the fetched
|
||||
# bower packages.
|
||||
HOME=$PWD bower \
|
||||
--config.storage.packages=bc/packages \
|
||||
--config.storage.registry=bc/registry \
|
||||
--offline install
|
||||
|
||||
# Sets up a single bower_components directory within
|
||||
# the output derivation.
|
||||
mkdir -p $out
|
||||
mv bower_components $out
|
||||
'';
|
||||
|
||||
buildInputs = buildInputs ++ [
|
||||
pkgs.git
|
||||
pkgs.nodePackages.bower
|
||||
];
|
||||
}
|
||||
)
|
||||
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
bsd3
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ tfmoraes ];
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -63,6 +63,7 @@ mapAliases {
|
||||
inherit (pkgs) bash-language-server; # added 2024-06-07
|
||||
bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
|
||||
bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
|
||||
bower = throw "bower was removed because it was deprecated"; # added 2025-09-17
|
||||
inherit (pkgs) bower2nix; # added 2024-08-23
|
||||
inherit (pkgs) btc-rpc-explorer; # added 2023-08-17
|
||||
inherit (pkgs) carbon-now-cli; # added 2023-08-17
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user