Project import generated by Copybara.
GitOrigin-RevId: c21ba4f7bb4a3d621eb1d187e6b5e816bb85380c
This commit is contained in:
parent
8d28093ffb
commit
9543354213
265 changed files with 8507 additions and 6852 deletions
|
@ -6,7 +6,7 @@ When using Nix, you will frequently need to download source code and other files
|
|||
|
||||
Because fixed output derivations are _identified_ by their hash, a common mistake is to update a fetcher's URL or a version parameter, without updating the hash. **This will cause the old contents to be used.** So remember to always invalidate the hash argument.
|
||||
|
||||
For those who develop and maintain fetcheres, a similar problem arises with changes to the implementation of a fetcher. These may cause a fixed output derivation to fail, but won't normally be caught by tests because the supposed output is already in the store or cache. For the purpose of testing, you can use a trick that is embodied by the [`invalidateFetcherByDrvHash`](#sec-pkgs-invalidateFetcherByDrvHash) function. It uses the derivation `name` to create a unique output path per fetcher implementation, defeating the caching precisely where it would be harmful.
|
||||
For those who develop and maintain fetchers, a similar problem arises with changes to the implementation of a fetcher. These may cause a fixed output derivation to fail, but won't normally be caught by tests because the supposed output is already in the store or cache. For the purpose of testing, you can use a trick that is embodied by the [`invalidateFetcherByDrvHash`](#sec-pkgs-invalidateFetcherByDrvHash) function. It uses the derivation `name` to create a unique output path per fetcher implementation, defeating the caching precisely where it would be harmful.
|
||||
|
||||
## `fetchurl` and `fetchzip` {#fetchurl}
|
||||
|
||||
|
|
|
@ -96,6 +96,11 @@ re-enter the shell.
|
|||
|
||||
## Updating the package set {#updating-the-package-set}
|
||||
|
||||
There is a script and associated environment for regenerating the package
|
||||
sets and synchronising the rPackages tree to the current CRAN and matching
|
||||
BIOC release. These scripts are found in the `pkgs/development/r-modules`
|
||||
directory and executed as follows:
|
||||
|
||||
```bash
|
||||
nix-shell generate-shell.nix
|
||||
|
||||
|
@ -112,12 +117,11 @@ Rscript generate-r-packages.R bioc-experiment > bioc-experiment-packages.nix.new
|
|||
mv bioc-experiment-packages.nix.new bioc-experiment-packages.nix
|
||||
```
|
||||
|
||||
`generate-r-packages.R <repo>` reads `<repo>-packages.nix`, therefor the renaming.
|
||||
`generate-r-packages.R <repo>` reads `<repo>-packages.nix`, therefore
|
||||
the renaming.
|
||||
|
||||
## Testing if the Nix-expression could be evaluated {#testing-if-the-nix-expression-could-be-evaluated}
|
||||
|
||||
```bash
|
||||
nix-build test-evaluation.nix --dry-run
|
||||
```
|
||||
|
||||
If this exits fine, the expression is ok. If not, you have to edit `default.nix`
|
||||
Some packages require overrides to specify external dependencies or other
|
||||
patches and special requirements. These overrides are specified in the
|
||||
`pkgs/development/r-modules/default.nix` file. As the `*-packages.nix`
|
||||
contents are automatically generated it should not be edited and broken
|
||||
builds should be addressed using overrides.
|
||||
|
|
|
@ -68,7 +68,7 @@ luautf8,,,,,,pstn
|
|||
luazip,,,,,,
|
||||
lua-yajl,,,,,,pstn
|
||||
luuid,,,,,,
|
||||
luv,,,,1.30.0-0,,
|
||||
luv,,,,1.42.0-0,,
|
||||
lyaml,,,,,,lblasc
|
||||
markdown,,,,,,
|
||||
mediator_lua,,,,,,
|
||||
|
|
|
|
@ -16,16 +16,67 @@ let
|
|||
lib.concatMapStrings (s: if lib.isList s then "-" else s)
|
||||
(builtins.split "[^a-zA-Z0-9_.\\-]+" name);
|
||||
|
||||
# Function to build "zfs allow" and "zfs unallow" commands for the
|
||||
# filesystems we've delegated permissions to.
|
||||
buildAllowCommand = zfsAction: permissions: dataset: lib.escapeShellArgs [
|
||||
# Function to build "zfs allow" commands for the filesystems we've
|
||||
# delegated permissions to. It also checks if the target dataset
|
||||
# exists before delegating permissions, if it doesn't exist we
|
||||
# delegate it to the parent dataset. This should solve the case of
|
||||
# provisoning new datasets.
|
||||
buildAllowCommand = permissions: dataset: (
|
||||
"-+${pkgs.writeShellScript "zfs-allow-${dataset}" ''
|
||||
# Here we explicitly use the booted system to guarantee the stable API needed by ZFS
|
||||
"-+/run/booted-system/sw/bin/zfs"
|
||||
zfsAction
|
||||
|
||||
# Run a ZFS list on the dataset to check if it exists
|
||||
if ${lib.escapeShellArgs [
|
||||
"/run/booted-system/sw/bin/zfs"
|
||||
"list"
|
||||
dataset
|
||||
]} 2> /dev/null; then
|
||||
${lib.escapeShellArgs [
|
||||
"/run/booted-system/sw/bin/zfs"
|
||||
"allow"
|
||||
cfg.user
|
||||
(concatStringsSep "," permissions)
|
||||
dataset
|
||||
];
|
||||
]}
|
||||
else
|
||||
${lib.escapeShellArgs [
|
||||
"/run/booted-system/sw/bin/zfs"
|
||||
"allow"
|
||||
cfg.user
|
||||
(concatStringsSep "," permissions)
|
||||
# Remove the last part of the path
|
||||
(builtins.dirOf dataset)
|
||||
]}
|
||||
fi
|
||||
''}"
|
||||
);
|
||||
|
||||
# Function to build "zfs unallow" commands for the filesystems we've
|
||||
# delegated permissions to. Here we unallow both the target but also
|
||||
# on the parent dataset because at this stage we have no way of
|
||||
# knowing if the allow command did execute on the parent dataset or
|
||||
# not in the pre-hook. We can't run the same if in the post hook
|
||||
# since the dataset should have been created at this point.
|
||||
buildUnallowCommand = permissions: dataset: (
|
||||
"-+${pkgs.writeShellScript "zfs-unallow-${dataset}" ''
|
||||
# Here we explicitly use the booted system to guarantee the stable API needed by ZFS
|
||||
${lib.escapeShellArgs [
|
||||
"/run/booted-system/sw/bin/zfs"
|
||||
"unallow"
|
||||
cfg.user
|
||||
(concatStringsSep "," permissions)
|
||||
dataset
|
||||
]}
|
||||
${lib.escapeShellArgs [
|
||||
"/run/booted-system/sw/bin/zfs"
|
||||
"unallow"
|
||||
cfg.user
|
||||
(concatStringsSep "," permissions)
|
||||
# Remove the last part of the path
|
||||
(builtins.dirOf dataset)
|
||||
]}
|
||||
''}"
|
||||
);
|
||||
in
|
||||
{
|
||||
|
||||
|
@ -274,11 +325,11 @@ in
|
|||
path = [ "/run/booted-system/sw/bin/" ];
|
||||
serviceConfig = {
|
||||
ExecStartPre =
|
||||
(map (buildAllowCommand "allow" c.localSourceAllow) (localDatasetName c.source)) ++
|
||||
(map (buildAllowCommand "allow" c.localTargetAllow) (localDatasetName c.target));
|
||||
(map (buildAllowCommand c.localSourceAllow) (localDatasetName c.source)) ++
|
||||
(map (buildAllowCommand c.localTargetAllow) (localDatasetName c.target));
|
||||
ExecStopPost =
|
||||
(map (buildAllowCommand "unallow" c.localSourceAllow) (localDatasetName c.source)) ++
|
||||
(map (buildAllowCommand "unallow" c.localTargetAllow) (localDatasetName c.target));
|
||||
(map (buildUnallowCommand c.localSourceAllow) (localDatasetName c.source)) ++
|
||||
(map (buildUnallowCommand c.localTargetAllow) (localDatasetName c.target));
|
||||
ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/syncoid" ]
|
||||
++ optionals c.useCommonArgs cfg.commonArgs
|
||||
++ optional c.recursive "-r"
|
||||
|
|
|
@ -544,7 +544,7 @@ in
|
|||
type = types.lines;
|
||||
default = "";
|
||||
description = "
|
||||
Entries for the virtual alias map, cf. man-page virtual(8).
|
||||
Entries for the virtual alias map, cf. man-page virtual(5).
|
||||
";
|
||||
};
|
||||
|
||||
|
|
|
@ -9,6 +9,14 @@ in
|
|||
{
|
||||
options.services.snapper = {
|
||||
|
||||
snapshotRootOnBoot = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to snapshot root on boot
|
||||
'';
|
||||
};
|
||||
|
||||
snapshotInterval = mkOption {
|
||||
type = types.str;
|
||||
default = "hourly";
|
||||
|
@ -130,20 +138,22 @@ in
|
|||
Type = "dbus";
|
||||
BusName = "org.opensuse.Snapper";
|
||||
ExecStart = "${pkgs.snapper}/bin/snapperd";
|
||||
CapabilityBoundingSet = "CAP_DAC_OVERRIDE CAP_FOWNER CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_SYS_ADMIN CAP_SYS_MODULE CAP_IPC_LOCK CAP_SYS_NICE";
|
||||
LockPersonality = true;
|
||||
NoNewPrivileges = false;
|
||||
PrivateNetwork = true;
|
||||
ProtectHostname = true;
|
||||
RestrictAddressFamilies = "AF_UNIX";
|
||||
RestrictRealtime = true;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.snapper-timeline = {
|
||||
description = "Timeline of Snapper Snapshots";
|
||||
inherit documentation;
|
||||
requires = [ "local-fs.target" ];
|
||||
serviceConfig.ExecStart = "${pkgs.snapper}/lib/snapper/systemd-helper --timeline";
|
||||
};
|
||||
|
||||
systemd.timers.snapper-timeline = {
|
||||
description = "Timeline of Snapper Snapshots";
|
||||
inherit documentation;
|
||||
wantedBy = [ "basic.target" ];
|
||||
timerConfig.OnCalendar = cfg.snapshotInterval;
|
||||
startAt = cfg.snapshotInterval;
|
||||
};
|
||||
|
||||
systemd.services.snapper-cleanup = {
|
||||
|
@ -155,10 +165,21 @@ in
|
|||
systemd.timers.snapper-cleanup = {
|
||||
description = "Cleanup of Snapper Snapshots";
|
||||
inherit documentation;
|
||||
wantedBy = [ "basic.target" ];
|
||||
wantedBy = [ "timers.target" ];
|
||||
requires = [ "local-fs.target" ];
|
||||
timerConfig.OnBootSec = "10m";
|
||||
timerConfig.OnUnitActiveSec = cfg.cleanupInterval;
|
||||
};
|
||||
|
||||
systemd.services.snapper-boot = lib.optionalAttrs cfg.snapshotRootOnBoot {
|
||||
description = "Take snapper snapshot of root on boot";
|
||||
inherit documentation;
|
||||
serviceConfig.ExecStart = "${pkgs.snapper}/bin/snapper --config root create --cleanup-algorithm number --description boot";
|
||||
serviceConfig.type = "oneshot";
|
||||
requires = [ "local-fs.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
unitConfig.ConditionPathExists = "/etc/snapper/configs/root";
|
||||
};
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -366,5 +366,5 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
meta.maintainers = with lib.maintainers; [ ];
|
||||
}
|
||||
|
|
|
@ -32,6 +32,7 @@ let
|
|||
"dnsmasq"
|
||||
"domain"
|
||||
"dovecot"
|
||||
"fastly"
|
||||
"fritzbox"
|
||||
"influxdb"
|
||||
"json"
|
||||
|
|
41
third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix
vendored
Normal file
41
third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix
vendored
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
|
||||
let cfg = config.services.prometheus.exporters.fastly;
|
||||
in
|
||||
{
|
||||
port = 9118;
|
||||
extraOpts = {
|
||||
debug = mkEnableOption "Debug logging mode for fastly-exporter";
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = ''
|
||||
Path to a fastly-exporter configuration file.
|
||||
Example one can be generated with <literal>fastly-exporter --config-file-example</literal>.
|
||||
'';
|
||||
example = "./fastly-exporter-config.txt";
|
||||
};
|
||||
|
||||
tokenPath = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
apply = final: if final == null then null else toString final;
|
||||
description = ''
|
||||
A run-time path to the token file, which is supposed to be provisioned
|
||||
outside of Nix store.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
script = ''
|
||||
${optionalString (cfg.tokenPath != null)
|
||||
"export FASTLY_API_TOKEN=$(cat ${toString cfg.tokenPath})"}
|
||||
${pkgs.fastly-exporter}/bin/fastly-exporter \
|
||||
-endpoint http://${cfg.listenAddress}:${cfg.port}/metrics
|
||||
${optionalString cfg.debug "-debug true"} \
|
||||
${optionalString cfg.configFile "-config-file ${cfg.configFile}"}
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -38,10 +38,13 @@ let
|
|||
"mod_rrdtool"
|
||||
"mod_accesslog"
|
||||
# Remaining list of modules, order assumed to be unimportant.
|
||||
"mod_authn_dbi"
|
||||
"mod_authn_file"
|
||||
"mod_authn_gssapi"
|
||||
"mod_authn_ldap"
|
||||
"mod_authn_mysql"
|
||||
"mod_authn_pam"
|
||||
"mod_authn_sasl"
|
||||
"mod_cml"
|
||||
"mod_deflate"
|
||||
"mod_evasive"
|
||||
|
@ -132,6 +135,15 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.lighttpd;
|
||||
defaultText = "pkgs.lighttpd";
|
||||
type = types.package;
|
||||
description = ''
|
||||
lighttpd package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
default = 80;
|
||||
type = types.port;
|
||||
|
@ -240,7 +252,7 @@ in
|
|||
description = "Lighttpd Web Server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f ${configFile}";
|
||||
serviceConfig.ExecStart = "${cfg.package}/sbin/lighttpd -D -f ${configFile}";
|
||||
# SIGINT => graceful shutdown
|
||||
serviceConfig.KillSignal = "SIGINT";
|
||||
};
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
use strict;
|
||||
use warnings;
|
||||
use File::Path qw(make_path);
|
||||
use File::Basename;
|
||||
use File::Slurp;
|
||||
use Net::DBus;
|
||||
|
@ -14,9 +15,17 @@ my $out = "@out@";
|
|||
my $curSystemd = abs_path("/run/current-system/sw/bin");
|
||||
|
||||
# To be robust against interruption, record what units need to be started etc.
|
||||
my $startListFile = "/run/systemd/start-list";
|
||||
my $restartListFile = "/run/systemd/restart-list";
|
||||
my $reloadListFile = "/run/systemd/reload-list";
|
||||
my $startListFile = "/run/nixos/start-list";
|
||||
my $restartListFile = "/run/nixos/restart-list";
|
||||
my $reloadListFile = "/run/nixos/reload-list";
|
||||
|
||||
# Parse restart/reload requests by the activation script
|
||||
my $restartByActivationFile = "/run/nixos/activation-restart-list";
|
||||
my $reloadByActivationFile = "/run/nixos/activation-reload-list";
|
||||
my $dryRestartByActivationFile = "/run/nixos/dry-activation-restart-list";
|
||||
my $dryReloadByActivationFile = "/run/nixos/dry-activation-reload-list";
|
||||
|
||||
make_path("/run/nixos", { mode => 0755 });
|
||||
|
||||
my $action = shift @ARGV;
|
||||
|
||||
|
@ -150,7 +159,7 @@ $unitsToRestart{$_} = 1 foreach
|
|||
split('\n', read_file($restartListFile, err_mode => 'quiet') // "");
|
||||
|
||||
$unitsToReload{$_} = 1 foreach
|
||||
split '\n', read_file($reloadListFile, err_mode => 'quiet') // "";
|
||||
split('\n', read_file($reloadListFile, err_mode => 'quiet') // "");
|
||||
|
||||
my $activePrev = getActiveUnits;
|
||||
while (my ($unit, $state) = each %{$activePrev}) {
|
||||
|
@ -366,6 +375,12 @@ if ($action eq "dry-activate") {
|
|||
print STDERR "would activate the configuration...\n";
|
||||
system("$out/dry-activate", "$out");
|
||||
|
||||
$unitsToRestart{$_} = 1 foreach
|
||||
split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // "");
|
||||
|
||||
$unitsToReload{$_} = 1 foreach
|
||||
split('\n', read_file($dryReloadByActivationFile, err_mode => 'quiet') // "");
|
||||
|
||||
print STDERR "would restart systemd\n" if $restartSystemd;
|
||||
print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"
|
||||
if scalar(keys %unitsToRestart) > 0;
|
||||
|
@ -373,6 +388,8 @@ if ($action eq "dry-activate") {
|
|||
if scalar @unitsToStartFiltered;
|
||||
print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n"
|
||||
if scalar(keys %unitsToReload) > 0;
|
||||
unlink($dryRestartByActivationFile);
|
||||
unlink($dryReloadByActivationFile);
|
||||
exit 0;
|
||||
}
|
||||
|
||||
|
@ -395,6 +412,15 @@ my $res = 0;
|
|||
print STDERR "activating the configuration...\n";
|
||||
system("$out/activate", "$out") == 0 or $res = 2;
|
||||
|
||||
# Handle the activation script requesting the restart or reload of a unit.
|
||||
# We can only restart and reload (not stop/start) because the units to be
|
||||
# stopped are already stopped before the activation script is run.
|
||||
$unitsToRestart{$_} = 1 foreach
|
||||
split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // "");
|
||||
|
||||
$unitsToReload{$_} = 1 foreach
|
||||
split('\n', read_file($reloadByActivationFile, err_mode => 'quiet') // "");
|
||||
|
||||
# Restart systemd if necessary. Note that this is done using the
|
||||
# current version of systemd, just in case the new one has trouble
|
||||
# communicating with the running pid 1.
|
||||
|
@ -434,6 +460,7 @@ if (scalar(keys %unitsToReload) > 0) {
|
|||
print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n";
|
||||
system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4;
|
||||
unlink($reloadListFile);
|
||||
unlink($reloadByActivationFile);
|
||||
}
|
||||
|
||||
# Restart changed services (those that have to be restarted rather
|
||||
|
@ -442,6 +469,7 @@ if (scalar(keys %unitsToRestart) > 0) {
|
|||
print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n";
|
||||
system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4;
|
||||
unlink($restartListFile);
|
||||
unlink($restartByActivationFile);
|
||||
}
|
||||
|
||||
# Start all active targets, as well as changed units we stopped above.
|
||||
|
|
|
@ -382,6 +382,7 @@ in
|
|||
radicale = handleTest ./radicale.nix {};
|
||||
redis = handleTest ./redis.nix {};
|
||||
redmine = handleTest ./redmine.nix {};
|
||||
restartByActivationScript = handleTest ./restart-by-activation-script.nix {};
|
||||
restic = handleTest ./restic.nix {};
|
||||
robustirc-bridge = handleTest ./robustirc-bridge.nix {};
|
||||
roundcube = handleTest ./roundcube.nix {};
|
||||
|
|
73
third_party/nixpkgs/nixos/tests/restart-by-activation-script.nix
vendored
Normal file
73
third_party/nixpkgs/nixos/tests/restart-by-activation-script.nix
vendored
Normal file
|
@ -0,0 +1,73 @@
|
|||
import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
name = "restart-by-activation-script";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ das_j ];
|
||||
};
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
imports = [ ../modules/profiles/minimal.nix ];
|
||||
|
||||
systemd.services.restart-me = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${pkgs.coreutils}/bin/true";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.reload-me = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = rec {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${pkgs.coreutils}/bin/true";
|
||||
ExecReload = ExecStart;
|
||||
};
|
||||
};
|
||||
|
||||
system.activationScripts.test = {
|
||||
supportsDryActivation = true;
|
||||
text = ''
|
||||
if [ -e /test-the-activation-script ]; then
|
||||
if [ "$NIXOS_ACTION" != dry-activate ]; then
|
||||
touch /activation-was-run
|
||||
echo restart-me.service > /run/nixos/activation-restart-list
|
||||
echo reload-me.service > /run/nixos/activation-reload-list
|
||||
else
|
||||
echo restart-me.service > /run/nixos/dry-activation-restart-list
|
||||
echo reload-me.service > /run/nixos/dry-activation-reload-list
|
||||
fi
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
testScript = /* python */ ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
with subtest("nothing happens when the activation script does nothing"):
|
||||
out = machine.succeed("/run/current-system/bin/switch-to-configuration dry-activate 2>&1")
|
||||
assert 'restart' not in out
|
||||
assert 'reload' not in out
|
||||
out = machine.succeed("/run/current-system/bin/switch-to-configuration test")
|
||||
assert 'restart' not in out
|
||||
assert 'reload' not in out
|
||||
|
||||
machine.succeed("touch /test-the-activation-script")
|
||||
|
||||
with subtest("dry activation"):
|
||||
out = machine.succeed("/run/current-system/bin/switch-to-configuration dry-activate 2>&1")
|
||||
assert 'would restart the following units: restart-me.service' in out
|
||||
assert 'would reload the following units: reload-me.service' in out
|
||||
machine.fail("test -f /run/nixos/dry-activation-restart-list")
|
||||
machine.fail("test -f /run/nixos/dry-activation-reload-list")
|
||||
|
||||
with subtest("real activation"):
|
||||
out = machine.succeed("/run/current-system/bin/switch-to-configuration test 2>&1")
|
||||
assert 'restarting the following units: restart-me.service' in out
|
||||
assert 'reloading the following units: reload-me.service' in out
|
||||
machine.fail("test -f /run/nixos/activation-restart-list")
|
||||
machine.fail("test -f /run/nixos/activation-reload-list")
|
||||
'';
|
||||
})
|
|
@ -1,161 +0,0 @@
|
|||
{ lib, stdenv
|
||||
, fetchgit
|
||||
, alsa-lib
|
||||
, aubio
|
||||
, boost
|
||||
, cairomm
|
||||
, curl
|
||||
, doxygen
|
||||
, fftwSinglePrec
|
||||
, flac
|
||||
, glibmm
|
||||
, graphviz
|
||||
, gtkmm2
|
||||
, libjack2
|
||||
, liblo
|
||||
, libogg
|
||||
, libsamplerate
|
||||
, libsigcxx
|
||||
, libsndfile
|
||||
, libusb1
|
||||
, fluidsynth_1
|
||||
, hidapi
|
||||
, libltc
|
||||
, qm-dsp
|
||||
, libxml2
|
||||
, lilv
|
||||
, lrdf
|
||||
, lv2
|
||||
, perl
|
||||
, pkg-config
|
||||
, itstool
|
||||
, python2
|
||||
, rubberband
|
||||
, serd
|
||||
, sord
|
||||
, sratom
|
||||
, taglib
|
||||
, vamp-plugin-sdk
|
||||
, dbus
|
||||
, fftw
|
||||
, pango
|
||||
, suil
|
||||
, libarchive
|
||||
, wafHook
|
||||
}:
|
||||
let
|
||||
# Ardour git repo uses a mix of annotated and lightweight tags. Annotated
|
||||
# tags are used for MAJOR.MINOR versioning, and lightweight tags are used
|
||||
# in-between; MAJOR.MINOR.REV where REV is the number of commits since the
|
||||
# last annotated tag. A slightly different version string format is needed
|
||||
# for the 'revision' info that is built into the binary; it is the format of
|
||||
# "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
|
||||
|
||||
# Version to build.
|
||||
tag = "5.12";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ardour_5";
|
||||
version = "5.12";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.ardour.org/ardour/ardour.git";
|
||||
rev = "ae0dcdc0c5d13483271065c360e378202d20170a";
|
||||
sha256 = "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wafHook
|
||||
pkg-config
|
||||
itstool
|
||||
doxygen
|
||||
graphviz # for dot
|
||||
perl
|
||||
python2
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
aubio
|
||||
boost
|
||||
cairomm
|
||||
curl
|
||||
dbus
|
||||
fftw
|
||||
fftwSinglePrec
|
||||
flac
|
||||
glibmm
|
||||
gtkmm2
|
||||
libjack2
|
||||
liblo
|
||||
libogg
|
||||
libsamplerate
|
||||
libsigcxx
|
||||
libsndfile
|
||||
libusb1
|
||||
fluidsynth_1
|
||||
hidapi
|
||||
libltc
|
||||
qm-dsp
|
||||
libxml2
|
||||
lilv
|
||||
lrdf
|
||||
lv2
|
||||
pango
|
||||
rubberband
|
||||
serd
|
||||
sord
|
||||
sratom
|
||||
suil
|
||||
taglib
|
||||
vamp-plugin-sdk
|
||||
libarchive
|
||||
];
|
||||
|
||||
wafConfigureFlags = [
|
||||
"--optimize"
|
||||
"--docs"
|
||||
"--use-external-libs"
|
||||
"--freedesktop"
|
||||
"--with-backends=jack,alsa,dummy"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${qm-dsp}/include/qm-dsp";
|
||||
|
||||
# ardour's wscript has a "tarball" target but that required the git revision
|
||||
# be available. Since this is an unzipped tarball fetched from github we
|
||||
# have to do that ourself.
|
||||
postPatch = ''
|
||||
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc
|
||||
patchShebangs ./tools/
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# wscript does not install these for some reason
|
||||
install -vDm 644 "build/gtk2_ardour/ardour.xml" \
|
||||
-t "$out/share/mime/packages"
|
||||
install -vDm 644 "build/gtk2_ardour/ardour5.desktop" \
|
||||
-t "$out/share/applications"
|
||||
for size in 16 22 32 48 256 512; do
|
||||
install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
|
||||
"$out/share/icons/hicolor/''${size}x''${size}/apps/ardour5.png"
|
||||
done
|
||||
install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multi-track hard disk recording software";
|
||||
longDescription = ''
|
||||
Ardour is a digital audio workstation (DAW), You can use it to
|
||||
record, edit and mix multi-track audio and midi. Produce your
|
||||
own CDs. Mix video soundtracks. Experiment with new ideas about
|
||||
music and sound.
|
||||
|
||||
Please consider supporting the ardour project financially:
|
||||
https://community.ardour.org/donate
|
||||
'';
|
||||
homepage = "https://ardour.org/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ goibhniu fps ];
|
||||
};
|
||||
}
|
|
@ -59,6 +59,9 @@ stdenv.mkDerivation rec {
|
|||
libpulseaudio
|
||||
];
|
||||
|
||||
# https://github.com/xou816/spot/issues/313
|
||||
mesonBuildType = "release";
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/cargo.sh
|
||||
patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
trivialBuild {
|
||||
pname = "bqn-mode";
|
||||
version = "0.0.0+unstable=-2021-09-15";
|
||||
version = "0.0.0+unstable=2021-09-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlochbaum";
|
||||
repo = "BQN";
|
||||
rev = "fb6ec1d8b083cd2b335828ae22e978b1b13986fa";
|
||||
hash = "sha256-57ryT5gb7hToAJOiGjjgU87rmlswjPK9tV1iQzJ4C0Y=";
|
||||
rev = "97cbdc67fe6a9652c42daefadd658cc41c1e5ae3";
|
||||
sha256 = "09nmsl7gzyi56g0x459a6571c8nsafl0g350m0hk1vy2gpg6yq0p";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
@ -63,5 +63,6 @@ mkDerivation rec {
|
|||
longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers.";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ leonardoce ];
|
||||
mainProgram = "leo";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -32,13 +32,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neovim-unwrapped";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "neovim";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi";
|
||||
sha256 = "0b2gda9h14lvwahrr7kq3ix8wsw99g4ngy1grmhv5544n93ypcyk";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,9 +1,42 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos
|
||||
, xlibsWrapper, sqlite, gsl, qwt, fcgi, python3Packages, libspatialindex
|
||||
, libspatialite, postgresql, txt2tags, openssl, libzip, hdf5, netcdf, exiv2
|
||||
, protobuf, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport
|
||||
, qtxmlpatterns, withGrass ? true, grass, withWebKit ? true, qtwebkit }:
|
||||
with lib;
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, flex
|
||||
, bison
|
||||
, proj
|
||||
, geos
|
||||
, xlibsWrapper
|
||||
, sqlite
|
||||
, gsl
|
||||
, qwt
|
||||
, fcgi
|
||||
, python3Packages
|
||||
, libspatialindex
|
||||
, libspatialite
|
||||
, postgresql
|
||||
, txt2tags
|
||||
, openssl
|
||||
, libzip
|
||||
, hdf5
|
||||
, netcdf
|
||||
, exiv2
|
||||
, protobuf
|
||||
, qtbase
|
||||
, qtsensors
|
||||
, qca-qt5
|
||||
, qtkeychain
|
||||
, qscintilla
|
||||
, qtserialport
|
||||
, qtxmlpatterns
|
||||
, withGrass ? true
|
||||
, grass
|
||||
, withWebKit ? true
|
||||
, qtwebkit
|
||||
}:
|
||||
|
||||
let
|
||||
pythonBuildInputs = with python3Packages; [
|
||||
qscintilla-qt5
|
||||
|
@ -25,8 +58,7 @@ let
|
|||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.16.10";
|
||||
pname = "qgis";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
pname = "qgis-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
|
@ -35,6 +67,13 @@ in mkDerivation rec {
|
|||
sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch";
|
||||
sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit pythonBuildInputs;
|
||||
inherit python3Packages;
|
||||
|
|
|
@ -7,11 +7,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "feh";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-V6scph9XyWWVh4Bp9VDTb1GFMPiPoxt0zDnNc5+SWLY=";
|
||||
sha256 = "sha256-hHGP0nIM9UDSRXaElP4OtOWY9Es54jJrrow2ioKcglg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
|
|
@ -12,6 +12,8 @@
|
|||
mkDerivation {
|
||||
pname = "akregator";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/akregator/";
|
||||
description = "KDE feed reader";
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
|
|
|
@ -30,6 +30,7 @@ mkDerivation {
|
|||
qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath extraTools) ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/ark/";
|
||||
description = "Graphical file compression/decompression utility";
|
||||
license = with licenses; [ gpl2 lgpl3 ] ++ optional unfreeEnableUnrar unfree;
|
||||
maintainers = [ maintainers.ttuegel ];
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
mkDerivation {
|
||||
pname = "dolphin";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/dolphin/";
|
||||
description = "KDE file manager";
|
||||
license = with lib.licenses; [ gpl2 fdl12 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
broken = lib.versionOlder qtbase.version "5.14";
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
mkDerivation {
|
||||
pname = "dragon";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/dragonplayer/";
|
||||
license = with lib.licenses; [ gpl2 fdl12 ];
|
||||
description = "A simple media player for KDE";
|
||||
maintainers = [ lib.maintainers.jonathanreeve ];
|
||||
|
|
|
@ -40,6 +40,7 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/elisa/";
|
||||
description = "A simple media player for KDE";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
mkDerivation {
|
||||
pname = "filelight";
|
||||
meta = {
|
||||
description = "Disk usage statistics";
|
||||
homepage = "https://apps.kde.org/filelight/";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ fridh vcunat ];
|
||||
broken = lib.versionOlder qtbase.version "5.13";
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
mkDerivation {
|
||||
pname = "gwenview";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/gwenview/";
|
||||
description = "KDE image viewer";
|
||||
license = with lib.licenses; [ gpl2 fdl12 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
mkDerivation {
|
||||
pname = "k3b";
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/k3b/";
|
||||
description = "Disk burning application";
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
maintainers = with maintainers; [ sander phreedom ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
mkDerivation {
|
||||
pname = "kaddressbook";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kaddressbook/";
|
||||
description = "KDE contact manager";
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
mkDerivation {
|
||||
pname = "kalarm";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kalarm/";
|
||||
description = "Personal alarm scheduler";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = [ lib.maintainers.rittelle ];
|
||||
};
|
||||
|
|
|
@ -37,5 +37,9 @@ mkDerivation {
|
|||
"--prefix GST_PLUGIN_PATH : ${lib.makeSearchPath "lib/gstreamer-1.0" gst}"
|
||||
];
|
||||
|
||||
meta.license = with lib.licenses; [ lgpl21Only gpl3Only ];
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kamoso/";
|
||||
description = "A simple and friendly program to use your camera";
|
||||
license = with lib.licenses; [ lgpl21Only gpl3Only ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
mkDerivation {
|
||||
pname = "kate";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kate/";
|
||||
description = "Advanced text editor";
|
||||
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
|
|
|
@ -11,7 +11,11 @@
|
|||
|
||||
mkDerivation {
|
||||
pname = "kbreakout";
|
||||
meta.license = with lib.licenses; [ lgpl21 gpl3 ];
|
||||
meta = {
|
||||
homepage = "KBreakOut";
|
||||
description = "Breakout-like game";
|
||||
license = with lib.licenses; [ lgpl21 gpl3 ];
|
||||
};
|
||||
outputs = [ "out" "dev" ];
|
||||
nativeBuildInputs = [
|
||||
cmake extra-cmake-modules
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
mkDerivation {
|
||||
pname = "kcachegrind";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kcachegrind/";
|
||||
description = "Profiler frontend";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ orivej ];
|
||||
};
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
mkDerivation {
|
||||
pname = "kcalc";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kcalc/";
|
||||
description = "Scientific calculator";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = [ lib.maintainers.fridh ];
|
||||
};
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
mkDerivation {
|
||||
pname = "kcharselect";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kcharselect/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.schmittlauch ];
|
||||
description = "A tool to select special characters from all installed fonts and copy them into the clipboard";
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
mkDerivation {
|
||||
pname = "kcolorchooser";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kcolorchooser/";
|
||||
description = "Color chooser";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
mkDerivation {
|
||||
pname = "kdebugsettings";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kdebugsettings/";
|
||||
description = "KDE debug settings";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = [ lib.maintainers.rittelle ];
|
||||
broken = lib.versionOlder qtbase.version "5.13";
|
||||
|
|
|
@ -101,6 +101,8 @@ mkDerivation {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kdenlive/";
|
||||
description = "Video editor";
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
maintainers = with lib.maintainers; [ turion ];
|
||||
};
|
||||
|
|
|
@ -8,6 +8,8 @@ mkDerivation {
|
|||
pname = "kdialog";
|
||||
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kdialog/";
|
||||
description = "Display dialog boxes from shell scripts";
|
||||
license = with lib.licenses; [ gpl2 fdl12 ];
|
||||
maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
mkDerivation {
|
||||
pname = "kfind";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kfind/";
|
||||
description = "Find files/folders";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = [ lib.maintainers.iblech ];
|
||||
};
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
mkDerivation {
|
||||
pname = "kgeography";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kgeography/";
|
||||
description = "Geography trainer";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = [ lib.maintainers.globin ];
|
||||
};
|
||||
|
|
|
@ -16,6 +16,8 @@ mkDerivation {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/kget/";
|
||||
description = "Download manager";
|
||||
license = with licenses; [ gpl2 ];
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
|
|
@ -18,6 +18,8 @@ mkDerivation {
|
|||
wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg ]}"
|
||||
'';
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kgpg/";
|
||||
description = "Encryption tool";
|
||||
license = [ lib.licenses.gpl2 ];
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
{
|
||||
mkDerivation,
|
||||
extra-cmake-modules, kdoctools,
|
||||
grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, ki18n,
|
||||
kinit, khtml, kservice, xapian
|
||||
{ lib, mkDerivation
|
||||
, extra-cmake-modules, kdoctools
|
||||
, grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, ki18n
|
||||
, kinit, khtml, kservice, xapian
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
@ -12,4 +11,9 @@ mkDerivation {
|
|||
grantlee kcmutils kconfig kcoreaddons kdbusaddons khtml
|
||||
ki18n kinit kservice xapian
|
||||
];
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/help/";
|
||||
description = "Help center";
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
mkDerivation {
|
||||
pname = "kig";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kig/";
|
||||
description = "Interactive geometry";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
};
|
||||
|
@ -16,4 +18,3 @@ mkDerivation {
|
|||
boost karchive kcrash kiconthemes kparts ktexteditor qtsvg qtxmlpatterns
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
mkDerivation {
|
||||
pname = "kleopatra";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kleopatra/";
|
||||
description = "Certificate manager and unified crypto GUI";
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
|
|
|
@ -13,6 +13,8 @@ mkDerivation {
|
|||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ];
|
||||
meta = {
|
||||
description = "Mahjongg solitaire";
|
||||
homepage = "https://apps.kde.org/kmahjongg/";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
|
|
|
@ -53,6 +53,8 @@
|
|||
mkDerivation {
|
||||
pname = "kmail";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kmail2/";
|
||||
description = "Mail client";
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
mkDerivation {
|
||||
pname = "kmix";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kmix/";
|
||||
description = "Sound mixer";
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = [ lib.maintainers.rongcuid ];
|
||||
};
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
mkDerivation {
|
||||
pname = "kmplot";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kmplot/";
|
||||
description = "Mathematical function plotter";
|
||||
license = with lib.licenses; [ gpl2Plus fdl12 ];
|
||||
maintainers = [ lib.maintainers.orivej ];
|
||||
};
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
{
|
||||
mkDerivation,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash,
|
||||
kdbusaddons, kdnssd, kglobalaccel, kiconthemes, kitemmodels,
|
||||
kitemviews, kcmutils, knewstuff, knotifications, knotifyconfig,
|
||||
kparts, ktextwidgets, kwidgetsaddons, kwindowsystem,
|
||||
grantlee, grantleetheme, qtx11extras,
|
||||
akonadi, akonadi-notes, akonadi-search, kcalutils,
|
||||
kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit,
|
||||
kcalendarcore
|
||||
{ lib, mkDerivation
|
||||
, extra-cmake-modules, kdoctools
|
||||
, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash
|
||||
, kdbusaddons, kdnssd, kglobalaccel, kiconthemes, kitemmodels
|
||||
, kitemviews, kcmutils, knewstuff, knotifications, knotifyconfig
|
||||
, kparts, ktextwidgets, kwidgetsaddons, kwindowsystem
|
||||
, grantlee, grantleetheme, qtx11extras
|
||||
, akonadi, akonadi-notes, akonadi-search, kcalutils
|
||||
, kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit
|
||||
, kcalendarcore
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
@ -25,4 +24,9 @@ mkDerivation {
|
|||
akonadi-search
|
||||
kcalendarcore
|
||||
];
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/knotes/";
|
||||
description = "Popup notes";
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,6 +10,8 @@ mkDerivation {
|
|||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ libkdegames kio ktextwidgets ];
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kolf/";
|
||||
description = "Miniature golf";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
|
|
@ -17,6 +17,8 @@ mkDerivation {
|
|||
kguiaddons kio ktextwidgets kwidgetsaddons kxmlgui libkexiv2
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kolourpaint/";
|
||||
description = "Paint program";
|
||||
maintainers = [ lib.maintainers.fridh ];
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
};
|
||||
|
|
|
@ -7,7 +7,11 @@
|
|||
|
||||
mkDerivation {
|
||||
pname = "kompare";
|
||||
meta = { license = with lib.licenses; [ gpl2 ]; };
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kompare/";
|
||||
description = "Diff/patch frontend";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
|
||||
|
|
|
@ -22,6 +22,8 @@ mkDerivation {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/konqueror/";
|
||||
description = "Web browser, file manager and viewer";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
broken = lib.versionOlder qtbase.version "5.13";
|
||||
|
|
|
@ -22,6 +22,8 @@ mkDerivation {
|
|||
qtquickcontrols
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/konquest/";
|
||||
description = "Galactic strategy game";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ lheckemann ];
|
||||
};
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
mkDerivation {
|
||||
pname = "konsole";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/konsole/";
|
||||
description = "KDE terminal emulator";
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = with lib.maintainers; [ ttuegel turion ];
|
||||
};
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
mkDerivation {
|
||||
pname = "kontact";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kontact/";
|
||||
description = "Personal information manager";
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
mkDerivation {
|
||||
pname = "korganizer";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/korganizer/";
|
||||
description = "Personal organizer";
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
|
|
|
@ -18,6 +18,7 @@ mkDerivation {
|
|||
'';
|
||||
meta = with lib; {
|
||||
homepage = "http://www.kde.org";
|
||||
description = "Remote desktop client";
|
||||
license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
mkDerivation {
|
||||
pname = "krfb";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/krfb/";
|
||||
description = "Desktop sharing (VNC)";
|
||||
license = with lib.licenses; [ gpl2 fdl12 ];
|
||||
maintainers = with lib.maintainers; [ jerith666 ];
|
||||
};
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
mkDerivation {
|
||||
pname = "kruler";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kruler/";
|
||||
description = "Screen ruler";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = [ lib.maintainers.vandenoever ];
|
||||
};
|
||||
|
|
|
@ -11,7 +11,11 @@
|
|||
|
||||
mkDerivation {
|
||||
pname = "kspaceduel";
|
||||
meta.license = with lib.licenses; [ lgpl21 gpl3 ];
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kspaceduel/";
|
||||
description = "Space arcade game";
|
||||
license = with lib.licenses; [ lgpl21 gpl3 ];
|
||||
};
|
||||
outputs = [ "out" "dev" ];
|
||||
nativeBuildInputs = [
|
||||
cmake extra-cmake-modules
|
||||
|
|
|
@ -12,6 +12,8 @@ mkDerivation {
|
|||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ libGLU kdeclarative libkdegames ];
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/ksudoku/";
|
||||
description = "Suduko game";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
|
|
|
@ -11,6 +11,8 @@ mkDerivation {
|
|||
propagatedBuildInputs = [ karchive kconfig kio ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/ksystemlog/";
|
||||
description = "System log viewer";
|
||||
license = with licenses; [ gpl2 ];
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
|
|
@ -7,10 +7,10 @@
|
|||
, xorg
|
||||
}:
|
||||
|
||||
|
||||
mkDerivation {
|
||||
pname = "ktouch";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/ktouch/";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.schmittlauch ];
|
||||
description = "A touch typing tutor from the KDE software collection";
|
||||
|
|
|
@ -14,6 +14,9 @@
|
|||
mkDerivation {
|
||||
pname = "kwalletmanager";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/kwalletmanager5/";
|
||||
|
||||
description = "KDE wallet management tool";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
|
|
|
@ -7,7 +7,11 @@
|
|||
|
||||
mkDerivation {
|
||||
pname = "marble";
|
||||
meta.license = with lib.licenses; [ lgpl21 gpl3 ];
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/marble/";
|
||||
description = "Virtual globe";
|
||||
license = with lib.licenses; [ lgpl21 gpl3 ];
|
||||
};
|
||||
outputs = [ "out" "dev" ];
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
mkDerivation {
|
||||
pname = "minuet";
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/minuet/";
|
||||
description = "Music Education Software";
|
||||
license = with licenses; [ lgpl21 gpl3 ];
|
||||
maintainers = with maintainers; [ peterhoeg HaoZeke ];
|
||||
broken = lib.versionOlder qtbase.version "5.14";
|
||||
|
|
|
@ -29,6 +29,7 @@ mkDerivation {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.kde.org";
|
||||
description = "KDE document viewer";
|
||||
license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
|
||||
maintainers = with maintainers; [ ttuegel turion ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
mkDerivation {
|
||||
pname = "picmi";
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/picmi/";
|
||||
description = "Nonogram game";
|
||||
longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or
|
||||
leaving blank the cells in a grid according to numbers given at the side of the grid.
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
mkDerivation {
|
||||
pname = "pim-data-exporter";
|
||||
meta = {
|
||||
homepage = "https://apps.kde.org/pimdataexporter/";
|
||||
description = "Saves and restores all data from PIM apps";
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
|
|
|
@ -20,6 +20,8 @@ mkDerivation {
|
|||
'';
|
||||
propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/spectacle/";
|
||||
description = "Screenshot capture utility";
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
broken = versionOlder qtbase.version "5.15";
|
||||
};
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, addOpenGLRunpath
|
||||
, cmake
|
||||
, glibc_multi
|
||||
, glibc
|
||||
|
@ -9,7 +10,6 @@
|
|||
, pkg-config
|
||||
, cudatoolkit
|
||||
, withCuda ? false
|
||||
, linuxPackages
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -60,13 +60,23 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake git pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
git
|
||||
pkg-config
|
||||
] ++ lib.optionals withCuda [
|
||||
addOpenGLRunpath
|
||||
];
|
||||
|
||||
buildInputs = [ hwloc ] ++ (if withCuda then
|
||||
[ glibc_multi cudatoolkit linuxPackages.nvidia_x11 ]
|
||||
[ glibc_multi cudatoolkit ]
|
||||
else
|
||||
[ glibc.static ]);
|
||||
|
||||
NIX_LDFLAGS = lib.optionals withCuda [
|
||||
"-L${cudatoolkit}/lib/stubs"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DFIRESTARTER_BUILD_HWLOC=OFF"
|
||||
"-DCMAKE_C_COMPILER_WORKS=1"
|
||||
|
@ -76,8 +86,14 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp src/FIRESTARTER${lib.optionalString withCuda "_CUDA"} $out/bin/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString withCuda ''
|
||||
addOpenGLRunpath $out/bin/FIRESTARTER_CUDA
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kile-wl";
|
||||
version = "unstable-2021-08-03";
|
||||
version = "unstable-2021-09-02";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "snakedye";
|
||||
repo = "kile";
|
||||
rev = "7f0b1578352d935084d3d56ef42487d2a8cfbfe8";
|
||||
sha256 = "sha256-Ir9LNQt7/7TjhCJ69HYx1tBXeq/i7F3ydmenvchZgDI=";
|
||||
rev = "acd61f7e59cc34091c976b0cdc3067dd35b53cae";
|
||||
sha256 = "sha256-O5sdPw9tR3GFPmJmb/QDmdBc7yeSGui4k+yn4Xo016A=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
url = "https://gitlab.com/snakedye/kile.git";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-195rPxX3BTxJ0xLgye14aWuBd5OuJ30wyUa4wrbQ3Xo=";
|
||||
cargoSha256 = "sha256-2QCv5fk0AH4sv0QJ/16zniHfg3HZLoHB7dl6vSfkxpE=";
|
||||
|
||||
nativeBuildInputs = [ scdoc ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } :
|
||||
{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osm2xmap";
|
||||
|
@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = [
|
||||
"GIT_VERSION=${version}"
|
||||
"GIT_TIMESTAMP="
|
||||
"SHAREDIR=${placeholder "out"}/share/osm2xmap"
|
||||
"SHAREDIR=${placeholder "out"}/share/osm2xmap/"
|
||||
"INSTALL_BINDIR=${placeholder "out"}/bin"
|
||||
"INSTALL_MANDIR=${placeholder "out"}/share/man/man1"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
|
||||
|
||||
buildInputs = [ libroxml proj libyamlcpp boost ];
|
||||
buildInputs = [ libroxml proj_7 libyamlcpp boost ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sembruk/osm2xmap";
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, wxGTK30-gtk3
|
||||
, wxmac
|
||||
, ffmpeg
|
||||
, proj
|
||||
, proj_7
|
||||
, perl532
|
||||
, unscii
|
||||
, python
|
||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ];
|
||||
|
||||
buildInputs = [
|
||||
libGL libGLU ffmpeg proj
|
||||
libGL libGLU ffmpeg proj_7
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
wxmac Carbon Cocoa
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg }:
|
||||
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.6.1";
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
|
||||
buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ];
|
||||
buildInputs = [ bzip2 qtbase libnova proj_7 openjpeg libpng ];
|
||||
cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];
|
||||
|
||||
|
|
|
@ -44,9 +44,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "94.0.4606.54",
|
||||
"sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83",
|
||||
"sha256bin64": "0lq34l00zrr92g882xzqwq1lf2vf12x1mwidrr2qh6fz7v5418d3",
|
||||
"version": "94.0.4606.61",
|
||||
"sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4",
|
||||
"sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-08-11",
|
||||
|
@ -55,8 +55,8 @@
|
|||
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "94.0.4606.54-1",
|
||||
"sha256": "0phy87fiqdgikgl60yap7n1mvyvsidgznqp06j86287iihml3z2m"
|
||||
"rev": "94.0.4606.61-1",
|
||||
"sha256": "1sb6n3dnp8d1bzhyl9d8yc0x9imyccnwxf1fqzv7vs3fd6dgcprp"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,17 +1,27 @@
|
|||
{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake
|
||||
, qtbase, qtquickcontrols, qtquickcontrols2, qtkeychain, qtmultimedia, qttools
|
||||
, libquotient, libsecret
|
||||
{ mkDerivation
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qtbase
|
||||
, qtquickcontrols
|
||||
, qtquickcontrols2
|
||||
, qtkeychain
|
||||
, qtmultimedia
|
||||
, qttools
|
||||
, libquotient
|
||||
, libsecret
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "quaternion";
|
||||
version = "0.0.9.5-beta2";
|
||||
version = "0.0.95";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QMatrixClient";
|
||||
repo = "Quaternion";
|
||||
rev = version;
|
||||
sha256 = "sha256-K4SMB5kL0YO2OIeNUu4hWqU4E4n4vZDRRsJVYmCZqvM=";
|
||||
sha256 = "sha256-WqhHqo4ySxufulC+TxS2ko2R5hUiORgdNAkp5Awdcw8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -26,7 +36,8 @@ mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake qttools ];
|
||||
|
||||
postInstall = if stdenv.isDarwin then ''
|
||||
postInstall =
|
||||
if stdenv.isDarwin then ''
|
||||
mkdir -p $out/Applications
|
||||
mv $out/bin/quaternion.app $out/Applications
|
||||
rmdir $out/bin || :
|
||||
|
|
|
@ -30,4 +30,6 @@
|
|||
buffer_autoset = callPackage ./buffer_autoset { };
|
||||
|
||||
highmon = callPackage ./highmon { };
|
||||
|
||||
zncplayback = callPackage ./zncplayback { };
|
||||
}
|
||||
|
|
28
third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/zncplayback/default.nix
vendored
Normal file
28
third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/zncplayback/default.nix
vendored
Normal file
|
@ -0,0 +1,28 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "weechat-zncplayback";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/weechat/scripts/raw/bcc9643136addd2cd68ac957dd64e336e4f88aa1/python/zncplayback.py";
|
||||
sha256 = "1k32p6naxg40g664ip48zvm61xza7l9az3v3rawmjw97i0mwz7y3";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share
|
||||
cp $src $out/share/zncplayback.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
scripts = [ "zncplayback.py" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Add support for the ZNC Playback module";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
};
|
||||
}
|
|
@ -1,29 +0,0 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub
|
||||
, cmake, qtbase, kdnssd
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "trebleshot";
|
||||
version = "0.1.0-alpha2-15-ga7ac23c";
|
||||
# name="${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "genonbeta";
|
||||
repo = "TrebleShot-Desktop";
|
||||
rev = version;
|
||||
sha256 = "1k8wagw6arsi1lqkhn1nl6j11mb122vi1qs0q2np6nznwfy7pn1k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ qtbase kdnssd ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Android file transferring tool for desktop";
|
||||
homepage = "https://github.com/genonbeta/TrebleShot-Desktop";
|
||||
license = licenses.gpl2;
|
||||
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ woffs ];
|
||||
};
|
||||
}
|
|
@ -1,27 +1,31 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtwebengine }:
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, qtbase
|
||||
, qtwebengine
|
||||
}:
|
||||
|
||||
let
|
||||
description = "A note-taking application that knows programmers and Markdown better";
|
||||
in mkDerivation rec {
|
||||
version = "2.10";
|
||||
mkDerivation rec {
|
||||
pname = "vnote";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tamlok";
|
||||
repo = "vnote";
|
||||
owner = "vnotex";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
sha256 = "EeeVGnKI0irLO1zJQxlVlIUhqG987JIgxNvKpUgLxUQ=";
|
||||
sha256 = "sha256-D9/4BakXTComvGTV8F131G5PzA8LhWfNSZRBOMo5t5c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase qtwebengine ];
|
||||
|
||||
meta = with lib; {
|
||||
inherit description;
|
||||
homepage = "https://tamlok.github.io/vnote";
|
||||
homepage = "https://vnotex.github.io/vnote";
|
||||
description = "A pleasant note-taking platform";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.kuznero ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -33,13 +33,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "sdrangel";
|
||||
version = "6.16.2";
|
||||
version = "6.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f4exb";
|
||||
repo = "sdrangel";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wWGKJWd3JDaT0dDMUrxv9ShMVe+q4zvH8SjyKw7UIbo=";
|
||||
sha256 = "sha256-qgFnl9IliKRI4TptpXyK9JHzpLEUQ7NZLIfc0AROCvA=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,31 +1,69 @@
|
|||
{ lib, stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal, cgal
|
||||
, proj, boost, cmake, python2, doxygen, graphviz, gmp, mpfr }:
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, cmake
|
||||
, doxygen
|
||||
, graphviz
|
||||
, boost
|
||||
, cgal_5
|
||||
, gdal
|
||||
, glew
|
||||
, gmp
|
||||
, libGL
|
||||
, libGLU
|
||||
, mpfr
|
||||
, proj
|
||||
, python3
|
||||
, qtxmlpatterns
|
||||
, qwt
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
python = python3.withPackages (ps: with ps; [
|
||||
numpy
|
||||
]);
|
||||
boost' = boost.override {
|
||||
enablePython = true;
|
||||
inherit python;
|
||||
};
|
||||
cgal = cgal_5.override {
|
||||
boost = boost';
|
||||
};
|
||||
in mkDerivation rec {
|
||||
pname = "gplates";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2";
|
||||
sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b";
|
||||
name = "gplates_${version}_src.tar.bz2";
|
||||
url = "https://www.earthbyte.org/download/8421/?uid=b89bb31428";
|
||||
sha256 = "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2
|
||||
doxygen graphviz gmp mpfr
|
||||
(boost.override {
|
||||
enablePython = true;
|
||||
python = python2;
|
||||
})
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
graphviz
|
||||
];
|
||||
|
||||
NIX_CFLAGS_LINK="-ldl -lpthread -lutil";
|
||||
buildInputs = [
|
||||
boost'
|
||||
cgal
|
||||
gdal
|
||||
glew
|
||||
gmp
|
||||
libGL
|
||||
libGLU
|
||||
mpfr
|
||||
proj
|
||||
python
|
||||
qtxmlpatterns
|
||||
qwt
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Desktop software for the interactive visualisation of plate-tectonics";
|
||||
homepage = "https://www.gplates.org";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "pass-git-helper";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "languitar";
|
||||
repo = "pass-git-helper";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GdsFPpBdoEaOCmdKxw5xTuFOcGFH94w5q/lV891lCUs=";
|
||||
sha256 = "sha256-HEdOR6jS16c4UIatlgB6HeBtyyxePSab+6e2hu85dsI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyxdg ];
|
||||
|
@ -21,6 +21,6 @@ buildPythonApplication rec {
|
|||
homepage = "https://github.com/languitar/pass-git-helper";
|
||||
description = "A git credential helper interfacing with pass, the standard unix password manager";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ vanzef ];
|
||||
maintainers = with maintainers; [ hmenke vanzef ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, crystal_0_33
|
||||
, crystal_1_0
|
||||
}:
|
||||
|
||||
let
|
||||
crystal = crystal_0_33;
|
||||
crystal = crystal_1_0;
|
||||
|
||||
in crystal.buildCrystalPackage rec {
|
||||
pname = "thicket";
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
ameba = {
|
||||
owner = "veelenga";
|
||||
repo = "ameba";
|
||||
rev = "v0.10.0";
|
||||
sha256 = "1yjxzwdhigsyjn0qp362jkj85qvg4dsyzal00pgr1srnh2xry912";
|
||||
rev = "v0.14.3";
|
||||
sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -25,13 +25,13 @@ assert lib.versionAtLeast mlt.version "6.24.0";
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "shotcut";
|
||||
version = "21.03.21";
|
||||
version = "21.09.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mltframework";
|
||||
repo = "shotcut";
|
||||
rev = "v${version}";
|
||||
sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk=";
|
||||
sha256 = "1y46n5gmlayfl46l0vhg5g5dbbc0sg909mxb68sia0clkaas8xrh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
@ -57,7 +57,7 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
prePatch = ''
|
||||
sed 's_shotcutPath, "melt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
|
||||
sed 's_shotcutPath, "melt[^"]*"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
|
||||
sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp
|
||||
sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp
|
||||
NICE=$(type -P nice)
|
||||
|
@ -94,7 +94,7 @@ mkDerivation rec {
|
|||
please use the official build from shotcut.org instead.
|
||||
'';
|
||||
homepage = "https://shotcut.org";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ goibhniu woffs peti ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "river";
|
||||
version = "unstable-2021-08-03";
|
||||
version = "unstable-2021-08-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ifreund";
|
||||
repo = pname;
|
||||
rev = "2fc0875a3e17a0328d14d0c6323bd8022d5b15de";
|
||||
sha256 = "sha256-Cs9RRubxy0DY6ILRZY36HtcoqBvzbN7NEfpREq1KBBQ=";
|
||||
rev = "e59c2a73d72853cb54f55eecc446f337c94cda24";
|
||||
sha256 = "sha256-R/Wg8KLh4v3ccX1Uh0Q+7026tRH7XLxHpX9/BgsGGdA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -22,7 +22,8 @@
|
|||
, postInstall
|
||||
# : list Maintainer
|
||||
, maintainers ? []
|
||||
|
||||
# : passtrhu arguments (e.g. tests)
|
||||
, passthru ? {}
|
||||
|
||||
}:
|
||||
|
||||
|
@ -49,6 +50,8 @@ let
|
|||
"CHANGELOG"
|
||||
"README"
|
||||
"README.*"
|
||||
"DCO"
|
||||
"CONTRIBUTING"
|
||||
];
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
|
@ -106,4 +109,6 @@ in stdenv.mkDerivation {
|
|||
[ pmahoney Profpatsch qyliss ] ++ maintainers;
|
||||
};
|
||||
|
||||
inherit passthru;
|
||||
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ let
|
|||
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "10.0.0";
|
||||
version = "10.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
|
||||
|
|
|
@ -1,95 +1,95 @@
|
|||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
iosevka = "1730pcbxkcyzfw22hgqsv45sybd79pdsm7vb4l2gm9pfzasypjra";
|
||||
iosevka-aile = "1nm0s8zhmg5v181rik4d4nsygxrvfr9wdjwqz6gfl2dmg17r7cyi";
|
||||
iosevka-curly = "0kmvj1zhf0xs02rdf2x1f3lnahj36dpc91p6k4mbji5mn9klb547";
|
||||
iosevka-curly-slab = "0zklkypyh303gi5gqpdkwmj3g9m1f1xqda3ah232c3d6cfznbyqc";
|
||||
iosevka-etoile = "1nj0p25pbjkzc1lg8fp45zxj6r3q4k5yc882rra3jkjmlw2h65b7";
|
||||
iosevka-slab = "1vz9443swmxb27iqmimjyg3zs6q0pw7fpwiiaa7k1s7gc5xkyb5s";
|
||||
iosevka-ss01 = "1g2xxl9x5apyhhm7lsbmplh19c5aln3jwryzqvrqxpnsngkqmp0h";
|
||||
iosevka-ss02 = "1d2b8syvdx8i1dqw9k87yirkyg3wdvr7y2hy5c3nzj62sg7drfla";
|
||||
iosevka-ss03 = "0b4y1v6kri4d56h6m58qqmc50bh4r4151h72n1a2q0a0nwkgvlwm";
|
||||
iosevka-ss04 = "0fj7rj9xy9sfrzdhjqzv37v34lmkajz4d497i7lvdc2i0w4ia4gf";
|
||||
iosevka-ss05 = "0xncnrf8d78iqf3731z0midw4rlza8hdji0m3gvxnigbq3cqxhwd";
|
||||
iosevka-ss06 = "15vclj2m5brp1fnw82w5b53cwlwzzsr5hzxm6j2bj9bghc75cigm";
|
||||
iosevka-ss07 = "1hs7c5n5pcgmspwrhdxv69dc0wdycfcdfs1mxwbamnal77c9q0s8";
|
||||
iosevka-ss08 = "00fz1yb0g1rlzw3pxfpi88vh03k1q9nkzi8h6naqv0hngcbsz1ia";
|
||||
iosevka-ss09 = "1ig5lqpk86z7mwr45gqvsdxs00g7b0mvx1i8q8hx5x4pyr36y7yh";
|
||||
iosevka-ss10 = "12c50mh3xggz03lqqrkdcmdfvfq3m87x8xb9x0h8lwfslqaa0c0x";
|
||||
iosevka-ss11 = "1qvdsfviif8wyms0bkzm7vx0gf8vx5gic3ghincv4ignx8hmrbm9";
|
||||
iosevka-ss12 = "17qxrpmbrandlibhshycsgjlwspx7gz0x6mzhy1n8ccycrd7qlii";
|
||||
iosevka-ss13 = "07nz5wf99j6m72vkrnbhpr4yhn3pdgb898dinzi4n5k0rmky03zb";
|
||||
iosevka-ss14 = "1h9icwqz4qdzm99j17qxmrv1jvm3dzqrcghsffva9yvr32anc5y6";
|
||||
iosevka-ss15 = "06362h12vy48ib338dw7vjxx6vqpfzcc47f54f23pp1b73ygrkxp";
|
||||
iosevka-ss16 = "1sbby53vmjaq8h09a2izf4w5nha5knpgb0ljfyfd1wj1nnkdbisp";
|
||||
iosevka-ss17 = "13l3dindp0x76c3ddx7ibjins65f6xpv8zy7dfjyil8kg2570lfq";
|
||||
iosevka-ss18 = "1z0ypy19cj2hlg8qhvg0a54p0704f8szljf0lrrajprc8ws4cqy0";
|
||||
sgr-iosevka = "0cl08cxidpvrjy2ifhjb4cgrcjsldv86ipx4i8wh2kvs632hkz42";
|
||||
sgr-iosevka-aile = "01a7glrzrifwbfh05jynhmjd78cck4hw8aik3qf8pjr0lmyn8inz";
|
||||
sgr-iosevka-curly = "1wl80fn6zk1dvhqnfwxc74i2f925yf362s45d1bshi3n2qd7ixv4";
|
||||
sgr-iosevka-curly-slab = "18vvhkqhljnpv75v7cbw5z3d4xc418g0pgh39zyy1sdpq01h6ycj";
|
||||
sgr-iosevka-etoile = "0g7brirxpb2s0a94vc00jk8d45wafcimkd1dkilhpc5h862d7y3d";
|
||||
sgr-iosevka-fixed = "17g81448bjms88xph2h8cjfz2z2bhy4dc5ialy583zw9hafk0b6k";
|
||||
sgr-iosevka-fixed-curly = "18kfz4bdp81ylwjikdyj00m58bb5ykaxnxv288d9qr9r0wav14bf";
|
||||
sgr-iosevka-fixed-curly-slab = "1r1223m547ddpjrc0dpzkmkbw4851lvkc2g37yzd97i7g3da0q5g";
|
||||
sgr-iosevka-fixed-slab = "006d1cznz5ikclpz6kli69h5jnsr50yd08za3m6k07npnj4g9i9h";
|
||||
sgr-iosevka-fixed-ss01 = "0dxjmxvhq7dba7f4dcw2z85mgbx4qmy3w1nz99kbn729pjv3xbnr";
|
||||
sgr-iosevka-fixed-ss02 = "1ljq7dxj7dfg8bwmljykbl0lgkw4q9v5h41mflrvxhxkgblghji9";
|
||||
sgr-iosevka-fixed-ss03 = "14q5wi4af1mnm6g895zgpmf1qcnadv0mpiyydcizayqxnc015xr0";
|
||||
sgr-iosevka-fixed-ss04 = "0szy07dlv9ag7jqahlgyi9wgwpas73rg2vw74jg63fx06svwyx7z";
|
||||
sgr-iosevka-fixed-ss05 = "1bm6mqal8jni9za27dmbq9pdqs9j3x58w0cnzx7ma3gyaypfi5jc";
|
||||
sgr-iosevka-fixed-ss06 = "08a6mzrbx7wl4z147kv3289fbaccd7cs0r1gp3dnkkypsy4cw907";
|
||||
sgr-iosevka-fixed-ss07 = "05l0i4mblgx2zqfp5qvpwqp9671mkfj60i4pg0kznwd13j0ya8qs";
|
||||
sgr-iosevka-fixed-ss08 = "15ils79jpa1kibyh3ih5dkjk0qi0ppsy9iibyyl301c4vyhgypzb";
|
||||
sgr-iosevka-fixed-ss09 = "1s2m349m7560zz10r0w0nmgixxzn0ys4j8jwy3c1zxzphdq60a10";
|
||||
sgr-iosevka-fixed-ss10 = "1iby1afylism23cn70x0bb2qi8mdkf0ysgnmagdr47cgh6n8kgmy";
|
||||
sgr-iosevka-fixed-ss11 = "10zn26ijrdj2s0fzc1d1kyi0rpy6qw1bbp6qwf1x1mbhapj0mc8a";
|
||||
sgr-iosevka-fixed-ss12 = "1vdxn5qr1h192c1czxifvr4f2mv1jhkb20m5n3wgawyf75p7blcy";
|
||||
sgr-iosevka-fixed-ss13 = "1fdki2kf6xy2mvxnna1m77xgk5hm88i1g5ds8dzr6gc5mkm5mw8m";
|
||||
sgr-iosevka-fixed-ss14 = "1gaycm1zzm2qnriy76xnyy74rk9ccs54q71br2m55jlr4ifglanv";
|
||||
sgr-iosevka-fixed-ss15 = "07b9ss5a2vk4gndwc6zw8qwa4wgsrfnfq9cbrx9zlzj08143q9dr";
|
||||
sgr-iosevka-fixed-ss16 = "156yh0hbqqklhpf7czblk43nmq3cw0akgiy4z7jq0904b96v68zs";
|
||||
sgr-iosevka-fixed-ss17 = "0wj8j09wvf7m7m1ss47bqf6s0nvrn3vlzdhgnmzwc2jc4rkrvjpa";
|
||||
sgr-iosevka-fixed-ss18 = "0zsy2ql3r0419h6ganfdfhmwzn7lprypw26bq7iqzvld03vss45c";
|
||||
sgr-iosevka-slab = "10al24w3lglgdz9v86yx6q58mx4qyrxr8kffl0qvjiqvdcyyp460";
|
||||
sgr-iosevka-ss01 = "0ipwpjwg14wijzx0qb0zni8rzvw6wwfbwzqv8pzf2dmm6iwnmnqc";
|
||||
sgr-iosevka-ss02 = "0nfbw5smfarglma3cddzw397rjh72qjxqhz3g28l0sj26gk2bwma";
|
||||
sgr-iosevka-ss03 = "0cdvb5igir3c216niq3i0hbjvff1y9bnzf6fwny17303vjvfqg41";
|
||||
sgr-iosevka-ss04 = "0sj62id2ljwsms8xv17j474pdr881r6z8kb7a26gv48p08r225fq";
|
||||
sgr-iosevka-ss05 = "13pxfc2s2vxxkqp4jvzam6bx7ywn350phs5xhlzmcdk4sjgml9i2";
|
||||
sgr-iosevka-ss06 = "0xscng0a90vlr621pnl3hxpn2la862rgcx7xy8d1i6k47wpp1zbj";
|
||||
sgr-iosevka-ss07 = "0yj11jc8fzw9l2316y90mdj7hsqd46y5i1rckxlvih5nv300x1cp";
|
||||
sgr-iosevka-ss08 = "15jn1xjafawd5b4y2z4fkbaf22fgbvc861m3sjx4hib5vqjn41p3";
|
||||
sgr-iosevka-ss09 = "0kffxk8kr5giisfc10a5h889azgkqs4q9f0gggv8xlml4afdycd0";
|
||||
sgr-iosevka-ss10 = "1ldwpx2ysx0v79qfzhcqcc2cwylwnr6x81fy2yqqnv2319v1xrky";
|
||||
sgr-iosevka-ss11 = "1rd98yvky9wxgxcp4ps9p1k4ll8hnh9g9vgwf1r0bjlykhv7dhmf";
|
||||
sgr-iosevka-ss12 = "0439fg1pvxnv96v77rzrn0sbzna962ixgn8bx4ykpx0wkrigmyrk";
|
||||
sgr-iosevka-ss13 = "0qzbf4milkijhmxfkv3al2w5s2aa0a0aqqqxbv2wgza7g3i2glgv";
|
||||
sgr-iosevka-ss14 = "0vk8s71lyrdgngdbaasimdg0a5ygckciy7wxkkbixvxh18vi3mfr";
|
||||
sgr-iosevka-ss15 = "0c5sai8zbciwpkwrfliakf8091n5zcj7bilkbhzljpgfhalxg43v";
|
||||
sgr-iosevka-ss16 = "0a8q3ns3chw6kg77fxc03njlbr4slnq83381lwznhnsziyk7jb6r";
|
||||
sgr-iosevka-ss17 = "0bbfq7fjbr718fnmfy4nl7m9n7sjnra89chig9am7571ws66wbxc";
|
||||
sgr-iosevka-ss18 = "16sj1g5i75hfd07ghsm6zb655mypgwagxzpz5sk22dkrilxwrdix";
|
||||
sgr-iosevka-term = "1ncr05mprm8bar8v9saqsklgm36mymzhzw5x1viz04757s89cqnc";
|
||||
sgr-iosevka-term-curly = "0vwi4ccz0fnd7a3adfxffar5qxfzkx4pz23208kzc5zjidl9s9ka";
|
||||
sgr-iosevka-term-curly-slab = "0dwjcj8d4am5kqw35w68hm3qnxyk9w5k44z2n1mf9gsj411layi8";
|
||||
sgr-iosevka-term-slab = "1i7gp1lirdzzcmcv5lcrdf2mb2l9v3kjx1yhhdydfpapq85q5wma";
|
||||
sgr-iosevka-term-ss01 = "0zjx0r7sznzdw1diy88p6bkdki0ihqilvksil6qccbg4fn9f2swm";
|
||||
sgr-iosevka-term-ss02 = "1ma8366h42n5ij2czhkhmfyzmv23hmn165ihjxmwkxhg0c58l4jl";
|
||||
sgr-iosevka-term-ss03 = "0n23fy0ks0pid1m8z5vl9j7g607nl70h7bxfn015lryl7v8yj2dm";
|
||||
sgr-iosevka-term-ss04 = "1a7llxzf4cs9jr7ldnhxdc7r2jviaffq2kvhkj3spqan9bk6ymcx";
|
||||
sgr-iosevka-term-ss05 = "1d3sp99f6gycbmxk6z0raa7gk0is0m7bc7dqb4dy6zikra35kv4x";
|
||||
sgr-iosevka-term-ss06 = "1vjc785rzzrcbdbcp5j2dljk9flv9inmcjswyf7fyacn4ghszap6";
|
||||
sgr-iosevka-term-ss07 = "03pjbr7bp1av2pav1x913j1h18b4nhxvr7k62dg68b019rj1pvfg";
|
||||
sgr-iosevka-term-ss08 = "1b9qvkb4zpvwfygvh7i6b6dcwk8jk0y1kg078ma4vlpfag9ay4xb";
|
||||
sgr-iosevka-term-ss09 = "0zcg1b1j7113qp5q81s5dx34n1h3lmrshrx8xkvy6kn1n48b17b8";
|
||||
sgr-iosevka-term-ss10 = "1nrciywy8fr8x716w087pyyw0vkyd60j3lmxc7ixsr9yl3ff9bb0";
|
||||
sgr-iosevka-term-ss11 = "1k4xsl9x6195ap2zg0xxrla4svvzxhwas6xf0dbh7k2baiwyknb3";
|
||||
sgr-iosevka-term-ss12 = "16h0i0vj98l0l6hfyjsq4qy8mxkz5p8xpqxnpd56wxm7mnl2b7i9";
|
||||
sgr-iosevka-term-ss13 = "1i907injbdamdyfd1ydzdjsygn0b3syab0ahas7xmd438rfkcfj6";
|
||||
sgr-iosevka-term-ss14 = "1ypx059ws3pdhkn6lsc4cai4qhm8gzm9chmrsiqk2978yaf2z06c";
|
||||
sgr-iosevka-term-ss15 = "1nqbslx44ikj4wd3h1ycqsbk6sk72zz2n49pkn9r3khp9wwz7qwn";
|
||||
sgr-iosevka-term-ss16 = "1lpmph22gqzn3zf9zsr5hzb59573xkiz7yq9pfqg5bxnx248byr9";
|
||||
sgr-iosevka-term-ss17 = "02d3vs46cg4nbak1y64cw5jlhzgxmlxxkhlz3jzf5wzzb9kli4iv";
|
||||
sgr-iosevka-term-ss18 = "1z580s3icbzpivp766cqdc3j8ijgpp5f2yz9a4g4hpz3isa1lpy6";
|
||||
iosevka = "09fwk1sm2i0yf2qvwc99g46jhhi9jwmxrqm02m9n348gcsvml7k1";
|
||||
iosevka-aile = "07nykjvm5acnxc585y7qfs38d1mm4x654wykq24cwd0qdialz2yn";
|
||||
iosevka-curly = "1v9v5xhv4pdihb2q1hgzlw3z54vpg9lvjf753z95x97ah246kbyc";
|
||||
iosevka-curly-slab = "0av94y57pi9vy8skb96dbvlcbz7j6hz7cvhsrdpx50nbf9x2ya4b";
|
||||
iosevka-etoile = "0vinmfcxs16rx1i86sl7ig7hwwyfwv49vh12k6yx9gx56jyywj51";
|
||||
iosevka-slab = "18sjdj5gdg993a0mzvx43l3ll7q2l8w30j12934nlzlw5cadv8gf";
|
||||
iosevka-ss01 = "1k08nwzgdz78iiijd6bzfricjbwa23xmzjm6jq72q7cvcqrwpzfj";
|
||||
iosevka-ss02 = "139q7ps9y97qzmyqr45xqphw5szr4a119pm1jnwrc5scplnhiisb";
|
||||
iosevka-ss03 = "1rbsvrc11skznnk448nj0brfvj58zhgkczlq7skhb8rc3mznhgb8";
|
||||
iosevka-ss04 = "0rr7zy9n84lqxj7h0ljd091m8a5yjs0kzpyp3j68mvccsdwncqq4";
|
||||
iosevka-ss05 = "035rv0pq7741n6c7zkajjzis2rkdyb75z9zjzyiiylfx19j6d6a7";
|
||||
iosevka-ss06 = "0bvbl36zpk79f3h7svs51l0wbllmnnkgxmdk76ikfg4a490nz4g9";
|
||||
iosevka-ss07 = "061xngjvznr6syk1y996fmnjqpj0kvnnibibr46lgqcx5xb1w38x";
|
||||
iosevka-ss08 = "0szc3iydg3kkg6v42ym52b7nd6ljfwrfcw7n3j1av9vhf5gmn0rv";
|
||||
iosevka-ss09 = "1p0hsl6vihly2drh6yiniijcwvwjz35d34d6jfxavjhx028h92mw";
|
||||
iosevka-ss10 = "152asnmd7m7q1hligkv4ar8h71xn96586p9whplvmkgfrcr731p7";
|
||||
iosevka-ss11 = "0mf3gg1b9x3i1j8c3yqks7sc56j97fwx736pr01bf99lw4jchd2h";
|
||||
iosevka-ss12 = "136s3i5dwz0iv8mivq8fraadhbqzjjc5h2c5wqydvmw9i7rpyp2h";
|
||||
iosevka-ss13 = "0n9886kn9sr89rwnc0r0q9d2a16fykq5asd0cazrs95jbqq0acix";
|
||||
iosevka-ss14 = "128y8dgsawdz20lyjshdl7932222dph6qyiirim6rkh99bp2kdy6";
|
||||
iosevka-ss15 = "0h2ywzn2gmaj61n5gzdms7v3yqa3x474icdg10vqds7i86n6g8am";
|
||||
iosevka-ss16 = "1c1sr4lphwf8x5xdagciws8dr7ia8jh2cy3zv787g8dhflhzvc1i";
|
||||
iosevka-ss17 = "1gqbwx89hcnky7bi1xscz13ykh4srvycbfgf9z4b5j26wflfk2a9";
|
||||
iosevka-ss18 = "07h0zcf789g6qw5laznf5y67syh003lwhr6141ifz2zv2sgjl716";
|
||||
sgr-iosevka = "0h9yg63cjc0s4kbl5k9lpic48y5iz0hlm8bi7h2h850zhbj405fm";
|
||||
sgr-iosevka-aile = "1sv0lb2xb18skwvvw95qzdi9hqr1mr3gi2p4plqlbxq6bjpcvc57";
|
||||
sgr-iosevka-curly = "1irg71zrbqnw1r2ar5qkfzdjzb1ziwd22jyvm9g1gynjiwh1idaj";
|
||||
sgr-iosevka-curly-slab = "12lc9gqlbnp4crp9qrqf38dlzwaqanyj3l9xyasd96z33wmgnvcr";
|
||||
sgr-iosevka-etoile = "0j78cbrdsz9qnvs6y6vkv1ys2spfv9l207z20zkyw5m0i3yvhwi4";
|
||||
sgr-iosevka-fixed = "04lirldlmjlvz8q33xb2886d1jqaj1a7a94mnrm1ikw2gzbh7j1m";
|
||||
sgr-iosevka-fixed-curly = "1s4xyzlmg9s8jvpvc22bxqc6z9qn0bbgham9kp1w2nwlmlnhl712";
|
||||
sgr-iosevka-fixed-curly-slab = "01g6rk0n1xs0bv4vyqv9pwyndzk9k8cfhf0sd640zdkqi51p4raw";
|
||||
sgr-iosevka-fixed-slab = "1ipzwxs0jqk4cc8snyy9mxhak1zrj9qlicwwhhhv8pmxs2lcirgq";
|
||||
sgr-iosevka-fixed-ss01 = "1vpfgj496yzn5n8zb5hxzlx0kh0yfh27v2naz4zi4gci0k58mj4g";
|
||||
sgr-iosevka-fixed-ss02 = "122id78h9lvnm4abflng5572zjdn52wqci9jq88gh5iyk02kja6b";
|
||||
sgr-iosevka-fixed-ss03 = "0wa4q1zqp75ja5m34wy3zmx5in225ldr0ah23y7l9kh3x67lfykd";
|
||||
sgr-iosevka-fixed-ss04 = "11dxlc3r1gn3psf4bpsiwr283zjpc63d8fgswwbh5d6swk9nxm7v";
|
||||
sgr-iosevka-fixed-ss05 = "0jw57byz8rbdc5h1ig5d4kpjklqrm6880sx0z06gw97z3p4aqmb1";
|
||||
sgr-iosevka-fixed-ss06 = "0saxvswnrszi3kirv5j1pp96n9fhnqwrmsc8naqdgq342rcy13w5";
|
||||
sgr-iosevka-fixed-ss07 = "0bsrpfbcjf2g8vd6f6sv6yxvdi9s6wdjckbjb3m64mdgv25lpdwv";
|
||||
sgr-iosevka-fixed-ss08 = "1l5k2y0h4h3fsk2ac7akym4rash6bb63bj9vhh3f9igq062dk10a";
|
||||
sgr-iosevka-fixed-ss09 = "09s1x6q7lx4y0462m0ac3jp8jfy4x2sc2irfmxcz2rl5px2smgdg";
|
||||
sgr-iosevka-fixed-ss10 = "0j8h200gw60rzknxyg7nvcg9cw1nhvgy3n6n70lf3b8jnp5splzd";
|
||||
sgr-iosevka-fixed-ss11 = "0cgxy8gq5wak1a7z3j013l1kadph45ckl865dlkw5jnmndz7a684";
|
||||
sgr-iosevka-fixed-ss12 = "1y9grhh3ami6qwdm8a6r7m671n7c9bnxp7qgmk7qxgb8jax31qcp";
|
||||
sgr-iosevka-fixed-ss13 = "1a9in4ybl9vjyvxab0hdbjnq46rg3yx9gyalj6x8y3mxsfij0wh2";
|
||||
sgr-iosevka-fixed-ss14 = "0wc3yw6rf05wdh8kzz6af1apirvyspkb8bav4pbdxahsy1asij58";
|
||||
sgr-iosevka-fixed-ss15 = "1b7ns68lx267y9rwlv47yl0y48nvwyzqdpgpwdfwkmpl6vd9kmnn";
|
||||
sgr-iosevka-fixed-ss16 = "07h4zvcll7324r4l7kwwk13874hmjs7vdiiffbjwhi403vbiw1an";
|
||||
sgr-iosevka-fixed-ss17 = "1rjb0c3yvww8n3sam49ynj2f7h0xgbdsznk7xbj4sk5pkx3l5zr5";
|
||||
sgr-iosevka-fixed-ss18 = "0s39p9khjidasizg1ps3k87ldlkpy3cxy5l6r0c2bkvnfz63k66n";
|
||||
sgr-iosevka-slab = "10gx0hlr2iywj3nksc70idjha9wja3fw9fl8yvkmnpbqaxlrlzm8";
|
||||
sgr-iosevka-ss01 = "1fzxzx9ky4zrbv3zbjh7c57k8dm949xz356a4jk1lpbmwyd0gry4";
|
||||
sgr-iosevka-ss02 = "1qk9f257pq2r4jfilrh02viwgy80kqga4czpc1mvwwbqfalz2lg9";
|
||||
sgr-iosevka-ss03 = "0cj2xgpfcxdj4sh2sdp6cvbg08s6c8gvg0h01ylrqnazxddfv1xr";
|
||||
sgr-iosevka-ss04 = "02q2xqv1qvdijn53p3nbz2swn39yk2pp5ndq1wkakm5j3w5n52f9";
|
||||
sgr-iosevka-ss05 = "0y4f8zkzvxq512ns4qzbq5hnd6zzwdjlc1p2iify0f4m491msx5n";
|
||||
sgr-iosevka-ss06 = "154jzvb44h1njzkzsk9x6mk7g9sa5jr7kqjv26ylm0ax0i039ax2";
|
||||
sgr-iosevka-ss07 = "08025i39hkinrd0sq0yj3d9dc3fqhv5qfdvxaqg3wp89p5jz2q2q";
|
||||
sgr-iosevka-ss08 = "1hj80l9k1qi4cnw5dqfp431z3yiyqvrhby9f4ny84ppkpihp60xk";
|
||||
sgr-iosevka-ss09 = "0pl1fz70nx0ls0l4zr8j111flf2mh54miavb0422r2dzprvqaviq";
|
||||
sgr-iosevka-ss10 = "1wb03i26g36n6qgzkyza3sbdbgpari5sw0m4qm7yaz3c2f91ic69";
|
||||
sgr-iosevka-ss11 = "1mz1mg0pc3nidsl5pb6kvdmmga62fj8x77x0n1xjzcz2iwvdd616";
|
||||
sgr-iosevka-ss12 = "0g3i88rhax9am4nfjzq91kdkj1k6vzszia7g79hzsw8nfyrd1i52";
|
||||
sgr-iosevka-ss13 = "1jcg4y52xbig8npjd7jbjxqdr9nsbwh120mh9sjy9vvq3hxdsbqh";
|
||||
sgr-iosevka-ss14 = "1am7j9ymxgmyb50qziyd3xkal1f82cnx4m21gd2rqxijpa12x1r3";
|
||||
sgr-iosevka-ss15 = "0zpwz51xdbckldgycgbmrqf3g9wssanmb2z554n1vbmc5whhwkpp";
|
||||
sgr-iosevka-ss16 = "19jzkq3xj0cncs4mk11z8q8mmf6h75i0x2nj4ikcvk01mlrss6s8";
|
||||
sgr-iosevka-ss17 = "1zn0xh0h997afjsj6n97bmxanxk441iw6mcdliavfs9l6lj1zhns";
|
||||
sgr-iosevka-ss18 = "147w89y3p9s2qanm4wwxv3plpif50fs85hzhhdz23jin5zvh5lz2";
|
||||
sgr-iosevka-term = "01aqqniw3r2njv4fc114iymjzp9k5mdl7c5dyxypm71sdlpcjxqj";
|
||||
sgr-iosevka-term-curly = "0rh0k1svfsan04q50ihhf2xf2fa8isggpqmfps77q1xrbih9miyc";
|
||||
sgr-iosevka-term-curly-slab = "0ys2apprdz1awf6nad6phv2k2kf0qfigb22j930y1gya9vshxqx1";
|
||||
sgr-iosevka-term-slab = "0qbiwsllyim81ayh0whrkzc1nq06x9g7hnv8haxh91jg9nf327vw";
|
||||
sgr-iosevka-term-ss01 = "0mdgh9hdnz752d7sxv91ayi6lyp6czs6gq21dqigk3wmkgwaraz2";
|
||||
sgr-iosevka-term-ss02 = "0zxynyzbngng6ymajd7yf5pmagdzxnr19vnpbmqkvhjnsjmhqpcd";
|
||||
sgr-iosevka-term-ss03 = "192fjh0kc8jh0z8y7l74g41jvqfnax5p2shnn0ch1h824vraklvd";
|
||||
sgr-iosevka-term-ss04 = "0fjmy0wl8hh38gbhf5h6m064la1dp68lyfimmxvjpf1s2c3g5szd";
|
||||
sgr-iosevka-term-ss05 = "0w57k1kjn91srngy297fywi1wnc64bwyymclk0w704sqpx04jv4n";
|
||||
sgr-iosevka-term-ss06 = "0n2ifw444z606qm9w4il6inmf5zmbkhrk2wvldfx5bsgv2pfxnjd";
|
||||
sgr-iosevka-term-ss07 = "1wwky8pichvr467ypgxrxyfqgr27hqkpmx7c35fzka9c0kap483q";
|
||||
sgr-iosevka-term-ss08 = "117c54z898rmsclm23hn4x2wvhypc2vmncrq2mvkqck0wawkwaxw";
|
||||
sgr-iosevka-term-ss09 = "0lahhifnar8f716xq63xjhibay7cfqgaa7drxvz4pqxmzijv6r2r";
|
||||
sgr-iosevka-term-ss10 = "0fp149a4dn7wgdsms70k162g60jgdg5ric93rhxnkn83x3d5jam1";
|
||||
sgr-iosevka-term-ss11 = "16pvy63b194vig5vxy15ylmyl5422vrj9adqqwl82r0l9aqpkqlw";
|
||||
sgr-iosevka-term-ss12 = "1gldv3srnm7zx9gkyizi6gvf34b7z7xg17qk77882jczsv95hyh1";
|
||||
sgr-iosevka-term-ss13 = "0aznbica0yc4vhp4bp84dflfd6jhzw8lsakknfn8dz10kj1qq7vc";
|
||||
sgr-iosevka-term-ss14 = "0x73vwywxj7j6qg3armbhm6rjy308j1rk1fhjfriv51hnkm6ylz2";
|
||||
sgr-iosevka-term-ss15 = "0px9y25bx75ppsdaq0rfddd9ljxwa3fv5296kvvkw3mwd0ralflx";
|
||||
sgr-iosevka-term-ss16 = "1bmnf7z8v4mbcq97lj2qkf722ww1n500jgv2zgs36vxc22zjjrvk";
|
||||
sgr-iosevka-term-ss17 = "0lp5qz8j9xc8n959lm4sbfkjhm3ib79qnv69a57nkv5a10ddk20r";
|
||||
sgr-iosevka-term-ss18 = "0jkp6zjx9ih5m4pa95a2rn7j1wx4hvnxg2j24cib9dixr7sc81b6";
|
||||
}
|
||||
|
|
24
third_party/nixpkgs/pkgs/data/fonts/ocr-a/default.nix
vendored
Normal file
24
third_party/nixpkgs/pkgs/data/fonts/ocr-a/default.nix
vendored
Normal file
|
@ -0,0 +1,24 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "OCR-A";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ocr-a-font/OCR-A/${version}/OCRA.ttf";
|
||||
sha256 = "0kpmjjxwzm84z8maz6lq9sk1b0xv1zkvl28lwj7i0m2xf04qixd0";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
install -D -m 0644 $src $out/share/fonts/truetype/OCRA.ttf
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "ANSI OCR font from the '60s. CYBER";
|
||||
homepage = "https://sourceforge.net/projects/ocr-a-font/";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ V ];
|
||||
};
|
||||
}
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "greybird";
|
||||
version = "3.22.14";
|
||||
version = "3.22.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shimmerproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0b0axzrvdsv7aa029idz4rs1jm6df4ff3v4j4d5wf4yiypb48js9";
|
||||
sha256 = "1fk66fxy2lif9ngazlgkpsziw216i4b1ld2zm97cadf7n97376g9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "matcha-gtk-theme";
|
||||
version = "2021-08-23";
|
||||
version = "2021-09-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gemDiGcr7xLv247w9J1CMOSKg2tWp8ADKpG16qa3hZQ=";
|
||||
sha256 = "064x340z6fif59bbk1p7ryl6xfj8hlf42ld7h8prcjsyghpznw15";
|
||||
};
|
||||
|
||||
buildInputs = [ gdk-pixbuf librsvg ];
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfdashboard";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
rev-prefix = "";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-xoeqVsfvBH2zzQqDUJGiA47hgVvEkvVf9bNYQmyiytk=";
|
||||
sha256 = "sha256-ZDrBLSfRBw5/nIs/x1jJQCVgNJer85b8Hm1kkX1Dk3s=";
|
||||
|
||||
buildInputs = [
|
||||
clutter
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
let unwrapped = mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "thunar";
|
||||
version = "4.16.9";
|
||||
version = "4.16.10";
|
||||
|
||||
sha256 = "sha256-TpazNC4TwNhcEGQ4AQICxbmfZ1i4RE9vXkM9Zln80vE=";
|
||||
sha256 = "sha256-BeEy8+zEsJ5fJAbvP37tfekqF5LTHil0RDcE5RY0f64=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xsl
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue