Project import generated by Copybara.

GitOrigin-RevId: a322b32e9d74fb476944ff6cfb55833dc69cfaaa
This commit is contained in:
Default email 2020-11-19 01:13:47 +01:00
parent cf952b2f6a
commit 6ae7ad3cc5
654 changed files with 8854 additions and 6269 deletions

View file

@ -0,0 +1,48 @@
---
name: Out-of-date package reports
about: For packages that are out-of-date
title: ''
labels: '9.needs: package (update)'
assignees: ''
---
###### Checklist
<!-- Note that these are hard requirements -->
<!--
You can use the "Go to file" functionality on github to find the package
Then you can go to the history for this package
Find the latest "package_name: old_version -> new_version" commit
The "new_version" is the the current version of the package
-->
- [ ] Checked the [nixpkgs master branch](https://github.com/NixOS/nixpkgs)
<!--
Type the name of your package and try to find an open pull request for the package
If you find an open pull request, you can review it!
There's a high chance that you'll have the new version right away while helping the community!
-->
- [ ] Checked the [nixpkgs pull requests](https://github.com/NixOS/nixpkgs/pulls)
###### Project name
`nix search` name:
<!--
The current version can be found easily with the same process than above for checking the master branch
If an open PR is present for the package, take this version as the current one and link to the PR
-->
current version:
desired version:
###### Notify maintainers
<!--
Search your package here: https://search.nixos.org/packages?channel=unstable
If no maintainer is listed for your package, tag the person that last updated the package
-->
maintainers:
###### Note for maintainers
Please tag this issue in your PR.

View file

@ -6,20 +6,16 @@
<para> <para>
Some packages provide the shell integration to be more useful. But unlike other systems, nix doesn't have a standard share directory location. This is why a bunch <command>PACKAGE-share</command> scripts are shipped that print the location of the corresponding shared folder. Current list of such packages is as following: Some packages provide the shell integration to be more useful. But unlike other systems, nix doesn't have a standard share directory location. This is why a bunch <command>PACKAGE-share</command> scripts are shipped that print the location of the corresponding shared folder. Current list of such packages is as following:
<itemizedlist> <itemizedlist>
<listitem>
<para>
<literal>autojump</literal>: <command>autojump-share</command>
</para>
</listitem>
<listitem> <listitem>
<para> <para>
<literal>fzf</literal>: <command>fzf-share</command> <literal>fzf</literal>: <command>fzf-share</command>
</para> </para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
E.g. <literal>autojump</literal> can then used in the .bashrc like this: E.g. <literal>fzf</literal> can then used in the .bashrc like this:
<screen> <screen>
source "$(autojump-share)/autojump.bash" source "$(fzf-share)/completion.bash"
source "$(fzf-share)/key-bindings.bash"
</screen> </screen>
</para> </para>
</section> </section>

View file

@ -35,6 +35,7 @@ let
"msp430-none" "msp430-none"
"riscv64-none" "riscv32-none" "riscv64-none" "riscv32-none"
"vc4-none" "vc4-none"
"or1k-none"
"mmix-mmixware" "mmix-mmixware"
@ -61,6 +62,7 @@ in {
mmix = filterDoubles predicates.isMmix; mmix = filterDoubles predicates.isMmix;
riscv = filterDoubles predicates.isRiscV; riscv = filterDoubles predicates.isRiscV;
vc4 = filterDoubles predicates.isVc4; vc4 = filterDoubles predicates.isVc4;
or1k = filterDoubles predicates.isOr1k;
js = filterDoubles predicates.isJavaScript; js = filterDoubles predicates.isJavaScript;
bigEndian = filterDoubles predicates.isBigEndian; bigEndian = filterDoubles predicates.isBigEndian;

View file

@ -129,6 +129,12 @@ rec {
platform = {}; platform = {};
}; };
or1k = {
config = "or1k-elf";
libc = "newlib";
platform = {};
};
arm-embedded = { arm-embedded = {
config = "arm-none-eabi"; config = "arm-none-eabi";
libc = "newlib"; libc = "newlib";

View file

@ -25,6 +25,7 @@ rec {
isVc4 = { cpu = { family = "vc4"; }; }; isVc4 = { cpu = { family = "vc4"; }; };
isAvr = { cpu = { family = "avr"; }; }; isAvr = { cpu = { family = "avr"; }; };
isAlpha = { cpu = { family = "alpha"; }; }; isAlpha = { cpu = { family = "alpha"; }; };
isOr1k = { cpu = { family = "or1k"; }; };
isJavaScript = { cpu = cpuTypes.js; }; isJavaScript = { cpu = cpuTypes.js; };
is32bit = { cpu = { bits = 32; }; }; is32bit = { cpu = { bits = 32; }; };

View file

@ -116,6 +116,8 @@ rec {
vc4 = { bits = 32; significantByte = littleEndian; family = "vc4"; }; vc4 = { bits = 32; significantByte = littleEndian; family = "vc4"; };
or1k = { bits = 32; significantByte = bigEndian; family = "or1k"; };
js = { bits = 32; significantByte = littleEndian; family = "js"; }; js = { bits = 32; significantByte = littleEndian; family = "js"; };
}; };

View file

@ -1218,6 +1218,16 @@
githubId = 5525646; githubId = 5525646;
name = "Brice Waegeneire"; name = "Brice Waegeneire";
}; };
Br1ght0ne = {
email = "brightone@protonmail.com";
github = "Br1ght0ne";
githubId = 12615679;
name = "Oleksii Filonenko";
keys = [{
longkeyid = "rsa3072/0xA1BC8428323ECFE8";
fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8";
}];
};
bsima = { bsima = {
email = "ben@bsima.me"; email = "ben@bsima.me";
github = "bsima"; github = "bsima";
@ -2907,16 +2917,6 @@
githubId = 8182846; githubId = 8182846;
name = "Francesco Gazzetta"; name = "Francesco Gazzetta";
}; };
filalex77 = {
email = "brightone@protonmail.com";
github = "filalex77";
githubId = 12615679;
name = "Oleksii Filonenko";
keys = [{
longkeyid = "rsa3072/0xA1BC8428323ECFE8";
fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8";
}];
};
fionera = { fionera = {
email = "nix@fionera.de"; email = "nix@fionera.de";
github = "fionera"; github = "fionera";
@ -3311,6 +3311,16 @@
githubId = 1621335; githubId = 1621335;
name = "Andrew Trachenko"; name = "Andrew Trachenko";
}; };
govanify = {
name = "Gauvain 'GovanifY' Roussel-Tarbouriech";
email = "gauvain@govanify.com";
github = "govanify";
githubId = 6375438;
keys = [{
longkeyid = "rsa4096/0xDE62E1E2A6145556";
fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556";
}];
};
gpyh = { gpyh = {
email = "yacine.hmito@gmail.com"; email = "yacine.hmito@gmail.com";
github = "yacinehmito"; github = "yacinehmito";
@ -6149,10 +6159,10 @@
githubId = 6455574; githubId = 6455574;
name = "Matt Votava"; name = "Matt Votava";
}; };
mwilsoninsight = { maxwilson = {
email = "max.wilson@insight.com"; email = "nixpkgs@maxwilson.dev";
github = "mwilsoninsight"; github = "mwilsoncoding";
githubId = 47782621; githubId = 43796009;
name = "Max Wilson"; name = "Max Wilson";
}; };
myrl = { myrl = {
@ -9772,6 +9782,12 @@
githubId = 10643; githubId = 10643;
name = "Jason A. Donenfeld"; name = "Jason A. Donenfeld";
}; };
zyansheep = {
email = "zyansheep@protonmail.com";
github = "zyansheep";
githubId = 20029431;
name = "Zyansheep";
};
zzamboni = { zzamboni = {
email = "diego@zzamboni.org"; email = "diego@zzamboni.org";
github = "zzamboni"; github = "zzamboni";

View file

@ -89,6 +89,18 @@
user D-Bus session available also for non-graphical logins. user D-Bus session available also for non-graphical logins.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>rubyMinimal</literal> was removed due to being unused and
unusable. The default ruby interpreter includes JIT support, which makes
it reference it's compiler. Since JIT support is probably needed by some
Gems, it was decided to enable this feature with all cc references by
default, and allow to build a Ruby derivation without references to cc,
by setting <literal>jitSupport = false;</literal> in an overlay. See
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/90151">#90151</link>
for more info.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The option <option>fonts.enableFontDir</option> has been renamed to The option <option>fonts.enableFontDir</option> has been renamed to

View file

@ -48,7 +48,7 @@ assert usbBootable -> isohybridMbrImage != "";
stdenv.mkDerivation { stdenv.mkDerivation {
name = isoName; name = isoName;
builder = ./make-iso9660-image.sh; builder = ./make-iso9660-image.sh;
buildInputs = [ xorriso syslinux zstd libossp_uuid ]; nativeBuildInputs = [ xorriso syslinux zstd libossp_uuid ];
inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable; inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable;

View file

@ -37,7 +37,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tarball"; name = "tarball";
builder = ./make-system-tarball.sh; builder = ./make-system-tarball.sh;
buildInputs = extraInputs; nativeBuildInputs = extraInputs;
inherit fileName extraArgs extraCommands compressCommand; inherit fileName extraArgs extraCommands compressCommand;

View file

@ -40,9 +40,9 @@ let
in scrubbedEval.options; in scrubbedEval.options;
}; };
helpScript = pkgs.writeScriptBin "nixos-help"
'' nixos-help = let
#! ${pkgs.runtimeShell} -e helpScript = pkgs.writeShellScriptBin "nixos-help" ''
# Finds first executable browser in a colon-separated list. # Finds first executable browser in a colon-separated list.
# (see how xdg-open defines BROWSER) # (see how xdg-open defines BROWSER)
browser="$( browser="$(
@ -59,14 +59,22 @@ let
exec "$browser" ${manual.manualHTMLIndex} exec "$browser" ${manual.manualHTMLIndex}
''; '';
desktopItem = pkgs.makeDesktopItem { desktopItem = pkgs.makeDesktopItem {
name = "nixos-manual"; name = "nixos-manual";
desktopName = "NixOS Manual"; desktopName = "NixOS Manual";
genericName = "View NixOS documentation in a web browser"; genericName = "View NixOS documentation in a web browser";
icon = "nix-snowflake"; icon = "nix-snowflake";
exec = "${helpScript}/bin/nixos-help"; exec = "nixos-help";
categories = "System"; categories = "System";
}; };
in pkgs.symlinkJoin {
name = "nixos-help";
paths = [
helpScript
desktopItem
];
};
in in
@ -250,8 +258,8 @@ in
environment.systemPackages = [] environment.systemPackages = []
++ optional cfg.man.enable manual.manpages ++ optional cfg.man.enable manual.manpages
++ optionals cfg.doc.enable ([ manual.manualHTML helpScript ] ++ optionals cfg.doc.enable ([ manual.manualHTML nixos-help ]
++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ]); ++ optionals config.services.xserver.enable [ pkgs.nixos-icons ]);
services.mingetty.helpLine = mkIf cfg.doc.enable ( services.mingetty.helpLine = mkIf cfg.doc.enable (
"\nRun 'nixos-help' for the NixOS manual." "\nRun 'nixos-help' for the NixOS manual."

View file

@ -4,7 +4,7 @@ with lib;
let cfg = config.programs.bandwhich; let cfg = config.programs.bandwhich;
in { in {
meta.maintainers = with maintainers; [ filalex77 ]; meta.maintainers = with maintainers; [ Br1ght0ne ];
options = { options = {
programs.bandwhich = { programs.bandwhich = {

View file

@ -21,7 +21,7 @@ in {
}; };
environmentFiles = mkOption { environmentFiles = mkOption {
type = types.nullOr (types.listOf types.path); type = types.listOf types.path;
default = []; default = [];
example = "/run/keys/telegraf.env"; example = "/run/keys/telegraf.env";
description = '' description = ''
@ -38,17 +38,13 @@ in {
description = "Extra configuration options for telegraf"; description = "Extra configuration options for telegraf";
type = settingsFormat.type; type = settingsFormat.type;
example = { example = {
outputs = { outputs.influxdb = {
influxdb = { urls = ["http://localhost:8086"];
urls = ["http://localhost:8086"]; database = "telegraf";
database = "telegraf";
};
}; };
inputs = { inputs.statsd = {
statsd = { service_address = ":8125";
service_address = ":8125"; delete_timings = true;
delete_timings = true;
};
}; };
}; };
}; };

View file

@ -23,18 +23,14 @@ let
''; '';
configFile = pkgs.writeText "kresd.conf" ( configFile = pkgs.writeText "kresd.conf" (
optionalString (cfg.listenDoH != []) '' ""
modules.load('http')
''
+ concatMapStrings (mkListen "dns") cfg.listenPlain + concatMapStrings (mkListen "dns") cfg.listenPlain
+ concatMapStrings (mkListen "tls") cfg.listenTLS + concatMapStrings (mkListen "tls") cfg.listenTLS
+ concatMapStrings (mkListen "doh") cfg.listenDoH + concatMapStrings (mkListen "doh2") cfg.listenDoH
+ cfg.extraConfig + cfg.extraConfig
); );
package = if cfg.listenDoH == [] package = pkgs.knot-resolver;
then pkgs.knot-resolver # never force `extraFeatures = false`
else pkgs.knot-resolver.override { extraFeatures = true; };
in { in {
meta.maintainers = [ maintainers.vcunat /* upstream developer */ ]; meta.maintainers = [ maintainers.vcunat /* upstream developer */ ];
@ -92,7 +88,7 @@ in {
default = []; default = [];
example = [ "198.51.100.1:443" "[2001:db8::1]:443" "443" ]; example = [ "198.51.100.1:443" "[2001:db8::1]:443" "443" ];
description = '' description = ''
Addresses and ports on which kresd should provide DNS over HTTPS (see RFC 8484). Addresses and ports on which kresd should provide DNS over HTTPS/2 (see RFC 8484).
For detailed syntax see ListenStream in man systemd.socket. For detailed syntax see ListenStream in man systemd.socket.
''; '';
}; };

View file

@ -6,8 +6,10 @@ let
cfg = config.services.codimd; cfg = config.services.codimd;
prettyJSON = conf: prettyJSON = conf:
pkgs.runCommand "codimd-config.json" { preferLocalBuild = true; } '' pkgs.runCommandLocal "codimd-config.json" {
echo '${builtins.toJSON conf}' | ${pkgs.jq}/bin/jq \ nativeBuildInputs = [ pkgs.jq ];
} ''
echo '${builtins.toJSON conf}' | jq \
'{production:del(.[]|nulls)|del(.[][]?|nulls)}' > $out '{production:del(.[]|nulls)|del(.[][]?|nulls)}' > $out
''; '';
in in
@ -878,7 +880,6 @@ in
}; };
}; };
environmentFile = mkOption { environmentFile = mkOption {
type = with types; nullOr path; type = with types; nullOr path;
default = null; default = null;
@ -908,6 +909,14 @@ in
<literal>CodiMD</literal> is running. <literal>CodiMD</literal> is running.
''; '';
}; };
package = mkOption {
type = types.package;
default = pkgs.codimd;
description = ''
Package that provides CodiMD.
'';
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -938,7 +947,7 @@ in
''; '';
serviceConfig = { serviceConfig = {
WorkingDirectory = cfg.workDir; WorkingDirectory = cfg.workDir;
ExecStart = "${pkgs.codimd}/bin/codimd"; ExecStart = "${cfg.package}/bin/codimd";
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
Environment = [ Environment = [
"CMD_CONFIG_FILE=${cfg.workDir}/config.json" "CMD_CONFIG_FILE=${cfg.workDir}/config.json"

View file

@ -10,20 +10,9 @@ let
rpcMountpoint = "${nfsStateDir}/rpc_pipefs"; rpcMountpoint = "${nfsStateDir}/rpc_pipefs";
idmapdConfFile = pkgs.writeText "idmapd.conf" '' format = pkgs.formats.ini {};
[General]
Pipefs-Directory = ${rpcMountpoint}
${optionalString (config.networking.domain != null)
"Domain = ${config.networking.domain}"}
[Mapping]
Nobody-User = nobody
Nobody-Group = nogroup
[Translation]
Method = nsswitch
'';
idmapdConfFile = format.generate "idmapd.conf" cfg.idmapd.settings;
nfsConfFile = pkgs.writeText "nfs.conf" cfg.extraConfig; nfsConfFile = pkgs.writeText "nfs.conf" cfg.extraConfig;
requestKeyConfFile = pkgs.writeText "request-key.conf" '' requestKeyConfFile = pkgs.writeText "request-key.conf" ''
create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
@ -38,6 +27,25 @@ in
options = { options = {
services.nfs = { services.nfs = {
idmapd.settings = mkOption {
type = format.type;
default = {};
description = ''
libnfsidmap configuration. Refer to
<link xlink:href="https://linux.die.net/man/5/idmapd.conf"/>
for details.
'';
example = literalExample ''
{
Translation = {
GSS-Methods = "static,nsswitch";
};
Static = {
"root/hostname.domain.com@REALM.COM" = "root";
};
}
'';
};
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines; type = types.lines;
default = ""; default = "";
@ -54,6 +62,20 @@ in
services.rpcbind.enable = true; services.rpcbind.enable = true;
services.nfs.idmapd.settings = {
General = mkMerge [
{ Pipefs-Directory = rpcMountpoint; }
(mkIf (config.networking.domain != null) { Domain = config.networking.domain; })
];
Mapping = {
Nobody-User = "nobody";
Nobody-Group = "nogroup";
};
Translation = {
Method = "nsswitch";
};
};
system.fsPackages = [ pkgs.nfs-utils ]; system.fsPackages = [ pkgs.nfs-utils ];
boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ]; boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];

View file

@ -21,6 +21,10 @@ in {
}; };
config = mkMerge [ config = mkMerge [
({
# minimal configuration file to make lvmconfig/lvm2-activation-generator happy
environment.etc."lvm/lvm.conf".text = "config {}";
})
(mkIf (!config.boot.isContainer) { (mkIf (!config.boot.isContainer) {
systemd.tmpfiles.packages = [ cfg.package.out ]; systemd.tmpfiles.packages = [ cfg.package.out ];
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];

View file

@ -1062,7 +1062,6 @@ in
]; ];
boot.kernelModules = [ ] boot.kernelModules = [ ]
++ optional cfg.enableIPv6 "ipv6"
++ optional hasVirtuals "tun" ++ optional hasVirtuals "tun"
++ optional hasSits "sit" ++ optional hasSits "sit"
++ optional hasBonds "bonding"; ++ optional hasBonds "bonding";

View file

@ -97,6 +97,7 @@ in rec {
(onFullSupported "nixos.tests.login") (onFullSupported "nixos.tests.login")
(onFullSupported "nixos.tests.misc") (onFullSupported "nixos.tests.misc")
(onFullSupported "nixos.tests.mutableUsers") (onFullSupported "nixos.tests.mutableUsers")
(onFullSupported "nixos.tests.nano")
(onFullSupported "nixos.tests.nat.firewall-conntrack") (onFullSupported "nixos.tests.nat.firewall-conntrack")
(onFullSupported "nixos.tests.nat.firewall") (onFullSupported "nixos.tests.nat.firewall")
(onFullSupported "nixos.tests.nat.standalone") (onFullSupported "nixos.tests.nat.standalone")

View file

@ -225,6 +225,7 @@ in
mysql-backup = handleTest ./mysql/mysql-backup.nix {}; mysql-backup = handleTest ./mysql/mysql-backup.nix {};
mysql-replication = handleTest ./mysql/mysql-replication.nix {}; mysql-replication = handleTest ./mysql/mysql-replication.nix {};
nagios = handleTest ./nagios.nix {}; nagios = handleTest ./nagios.nix {};
nano = handleTest ./nano.nix {};
nar-serve = handleTest ./nar-serve.nix {}; nar-serve = handleTest ./nar-serve.nix {};
nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall = handleTest ./nat.nix { withFirewall = true; };
nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; };
@ -388,6 +389,7 @@ in
xmonad = handleTest ./xmonad.nix {}; xmonad = handleTest ./xmonad.nix {};
xrdp = handleTest ./xrdp.nix {}; xrdp = handleTest ./xrdp.nix {};
xss-lock = handleTest ./xss-lock.nix {}; xss-lock = handleTest ./xss-lock.nix {};
xterm = handleTest ./xterm.nix {};
yabar = handleTest ./yabar.nix {}; yabar = handleTest ./yabar.nix {};
yggdrasil = handleTest ./yggdrasil.nix {}; yggdrasil = handleTest ./yggdrasil.nix {};
zfs = handleTest ./zfs.nix {}; zfs = handleTest ./zfs.nix {};

View file

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "caddy"; name = "caddy";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ xfix filalex77 ]; maintainers = [ xfix Br1ght0ne ];
}; };
nodes = { nodes = {

View file

@ -0,0 +1,44 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "nano";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
};
machine = { lib, ... }: {
environment.systemPackages = [ pkgs.nano ];
};
testScript = { ... }: ''
start_all()
with subtest("Create user and log in"):
machine.wait_for_unit("multi-user.target")
machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
machine.succeed("useradd -m alice")
machine.succeed("(echo foobar; echo foobar) | passwd alice")
machine.wait_until_tty_matches(1, "login: ")
machine.send_chars("alice\n")
machine.wait_until_tty_matches(1, "login: alice")
machine.wait_until_succeeds("pgrep login")
machine.wait_until_tty_matches(1, "Password: ")
machine.send_chars("foobar\n")
machine.wait_until_succeeds("pgrep -u alice bash")
machine.screenshot("prompt")
with subtest("Use nano"):
machine.send_chars("nano /tmp/foo")
machine.send_key("ret")
machine.sleep(2)
machine.send_chars("42")
machine.sleep(1)
machine.send_key("ctrl-x")
machine.sleep(1)
machine.send_key("y")
machine.sleep(1)
machine.screenshot("nano")
machine.sleep(1)
machine.send_key("ret")
machine.wait_for_file("/tmp/foo")
assert "42" in machine.succeed("cat /tmp/foo")
'';
})

View file

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: { import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "riak"; name = "riak";
meta = with lib.maintainers; { meta = with lib.maintainers; {
maintainers = [ filalex77 ]; maintainers = [ Br1ght0ne ];
}; };
machine = { machine = {

View file

@ -6,9 +6,9 @@ import ./make-test-python.nix ({ pkgs, ...} : {
machine = { ... }: { machine = { ... }: {
services.telegraf.enable = true; services.telegraf.enable = true;
services.telegraf.environmentFiles = [pkgs.writeText "secrets" '' services.telegraf.environmentFiles = [(pkgs.writeText "secrets" ''
SECRET=example SECRET=example
'']; '')];
services.telegraf.extraConfig = { services.telegraf.extraConfig = {
agent.interval = "1s"; agent.interval = "1s";
agent.flush_interval = "1s"; agent.flush_interval = "1s";

View file

@ -0,0 +1,23 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "xterm";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
};
machine = { pkgs, ... }:
{
imports = [ ./common/x11.nix ];
services.xserver.desktopManager.xterm.enable = false;
};
testScript =
''
machine.wait_for_x()
machine.succeed("DISPLAY=:0 xterm -title testterm -class testterm -fullscreen &")
machine.sleep(2)
machine.send_chars("echo $XTERM_VERSION >> /tmp/xterm_version\n")
machine.wait_for_file("/tmp/xterm_version")
assert "${pkgs.xterm.version}" in machine.succeed("cat /tmp/xterm_version")
machine.screenshot("window")
'';
})

View file

@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, fetchpatch }: { stdenv, fetchFromGitLab, fetchpatch }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "aacgain-1.9.0"; name = "aacgain-1.9.0";
src = fetchFromGitHub { src = fetchFromGitLab {
owner = "mulx"; owner = "mulx";
repo = "aacgain"; repo = "aacgain";
rev = "7c29dccd878ade1301710959aeebe87a8f0828f5"; rev = "7c29dccd878ade1301710959aeebe87a8f0828f5";

View file

@ -1,17 +1,21 @@
{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2, alsaLib }: { mkDerivation, lib, fetchFromGitHub, pkgconfig, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }:
stdenv.mkDerivation { mkDerivation rec {
name = "jackmix-0.5.2"; pname = "jackmix";
src = fetchurl { version = "0.6.0";
url = "https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz";
sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j"; src = fetchFromGitHub {
owner = "kampfschlaefer";
repo = "jackmix";
rev = version;
sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
}; };
patches = [ ./no_error.patch ]; patches = [ ./no_error.patch ];
nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ]; nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ];
buildInputs = [ buildInputs = [
qt4 qtbase
lash lash
jack jack
alsaLib alsaLib
@ -21,11 +25,11 @@ stdenv.mkDerivation {
install -D jackmix/jackmix $out/bin/jackmix install -D jackmix/jackmix $out/bin/jackmix
''; '';
meta = { meta = with lib; {
description = "Matrix-Mixer for the Jack-Audio-connection-Kit"; description = "Matrix-Mixer for the Jack-Audio-connection-Kit";
homepage = "http://www.arnoldarts.de/jackmix/"; homepage = "https://github.com/kampfschlaefer/jackmix";
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2Only;
maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; maintainers = with maintainers; [ kampfschlaefer ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -1,13 +1,13 @@
diff --git a/SConstruct b/SConstruct diff --git a/SConstruct b/SConstruct
index 4290fa5..0a7a679 100644 index 8bf6517..a432aa9 100644
--- a/SConstruct --- a/SConstruct
+++ b/SConstruct +++ b/SConstruct
@@ -16,7 +16,7 @@ env = Environment( @@ -16,7 +16,7 @@ env = Environment(
env.Replace( LIBS="" ) env.Replace(LIBS="")
env.Replace( LIBPATH="" ) env.Replace(LIBPATH="")
-env.MergeFlags( ['-Wall', '-Werror', '-g', '-fpic'] ) -env.MergeFlags(['-Wall', '-Werror', '-g', '-fpic', '-std=c++11'])
+env.MergeFlags( ['-g', '-fpic'] ) +env.MergeFlags(['-g', '-fpic', '-std=c++11'])
tests = { } tests = {}
tests.update( env['PKGCONFIG_TESTS'] ) tests.update(env['PKGCONFIG_TESTS'])

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ocenaudio"; pname = "ocenaudio";
version = "3.9.2"; version = "3.9.5";
src = fetchurl { src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "1fvpba3dnzb7sm6gp0znbrima02ckfiy2zwb66x1gr05y9a56inv"; sha256 = "13hvdfydlgp2qf49ddhdzghz5jkyx1rhnsj8sf8khfxf9k8phkjd";
}; };

View file

@ -2,14 +2,14 @@
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }: , usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
let let
version = "0.5.2"; version = "0.5.3";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "openmpt123"; pname = "openmpt123";
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
sha256 = "1cwpc4j90dpxa2siia68rg9qwwm2xk6bhxnslfjj364507jy6s4l"; sha256 = "1f155yf5v57dwhzb7z0kh67lckr3yq4x8040dm54qgbxw582la77";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -9,13 +9,13 @@
mkDerivation rec { mkDerivation rec {
pname = "ptcollab"; pname = "ptcollab";
version = "0.3.4.1"; version = "0.3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yuxshao"; owner = "yuxshao";
repo = "ptcollab"; repo = "ptcollab";
rev = "v${version}"; rev = "v${version}";
sha256 = "0rjyhxfad864w84n0bxyhc1jjxhzwwdx26r6psba2582g90cv024"; sha256 = "0mgn7lkpgj72hsybnnj0kpfyls4aha1qvv4nhdyclqdfbb6mldxg";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];

View file

@ -0,0 +1,29 @@
{ stdenv, python3Packages, dbus }:
python3Packages.buildPythonApplication rec {
pname = "spotify-cli-linux";
version = "1.6.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0slyc3jfrj3rwq8rv6p5aqkw487aw7a87kmf1fb6n4vnvcf08v7w";
};
preBuild = ''
substituteInPlace spotifycli/spotifycli.py \
--replace dbus-send ${dbus}/bin/dbus-send
'';
disabled = !python3Packages.isPy3k;
propagatedBuildInputs = with python3Packages; [ lyricwikia dbus-python ];
# upstream has no code tests, but uses its "tests" for linting and formatting checks
doCheck = false;
meta = with stdenv.lib; {
homepage = "https://pwittchen.github.io/spotify-cli-linux/";
maintainers = [ maintainers.kmein ];
description = "A command line interface to Spotify on Linux.";
license = licenses.gpl3;
platforms = platforms.linux;
};
}

View file

@ -10,14 +10,14 @@ let
# If an update breaks things, one of those might have valuable info: # If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/ # https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux # https://community.spotify.com/t5/Desktop-Linux
version = "1.1.42.622.gbd112320-37"; version = "1.1.46.916.g416cacf1";
# To get the latest stable revision: # To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information: # To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage: # More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
rev = "42"; rev = "43";
deps = [ deps = [
alsaLib alsaLib
@ -78,7 +78,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl { src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
sha512 = "06371c6a285aba916a779cd9f2a933f97db8fb38393545baa94c8984302e003c559af7b1b35afd7df5f2c35e379e2cb80c00facf527bc22df09061cdb67d9d7a"; sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1";
}; };
buildInputs = [ squashfsTools makeWrapper ]; buildInputs = [ squashfsTools makeWrapper ];

View file

@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
description = "An open source Spotify client running as a UNIX daemon"; description = "An open source Spotify client running as a UNIX daemon";
homepage = "https://github.com/Spotifyd/spotifyd"; homepage = "https://github.com/Spotifyd/spotifyd";
license = with licenses; [ gpl3 ]; license = with licenses; [ gpl3 ];
maintainers = with maintainers; [ anderslundstedt filalex77 marsam ]; maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -35,13 +35,13 @@
mkDerivation rec { mkDerivation rec {
pname = "strawberry"; pname = "strawberry";
version = "0.8.2"; version = "0.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jonaski"; owner = "jonaski";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-tJcpjviCXA1Y/PX1jlXphXZZMWBAAg3kdbsj41tmunE="; sha256 = "0v3rbpaz6pqkam0cj86ydq8gc2rhas8mhwgvy31djvxng9nv3h5j";
}; };
buildInputs = [ buildInputs = [

View file

@ -21,14 +21,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "deja-dup"; pname = "deja-dup";
version = "42.4"; version = "42.5";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "World"; owner = "World";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "c4E6mHYVb8TWVTVlmHidcLa9ebHJ27iStsNNLJhY8vY="; sha256 = "1xgsd9a9y36lv6f2vjw2nxi9zj2zl1gv6rcyzkqajf91vgmxwf8k";
}; };
patches = [ patches = [

View file

@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exodus"; pname = "exodus";
version = "20.10.23"; version = "20.11.10";
src = fetchurl { src = fetchurl {
url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
sha256 = "083hcxljqg36ilpy6xa4j455ngpc775qgam0dbj26kg7sh33dz2c"; sha256 = "1a7qrh5mdkqpz5cpk5jdq0s2cfrvn7ja76r5cmhs70ba1xnzd8rq";
}; };
sourceRoot = "."; sourceRoot = ".";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoPackage, git, which }: { stdenv, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }:
buildGoPackage rec { buildGoPackage rec {
pname = "quorum"; pname = "quorum";
@ -25,6 +25,12 @@ buildGoPackage rec {
cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin
''; '';
# fails with `GOFLAGS=-trimpath`
allowGoReference = true;
preFixup = ''
find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' +
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A permissioned implementation of Ethereum supporting data privacy"; description = "A permissioned implementation of Ethereum supporting data privacy";
homepage = "https://www.goquorum.com/"; homepage = "https://www.goquorum.com/";

View file

@ -3,11 +3,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bluefish-2.2.11"; name = "bluefish-2.2.12";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; url = "mirror://sourceforge/bluefish/${name}.tar.bz2";
sha256 = "1zy2ppdg3nq9iy3zgfhnw93bq5zbbhyampf7bk3grpfvq5zqfk25"; sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d";
}; };
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];

View file

@ -21,6 +21,6 @@ buildGoModule rec {
description = "Render markdown on the CLI, with pizzazz!"; description = "Render markdown on the CLI, with pizzazz!";
homepage = "https://github.com/charmbracelet/glow"; homepage = "https://github.com/charmbracelet/glow";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ehmry filalex77 penguwin ]; maintainers = with maintainers; [ ehmry Br1ght0ne penguwin ];
}; };
} }

View file

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
description = "A lightweight text editor written in Lua"; description = "A lightweight text editor written in Lua";
homepage = "https://github.com/rxi/lite"; homepage = "https://github.com/rxi/lite";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ filalex77 ]; maintainers = with maintainers; [ Br1ght0ne ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -1,10 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub { stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript
, ncurses , common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests
, texinfo , gettext ? null, enableNls ? true, enableTiny ? false }:
, gettext ? null
, enableNls ? true
, enableTiny ? false
}:
assert enableNls -> (gettext != null); assert enableNls -> (gettext != null);
@ -44,13 +40,42 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = {
tests = { inherit (nixosTests) nano; };
updateScript = writeScript "update.sh" ''
#!${stdenv.shell}
set -o errexit
PATH=${
stdenv.lib.makeBinPath [
common-updater-scripts
git
nixfmt
nix
coreutils
gnused
]
}
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git://git.savannah.gnu.org/nano.git '*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
if [ ! "$oldVersion" = "$latestTag" ]; then
update-source-version ${pname} "$latestTag" --version-key=version --print-changes
nixpkgs="$(git rev-parse --show-toplevel)"
default_nix="$nixpkgs/pkgs/applications/editors/nano/default.nix"
nixfmt "$default_nix"
else
echo "${pname} is already up-to-date"
fi
'';
};
meta = { meta = {
homepage = "https://www.nano-editor.org/"; homepage = "https://www.nano-editor.org/";
description = "A small, user-friendly console text editor"; description = "A small, user-friendly console text editor";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ maintainers = with maintainers; [ joachifm nequissimus ];
joachifm
];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
description = "Native Linux Design application built in Vala and GTK"; description = "Native Linux Design application built in Vala and GTK";
homepage = "https://github.com/akiraux/Akira"; homepage = "https://github.com/akiraux/Akira";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ filalex77 neonfuz ] ++ pantheon.maintainers; maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "drawio"; pname = "drawio";
version = "13.7.9"; version = "13.9.5";
src = fetchurl { src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
sha256 = "1h0baxh9gvshdfqb77x5m8v95lw4lw4djj3gwrna0jjpfhmcs4vq"; sha256 = "1glklqpbx28ssi41cdshckgvix24wkqmsw0rgf964vjc28qgfy1s";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -33,11 +33,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gthumb"; pname = "gthumb";
version = "3.10.0"; version = "3.10.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0j7cxp4hhkvkckyvll6pmqkv5rwrknlzq9j1my0grb01b8wzhw9y"; sha256 = "0gm7q6n9lnjsdqpx5b0cqjayhzwnplqb6p5pshzhbfp2zqd2g9ss";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -7,24 +7,24 @@ let
bgrabitmap = fetchFromGitHub { bgrabitmap = fetchFromGitHub {
owner = "bgrabitmap"; owner = "bgrabitmap";
repo = "bgrabitmap"; repo = "bgrabitmap";
rev = "v11.2.4"; rev = "v11.2.5";
sha256 = "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md"; sha256 = "0w5pdihsxn039kalkf4cx23j69hz5r09qmhd358h2n74irv1r3x1";
}; };
bgracontrols = fetchFromGitHub { bgracontrols = fetchFromGitHub {
owner = "bgrabitmap"; owner = "bgrabitmap";
repo = "bgracontrols"; repo = "bgracontrols";
rev = "v6.9"; rev = "v7.0";
sha256 = "0hwjlqlwqs4fqxlgay84hccs1lm3c6i9nmq9sxzrip410mggnjyw"; sha256 = "0qz3cscrc9jvhrix1hbmzhdxv6mxk0mz9azr46canflsydda8fjy";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "lazpaint"; pname = "lazpaint";
version = "7.1.4"; version = "7.1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bgrabitmap"; owner = "bgrabitmap";
repo = "lazpaint"; repo = "lazpaint";
rev = "v${version}"; rev = "v${version}";
sha256 = "19b0wrjjyvz3g2d2gdsz8ihc1clda5v22yb597an8j9sblp9m0nf"; sha256 = "0bpk3rlqzbxvgrxmrzs0hcrgwhsqnpjqv1kdd9cp09knimmksvy5";
}; };
nativeBuildInputs = [ lazarus fpc makeWrapper ]; nativeBuildInputs = [ lazarus fpc makeWrapper ];
@ -56,10 +56,6 @@ in stdenv.mkDerivation rec {
# Python is needed for scripts # Python is needed for scripts
makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \ makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \
--prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]} --prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]}
substituteInPlace $out/share/applications/lazpaint.desktop \
--replace /usr/share/pixmaps/lazpaint.png $out/share/pixmaps/lazpaint.png \
--replace /usr/share/lazpaint/lazpaint $out/bin/lazpaint
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
description = "Modern and extensible pixel editor implemented in Rust"; description = "Modern and extensible pixel editor implemented in Rust";
homepage = "https://rx.cloudhead.io/"; homepage = "https://rx.cloudhead.io/";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ minijackson filalex77 ]; maintainers = with maintainers; [ minijackson Br1ght0ne ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

View file

@ -1,107 +0,0 @@
{ stdenv
, fetchurl
, gnutar
, autoPatchelfHook
, glibc
, gtk2
, xorg
, libgudev
, undmg
}:
let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
pname = "vuescan";
# Minor versions are released using the same file name
version = "9.7";
versionString = builtins.replaceStrings ["."] [""] version;
src = let
base = "https://www.hamrick.com/files/";
in {
x86_64-darwin = fetchurl {
url = "${base}/vuex64${versionString}.dmg";
sha256 = "045ihd2pj0zmzjfwn2qmv5114yvs9vf6mw6sf4x3hwcdmpk40sfh";
};
i686-darwin = fetchurl {
url = "${base}/vuex32${versionString}.dmg";
sha256 = "0nny1jm3s1nr7xm03mcy3zgxvslznnvc8a5gn93gjww6gwg9rcn6";
};
x86_64-linux = fetchurl {
url = "${base}/vuex64${versionString}.tgz";
sha256 = "0jkj92w3y66dcxwq3kkg7vhqxljwf9dqs563xbkh1r7piyjfwycm";
};
i686-linux = fetchurl {
url = "${base}/vuex32${versionString}.tgz";
sha256 = "03qac9c0sg21jwz91nzzwk3ml8byv06ay9wiq00dl62nmhs20r5m";
};
aarch64-linux = fetchurl {
url = "${base}/vuea64${versionString}.tgz";
sha256 = "17viy7kcb78j0p3ik99psabmkgpwpmgvk96wjhn9aar48gpyr1wj";
};
armv6l-linux = fetchurl {
url = "${base}/vuea32${versionString}.tgz";
sha256 = "0m7sp18bdf2l2yf3q3z6c3i0bm4mq2h4ndm6qfvyknip0h11gv7i";
};
}.${system} or throwSystem;
meta = with stdenv.lib; {
description = "Scanner software supporting a wide range of devices";
homepage = "https://hamrick.com/";
license = licenses.unfree;
maintainers = with maintainers; [ evax ];
platforms = [
"x86_64-darwin" "i686-darwin"
"x86_64-linux" "i686-linux"
"aarch64-linux" "armv6l-linux"
];
};
linux = stdenv.mkDerivation rec {
inherit pname version src meta;
# Stripping the binary breaks the license form
dontStrip = true;
nativeBuildInputs = [
gnutar
autoPatchelfHook
];
buildInputs = [
glibc
gtk2
xorg.libSM
libgudev
];
unpackPhase = ''
tar xfz $src
'';
installPhase = ''
install -m755 -D VueScan/vuescan $out/bin/vuescan
'';
};
darwin = stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ undmg ];
sourceRoot = {
x86_64-darwin = "vuex64${versionString}.dmg";
i686-darwin = "vuex32${versionString}.dmg";
}.${system} or throwSystem;
installPhase = ''
mkdir -p $out/Applications/VueScan.app
cp -R . $out/Applications/VueScan.app
'';
};
in if stdenv.isDarwin
then darwin
else linux

View file

@ -2,13 +2,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "cointop"; pname = "cointop";
version = "1.5.4"; version = "1.5.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "miguelmota"; owner = "miguelmota";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1gkrwh5g69mywlllszy310xpahr8rz8nghjjpiamd85djf1iz43b"; sha256 = "051jxa07c58ym1w0mwckwxh60v28gqcpqw5nv8sm5wxil1crcayr";
}; };
goPackagePath = "github.com/miguelmota/cointop"; goPackagePath = "github.com/miguelmota/cointop";

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "dasel"; pname = "dasel";
version = "1.2.0"; version = "1.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TomWright"; owner = "TomWright";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Un9tqODwiWsaw66t2m8NyaDF0+hq/e0tmRFi3/T4LMI="; sha256 = "sha256-LGrFs9JNb0gjXg6IRkUfUOWS+sr1nukzOEWK4XUfkfw=";
}; };
vendorSha256 = "sha256:1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Query and update data structures from the command line"; description = "Query and update data structures from the command line";

View file

@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
description = "CLI Epub Reader"; description = "CLI Epub Reader";
homepage = "https://github.com/wustho/epr"; homepage = "https://github.com/wustho/epr";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.filalex77 ]; maintainers = [ maintainers.Br1ght0ne ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "font-manager"; pname = "font-manager";
version = "0.7.8"; version = "0.7.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FontManager"; owner = "FontManager";
repo = "master"; repo = "master";
rev = version; rev = version;
sha256 = "0s1l30y55l45rrqd9lygvp2gzrqw25rmjgnnja6s5rzs79gc668c"; sha256 = "1nc0i824v2szz0j9a5rwl8gygih15xbxnxpnx9d3wr0yq9057q6q";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/jarun/googler"; homepage = "https://github.com/jarun/googler";
description = "Google Search, Google Site Search, Google News from the terminal"; description = "Google Search, Google Site Search, Google News from the terminal";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ koral filalex77 ]; maintainers = with maintainers; [ koral Br1ght0ne ];
platforms = python.meta.platforms; platforms = python.meta.platforms;
}; };
} }

View file

@ -25,6 +25,6 @@ buildGoModule rec {
description = "A fast and modern static website engine"; description = "A fast and modern static website engine";
homepage = "https://gohugo.io"; homepage = "https://gohugo.io";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ schneefux filalex77 Frostman ]; maintainers = with maintainers; [ schneefux Br1ght0ne Frostman ];
}; };
} }

View file

@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
description = "Commandline personal information management suite"; description = "Commandline personal information management suite";
homepage = "https://imag-pim.org/"; homepage = "https://imag-pim.org/";
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = with maintainers; [ filalex77 minijackson ]; maintainers = with maintainers; [ Br1ght0ne minijackson ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -31,7 +31,7 @@
, withKeePassKeeShare ? true , withKeePassKeeShare ? true
, withKeePassKeeShareSecure ? true , withKeePassKeeShareSecure ? true
, withKeePassSSHAgent ? true , withKeePassSSHAgent ? true
, withKeePassNetworking ? false , withKeePassNetworking ? true
, withKeePassTouchID ? true , withKeePassTouchID ? true
, withKeePassFDOSecrets ? true , withKeePassFDOSecrets ? true
}: }:

View file

@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec {
description = "Save disk space by cleaning unneeded files from software projects"; description = "Save disk space by cleaning unneeded files from software projects";
homepage = "https://github.com/tbillington/kondo"; homepage = "https://github.com/tbillington/kondo";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ filalex77 ]; maintainers = with maintainers; [ Br1ght0ne ];
}; };
} }

View file

@ -11,12 +11,12 @@
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "koreader"; pname = "koreader";
version = "2020.09"; version = "2020.11";
src = fetchurl { src = fetchurl {
url = url =
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
sha256 = "12kiw3mw8g8d9fb8ywd4clm2bgblhq2gqcxzadwpmf0wxq7p0v8z"; sha256 = "15nw8kyjyhqlr742gkpzn1b9906rdm6cssnc6jbbph5pjdlzspc4";
}; };
sourceRoot = "."; sourceRoot = ".";

View file

@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nnn"; pname = "nnn";
version = "3.4"; version = "3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jarun"; owner = "jarun";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0lyrpyhzzs2bdgx3ifq1c5dq3s2v30xdiaq0j8zjc64s6bghfxnd"; sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy";
}; };
configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf);
@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/jarun/nnn"; homepage = "https://github.com/jarun/nnn";
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ jfrankenau filalex77 ]; maintainers = with maintainers; [ jfrankenau Br1ght0ne ];
}; };
} }

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${product}-${version}"; name = "${product}-${version}";
product = "pdfpc"; product = "pdfpc";
version = "4.4.0"; version = "4.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = product; repo = product;
owner = product; owner = product;
rev = "v${version}"; rev = "v${version}";
sha256 = "0vh2r32akvasdrghkaq7ard24r2qncp34jfiyshi3zxabm9bhfaa"; sha256 = "11n925c5jj3yfwnqkgxzqrmsrpqh8ls1g4idmqqzpsanpam1xvna";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
having a black belt in shell scripting. having a black belt in shell scripting.
''; '';
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ afldcr filalex77 ]; maintainers = with maintainers; [ afldcr Br1ght0ne ];
platforms = platforms.linux; platforms = platforms.linux;
}; };

View file

@ -127,13 +127,13 @@ rec {
gammastep = mkRedshift rec { gammastep = mkRedshift rec {
pname = "gammastep"; pname = "gammastep";
version = "2.0.2"; version = "2.0.5";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "chinstrap"; owner = "chinstrap";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "09wqlz3yya955galhs20014qfwm2yk0lxhyqdsw8gwddvcpyprzg"; sha256 = "1l3x4gnichwzbb0529bhm723xpryn5svhhsfdiwlw122q1vmz2q7";
}; };
meta = redshift.meta // { meta = redshift.meta // {

View file

@ -51,7 +51,12 @@ let
cp "${sweethome3dItem}/share/applications/"* $out/share/applications cp "${sweethome3dItem}/share/applications/"* $out/share/applications
# MESA_GL_VERSION_OVERRIDE is needed since the update from MESA 19.3.3 to 20.0.2:
# without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null"
# exception is thrown on startup.
# https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753
makeWrapper ${jre}/bin/java $out/bin/$exec \ makeWrapper ${jre}/bin/java $out/bin/$exec \
--set MESA_GL_VERSION_OVERRIDE 2.1 \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"
''; '';
@ -73,14 +78,14 @@ in {
application = mkSweetHome3D rec { application = mkSweetHome3D rec {
pname = stdenv.lib.toLower module + "-application"; pname = stdenv.lib.toLower module + "-application";
version = "6.3"; version = "6.4.2";
module = "SweetHome3D"; module = "SweetHome3D";
description = "Design and visualize your future home"; description = "Design and visualize your future home";
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
src = fetchsvn { src = fetchsvn {
url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/";
sha256 = "1c13g0f73jgbzmjhdm9knqq1kh3vdl04zl3xlp30g9a1n0jkr38i"; sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4";
rev = "6896"; rev = "7504";
}; };
desktopName = "Sweet Home 3D"; desktopName = "Sweet Home 3D";
icons = { icons = {

View file

@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/M4444/TMatrix"; homepage = "https://github.com/M4444/TMatrix";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ infinisil filalex77 ]; maintainers = with maintainers; [ infinisil Br1ght0ne ];
}; };
} }

View file

@ -27,6 +27,6 @@ buildPythonApplication rec {
description = "Browse Reddit from your Terminal (fork of rtv)"; description = "Browse Reddit from your Terminal (fork of rtv)";
homepage = "https://gitlab.com/ajak/tuir/"; homepage = "https://gitlab.com/ajak/tuir/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ filalex77 matthiasbeyer ]; maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ];
}; };
} }

View file

@ -152,9 +152,6 @@ let
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (useVaapi && versionRange "86" "87") [
# Check for enable-accelerated-video-decode on Linux:
(githubPatch "54deb9811ca9bd2327def5c05ba6987b8c7a0897" "11jvxjlkzz1hm0pvfyr88j7z3zbwzplyl5idkx92l2lzv4459c8d")
]; ];
postPatch = '' postPatch = ''

View file

@ -15,7 +15,7 @@
, enablePepperFlash ? false , enablePepperFlash ? false
, enableWideVine ? false , enableWideVine ? false
, enableVaapi ? false # Disabled by default due to unofficial support , enableVaapi ? false # Disabled by default due to unofficial support
, useOzone ? false , useOzone ? true
, cupsSupport ? true , cupsSupport ? true
, pulseSupport ? config.pulseaudio or stdenv.isLinux , pulseSupport ? config.pulseaudio or stdenv.isLinux
, commandLineArgs ? "" , commandLineArgs ? ""
@ -41,8 +41,7 @@ let
inherit (upstream-info.deps.gn) url rev sha256; inherit (upstream-info.deps.gn) url rev sha256;
}; };
}); });
} // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { # TODO: Cleanup useOzone and useVaapi in common.nix:
useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/
useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine) useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine)
}); });

View file

@ -1,21 +1,21 @@
{ {
"stable": { "stable": {
"version": "86.0.4240.198", "version": "87.0.4280.66",
"sha256": "0i3s1il0x5yi3528gdsg3bhnyhs2x24zh7p1nd5apv3va9g85ax0", "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19",
"sha256bin64": "0qfhs73r6j0r3nyqbnscnf7h1rs1s68lfl5ndsyd32dmip7ma01x", "sha256bin64": "09hjhxjihhxq5i2wadpa0g72a6iis0igarr8arrcah4122icdr77",
"deps": { "deps": {
"gn": { "gn": {
"version": "2020-08-07", "version": "2020-09-09",
"url": "https://gn.googlesource.com/gn", "url": "https://gn.googlesource.com/gn",
"rev": "e327ffdc503815916db2543ec000226a8df45163", "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
"sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr" "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
} }
} }
}, },
"beta": { "beta": {
"version": "87.0.4280.47", "version": "87.0.4280.66",
"sha256": "0a3c4kz85857wrbcxqknbqmai250d36nq332l66a83r8sidhbxfq", "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19",
"sha256bin64": "0bjls2airr4p448rx7im1a7gff68yfnfb5vymr4bin4kz0s38mpw", "sha256bin64": "15n01jia8sxv3a7vfbla40rq45x54pyksg0kg14bm0br6m3n65pz",
"deps": { "deps": {
"gn": { "gn": {
"version": "2020-09-09", "version": "2020-09-09",

View file

@ -4,7 +4,7 @@
{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip { lib, stdenv, pkgconfig, pango, perl, python2, python3, zip
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify , freetype, fontconfig, file, nspr, nss, nss_3_53, libnotify
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper , yasm, libGLU, libGL, sqlite, unzip, makeWrapper
, hunspell, libXdamage, libevent, libstartup_notification , hunspell, libXdamage, libevent, libstartup_notification
, libvpx_1_8 , libvpx_1_8
@ -106,6 +106,8 @@ let
# 78 ESR won't build with rustc 1.47 # 78 ESR won't build with rustc 1.47
inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
rustc cargo; rustc cargo;
nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss;
in in
buildStdenv.mkDerivation ({ buildStdenv.mkDerivation ({
@ -116,12 +118,37 @@ buildStdenv.mkDerivation ({
patches = [ patches = [
./env_var_for_system_dir.patch ./env_var_for_system_dir.patch
] ++ lib.optional pipewireSupport ] ++
# there are two flavors of pipewire support
# The patches for the ESR release and the patches for the current stable
# release.
# Until firefox upstream stabilizes pipewire support we will have to continue
# tracking multiple versions here.
lib.optional (pipewireSupport && lib.versionOlder ffversion "83")
(fetchpatch { (fetchpatch {
# https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch
url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch"; url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch";
sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab";
}) })
++
# This picks pipewire patches from fedora that are part of https://bugzilla.mozilla.org/show_bug.cgi?id=1672944
lib.optionals (pipewireSupport && lib.versionAtLeast ffversion "83") (let
fedora_revision = "d6756537dd8cf4d9816dc63ada66ea026e0fd128";
mkPWPatch = spec: fetchpatch {
inherit (spec) name sha256;
url = "https://src.fedoraproject.org/rpms/firefox/raw/${fedora_revision}/f/${spec.name}";
};
in map mkPWPatch [
{ name = "pw1.patch"; sha256 = "1a7zvngn3k7dg886zmi38kmrsdzh2rrr46aw59bhr1gfmq8wlwn0"; }
{ name = "pw2.patch"; sha256 = "17irg3yb2mchcy0z0nr4k65mwvkps467cvvczr10fnm06lhkhw1l"; }
{ name = "pw3.patch"; sha256 = "12p6ql5ff2lfzlni6xkpz63h2xr6n2a9zf8hhjl99fj56rif6706"; }
{ name = "pw4.patch"; sha256 = "0rvysc92rdm98s47w5lvbnrklrf7d299k3918qnldniyb4b9p4mg"; }
{ name = "pw5.patch"; sha256 = "0kk2yxq4qkfwc4px6m08jrn18a7a7dhrngfiaw84r9ga6sgn0z00"; }
{ name = "pw6.patch"; sha256 = "12lhx9wjpw0ahbfmw07wsx76bb223mr453q9cg8cq951vyskch3s"; }
{ name = "pw7.patch"; sha256 = "0afw7cfd48vn62zb9y5kd2l26fg44s3aq1kyg3gm4q3rj34xidf6"; }
])
++ patches; ++ patches;
@ -144,7 +171,7 @@ buildStdenv.mkDerivation ({
# yasm can potentially be removed in future versions # yasm can potentially be removed in future versions
# https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
# https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
nspr nss nspr nss_pkg
] ]
++ lib.optional alsaSupport alsaLib ++ lib.optional alsaSupport alsaLib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
@ -165,14 +192,14 @@ buildStdenv.mkDerivation ({
NIX_CFLAGS_COMPILE = toString [ NIX_CFLAGS_COMPILE = toString [
"-I${glib.dev}/include/gio-unix-2.0" "-I${glib.dev}/include/gio-unix-2.0"
"-I${nss.dev}/include/nss" "-I${nss_pkg.dev}/include/nss"
]; ];
MACH_USE_SYSTEM_PYTHON = "1"; MACH_USE_SYSTEM_PYTHON = "1";
postPatch = '' postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu rm -rf obj-x86_64-pc-linux-gnu
'' + lib.optionalString pipewireSupport '' '' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") ''
# substitute the /usr/include/ lines for the libraries that pipewire provides. # substitute the /usr/include/ lines for the libraries that pipewire provides.
# The patch we pick from fedora only contains the generated moz.build files # The patch we pick from fedora only contains the generated moz.build files
# which hardcode the dependency paths instead of running pkg_config. # which hardcode the dependency paths instead of running pkg_config.

View file

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "82.0.2"; ffversion = "83.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "25wkgsqnafmq30m1kd1axkm454dhl2bmz6100i3ccqnn31vw3nyy6k3k1apsn62siqswpm55iclzcb10y4dfyyqcszvflim47c8i37k"; sha512 = "3va5a9471677jfzkhqp8xkba45n0bcpphbabhqbcbnps6p85m3y98pl5jy9q7cpq3a6gxc4ax7bp90yz2nfvfq7i64iz397xpprri2a";
}; };
patches = [ patches = [
@ -35,10 +35,10 @@ rec {
firefox-esr-78 = common rec { firefox-esr-78 = common rec {
pname = "firefox-esr"; pname = "firefox-esr";
ffversion = "78.4.0esr"; ffversion = "78.5.0esr";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "13640ssp1nq9dsfv8jqfw2paqk3wzwc4r47mvbhb4l9h990gzzb2chhlcjq066b7r3q9s0nq3iyk847vzi7z1yvhrhsnzfgk9g9gpnr"; sha512 = "20h53cn7p4dds1yfm166iwbjdmw4fkv5pfk4z0pni6x8ddjvg19imzs6ggmpnfhaji8mnlknm7xp5j7x9vi24awvdxdds5n88rh25hd";
}; };
patches = [ patches = [

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cloudflared"; pname = "cloudflared";
version = "2020.11.3"; version = "2020.11.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "cloudflared"; repo = "cloudflared";
rev = version; rev = version;
sha256 = "1v262wr1z0z3frb9avg6bgsv973cn6gmn4w6wghpcjwsm6jld575"; sha256 = "09bjqcrz7s40m7afb80dpx7jncp5prn2p6bksspv5wqc84l2nn5d";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -32,6 +32,6 @@ buildGoModule rec {
description = "CLI client for Flux, the GitOps Kubernetes operator"; description = "CLI client for Flux, the GitOps Kubernetes operator";
homepage = "https://github.com/fluxcd/flux"; homepage = "https://github.com/fluxcd/flux";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ Gonzih filalex77 ]; maintainers = with maintainers; [ Gonzih Br1ght0ne ];
}; };
} }

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "helmfile"; pname = "helmfile";
version = "0.134.0"; version = "0.134.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "roboll"; owner = "roboll";
repo = "helmfile"; repo = "helmfile";
rev = "v${version}"; rev = "v${version}";
sha256 = "0s64l3dj5ydal7rfyg1avckb2ri7a34y2x7rhbplam8lk0vdzx03"; sha256 = "14qlz6b4iddc5qxm4w4pvhkbzv60qzymn3bkyrpbx189b2yfvh6c";
}; };
vendorSha256 = "1p5m5v5lpdyzywq2ybsa9zkygixdkaifn2szxj7v8x162bzf16r5"; vendorSha256 = "0nk2f38qjmhy45pw9yz53acmsdy2fdxswqnasvbmfzrb85b0fnfq";
doCheck = false; doCheck = false;

View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "kube3d"; pname = "kube3d";
version = "3.2.0"; version = "3.2.1";
k3sVersion = "1.18.9-k3s1"; k3sVersion = "1.18.9-k3s1";
excludedPackages = ''tools''; excludedPackages = ''tools'';
@ -11,7 +11,7 @@ buildGoModule rec {
owner = "rancher"; owner = "rancher";
repo = "k3d"; repo = "k3d";
rev = "v${version}"; rev = "v${version}";
sha256 = "0jy0l8rvmwi0qznnvv97v50lfkpc2bwjmbnq4pxnmf9ih970wjwh"; sha256 = "1910vir9yc3xvb23260xljnfpznyhnk4gddy752rrndz7rk1b5c3";
}; };
buildFlagsArray = '' buildFlagsArray = ''

View file

@ -11,9 +11,9 @@
buildGoModule rec { buildGoModule rec {
pname = "minikube"; pname = "minikube";
version = "1.14.2"; version = "1.15.0";
vendorSha256 = "057mlmja3mygfdf0cp0bcm0chq7s30bjcs5hqacwl6c79ivrjf89"; vendorSha256 = "1xkk4f8qjqx5x878iniclni3jm2f7ka47va756vc3vk8p5s6vpdk";
doCheck = false; doCheck = false;
@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes"; owner = "kubernetes";
repo = "minikube"; repo = "minikube";
rev = "v${version}"; rev = "v${version}";
sha256 = "1fidvfm9x3rbqfjn9zm5kx9smk94dmjm4gb98rrdmgsld5fg99xj"; sha256 = "1n1jhsa0lrfpqvl7m5il37l3f22ffgg4zv8g42xq24cgna951a1z";
}; };
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];

View file

@ -19,7 +19,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "terraform-provider-libvirt"; pname = "terraform-provider-libvirt";
version = "0.6.2"; version = "0.6.3";
goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
@ -27,7 +27,7 @@ buildGoPackage rec {
owner = "dmacvicar"; owner = "dmacvicar";
repo = "terraform-provider-libvirt"; repo = "terraform-provider-libvirt";
rev = "v${version}"; rev = "v${version}";
sha256 = "1wkpns047ccff0clfb1108wjax1qb5v06hky0i3h2wpzysll7r7b"; sha256 = "0ak2lpnv6h0i7lzfcggd90jpfhvsasdr6nflkflk2drlcpalggj9";
}; };
nativeBuildInputs = [ pkgconfig makeWrapper ]; nativeBuildInputs = [ pkgconfig makeWrapper ];

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "terraform-provider-lxd"; pname = "terraform-provider-lxd";
version = "1.3.0"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sl1pm4t"; owner = "sl1pm4t";
repo = "terraform-provider-lxd"; repo = "terraform-provider-lxd";
rev = "v${version}"; rev = "v${version}";
sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv"; sha256 = "00gj7zj45wm9sf7a7nybjijdrdr00g2yf8h41c6j679a6nfnx0fd";
}; };
vendorSha256 = "1shdpl1zsbbpc3mfs0l65ykq2h15ggvqylaixcap4j4lfl7m9my0"; vendorSha256 = "0xq8zgx8h47pc88nkdvy5skpr8vk87b4212mm5msfxk8n7nl4fi2";
doCheck = false; doCheck = false;

View file

@ -2,20 +2,20 @@
buildGoModule rec { buildGoModule rec {
pname = "velero"; pname = "velero";
version = "1.5.1"; version = "1.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "vmware-tanzu"; owner = "vmware-tanzu";
repo = "velero"; repo = "velero";
sha256 = "1rmymwmglcia5j0c692g34hlffba1yqs2s0iyjpafma2zabrcnai"; sha256 = "1hfi1iipbval0c0c0nnf6fz5n76za0vwczm5lq86sddqnznbvsrz";
}; };
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
-s -w -s -w
-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version} -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=87d86a45a6ca66c6c942c7c7f08352e26809426c -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=456eb19668f8da603756353d9179b59b5a7bfa04
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean
''; '';

View file

@ -17,11 +17,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "filezilla"; pname = "filezilla";
version = "3.50.0"; version = "3.51.0";
src = fetchurl { src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
sha256 = "sha256-4NuHJpylIIqtFKAkFTN7T57+PEnC1NFOZukhx4oTXBA="; sha256 = "0k3c7gm16snc6dr9a3xgq14ajyqj4hxcrd6hk6jk5fsi9x51rgl2";
}; };
# https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769

View file

@ -35,7 +35,9 @@ in python.pkgs.buildPythonPackage {
postPatch = '' postPatch = ''
# yarl 1.4+ only requires Python 3.6+ # yarl 1.4+ only requires Python 3.6+
sed -iE "s/yarl==1.3.0//" requirements.txt substituteInPlace requirements.txt \
--replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \
--replace "yarl==1.3.0" ""
''; '';
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python.pkgs; [

View file

@ -21,7 +21,7 @@ buildGoModule rec {
description = "A third-party, open-source ProtonMail bridge"; description = "A third-party, open-source ProtonMail bridge";
homepage = "https://github.com/emersion/hydroxide"; homepage = "https://github.com/emersion/hydroxide";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ filalex77 ]; maintainers = with maintainers; [ Br1ght0ne ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -25,7 +25,7 @@ let
else ""); else "");
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "signal-desktop"; pname = "signal-desktop";
version = "1.37.3"; # Please backport all updates to the stable channel. version = "1.38.1"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release. # All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is # When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with: # applied. The expiration date for the current release can be extracted with:
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0gyg67qhrqqn1676m7ki8h9akhn29fh1sxmj0kw5j7dx4cyc4mid"; sha256 = "0d146l1s37qxawh1k7yrkv78kxxfzf0yzzzcn1q1v1ndrwrvwhjz";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -25,6 +25,7 @@
, libpulseaudio , libpulseaudio
, libuuid , libuuid
, libxcb , libxcb
, libxkbcommon
, mesa , mesa
, nspr , nspr
, nss , nss
@ -40,11 +41,11 @@ let
pname = "slack"; pname = "slack";
x86_64-darwin-version = "4.10.3"; x86_64-darwin-version = "4.11.1";
x86_64-darwin-sha256 = "0r77l57vr603xamich4h4gbdd5vdcj0sjs6yjpymfx9s0f98v8bb"; x86_64-darwin-sha256 = "0a5rq8zhgdckwxnyjv6nrgpnj682j1rd9yc4nwvsbvpzv15kmd35";
x86_64-linux-version = "4.10.3"; x86_64-linux-version = "4.11.1";
x86_64-linux-sha256 = "1gnjj2iyk8cwjajg8h9qpmzx10j4qjxjzciq8csg45qfzwkr3drf"; x86_64-linux-sha256 = "1r43g3xnla5aq38l3mpba8jb1gx9m2b6pr84prsclz27nr0rfm6g";
version = { version = {
x86_64-darwin = x86_64-darwin-version; x86_64-darwin = x86_64-darwin-version;
@ -99,6 +100,7 @@ let
libpulseaudio libpulseaudio
libuuid libuuid
libxcb libxcb
libxkbcommon
mesa mesa
nspr nspr
nss nss

View file

@ -1,7 +1,6 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, fetchpatch , pkg-config
, pkgconfig
, dconf , dconf
, telepathy-glib , telepathy-glib
, python3 , python3
@ -11,31 +10,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-mission-control"; pname = "telepathy-mission-control";
version = "5.16.5"; version = "5.16.6";
outputs = [ "out" "lib" "dev" ]; outputs = [ "out" "lib" "dev" ];
src = fetchurl { src = fetchurl {
url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc"; sha256 = "0ibs575pfr0wmhfcw6ln6iz7gw2y45l3bah11rksf6g9jlwsxy1d";
}; };
patches = [
# Fix property name (new GLib is stricter)
# https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-601494939
# https://gitlab.gnome.org/GNOME/polari/-/merge_requests/141
(fetchpatch {
url = "https://github.com/TelepathyIM/telepathy-mission-control/commit/d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910.patch";
sha256 = "1rchl0lyfj5c3yhl63spzvx9b6ny3967dlq4hgp9qhqn0zjra3sb";
})
];
buildInputs = [ buildInputs = [
python3 python3
]; # ToDo: optional stuff missing ]; # ToDo: optional stuff missing
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkg-config
libxslt libxslt
makeWrapper makeWrapper
]; ];
@ -57,7 +46,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An account manager and channel dispatcher for the Telepathy framework"; description = "An account manager and channel dispatcher for the Telepathy framework";
homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/"; homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/";
license = licenses.lgpl21; license = licenses.lgpl21Only;
maintainers = with maintainers; [ jtojnar ]; maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

View file

@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec {
description = "A console IRC client"; description = "A console IRC client";
homepage = "https://github.com/osa1/tiny"; homepage = "https://github.com/osa1/tiny";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ filalex77 ]; maintainers = with maintainers; [ Br1ght0ne ];
}; };
} }

View file

@ -32,7 +32,7 @@
, nasm , nasm
, nodejs , nodejs
, nspr , nspr
, nss , nss_3_53
, pango , pango
, perl , perl
, pkgconfig , pkgconfig
@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
libvpx libvpx
libwebp libwebp
nspr nspr
nss nss_3_53
pango pango
perl perl
sqlite sqlite
@ -142,7 +142,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE =[ NIX_CFLAGS_COMPILE =[
"-I${glib.dev}/include/gio-unix-2.0" "-I${glib.dev}/include/gio-unix-2.0"
"-I${nss.dev}/include/nss" "-I${nss_3_53.dev}/include/nss"
]; ];
patches = [ patches = [

View file

@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
license = licenses.gpl3; license = licenses.gpl3;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ filalex77 ]; maintainers = with maintainers; [ Br1ght0ne ];
}; };
} }

View file

@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
homepage = "https://termius.com/"; homepage = "https://termius.com/";
downloadPage = "https://termius.com/linux/"; downloadPage = "https://termius.com/linux/";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ filalex77 ]; maintainers = with maintainers; [ Br1ght0ne ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

View file

@ -18,7 +18,7 @@
, podofo , podofo
, poppler , poppler
, poppler_data , poppler_data
, python2 , python3
, qtbase , qtbase
, qtimageformats , qtimageformats
, qttools , qttools
@ -26,7 +26,7 @@
}: }:
let let
pythonEnv = python2.withPackages ( pythonEnv = python3.withPackages (
ps: [ ps: [
ps.pillow ps.pillow
ps.tkinter ps.tkinter
@ -36,50 +36,13 @@ in
mkDerivation rec { mkDerivation rec {
pname = "scribus"; pname = "scribus";
version = "1.5.5"; version = "1.5.6.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
sha256 = "0w9zzsiaq3f7vpxybk01c9z2b4qqg67mzpyfb2gjchz8dhdb423r"; sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s=";
}; };
patches = [
# Poppler patches from
# https://github.com/scribusproject/scribus/commits/master/scribus/plugins/import/pdf
# fix build with Poppler 0.82
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
})
# fix build with Poppler 0.83
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
})
# fix build with Poppler 0.84
# TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch";
sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y";
})
# Formating changes needed for the Poppler 0.86 patch to apply
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch";
sha256 = "16n3wch2mkabgkb06iywggdkckr4idrw4in56k5jh2jqjl0ra2db";
})
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch";
sha256 = "0g6l3qc75wiykh59059ajraxjczh11wkm68942d0skl144i893rr";
includes = [ "scribus/plugins/import/pdf/*" ];
})
# fix build with Poppler 0.86
(fetchpatch {
url = "https://github.com/scribusproject/scribus/commit/67f8771aaff2f55d61b8246f420e762f4b526944.patch";
sha256 = "1lszpzlpgdhm79nywvqji25aklfhzb2qfsfiyld7yv51h82zwp77";
})
];
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "samblaster"; pname = "samblaster";
version = "0.1.24"; version = "0.1.26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GregoryFaust"; owner = "GregoryFaust";
repo = "samblaster"; repo = "samblaster";
rev = "v.${version}"; rev = "v.${version}";
sha256 = "0iv2ddfw8363vb2x8gr3p8g88whb6mb9m0pf71i2cqsbv6jghap7"; sha256 = "0g24fq5hplnfgqkh3xqpg3lgx3wmxwnh9c7m6yw7pbi40lmgl1jv";
}; };
installPhase = '' installPhase = ''

View file

@ -4,12 +4,12 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marvin"; pname = "marvin";
version = "20.19.0"; version = "20.20.0";
src = fetchurl { src = fetchurl {
name = "marvin-${version}.deb"; name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
sha256 = "0b9a0yl3mxfb2dfdkgs2wphhxsgwixqk6nl2hsn1ly3gz53cws1q"; sha256 = "1a8b0drb0c95c8arm3aa0z0sbdm9ilj4h1g90i0qyn4g2wk2xsal";
}; };
nativeBuildInputs = [ dpkg makeWrapper ]; nativeBuildInputs = [ dpkg makeWrapper ];

View file

@ -1,40 +1,47 @@
{ stdenv, fetchFromGitHub, autoconf, gperf, flex, bison, readline, ncurses { stdenv
, bzip2, zlib , fetchFromGitHub
# Test inputs , autoconf
, bison
, bzip2
, flex
, gperf
, ncurses
, perl , perl
, readline
, zlib
}: }:
let let
iverilog-test = fetchFromGitHub { iverilog-test = fetchFromGitHub {
owner = "steveicarus"; owner = "steveicarus";
repo = "ivtest"; repo = "ivtest";
rev = "d4c80beb845cad92136c05074b3910b822a9315f"; rev = "253609b89576355b3bef2f91e90db62223ecf2be";
sha256 = "13cpnkki3xmhsh2v4bp2s35mhwknapcikdh85g4q6925ka940r45"; sha256 = "18i7jlr2csp7mplcrwjhllwvb6w3v7x7mnx7vdw48nd3g5scrydx";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iverilog"; pname = "iverilog";
version = "unstable-2020-10-24"; version = "11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "steveicarus"; owner = "steveicarus";
repo = pname; repo = pname;
rev = "d6e01d0c557253414109a4dde46b2966a5a3fb08"; rev = "v${stdenv.lib.replaceStrings ["."] ["_"] version}";
sha256 = "1bl75mbycj9zpjbpay8z12384yk9ih5q9agsrjh9pva0vv3h4y4y"; sha256 = "0nzcyi6l2zv9wxzsv9i963p3igyjds0n55x0ph561mc3pfbc7aqp";
}; };
nativeBuildInputs = [ autoconf gperf flex bison ]; nativeBuildInputs = [ autoconf bison flex gperf ];
buildInputs = [ readline ncurses bzip2 zlib ];
preConfigure = "bash $PWD/autoconf.sh"; buildInputs = [ bzip2 ncurses readline zlib ];
preConfigure = "sh autoconf.sh";
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = true;
# most tests pass, but some that rely on exact text of floating-point numbers
# fail on aarch64.
doInstallCheck = !stdenv.isAarch64;
installCheckInputs = [ perl ]; installCheckInputs = [ perl ];
installCheckPhase = '' installCheckPhase = ''
# copy tests to allow writing results # copy tests to allow writing results
export TESTDIR=$(mktemp -d) export TESTDIR=$(mktemp -d)
@ -53,7 +60,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Icarus Verilog compiler"; description = "Icarus Verilog compiler";
homepage = "http://iverilog.icarus.com/"; homepage = "http://iverilog.icarus.com/"; # https does not work
license = with licenses; [ gpl2Plus lgpl21Plus ]; license = with licenses; [ gpl2Plus lgpl21Plus ];
maintainers = with maintainers; [ winden thoughtpolice ]; maintainers = with maintainers; [ winden thoughtpolice ];
platforms = platforms.all; platforms = platforms.all;

View file

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, bison , bison
, flex , flex
, verilog , verilog
@ -16,6 +17,15 @@ stdenv.mkDerivation rec {
sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n"; sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n";
}; };
patches = stdenv.lib.optionals (!stdenv.isAarch64) [
# fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15
# for some strange reason, this is not needed for aarch64
(fetchpatch {
url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch";
sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
bison bison
flex flex

View file

@ -0,0 +1,29 @@
{ stdenv
, fetchFromGitHub
, autoreconfHook
, libX11
, libGL
, libGLU
, freeglut }:
stdenv.mkDerivation rec {
pname = "antiprism";
version = "0.26";
src = fetchFromGitHub {
owner = "antiprism";
repo = pname;
rev = version;
sha256 = "sha256-5FE6IbYKk7eMT985R9NCX3GDXE8SrdVHFcCpKeJvKtQ=";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ];
meta = with stdenv.lib; {
homepage = "https://www.antiprism.com";
description = "A collection of programs for generating, manipulating, transforming and viewing polyhedra";
license = with licenses; [ mit ];
maintainers = with maintainers; [ AndersonTorres ];
};
}

View file

@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
description = "Unit-aware calculator"; description = "Unit-aware calculator";
homepage = "https://rinkcalc.app"; homepage = "https://rinkcalc.app";
license = with licenses; [ mpl20 gpl3 ]; license = with licenses; [ mpl20 gpl3 ];
maintainers = with maintainers; [ sb0 filalex77 ]; maintainers = with maintainers; [ sb0 Br1ght0ne ];
}; };
} }

View file

@ -52,16 +52,17 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "alacritty"; pname = "alacritty";
version = "0.5.0"; # 0.5.0 is not compatible with gnome 3.38
version = "0.6.0-rc1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alacritty"; owner = "alacritty";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1948j57xhqvc5y876s929x9rhd6j0xnw5c91g1zqw2rfncn602g2"; sha256 = "RuIJvB0J/BQFqemOkEUiqS1uz0gMS49Dd8UQt0nbrQ0=";
}; };
cargoSha256 = "17lyzcj07f0vyki3091vgjd0w8ki11sw5m8gb3bxdph1dl04rria"; cargoSha256 = "+3iZywLvy+8C7j6g9bqij2DSLjBoE2u1GXgfV04cWRY=";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
@ -136,7 +137,7 @@ rustPlatform.buildRustPackage rec {
description = "A cross-platform, GPU-accelerated terminal emulator"; description = "A cross-platform, GPU-accelerated terminal emulator";
homepage = "https://github.com/alacritty/alacritty"; homepage = "https://github.com/alacritty/alacritty";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ filalex77 mic92 cole-h ma27 ]; maintainers = with maintainers; [ Br1ght0ne mic92 cole-h ma27 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -1,29 +1,41 @@
{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper { stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig
, enableDecLocator ? true , makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix
}: , gnused, coreutils, enableDecLocator ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xterm-353"; pname = "xterm";
version = "362";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"ftp://ftp.invisible-island.net/xterm/${name}.tgz" "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
]; ];
sha256 = "0s5pkfn4r8iy09s1q1y78zhnr9f3sm6wgbqir7azaqggkppd68g5"; sha256 = "HU/+Im+o8CGFm7wwB3iP9jpGoxJC2b2ae9fr4k6BrKI=";
}; };
buildInputs = buildInputs = [
[ xorg.libXaw xorg.xorgproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE xorg.libXaw
ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper xorg.xorgproto
]; xorg.libXt
xorg.libXext
xorg.libX11
xorg.libSM
xorg.libICE
ncurses
freetype
fontconfig
pkgconfig
xorg.libXft
xorg.luit
makeWrapper
];
patches = [ patches = [ ./sixel-256.support.patch ]
./sixel-256.support.patch ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl
(fetchpatch {
name = "posix-ptys.patch"; name = "posix-ptys.patch";
url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; url =
"https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";
sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr";
}); });
@ -62,10 +74,44 @@ stdenv.mkDerivation rec {
install -D -t $out/share/icons/hicolor/48x48/apps icons/xterm-color_48x48.xpm install -D -t $out/share/icons/hicolor/48x48/apps icons/xterm-color_48x48.xpm
''; '';
passthru = {
updateScript = let
# Tags that end in letters are unstable
suffixes = stdenv.lib.concatStringsSep " "
(map (c: "-c versionsort.suffix='${c}'")
(stdenv.lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz"));
in writeScript "update.sh" ''
#!${stdenv.shell}
set -o errexit
PATH=${
stdenv.lib.makeBinPath [
common-updater-scripts
git
nixfmt
nix
coreutils
gnused
]
}
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
latestTag="$(git ${suffixes} ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:ThomasDickey/xterm-snapshots.git 'xterm-*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^xterm-||g')"
if [ ! "$oldVersion" = "$latestTag" ]; then
update-source-version ${pname} "$latestTag" --version-key=version --print-changes
nixpkgs="$(git rev-parse --show-toplevel)"
default_nix="$nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix"
nixfmt "$default_nix"
else
echo "${pname} is already up-to-date"
fi
'';
};
meta = { meta = {
homepage = "https://invisible-island.net/xterm"; homepage = "https://invisible-island.net/xterm";
license = with stdenv.lib.licenses; [ mit ]; license = with stdenv.lib.licenses; [ mit ];
maintainers = with stdenv.lib.maintainers; [vrthra]; maintainers = with stdenv.lib.maintainers; [ nequissimus vrthra ];
platforms = with stdenv.lib.platforms; linux ++ darwin; platforms = with stdenv.lib.platforms; linux ++ darwin;
}; };
} }

View file

@ -5,13 +5,13 @@ let
in buildPythonApplication rec { in buildPythonApplication rec {
pname = "git-cola"; pname = "git-cola";
version = "3.5"; version = "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "git-cola"; owner = "git-cola";
repo = "git-cola"; repo = "git-cola";
rev = "v${version}"; rev = "v${version}";
sha256 = "09b60jbpdr4czx7h4vqahqmmi7m9vn77jlkpjfhys7crrdnxjp9i"; sha256 = "1qxv2k8lxcxpqx46ka7f042xk90xns5w9lc4009cxmsqvcdba03a";
}; };
buildInputs = [ git gettext ]; buildInputs = [ git gettext ];

View file

@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
description = "Blazing fast terminal-ui for git written in rust"; description = "Blazing fast terminal-ui for git written in rust";
homepage = "https://github.com/extrawurst/gitui"; homepage = "https://github.com/extrawurst/gitui";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ filalex77 yanganto ]; maintainers = with maintainers; [ Br1ght0ne yanganto ];
}; };
} }

Some files were not shown because too many files have changed in this diff Show more