Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar 2019-10-03 01:47:41 +02:00
commit b9c5f849a4
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
515 changed files with 8516 additions and 3198 deletions

View File

@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec {
}; };
cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
verifyCargoDeps = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A fast line-oriented regex search tool, similar to ag and ack"; description = "A fast line-oriented regex search tool, similar to ag and ack";
@ -64,6 +65,9 @@ When the `Cargo.lock`, provided by upstream, is not in sync with the
added in `cargoPatches` will also be prepended to the patches in `patches` at added in `cargoPatches` will also be prepended to the patches in `patches` at
build-time. build-time.
When `verifyCargoDeps` is set to `true`, the build will also verify that the
`cargoSha256` is not out of date by comparing the `Cargo.lock` file in both the `cargoDeps` and `src`. Note that this option changes the value of `cargoSha256` since it also copies the `Cargo.lock` in it. To avoid breaking backward-compatibility this option is not enabled by default but hopefully will be in the future.
## Compiling Rust crates using Nix instead of Cargo ## Compiling Rust crates using Nix instead of Cargo
### Simple operation ### Simple operation

View File

@ -591,12 +591,16 @@ rec {
{ options, ... }: { options, ... }:
{ options = setAttrByPath optionName (mkOption { { options = setAttrByPath optionName (mkOption {
visible = false; visible = false;
apply = x: throw "The option `${showOption optionName}' can no longer be used since it's been removed. ${replacementInstructions}";
}); });
config.warnings = config.assertions =
let opt = getAttrFromPath optionName options; in let opt = getAttrFromPath optionName options; in [{
optional opt.isDefined '' assertion = !opt.isDefined;
message = ''
The option definition `${showOption optionName}' in ${showFiles opt.files} no longer has any effect; please remove it. The option definition `${showOption optionName}' in ${showFiles opt.files} no longer has any effect; please remove it.
${replacementInstructions}''; ${replacementInstructions}
'';
}];
}; };
/* Return a module that causes a warning to be shown if the /* Return a module that causes a warning to be shown if the

View File

@ -7,7 +7,7 @@ let
all = [ all = [
"aarch64-linux" "aarch64-linux"
"armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux"
"mipsel-linux" "mipsel-linux"

View File

@ -14,7 +14,7 @@ let
in with lib.systems.doubles; lib.runTests { in with lib.systems.doubles; lib.runTests {
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded); testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded);
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
testmips = mseteq mips [ "mipsel-linux" ]; testmips = mseteq mips [ "mipsel-linux" ];
testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
@ -24,7 +24,7 @@ in with lib.systems.doubles; lib.runTests {
testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]; testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
testillumos = mseteq illumos [ "x86_64-solaris" ]; testillumos = mseteq illumos [ "x86_64-solaris" ];
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ]; testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ];
testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]; testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];

View File

@ -1655,6 +1655,12 @@
githubId = 1316469; githubId = 1316469;
name = "Naomi Morse"; name = "Naomi Morse";
}; };
dkudriavtsev = {
email = "dkudriavtsev@gmail.com";
github = "dkudriavtsev";
githubId = 9790772;
name = "Dmitry Kudriavtsev";
};
dmalikov = { dmalikov = {
email = "malikov.d.y@gmail.com"; email = "malikov.d.y@gmail.com";
github = "dmalikov"; github = "dmalikov";
@ -2007,6 +2013,11 @@
githubId = 4828; githubId = 4828;
name = "Eric Merritt"; name = "Eric Merritt";
}; };
ericdallo = {
email = "ercdll1337@gmail.com";
github = "ericdallo";
name = "Eric Dallo";
};
ericsagnes = { ericsagnes = {
email = "eric.sagnes@gmail.com"; email = "eric.sagnes@gmail.com";
github = "ericsagnes"; github = "ericsagnes";
@ -2045,6 +2056,12 @@
github = "ertes"; github = "ertes";
name = "Ertugrul Söylemez"; name = "Ertugrul Söylemez";
}; };
esclear = {
email = "esclear@users.noreply.github.com";
github = "esclear";
githubId = 7432848;
name = "Daniel Albert";
};
Esteth = { Esteth = {
email = "adam.copp@gmail.com"; email = "adam.copp@gmail.com";
name = "Adam Copp"; name = "Adam Copp";
@ -2077,6 +2094,12 @@
githubId = 195032; githubId = 195032;
name = "Eric Evenchick"; name = "Eric Evenchick";
}; };
evenbrenden = {
email = "evenbrenden@gmail.com";
github = "evenbrenden";
githubId = 2512008;
name = "Even Brenden";
};
exfalso = { exfalso = {
email = "0slemi0@gmail.com"; email = "0slemi0@gmail.com";
github = "exfalso"; github = "exfalso";
@ -2841,6 +2864,12 @@
githubId = 820715; githubId = 820715;
name = "Jake Logemann"; name = "Jake Logemann";
}; };
jakestanger = {
email = "mail@jstanger.dev";
github = "JakeStanger";
githubId = 5057870;
name = "Jake Stanger";
};
jakewaksbaum = { jakewaksbaum = {
email = "jake.waksbaum@gmail.com"; email = "jake.waksbaum@gmail.com";
github = "jbaum98"; github = "jbaum98";
@ -3132,6 +3161,11 @@
githubId = 392720; githubId = 392720;
name = "Jon Banafato"; name = "Jon Banafato";
}; };
jonathanmarler = {
email = "johnnymarler@gmail.com";
github = "marler8997";
name = "Jonathan Marler";
};
jonathanreeve = { jonathanreeve = {
email = "jon.reeve@gmail.com"; email = "jon.reeve@gmail.com";
github = "JonathanReeve"; github = "JonathanReeve";
@ -3495,6 +3529,11 @@
githubId = 1362179; githubId = 1362179;
name = "Kyle Lacy"; name = "Kyle Lacy";
}; };
laikq = {
email = "gwen@quasebarth.de";
github = "laikq";
name = "Gwendolyn Quasebarth";
};
lasandell = { lasandell = {
email = "lasandell@gmail.com"; email = "lasandell@gmail.com";
github = "lasandell"; github = "lasandell";
@ -5796,6 +5835,12 @@
githubId = 1151264; githubId = 1151264;
name = "Sebastian Graf"; name = "Sebastian Graf";
}; };
shahrukh330 = {
email = "shahrukh330@gmail.com";
github = "shahrukh330";
githubId = 1588288;
name = "Shahrukh Khan";
};
shanemikel = { shanemikel = {
email = "shanemikel1@gmail.com"; email = "shanemikel1@gmail.com";
github = "shanemikel"; github = "shanemikel";
@ -5881,6 +5926,12 @@
fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5";
}]; }];
}; };
simonchatts = {
email = "code@chatts.net";
github = "simonchatts";
githubId = 11135311;
name = "Simon Chatterjee";
};
simonvandel = { simonvandel = {
email = "simon.vandel@gmail.com"; email = "simon.vandel@gmail.com";
github = "simonvandel"; github = "simonvandel";
@ -7089,6 +7140,12 @@
githubId = 1866448; githubId = 1866448;
name = "Eric Bailey"; name = "Eric Bailey";
}; };
yvt = {
email = "i@yvt.jp";
github = "yvt";
githubId = 5253988;
name = "yvt";
};
z77z = { z77z = {
email = "maggesi@math.unifi.it"; email = "maggesi@math.unifi.it";
github = "maggesi"; github = "maggesi";

View File

@ -513,6 +513,12 @@
must be owned by either <literal>root</literal> or the user specified in <option>services.gitlab.user</option>. must be owned by either <literal>root</literal> or the user specified in <option>services.gitlab.user</option>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The Twitter client <literal>corebird</literal> has been dropped as <link xlink:href="https://www.patreon.com/posts/corebirds-future-18921328">it is discontinued and does not work against the new Twitter API</link>.
Please use the fork <literal>cawbird</literal> instead which has been adapted to the API changes and is still maintained.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

View File

@ -23,6 +23,11 @@
Support is planned until the end of October 2020, handing over to 20.09. Support is planned until the end of October 2020, handing over to 20.09.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Postgresql for NixOS service now defaults to v11.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
@ -73,7 +78,7 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para /> <para>SD images are now compressed by default using <literal>bzip2</literal>.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>

View File

@ -8,11 +8,6 @@ let
cfg = config.environment; cfg = config.environment;
pamProfiles =
map
(replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"])
cfg.profiles;
in in
{ {
@ -75,13 +70,20 @@ in
let let
suffixedVariables = suffixedVariables =
flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes: flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes:
flip concatMap pamProfiles (profile: flip concatMap cfg.profiles (profile:
map (suffix: "${profile}${suffix}") suffixes map (suffix: "${profile}${suffix}") suffixes
) )
); );
# We're trying to use the same syntax for PAM variables and env variables.
# That means we need to map the env variables that people might use to their
# equivalent PAM variable.
# Note: PAM_USER is a PAM_ITEM, HOME is an environment variable, they have
# different syntax.
replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["\${HOME}" "@{PAM_USER}"];
pamVariable = n: v: pamVariable = n: v:
''${n} DEFAULT="${concatStringsSep ":" (toList v)}"''; ''${n} DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"'';
pamVariables = pamVariables =
concatStringsSep "\n" concatStringsSep "\n"

View File

@ -98,6 +98,16 @@ in
populate the ./files/boot (/boot) directory. populate the ./files/boot (/boot) directory.
''; '';
}; };
compressImage = mkOption {
type = types.bool;
default = true;
description = ''
Whether the SD image should be compressed using
<command>bzip2</command>.
'';
};
}; };
config = { config = {
@ -118,10 +128,12 @@ in
sdImage.storePaths = [ config.system.build.toplevel ]; sdImage.storePaths = [ config.system.build.toplevel ];
system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux }: stdenv.mkDerivation { system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux, bzip2 }: stdenv.mkDerivation {
name = config.sdImage.imageName; name = config.sdImage.imageName;
nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux ]; nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 ];
inherit (config.sdImage) compressImage;
buildCommand = '' buildCommand = ''
mkdir -p $out/nix-support $out/sd-image mkdir -p $out/nix-support $out/sd-image
@ -168,6 +180,9 @@ in
# Verify the FAT partition before copying it. # Verify the FAT partition before copying it.
fsck.vfat -vn firmware_part.img fsck.vfat -vn firmware_part.img
dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS
if test -n "$compressImage"; then
bzip2 $img
fi
''; '';
}) {}; }) {};

View File

@ -299,10 +299,11 @@
./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome3/chrome-gnome-shell.nix
./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome3/evolution-data-server.nix
./services/desktops/gnome3/glib-networking.nix ./services/desktops/gnome3/glib-networking.nix
./services/desktops/gnome3/gnome-initial-setup.nix
./services/desktops/gnome3/gnome-keyring.nix ./services/desktops/gnome3/gnome-keyring.nix
./services/desktops/gnome3/gnome-online-accounts.nix ./services/desktops/gnome3/gnome-online-accounts.nix
./services/desktops/gnome3/gnome-remote-desktop.nix
./services/desktops/gnome3/gnome-online-miners.nix ./services/desktops/gnome3/gnome-online-miners.nix
./services/desktops/gnome3/gnome-remote-desktop.nix
./services/desktops/gnome3/gnome-settings-daemon.nix ./services/desktops/gnome3/gnome-settings-daemon.nix
./services/desktops/gnome3/gnome-user-share.nix ./services/desktops/gnome3/gnome-user-share.nix
./services/desktops/gnome3/rygel.nix ./services/desktops/gnome3/rygel.nix
@ -503,6 +504,7 @@
./services/monitoring/das_watchdog.nix ./services/monitoring/das_watchdog.nix
./services/monitoring/datadog-agent.nix ./services/monitoring/datadog-agent.nix
./services/monitoring/dd-agent/dd-agent.nix ./services/monitoring/dd-agent/dd-agent.nix
./services/monitoring/do-agent.nix
./services/monitoring/fusion-inventory.nix ./services/monitoring/fusion-inventory.nix
./services/monitoring/grafana.nix ./services/monitoring/grafana.nix
./services/monitoring/grafana-reporter.nix ./services/monitoring/grafana-reporter.nix

View File

@ -226,7 +226,8 @@ in
# Note: when changing the default, make it conditional on # Note: when changing the default, make it conditional on
# system.stateVersion to maintain compatibility with existing # system.stateVersion to maintain compatibility with existing
# systems! # systems!
mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11
else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
else throw "postgresql_9_4 was removed, please upgrade your postgresql version."); else throw "postgresql_9_4 was removed, please upgrade your postgresql version.");

View File

@ -0,0 +1,86 @@
# GNOME Initial Setup.
{ config, pkgs, lib, ... }:
with lib;
let
# GNOME initial setup's run is conditioned on whether
# the gnome-initial-setup-done file exists in XDG_CONFIG_HOME
# Because of this, every existing user will have initial setup
# running because they never ran it before.
#
# To prevent this we create the file if the users stateVersion
# is older than 20.03 (the release we added this module).
script = pkgs.writeScript "create-gis-stamp-files" ''
#!${pkgs.runtimeShell}
setup_done=$HOME/.config/gnome-initial-setup-done
echo "Creating g-i-s stamp file $setup_done ..."
cat - > $setup_done <<- EOF
yes
EOF
'';
createGisStampFilesAutostart = pkgs.writeTextFile rec {
name = "create-g-i-s-stamp-files";
destination = "/etc/xdg/autostart/${name}.desktop";
text = ''
[Desktop Entry]
Type=Application
Name=Create GNOME Initial Setup stamp files
Exec=${script}
StartupNotify=false
NoDisplay=true
OnlyShowIn=GNOME;
AutostartCondition=unless-exists gnome-initial-setup-done
X-GNOME-Autostart-Phase=EarlyInitialization
'';
};
in
{
###### interface
options = {
services.gnome3.gnome-initial-setup = {
enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system";
};
};
###### implementation
config = mkIf config.services.gnome3.gnome-initial-setup.enable {
environment.systemPackages = [
pkgs.gnome3.gnome-initial-setup
]
++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart
;
systemd.packages = [
pkgs.gnome3.gnome-initial-setup
];
systemd.user.targets."gnome-session".wants = [
"gnome-initial-setup-copy-worker.service"
"gnome-initial-setup-first-login.service"
"gnome-welcome-tour.service"
];
systemd.user.targets."gnome-session@gnome-initial-setup".wants = [
"gnome-initial-setup.service"
];
};
}

View File

@ -11,6 +11,7 @@ let
nixVersion = getVersion nix; nixVersion = getVersion nix;
isNix20 = versionAtLeast nixVersion "2.0pre"; isNix20 = versionAtLeast nixVersion "2.0pre";
isNix23 = versionAtLeast nixVersion "2.3pre";
makeNixBuildUser = nr: makeNixBuildUser = nr:
{ name = "nixbld${toString nr}"; { name = "nixbld${toString nr}";
@ -63,7 +64,7 @@ let
builders = builders =
''} ''}
system-features = ${toString cfg.systemFeatures} system-features = ${toString cfg.systemFeatures}
${optionalString (versionAtLeast nixVersion "2.3pre") '' ${optionalString isNix23 ''
sandbox-fallback = false sandbox-fallback = false
''} ''}
$extraOptions $extraOptions
@ -74,7 +75,7 @@ let
'' else '' '' else ''
echo "Checking that Nix can read nix.conf..." echo "Checking that Nix can read nix.conf..."
ln -s $out ./nix.conf ln -s $out ./nix.conf
NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net"} >/dev/null
'') '')
); );

View File

@ -0,0 +1,34 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.do-agent;
in
{
options.services.do-agent = {
enable = mkEnableOption "do-agent, the DigitalOcean droplet metrics agent";
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.do-agent ];
systemd.services.do-agent = {
description = "DigitalOcean Droplet Metrics Agent";
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
serviceConfig = {
ExecStart = "${pkgs.do-agent}/bin/do-agent --syslog";
Restart = "always";
OOMScoreAdjust = -900;
SyslogIdentifier = "DigitalOceanAgent";
PrivateTmp = "yes";
ProtectSystem = "full";
ProtectHome = "yes";
NoNewPrivileges = "yes";
DynamicUser = "yes";
};
};
};
}

View File

@ -49,6 +49,6 @@ in
(mkRemovedOptionModule [ "insecure" ] '' (mkRemovedOptionModule [ "insecure" ] ''
This option was replaced by 'prometheus.exporters.nginx.sslVerify'. This option was replaced by 'prometheus.exporters.nginx.sslVerify'.
'') '')
({ options.warnings = options.warnings; }) ({ options.warnings = options.warnings; options.assertions = options.assertions; })
]; ];
} }

View File

@ -50,13 +50,6 @@ in
systemd.packages = [ cfg.package ]; systemd.packages = [ cfg.package ];
# The upstream unit does not use StateDirectory, and will
# fail if the directory it needs is not present. Should be
# fixed when https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/5
# is merged.
systemd.services.fprintd.serviceConfig.StateDirectory = "fprint";
}; };
} }

View File

@ -155,10 +155,10 @@ in
environment.systemPackages = cfg.sessionPath; environment.systemPackages = cfg.sessionPath;
environment.variables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1"; environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
# Override GSettings schemas # Override GSettings schemas
environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
# If gnome3 is installed, build vim for gtk3 too. # If gnome3 is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3"; nixpkgs.config.vim.gui = "gtk3";
@ -229,6 +229,7 @@ in
services.colord.enable = mkDefault true; services.colord.enable = mkDefault true;
services.gnome3.chrome-gnome-shell.enable = mkDefault true; services.gnome3.chrome-gnome-shell.enable = mkDefault true;
services.gnome3.glib-networking.enable = true; services.gnome3.glib-networking.enable = true;
services.gnome3.gnome-initial-setup.enable = mkDefault true;
services.gnome3.gnome-remote-desktop.enable = mkDefault true; services.gnome3.gnome-remote-desktop.enable = mkDefault true;
services.gnome3.gnome-settings-daemon.enable = true; services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-user-share.enable = mkDefault true; services.gnome3.gnome-user-share.enable = mkDefault true;
@ -236,7 +237,23 @@ in
services.gvfs.enable = true; services.gvfs.enable = true;
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.telepathy.enable = mkDefault true; services.telepathy.enable = mkDefault true;
systemd.packages = [ pkgs.gnome3.vino ];
systemd.packages = with pkgs.gnome3; [ vino gnome-session gnome-settings-daemon ];
# gnome-settings-daemon.nix is shared between several desktop
# environments (eg. mate and pantheon) so specify these gnome-shell specific
# service dependencies here instead.
systemd.user.targets."gnome-session-initialized".wants = [
"gsd-a11y-settings.target" "gsd-housekeeping.target" "gsd-power.target"
"gsd-color.target" "gsd-keyboard.target" "gsd-print-notifications.target"
"gsd-datetime.target" "gsd-media-keys.target" "gsd-rfkill.target"
"gsd-screensaver-proxy.target" "gsd-sound.target" "gsd-smartcard.target"
"gsd-sharing.target" "gsd-wacom.target" "gsd-wwan.target"
];
systemd.user.targets."gnome-session-x11-services".wants = [
"gsd-xsettings.target"
];
services.avahi.enable = mkDefault true; services.avahi.enable = mkDefault true;
@ -329,10 +346,10 @@ in
# Let nautilus find extensions # Let nautilus find extensions
# TODO: Create nautilus-with-extensions package # TODO: Create nautilus-with-extensions package
environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0"; environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
# Override default mimeapps for nautilus # Override default mimeapps for nautilus
environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ]; environment.sessionVariables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
environment.pathsToLink = [ environment.pathsToLink = [
"/share/nautilus-python/extensions" "/share/nautilus-python/extensions"

View File

@ -150,6 +150,11 @@ in
mkdir -p /run/gdm/.config/pulse mkdir -p /run/gdm/.config/pulse
ln -sf ${pulseConfig} /run/gdm/.config/pulse/default.pa ln -sf ${pulseConfig} /run/gdm/.config/pulse/default.pa
chown -R gdm:gdm /run/gdm/.config chown -R gdm:gdm /run/gdm/.config
'' + optionalString config.services.gnome3.gnome-initial-setup.enable ''
# Create stamp file for gnome-initial-setup to prevent run.
cat - > /run/gdm/.config/gnome-initial-setup-done <<- EOF
yes
EOF
''; '';
}; };
@ -159,6 +164,10 @@ in
"rc-local.service" "rc-local.service"
"systemd-machined.service" "systemd-machined.service"
"systemd-user-sessions.service" "systemd-user-sessions.service"
"getty@tty1.service"
];
systemd.services.display-manager.conflicts = [
"getty@tty1.service"
]; ];
systemd.services.display-manager.serviceConfig = { systemd.services.display-manager.serviceConfig = {

View File

@ -47,7 +47,12 @@ in {
assertions = [ assertions = [
{ {
assertion = !config.services.xserver.libinput.enable; assertion = !config.services.xserver.libinput.enable;
message = "cmt and libinput are incompatible, you cannot enable both (in services.xserver)."; message = ''
cmt and libinput are incompatible, meaning you cannot enable them both.
To use cmt you need to disable libinput with `services.xserver.libinput.enable = false`
If you haven't enabled it in configuration.nix, it's enabled by default on a
different xserver module.
'';
} }
]; ];
}; };

View File

@ -305,7 +305,7 @@ let
optional (defined ipv6Address && defined ipv6PrefixLength) optional (defined ipv6Address && defined ipv6PrefixLength)
{ address = ipv6Address; prefixLength = ipv6PrefixLength; })) { address = ipv6Address; prefixLength = ipv6PrefixLength; }))
({ options.warnings = options.warnings; }) ({ options.warnings = options.warnings; options.assertions = options.assertions; })
]; ];
}; };

View File

@ -22,6 +22,7 @@ import ./make-test.nix ({ pkgs, ...} : {
{ {
networking = { networking = {
dhcpcd.enable = false; dhcpcd.enable = false;
useNetworkd = true;
interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ]; interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ]; interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
}; };

View File

@ -73,4 +73,5 @@ in with pkgs; {
kafka_2_0 = makeKafkaTest "kafka_2_0" apacheKafka_2_0; kafka_2_0 = makeKafkaTest "kafka_2_0" apacheKafka_2_0;
kafka_2_1 = makeKafkaTest "kafka_2_1" apacheKafka_2_1; kafka_2_1 = makeKafkaTest "kafka_2_1" apacheKafka_2_1;
kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2; kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2;
kafka_2_3 = makeKafkaTest "kafka_2_3" apacheKafka_2_3;
} }

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "parlatype"; pname = "parlatype";
version = "1.6.1"; version = "1.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gkarsay"; owner = "gkarsay";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0b811lwiylrjirx88gi9az1b1b71j2i5a4a6g56wp9qxln6lzjj2"; sha256 = "157423f40l8nd5da6y0qjmg4l3125zailp98w2hda3mxxn1j5ix3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -0,0 +1,26 @@
{ lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec {
pname = "rofi-mpd";
version = "1.1.0";
src = fetchFromGitHub {
owner = "JakeStanger";
repo = "Rofi_MPD";
rev = "v${version}";
sha256 = "0pdra1idgas3yl9z9v7b002igwg2c1mv0yw2ffb8rsbx88x4gbai";
};
propagatedBuildInputs = with python3Packages; [ mutagen mpd2 ];
# upstream doesn't contain a test suite
doCheck = false;
meta = with lib; {
description = "A rofi menu for interacting with MPD written in Python";
homepage = "https://github.com/JakeStanger/Rofi_MPD";
license = licenses.mit;
maintainers = with maintainers; [ jakestanger ];
platforms = platforms.all;
};
}

View File

@ -0,0 +1,56 @@
{ stdenv, fetchurl, libsndfile, freeglut, alsaLib, mesa, libGLU, libX11, libXmu
, libXext, libXi }:
stdenv.mkDerivation rec {
pname = "sndpeek";
version = "1.4";
src = fetchurl {
url = "https://soundlab.cs.princeton.edu/software/sndpeek/files/sndpeek-${version}.tgz";
sha256 = "2d86cf74854fa00dcdc05a35dd92bc4cf6115e87102b17023be5cba9ead8eedf";
};
sourceRoot = "sndpeek-${version}/src/sndpeek";
# this patch adds -lpthread to the list of libraries, without it a
# symbol-not-found-error is thrown
patches = [ ./pthread.patch ];
buildInputs = [
freeglut
alsaLib
mesa
libGLU
libsndfile
libX11
libXmu
libXext
libXi
];
buildFlags = "linux-alsa";
installPhase = ''
mkdir -p $out/bin
mv sndpeek $out/bin
'';
meta = with stdenv.lib; {
description = "Real-time 3D animated audio display/playback";
longDescription = ''
sndpeek is just what it sounds (and looks) like:
* real-time 3D animated display/playback
* can use mic-input or wav/aiff/snd/raw/mat file (with playback)
* time-domain waveform
* FFT magnitude spectrum
* 3D waterfall plot
* lissajous! (interchannel correlation)
* rotatable and scalable display
* freeze frame! (for didactic purposes)
* real-time spectral feature extraction (centroid, rms, flux, rolloff)
* available on MacOS X, Linux, and Windows under GPL
* part of the sndtools distribution.
'';
homepage = https://soundlab.cs.princeton.edu/software/sndpeek/;
license = licenses.gpl2;
maintainers = [ maintainers.laikq ];
};
}

View File

@ -0,0 +1,13 @@
diff --git a/makefile.alsa b/makefile.alsa
index 34fb848..cdaeaec 100644
--- a/makefile.alsa
+++ b/makefile.alsa
@@ -4,7 +4,7 @@ CPP=g++
INCLUDES=-I../marsyas/
MARSYAS_DIR=../marsyas/
CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
-LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
+LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile -lpthread
OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "spotifyd"; pname = "spotifyd";
version = "0.2.14"; version = "0.2.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Spotifyd"; owner = "Spotifyd";
repo = "spotifyd"; repo = "spotifyd";
rev = "v${version}"; rev = "v${version}";
sha256 = "1hbcyc5rdrvdnvvsgaykqamq4i0yq8wqq5qjp6zjf4jlaxxif4nz"; sha256 = "097hg18h7gya2w0wl5jkav79nb3qzcc4ycsryq7nhxa0h1agvinc";
}; };
cargoSha256 = "15gd8shg0mn4vsma2hckj6w8gkwr58iniyfw1vjrh4clw4x7ibb4"; cargoSha256 = "0ar4bfwn3qxa6wsz2hd7nv1wr824h74jy3xqba2qsy0rsfwy1bmm";
cargoBuildFlags = [ cargoBuildFlags = [
"--no-default-features" "--no-default-features"

View File

@ -1,6 +1,6 @@
{ stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig { stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig
, alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
, libzip, rtaudio, rtmidi, speex }: , libzip, rtaudio, rtmidi, speex, libsamplerate }:
let let
glfw-git = glfw.overrideAttrs (oldAttrs: rec { glfw-git = glfw.overrideAttrs (oldAttrs: rec {
@ -28,13 +28,13 @@ let
in in
with stdenv.lib; stdenv.mkDerivation rec { with stdenv.lib; stdenv.mkDerivation rec {
pname = "VCV-Rack"; pname = "VCV-Rack";
version = "1.1.4"; version = "1.1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "VCVRack"; owner = "VCVRack";
repo = "Rack"; repo = "Rack";
rev = "v${version}"; rev = "v${version}";
sha256 = "04kg0nm7w19s2zfrsxjfl3bs4sy3bzf28kzl4hayzwv480667ybx"; sha256 = "172v66v2vb6l9dpsq6fb6xn035igwhpjci8w3kz2na3rvmz1bc5w";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -58,7 +58,7 @@ with stdenv.lib; stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ makeWrapper pkgconfig ]; nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex ]; buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex libsamplerate ];
buildFlags = "Rack"; buildFlags = "Rack";

View File

@ -5,10 +5,9 @@ diff -ru a/Makefile b/Makefile
build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0) build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0)
LDFLAGS += -rdynamic \ LDFLAGS += -rdynamic \
- dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtmidi.a dep/lib/librtaudio.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a \ - dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a \
- -lpthread -lGL -ldl -lX11 -lasound -ljack \ + -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -lzip -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio \
+ -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \ -lpthread -lGL -ldl -lX11 -lasound -ljack \
+ -lpthread -lGL -ldl -lX11 -lasound -ljack -lglfw \
$(shell pkg-config --libs gtk+-2.0) $(shell pkg-config --libs gtk+-2.0)
TARGET := Rack TARGET := Rack
endif endif

View File

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "go-ethereum"; pname = "go-ethereum";
version = "1.9.3"; version = "1.9.5";
goPackagePath = "github.com/ethereum/go-ethereum"; goPackagePath = "github.com/ethereum/go-ethereum";
@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "ethereum"; owner = "ethereum";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0lv6gxp34j26hqazcvyr4c7rsl1vljm6cfzkcmlapsjdgym505bg"; sha256 = "1h1c02dgazlcgp9lrm0zsig80nfj0c9553jy9nsvjyzf95ym1542";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "jormungandr"; pname = "jormungandr";
version = "0.5.2"; version = "0.5.5";
src = fetchgit { src = fetchgit {
url = "https://github.com/input-output-hk/${pname}"; url = "https://github.com/input-output-hk/${pname}";
rev = "v${version}"; rev = "v${version}";
sha256 = "0aixz007kc5gisc4hvix3ccmy0r459lczlwmnm2989jcxk3hki3q"; sha256 = "1fzhmkx60b5fnx4x81g5ls93iixd3126m4q1smrpq8ksidw5xifa";
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoSha256 = "1grrxmczdmkf2sd0f0b2iblzzcp8qlrsad5dkm0r5vxch22rcx7d"; cargoSha256 = "1hkbzxp6ic1655cq45zv6dcyrk9rbmvscdl8wm8fbidabz4x8vqd";
nativeBuildInputs = [ pkgconfig protobuf ]; nativeBuildInputs = [ pkgconfig protobuf ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeDesktopItem, appimageTools }: { stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
let let
pname = "ledger-live-desktop"; pname = "ledger-live-desktop";
@ -20,6 +20,8 @@ in appimageTools.wrapType2 rec {
mv $out/bin/${name} $out/bin/${pname} mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop
install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png
${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png
install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png
substituteInPlace $out/share/applications/ledger-live-desktop.desktop \ substituteInPlace $out/share/applications/ledger-live-desktop.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}' --replace 'Exec=AppRun' 'Exec=${pname}'
''; '';

View File

@ -1,4 +1,4 @@
{ gcc8Stdenv { stdenv
, ctags , ctags
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
@ -22,6 +22,7 @@
, ninja , ninja
, ostree , ostree
, pcre , pcre
, pcre2
, pkgconfig , pkgconfig
, python3 , python3
, sysprof , sysprof
@ -32,20 +33,16 @@
, wrapGAppsHook , wrapGAppsHook
, dbus , dbus
, xvfb_run , xvfb_run
, glib
}: }:
let
# Does not build with GCC 7
# https://gitlab.gnome.org/GNOME/gnome-builder/issues/868
stdenv = gcc8Stdenv;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-builder"; pname = "gnome-builder";
version = "3.32.4"; version = "3.34.0";
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 = "0xip58m206p8wa28p0a3y4ykylzr5xzmirjl3dspg4j25r08i8qr"; sha256 = "19i2ipgw48fpd50wacwyhj35hajlg7qcyxpj8rsqk4g21ijfykrg";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -80,6 +77,7 @@ stdenv.mkDerivation rec {
libxml2 libxml2
ostree ostree
pcre pcre
pcre2
python3 python3
sysprof sysprof
template-glib template-glib
@ -98,6 +96,8 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py
''; '';
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
mesonFlags = [ mesonFlags = [
"-Dpython_libprefix=${python3.libPrefix}" "-Dpython_libprefix=${python3.libPrefix}"
"-Ddocs=true" "-Ddocs=true"

View File

@ -0,0 +1,47 @@
{ stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }:
rustPlatform.buildRustPackage rec {
pname = "gnvim-unwrapped";
version = "0.1.5";
src = fetchFromGitHub {
owner = "vhakulinen";
repo = "gnvim";
rev = version;
sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh";
};
cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2";
buildInputs = [ gtk webkitgtk ];
# The default build script tries to get the version through Git, so we
# replace it
prePatch = ''
cat << EOF > build.rs
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::Path;
fn main() {
let out_dir = env::var("OUT_DIR").unwrap();
let dest_path = Path::new(&out_dir).join("gnvim_version.rs");
let mut f = File::create(&dest_path).unwrap();
f.write_all(b"const VERSION: &str = \"${version}\";").unwrap();
}
EOF
'';
installPhase = ''
make install PREFIX="${placeholder "out"}"
'';
meta = with stdenv.lib; {
description = "GUI for neovim, without any web bloat";
homepage = "https://github.com/vhakulinen/gnvim";
license = licenses.mit;
maintainers = with maintainers; [ minijackson ];
inherit version;
};
}

View File

@ -0,0 +1,41 @@
{ stdenv, gnvim-unwrapped, neovim, makeWrapper }:
stdenv.mkDerivation {
pname = "gnvim";
version = gnvim-unwrapped.version;
buildCommand = if stdenv.isDarwin then ''
mkdir -p $out/Applications
cp -r ${gnvim-unwrapped}/bin/gnvim.app $out/Applications
chmod -R a+w "$out/Applications/gnvim.app/Contents/MacOS"
wrapProgram "$out/Applications/gnvim.app/Contents/MacOS/gnvim" \
--prefix PATH : "${neovim}/bin" \
--set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
'' else ''
makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \
--prefix PATH : "${neovim}/bin" \
--set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime"
mkdir -p "$out/share"
ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons"
# copy and fix .desktop file
cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications"
# Sed needs a writable directory to do inplace modifications
chmod u+rw "$out/share/applications"
for file in $out/share/applications/*.desktop; do
sed -e "s|Exec=.\\+gnvim\\>|Exec=$out/bin/gnvim|" -i "$file"
done
'';
preferLocalBuild = true;
nativeBuildInputs = [
makeWrapper
];
passthru.unwrapped = gnvim-unwrapped;
inherit (gnvim-unwrapped) meta;
}

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "quilter"; pname = "quilter";
version = "1.9.5"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lainsce"; owner = "lainsce";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "119ri6lkzqapi5k0v818qkhg1916jj9s6bh72yqvc2wmyjnn2dbw"; sha256 = "1jmgnmpalnl3261wifk0mqa9viag6yvlrycgzqalmnrm1b20pyg4";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform."; else throw "ImageMagick is not supported on this platform.";
cfg = { cfg = {
version = "7.0.8-58"; version = "7.0.8-66";
sha256 = "0yfw32nydwy7ag7ina1zc6yssa146x4v35hjv6v59bci9mmj9fb1"; sha256 = "0wih8ag5i6qg2zhbjrlcripb5ic5l6i1z04chnlgykb84n5pcirv";
patches = []; patches = [];
}; };
in in

View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook
, fetchpatch }:
let let
version = "2.3.1"; version = "2.3.1";
@ -14,6 +15,14 @@ in stdenv.mkDerivation {
sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7"; sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
}; };
patches = [
# Remove useage of deprecrated G_PARAM_PRIVATE
(fetchpatch {
url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch";
sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9";
})
];
nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ]; nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
buildInputs = [ gtk3 hicolor-icon-theme ]; buildInputs = [ gtk3 hicolor-icon-theme ];

View File

@ -35,13 +35,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-photos"; pname = "gnome-photos";
version = "3.32.1"; version = "3.34.0";
outputs = [ "out" "installedTests" ]; outputs = [ "out" "installedTests" ];
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 = "0nxa2jz1g73wypdsj19r4plf4hfkhs9mpl7gbhsiyqp1rkn84ahn"; sha256 = "12j455id5g616cn0nnj73v83aqgpavrsqszw1r5yhbpyc76lg03m";
}; };
patches = [ patches = [

View File

@ -53,6 +53,10 @@ mkDerivation rec {
# src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory
enableParallelBuilding = false; # true by default due to qmake enableParallelBuilding = false; # true by default due to qmake
preBuild = ''
sed -re 's/qscintilla2_qt5/qscintilla2/g' -i Makefile
'';
postInstall = stdenv.lib.optionalString stdenv.isDarwin '' postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
mkdir $out/Applications mkdir $out/Applications
mv $out/bin/*.app $out/Applications mv $out/bin/*.app $out/Applications

View File

@ -0,0 +1,76 @@
{ stdenv
, fetchFromGitLab
, fetchpatch
, appstream-glib
, desktop-file-utils
, fwupd
, gettext
, glib
, gnome3
, gtk3
, libsoup
, libxmlb
, meson
, ninja
, pkgconfig
, systemd
, help2man
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "gnome-firmware-updater";
version = "3.34.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "hughsie";
repo = "gnome-firmware-updater";
rev = version;
sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l";
};
patches = [
# Fixes manual build
(fetchpatch {
url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch";
sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06";
})
(fetchpatch {
url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch";
sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1";
})
];
nativeBuildInputs = [
appstream-glib # for ITS rules
desktop-file-utils
gettext
help2man
meson
ninja
pkgconfig
wrapGAppsHook
];
buildInputs = [
fwupd
glib
gtk3
libsoup
libxmlb
systemd
];
mesonFlags = [
"-Dconsolekit=false"
];
meta = with stdenv.lib; {
homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater";
description = "Tool for installing firmware on devices";
license = licenses.gpl2Plus;
maintainers = gnome3.maintainers;
platforms = platforms.linux;
};
}

View File

@ -13,15 +13,16 @@
, libgtop , libgtop
, libdazzle , libdazzle
, gnome3 , gnome3
, tracker
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-usage"; pname = "gnome-usage";
version = "3.32.0"; version = "3.33.2";
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 = "0bgszckddfpd3czyb9fddx4pgv5yv44sxc45dfk2kgqyy169gjih"; sha256 = "0w3ppfaf15il8mad64qyc9hj1rmlvzs5dyzrxhq7r50k4kyiwmk4";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
gtk3 gtk3
libdazzle libdazzle
libgtop libgtop
tracker
]; ];
postPatch = '' postPatch = ''

View File

@ -2,13 +2,13 @@
mkDerivation rec { mkDerivation rec {
pname = "gpxsee"; pname = "gpxsee";
version = "7.13"; version = "7.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tumic0"; owner = "tumic0";
repo = "GPXSee"; repo = "GPXSee";
rev = version; rev = version;
sha256 = "08cg5k4ffj2wrcm4rk7vyixbyyz0424276fw2fn8lmziklkdqyjw"; sha256 = "13lxjbc54mw2d5jn0q61wjzm0hk2f6vmbvw11n7z8p62n8q30nvb";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];

View File

@ -2,18 +2,18 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.58.0"; version = "0.58.3";
goPackagePath = "github.com/gohugoio/hugo"; goPackagePath = "github.com/gohugoio/hugo";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
repo = "hugo"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0971li0777c1s67w72wl1y0b58ky93dw05hbk3s4kqys0acanc2d"; sha256 = "00dhb6xilkwr9yhncpyc6alzqw77ch3vd85dc7lzsmhw1c80n0lc";
}; };
modSha256 = "14ylbh2hx14swcqvawprbx5gynkwyb0nlp5acr4fjy1zl0ifc790"; modSha256 = "0d6zc7hxb246zsvwsjz4ds6gdd2m95x6l3djh3mmciwfg9cd7prx";
buildFlags = "-tags extended"; buildFlags = "-tags extended";

View File

@ -0,0 +1,35 @@
{ stdenv, fetchzip }:
let
arch = "amd64";
in
stdenv.mkDerivation rec {
pname = "jotta-cli";
version = "0.6.18626";
src =
fetchzip {
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
sha256 = "0v9bw0f2mcvmzp7v8gs6q4p1q54rflqnbjv5sw7h1kyfwznmflzj";
stripRoot = false;
};
installPhase = ''
install -D usr/bin/jotta-cli usr/bin/jottad -t $out/bin/
mkdir -p $out/share/bash-completion/completions
'';
postFixup = ''
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad
$out/bin/jotta-cli completion > $out/share/bash-completion/completions/jotta-cli.bash
'';
meta = with stdenv.lib; {
description = "Jottacloud CLI";
homepage = https://www.jottacloud.com/;
downloadPage = https://repo.jotta.us/archives/linux/;
maintainers = with maintainers; [ evenbrenden ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
};
}

View File

@ -1,6 +1,6 @@
{ stdenv, pkgconfig, fetchurl, buildPythonApplication { stdenv, pkgconfig, fetchurl, buildPythonApplication
, autoreconfHook, wrapGAppsHook, gobject-introspection , autoreconfHook, wrapGAppsHook, gobject-introspection
, intltool, yelp-tools, itstool, libxmlxx3 , gettext, yelp-tools, itstool, libxmlxx3
, python, pygobject3, gtk3, gnome3, substituteAll , python, pygobject3, gtk3, gnome3, substituteAll
, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
, xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas , xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas
@ -9,13 +9,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "orca"; pname = "orca";
version = "3.32.0"; version = "3.34.0";
format = "other"; format = "other";
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 = "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i"; sha256 = "10h258cprsxzb2hz9wqrkzv1yrsm19ws46l6fsnspywza5wq0z4p";
}; };
patches = [ patches = [
@ -30,7 +30,7 @@ buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
intltool yelp-tools itstool gobject-introspection gettext yelp-tools itstool gobject-introspection
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -44,11 +44,6 @@ buildPythonApplication rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
]; ];
# Run intltoolize to create po/Makefile.in.in
preConfigure = ''
intltoolize
'';
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;

View File

@ -0,0 +1,32 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, qmake, mkDerivation,
qtsvg,
libxml2, postgresql }:
mkDerivation rec {
pname = "pgmodeler";
version = "0.9.1";
src = fetchFromGitHub {
owner = "pgmodeler";
repo = "pgmodeler";
rev = "v${version}";
sha256 = "15isnbli9jj327r6sj7498nmhgf1mzdyhc1ih120ibw4900aajiv";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig qmake ];
qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ];
# todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here.
buildInputs = [ postgresql qtsvg ];
meta = with stdenv.lib; {
description = "A database modeling tool for PostgreSQL";
longDescription = ''pgModeler (PostgreSQL Database Modeler) is an open source database modeling tool designed for PostgreSQL.'';
homepage = https://pgmodeler.io/;
license = licenses.gpl3;
maintainers = [ maintainers.esclear ];
platforms = platforms.linux;
};
}

View File

@ -5,13 +5,13 @@
mkDerivation rec { mkDerivation rec {
pname = "qlcplus"; pname = "qlcplus";
version = "4.12.1"; version = "4.12.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mcallegari"; owner = "mcallegari";
repo = "qlcplus"; repo = "qlcplus";
rev = "QLC+_${version}"; rev = "QLC+_${version}";
sha256 = "1kz2zbz7blnm91dysn949bjsy4xqxg658k47p3gbl0pjl58c44hp"; sha256 = "1j0jhgql78p5ghcaz36l1k55447s5qiv396a448qic7xqpym2vl3";
}; };
nativeBuildInputs = [ qmake pkgconfig ]; nativeBuildInputs = [ qmake pkgconfig ];

View File

@ -1,6 +1,6 @@
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub
, glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs
, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
, pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto , pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto
}: }:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ]; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ];
buildInputs = buildInputs =
[ gtk3 dbus dbus-glib vte pcre harfbuzz libpthreadstubs libXdmcp [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
utillinuxMinimal glib docbook_xsl xmlto libselinux utillinuxMinimal glib docbook_xsl xmlto libselinux
libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit
]; ];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }: { stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sakura"; pname = "sakura";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl pkgconfig ]; nativeBuildInputs = [ cmake perl pkgconfig ];
buildInputs = [ makeWrapper gtk3 vte pcre glib ]; buildInputs = [ makeWrapper gtk3 vte pcre2 glib ];
# Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ... # Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ...
postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: { stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "stupidterm"; pname = "stupidterm";
@ -6,7 +6,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ vte gtk ]; buildInputs = [ vte gtk pcre2 ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "esmil"; owner = "esmil";

View File

@ -1,6 +1,40 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }:
stdenv.mkDerivation rec { let
# termite requires VTE with some internals exposed
# https://github.com/thestinger/vte-ng
vte-ng = vte.overrideAttrs (attrs: {
patches = attrs.patches or [] ++ [
(fetchpatch {
name = "0001-expose-functions-for-pausing-unpausing-output.patch";
url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch";
sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715";
})
(fetchpatch {
name = "0002-expose-function-for-setting-cursor-position.patch";
url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch";
sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89";
})
(fetchpatch {
name = "0003-add-function-for-setting-the-text-selections.patch";
url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch";
sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x";
})
(fetchpatch {
name = "0004-add-functions-to-get-set-block-selection-mode.patch";
url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch";
sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g";
})
(fetchpatch {
name = "0005-expose-function-for-getting-the-selected-text.patch";
url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch";
sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27";
})
];
});
in stdenv.mkDerivation rec {
pname = "termite"; pname = "termite";
version = "15"; version = "15";
@ -24,7 +58,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
buildInputs = [ vte-ng gtk3 ncurses ]; buildInputs = [ vte-ng gtk3 ncurses pcre2 ];
nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; nativeBuildInputs = [ wrapGAppsHook pkgconfig ];

View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "urlscan"; pname = "urlscan";
version = "0.9.3"; version = "0.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "firecat53"; owner = "firecat53";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0z24k8sk2zfp2pwysyp844vmhr5vbkj74frwy4i0v5pj60i9jl0v"; sha256 = "11wkwjqsq848ks6m2jqsb8h0xnz75fb60bm0c4jkxys9wzy4chg5";
}; };
propagatedBuildInputs = [ python3Packages.urwid ]; propagatedBuildInputs = [ python3Packages.urwid ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "worker"; pname = "worker";
version = "4.0.1"; version = "4.1.0";
src = fetchurl { src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
sha256 = "1mwkyak68bsxgff399xmr7bb3hxl0r976b90zi7jrzznwlvxx7vh"; sha256 = "19v4g34sk4fkagk0s60rbixyrrgg22qy1xwffm8b5ffq36r7yfch";
}; };
buildInputs = [ libX11 ]; buildInputs = [ libX11 ];

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xmrig"; pname = "xmrig";
version = "3.0.0"; version = "3.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xmrig"; owner = "xmrig";
repo = "xmrig"; repo = "xmrig";
rev = "v${version}"; rev = "v${version}";
sha256 = "1m0rsjb7y1j77mzg5cqb3fdvzgvjkrwgmkjn9nv1xl2757z8hcl4"; sha256 = "05z3hpz42609zsrqwd9sbxkgzm4f28ajhvgk69jvcfw7azg5jcfq";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xmrig-proxy"; pname = "xmrig-proxy";
version = "3.0.0"; version = "3.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xmrig"; owner = "xmrig";
repo = "xmrig-proxy"; repo = "xmrig-proxy";
rev = "v${version}"; rev = "v${version}";
sha256 = "19rv5zmxwr3kmb2m3fas91aq1493cnkhvs88zcflnijr1ra218ks"; sha256 = "1qiwarf0bqc17w3r88ysxxpm71gm861zx1fnzp0xi4q3rbh3nfmd";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -3,14 +3,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xterm-348"; name = "xterm-349";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"ftp://ftp.invisible-island.net/xterm/${name}.tgz" "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
"https://invisible-mirror.net/archives/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz"
]; ];
sha256 = "1gkmj9v44xg4jahivhnpbmq22w1mwclr6fssv3lhssgkvchm27wb"; sha256 = "0ps7b2b2kbrkv5q49cmb8c51z0w21jmm7hwciw30m6jgfb9s79ir";
}; };
buildInputs = buildInputs =

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "zola"; pname = "zola";
version = "0.8.0"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "getzola"; owner = "getzola";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "166kmlkzd1qyw9yq2jqs58z8b3d956jjhw9r15jzw98md949psr5"; sha256 = "0dbj2rkn4k5glnwdazsvjhah5pj9cbdb8hwlvm5q4njsmrgpyaw5";
}; };
cargoSha256 = "1brmlg6nqyls1v62z0fg0km150q9m7h71wy67lidcnw76icmqr24"; cargoSha256 = "0i0xqbpbv3md42d2853cfzkhfwlkvxahhz5dldla5x96rm1i2hr8";
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ] buildInputs = [ openssl ]

View File

@ -1,24 +1,52 @@
{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas { stdenv
, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking , fetchurl
, cmake
, ninja
, pkgconfig
, intltool
, vala_0_44
, wrapGAppsHook
, gcr
, libpeas
, gtk3
, webkitgtk
, sqlite
, gsettings-desktop-schemas
, libsoup
, glib-networking
, json-glib
, libarchive
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "midori"; pname = "midori";
version = "7"; version = "9.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.0.tar.gz"; url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.tar.gz";
sha256 = "0ffdnjp55s0ci737vlhxikb2nihghwlb6mjcjzpgpnzi47vjqnwh"; sha256 = "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig cmake ninja intltool vala wrapGAppsHook cmake
intltool
ninja
pkgconfig
vala_0_44
wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr (libsoup.override { gnomeSupport = true; })
(libsoup.override { gnomeSupport = true; }) libpeas gcr
glib-networking glib-networking
gsettings-desktop-schemas
gtk3
libpeas
sqlite
webkitgtk
json-glib
libarchive
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -0,0 +1,46 @@
{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala
, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
, glib-networking, python3, fetchpatch }:
stdenv.mkDerivation rec {
version = "1.0.1";
pname = "cawbird";
src = fetchFromGitHub {
owner = "IBBoard";
repo = "cawbird";
rev = "v${version}";
sha256 = "sha256:0bk33fh32nnv6ya6j0ij34abw6a3g6m8fq13303slhhja8xhvmb1";
};
nativeBuildInputs = [
meson ninja vala pkgconfig wrapGAppsHook python3
gobject-introspection # for setup hook
];
buildInputs = [
glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);
patches = [
# Fix build with vala 0.46
(fetchpatch {
url = "https://github.com/IBBoard/cawbird/commit/7b88f8856d108b9555ba7b855c7daed7b9e745ca.patch";
sha256 = "10kfdy91yas4xyz0hd057q6nsqfrkljcj7pql81xgm43qaff31y0";
})
];
postPatch = ''
chmod +x data/meson_post_install.py # patchShebangs requires executable file
patchShebangs data/meson_post_install.py
'';
meta = with stdenv.lib; {
description = "Native GTK Twitter client for the Linux desktop";
longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird.";
homepage = https://ibboard.co.uk/cawbird/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ];
};
}

View File

@ -60,4 +60,9 @@ in rec {
version = "1.13.2"; version = "1.13.2";
sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng"; sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng";
}; };
kops_1_14 = mkKops {
version = "1.14.0";
sha256 = "0zd2plsdn45wf73qspv9yaxa0crwfy5h6ws3lvw96vxvrkhl96l2";
};
} }

View File

@ -1,8 +1,9 @@
{ stdenv, buildGoPackage, fetchFromGitHub }: { stdenv, buildGoModule, fetchFromGitHub }:
buildGoPackage rec { buildGoModule rec {
pname = "kube3d"; pname = "kube3d";
version = "1.3.1"; version = "1.3.1";
k3sVersion = "0.9.1";
goPackagePath = "github.com/rancher/k3d"; goPackagePath = "github.com/rancher/k3d";
@ -13,13 +14,20 @@ buildGoPackage rec {
sha256 = "0bdpjnzyxd6mdc1qv0ml89qds6305kn3wmyci2kv6g2y7r7wxvm2"; sha256 = "0bdpjnzyxd6mdc1qv0ml89qds6305kn3wmyci2kv6g2y7r7wxvm2";
}; };
goDeps = ./deps.nix; buildFlagsArray = ''
-ldflags=
-w -s
-X github.com/rancher/k3d/version.Version=${version}
-X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion}
'';
modSha256 = "1qadf3gc2626l4jpad4lzi649nh8if9m6fgs2cf46r1nish16h95";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/rancher/k3d"; homepage = "https://github.com/rancher/k3d";
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container"; description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ kuznero ]; maintainers = with maintainers; [ kuznero jlesquembre ];
}; };
} }

View File

@ -1,174 +0,0 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/Microsoft/go-winio";
fetch = {
type = "git";
url = "https://github.com/Microsoft/go-winio";
rev = "v0.4.12";
sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "v1.1.0";
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
};
}
{
goPackagePath = "github.com/docker/distribution";
fetch = {
type = "git";
url = "https://github.com/docker/distribution";
rev = "v2.7.1";
sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw";
};
}
{
goPackagePath = "github.com/docker/docker";
fetch = {
type = "git";
url = "https://github.com/docker/docker";
rev = "v1.13.1";
sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
};
}
{
goPackagePath = "github.com/docker/go-connections";
fetch = {
type = "git";
url = "https://github.com/docker/go-connections";
rev = "v0.4.0";
sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq";
};
}
{
goPackagePath = "github.com/docker/go-units";
fetch = {
type = "git";
url = "https://github.com/docker/go-units";
rev = "v0.3.3";
sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "v0.0.4";
sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "v1.1.0";
sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
};
}
{
goPackagePath = "github.com/olekukonko/tablewriter";
fetch = {
type = "git";
url = "https://github.com/olekukonko/tablewriter";
rev = "v0.0.1";
sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj";
};
}
{
goPackagePath = "github.com/opencontainers/go-digest";
fetch = {
type = "git";
url = "https://github.com/opencontainers/go-digest";
rev = "v1.0.0-rc1";
sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "v0.8.1";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "v1.0.0";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/stretchr/objx";
fetch = {
type = "git";
url = "https://github.com/stretchr/objx";
rev = "v0.1.0";
sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.3.0";
sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
};
}
{
goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "v1.20.0";
sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "c2843e01d9a2";
sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "b630fd6fe46b";
sha256 = "0m84kwckmmc0z05kjb4dd43g1g61al32a4z593flpcbaqx8di5sd";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "d0b11bdaac8a";
sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
]

View File

@ -1,38 +0,0 @@
{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40
, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
, glib-networking, python3 }:
stdenv.mkDerivation rec {
version = "1.7.4";
pname = "corebird";
src = fetchFromGitHub {
owner = "baedert";
repo = "corebird";
rev = version;
sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n";
};
nativeBuildInputs = [
meson ninja vala_0_40 pkgconfig wrapGAppsHook python3
gobject-introspection # for setup hook
];
buildInputs = [
glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);
postPatch = ''
chmod +x data/meson_post_install.py # patchShebangs requires executable file
patchShebangs data/meson_post_install.py
'';
meta = {
description = "Native GTK Twitter client for the Linux desktop";
longDescription = "Corebird is a modern, easy and fun Twitter client.";
homepage = https://corebird.baedert.org/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.jonafato ];
};
}

View File

@ -1,12 +1,12 @@
{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }: { stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "esniper-2.35.0-15-g91d2665"; name = "esniper-2.35.0-18-g4a59da0";
src = fetchgit { src = fetchgit {
url = "https://git.code.sf.net/p/esniper/git"; url = "https://git.code.sf.net/p/esniper/git";
rev = "91d2665539beaeac21fb4c0cc2fd39c44e771ed7"; rev = "4a59da032aa4536b9e5ea95633247650412511db";
sha256 = "0dixcsvbcj9jbfjfv50nwvw7w90c4s6gnkrpilaan984i6y45rw0"; sha256 = "0d3vazh5q7wymqahggbb2apl9hgrm037y4s3j91d24hjgk2pzzyd";
}; };
buildInputs = [ openssl curl ]; buildInputs = [ openssl curl ];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
}: }:
@ -32,6 +32,14 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson_post_install.py patchShebangs build-aux/meson_post_install.py
''; '';
patches = [
# Fixes build with libsecret
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/jangernert/FeedReader/pull/943.patch";
sha256 = "0anrwvcg6607dzvfrhy5qcnpxzflskb3iy3khdg191aw1h2mqhb5";
})
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A modern desktop application designed to complement existing web-based RSS accounts"; description = "A modern desktop application designed to complement existing web-based RSS accounts";
homepage = https://jangernert.github.io/FeedReader/; homepage = https://jangernert.github.io/FeedReader/;

View File

@ -1,24 +0,0 @@
{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl
, geoip, gperftools, python, swig }:
stdenv.mkDerivation rec {
name = "bro-2.5.5";
src = fetchurl {
url = "https://www.bro.org/downloads/${name}.tar.gz";
sha256 = "1kvkiq8jjsqryry9jd4vw45pbfb46jly988mq62mv4sd1fqsxwhq";
};
nativeBuildInputs = [ cmake flex bison file ];
buildInputs = [ openssl libpcap perl zlib curl geoip gperftools python swig ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Powerful network analysis framework much different from a typical IDS";
homepage = https://www.bro.org/;
license = licenses.bsd3;
maintainers = with maintainers; [ pSub ];
platforms = with platforms; linux;
};
}

View File

@ -0,0 +1,31 @@
{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl
, libmaxminddb, gperftools, python, swig, rocksdb }:
stdenv.mkDerivation rec {
pname = "zeek";
version = "3.0.0";
src = fetchurl {
url = "https://www.zeek.org/downloads/zeek-${version}.tar.gz";
sha256 = "16pz5fh0z1hmvhn8pxqmdm5a9d8mqrp4gxpxkaywnaqk2h598lmm";
};
nativeBuildInputs = [ cmake flex bison file ];
buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ];
enableParallelBuilding = true;
cmakeFlags = [
"-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
"-DENABLE_PERFTOOLS=true"
"-DINSTALL_AUX_TOOLS=true"
];
meta = with stdenv.lib; {
description = "Powerful network analysis framework much different from a typical IDS";
homepage = "https://www.zeek.org";
license = licenses.bsd3;
maintainers = with maintainers; [ pSub marsam tobim ];
platforms = platforms.unix;
};
}

View File

@ -13,6 +13,9 @@ stdenv.mkDerivation {
sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0"; sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0";
}; };
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];

View File

@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
buildInputs = [ pidgin gmime libxml2 nss ]; buildInputs = [ pidgin gmime libxml2 nss ];
enableParallelBuilding = true; enableParallelBuilding = true;
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.4.0", "version": "1.4.1",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"dependencies": { "dependencies": {

View File

@ -6,12 +6,12 @@
let let
executableName = "riot-desktop"; executableName = "riot-desktop";
version = "1.4.0"; version = "1.4.1";
riot-web-src = fetchFromGitHub { riot-web-src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "riot-web"; repo = "riot-web";
rev = "v${version}"; rev = "v${version}";
sha256 = "1p8bl7v2214shywn53fpcb27vvvdjrs3kcys3f045v2l5fg5xhsa"; sha256 = "0w4w39smak6hp65vam5rrz6l48rb4yzszzyn1yjhr1m8w8j9bvfl";
}; };
in yarn2nix-moretea.mkYarnPackage rec { in yarn2nix-moretea.mkYarnPackage rec {

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "riot-web"; pname = "riot-web";
version = "1.4.0"; version = "1.4.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1si11hxkfn6sqaq1hddm5vkfrd0pghzwqld1wv4vxlb5jyn32qqk"; sha256 = "16lgxyqxs6vpjcfdr4j7gnn7h8gyi6b5520b8nq8hxynh24iyhcq";
}; };
installPhase = let installPhase = let

View File

@ -8,7 +8,7 @@ with lib;
mkDerivation rec { mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "1.8.8"; version = "1.8.9";
# Note: Due to our strong dependency on the Arch patches it's probably best # Note: Due to our strong dependency on the Arch patches it's probably best
# to also wait for the Arch update (especially if the patches don't apply). # to also wait for the Arch update (especially if the patches don't apply).
@ -17,7 +17,7 @@ mkDerivation rec {
owner = "telegramdesktop"; owner = "telegramdesktop";
repo = "tdesktop"; repo = "tdesktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "1aj1pnzc6bz8jbdrfwdj2r54jhw9z7b5fd1095r007zmlnzs51lv"; sha256 = "0b1c903ah3fhxr9qjg23p8x9k895k3cxkzz5ckcr7r4pmmbnnvkp";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View File

@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let let
inherit (stdenv.lib) concatStringsSep makeBinPath optional; inherit (stdenv.lib) concatStringsSep makeBinPath optional;
version = "3.0.291715.0908"; version = "3.0.301026.0930";
srcs = { srcs = {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
sha256 = "1f2fcwf0p86bxcnfdhij6hvgizd7n7gjcccwzdm2jv0dbqskad2f"; sha256 = "0y3c7345y2wibz6p7d6p89wraaqb51651p176z4v7lcjv3gr8dar";
}; };
}; };

View File

@ -5,7 +5,7 @@
, static ? false # link statically , static ? false # link statically
, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf , stdenv, fetchFromGitHub, cmake, makeWrapper, dconf
, qtbase, qtscript , mkDerivation, qtbase, qtscript
, phonon, libdbusmenu, qca-qt5 , phonon, libdbusmenu, qca-qt5
, withKDE ? true # enable KDE integration , withKDE ? true # enable KDE integration
@ -20,6 +20,7 @@
}: }:
let let
inherit (stdenv) lib;
buildClient = monolithic || client; buildClient = monolithic || client;
buildCore = monolithic || enableDaemon; buildCore = monolithic || enableDaemon;
in in
@ -31,7 +32,7 @@ assert !buildClient -> !withKDE; # KDE is used by the client only
let let
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
in with stdenv; mkDerivation rec { in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
name = "quassel${tag}-${version}"; name = "quassel${tag}-${version}";
version = "0.13.1"; version = "0.13.1";
@ -67,13 +68,15 @@ in with stdenv; mkDerivation rec {
++ edf client "WANT_QTCLIENT" ++ edf client "WANT_QTCLIENT"
++ edf withKDE "WITH_KDE"; ++ edf withKDE "WITH_KDE";
preFixup = dontWrapQtApps = true;
postFixup =
lib.optionalString enableDaemon '' lib.optionalString enableDaemon ''
wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
'' + '' +
lib.optionalString buildClient '' lib.optionalString buildClient ''
wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \ wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -52,6 +52,11 @@ in stdenv.mkDerivation rec {
patches = [ patches = [
# Remove buildconfig.html to prevent a dependency on clang etc. # Remove buildconfig.html to prevent a dependency on clang etc.
./no-buildconfig.patch ./no-buildconfig.patch
(fetchpatch {
# https://phabricator.services.mozilla.com/D47796
url = "https://d3kxowhw4s8amj.cloudfront.net/file/data/a54c6fszaol23yh5aa27/PHID-FILE-sql3i57neyrztfdngrwe/D47796.diff";
sha256 = "18i1bk6rz875dly2vnkrdgbah8kx0lv4akjzl0i9gxc58hi5q3nq";
})
] ]
++ lib.optional (lib.versionOlder version "69") ++ lib.optional (lib.versionOlder version "69")
(fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29 (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }: { stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "owncloud-client"; pname = "owncloud-client";
version = "2.5.4.11654"; version = "2.5.4.11654";

View File

@ -1,19 +1,25 @@
{ stdenv, fetchFromGitHub, python2Packages }: { stdenv, fetchFromGitHub, python3Packages }:
python2Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "zeronet"; pname = "zeronet";
version = "0.6.5"; version = "0.7.1";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "HelloZeroNet"; owner = "HelloZeroNet";
repo = "ZeroNet"; repo = "ZeroNet";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b9jg525jq40czyw9xh9ck90fl9rzrdmzl2mzhqqhz23idb60j4a"; sha256 = "04prgicm0yjh2klcxdgwx1mvlsxxi2bdkzfcvysvixbgq20wjvdk";
}; };
propagatedBuildInputs = with python2Packages; [ msgpack gevent ]; propagatedBuildInputs = with python3Packages; [
buildPhase = "${python2Packages.python.interpreter} -O -m compileall ."; gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client
gevent-websocket rencode bitcoinlib maxminddb pyopenssl
];
buildPhase = ''
${python3Packages.python.interpreter} -O -m compileall .
'';
installPhase = '' installPhase = ''
mkdir -p $out/share mkdir -p $out/share
@ -23,7 +29,7 @@ python2Packages.buildPythonApplication rec {
postFixup = '' postFixup = ''
makeWrapper "$out/share/zeronet.py" "$out/bin/zeronet" \ makeWrapper "$out/share/zeronet.py" "$out/bin/zeronet" \
--set PYTHONPATH "$PYTHONPATH" \ --set PYTHONPATH "$PYTHONPATH" \
--set PATH ${python2Packages.python}/bin --set PATH ${python3Packages.python}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg"; sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
}; };
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
perl mkfiles.pl perl mkfiles.pl
( cd doc ; make ); ( cd doc ; make );

View File

@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with stdenv.lib; with stdenv.lib;
let let
version = "3.0.3"; version = "3.0.5";
variant = if withQt then "qt" else "cli"; variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0711jilp9sbgi46d105m3galw8n4wk5yncawi08031qxg2f754mg"; sha256 = "087qv7nd7zlbckvcs37fkkg7v0mw0hjd5yfbghqym764fpjgqlf5";
}; };
cmakeFlags = [ cmakeFlags = [

View File

@ -2,13 +2,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "rclone"; pname = "rclone";
version = "1.49.3"; version = "1.49.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0dd5xrbf62n4y77zzaai1rc069ism1ikvcw43hzja3mzwfa0sqqa"; sha256 = "04fa85ch85dxm2nq7vqria34zn6fbgvky7p1i59j1wib753jpxyp";
}; };
goPackagePath = "github.com/rclone/rclone"; goPackagePath = "github.com/rclone/rclone";

View File

@ -43,9 +43,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ dconf ]; propagatedUserEnvPkgs = [ dconf ];
# glib-2.58 deprecrated g_type_class_add_private # glib-2.62 deprecations
# Should probably be removed next version bump NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
CXXFLAGS = [ "-Wno-deprecated-declarations" ];
patches = [ ./cmake_check_symbol_exists.patch ]; patches = [ ./cmake_check_symbol_exists.patch ];

View File

@ -45,6 +45,9 @@ in stdenv.mkDerivation {
python2.pkgs.pygtk python2.pkgs.pygtk
]; ];
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
preConfigure = ''./autogen.sh''; preConfigure = ''./autogen.sh'';
configureFlags = [ configureFlags = [
"--enable-python" "--enable-python"

View File

@ -4,12 +4,12 @@ with pythonPackages;
buildPythonApplication rec { buildPythonApplication rec {
pname = "watson"; pname = "watson";
version = "1.7.0"; version = "1.8.0";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "td-watson"; pname = "td-watson";
sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d"; sha256 = "1ip66jhbcqifdw1avbhngwym0vv7fsqxgbph11da5wlqwfwp060n";
}; };
checkPhase = '' checkPhase = ''

View File

@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, xen_4_10 }:
stdenv.mkDerivation rec {
pname = "qubes-core-vchan-xen";
version = "4.1.2";
src = fetchFromGitHub {
owner = "QubesOS";
repo = pname;
rev = "v${version}";
sha256 = "1wj4vv8nkzzig52r2nzkd4jy0cwznfkyddx379hfsdl4pzsp55mj";
};
buildInputs = [ xen_4_10 ];
buildPhase = ''
make all PREFIX=/
'';
installPhase = ''
make install DESTDIR=$out PREFIX=/
'';
meta = with stdenv.lib; {
description = "Libraries required for the higher-level Qubes daemons and tools";
homepage = "https://qubes-os.org";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ "0x4A6F" ];
platforms = platforms.linux;
};
}

View File

@ -5,7 +5,7 @@
} : } :
let let
version = "0.5.2"; version = "0.5.0";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "qradiolink"; pname = "qradiolink";
@ -15,7 +15,7 @@ in stdenv.mkDerivation {
owner = "kantooon"; owner = "kantooon";
repo = "qradiolink"; repo = "qradiolink";
rev = version; rev = version;
sha256 = "0djhrr96b8sr2vi6hwbzgzlp9771622dp93f0rsphsyxlwbzsrgl"; sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi";
}; };
preBuild = '' preBuild = ''

View File

@ -4,14 +4,14 @@
stdenv.mkDerivation { stdenv.mkDerivation {
version = "18.12"; version = "19.08";
pname = "rtl_433"; pname = "rtl_433";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "merbanan"; owner = "merbanan";
repo = "rtl_433"; repo = "rtl_433";
rev = "18.12"; rev = "19.08";
sha256 = "0y73g9ffpsgnmfk8lbihyl9d1fd9v91wsn8k8xhsdmgmn4ra1jk5"; sha256 = "0cm82gm5c86qfl4dw37h8wyk77947k6fv2n1pn3xvk3wz2ygsdi6";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

View File

@ -8,6 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl"; sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl";
}; };
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
buildInputs = [ glib pkgconfig gtk2 hamlib ]; buildInputs = [ glib pkgconfig gtk2 hamlib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "picard-tools"; pname = "picard-tools";
version = "2.20.5"; version = "2.20.8";
src = fetchurl { src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "107zlvp74ahpn652nfkipp80bbzf3fp812pi1ma42njk4wchah10"; sha256 = "01bibkwyp4xzwcpvkr3ab6z0syjmzj4zmyxl3bybmrp9irhjvydg";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "verilator"; pname = "verilator";
version = "4.016"; version = "4.018";
src = fetchurl { src = fetchurl {
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij"; sha256 = "0ih38dd8hiwgjyc6gclx8i9jlycgdlrxzz8bicm4a6yj4p0jxmcq";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -1,8 +1,8 @@
diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py
index 0f2700168a..60f71357d2 100644 index 73a078e619..059125c59f 100644
--- a/src/sage_setup/docbuild/__init__.py --- a/src/sage_setup/docbuild/__init__.py
+++ b/src/sage_setup/docbuild/__init__.py +++ b/src/sage_setup/docbuild/__init__.py
@@ -86,26 +86,6 @@ def builder_helper(type): @@ -86,27 +86,6 @@ def builder_helper(type):
""" """
Returns a function which builds the documentation for Returns a function which builds the documentation for
output type ``type``. output type ``type``.
@ -19,7 +19,8 @@ index 0f2700168a..60f71357d2 100644
- ....: raise BaseException("abort pool operation") - ....: raise BaseException("abort pool operation")
- sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException - sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException
- -
- sage: from sage_setup.docbuild import builder_helper, build_many, build_ref_doc - sage: from sage_setup.docbuild import builder_helper, build_ref_doc
- sage: from sage_setup.docbuild import _build_many as build_many
- sage: helper = builder_helper("html") - sage: helper = builder_helper("html")
- sage: try: - sage: try:
- ....: build_many(build_ref_doc, [("docname", "en", "html", {})]) - ....: build_many(build_ref_doc, [("docname", "en", "html", {})])
@ -29,7 +30,7 @@ index 0f2700168a..60f71357d2 100644
""" """
def f(self, *args, **kwds): def f(self, *args, **kwds):
output_dir = self._output_dir(type) output_dir = self._output_dir(type)
@@ -127,10 +107,9 @@ def builder_helper(type): @@ -128,10 +107,9 @@ def builder_helper(type):
logger.debug(build_command) logger.debug(build_command)
# Run Sphinx with Sage's special logger # Run Sphinx with Sage's special logger
@ -43,10 +44,10 @@ index 0f2700168a..60f71357d2 100644
if ABORT_ON_ERROR: if ABORT_ON_ERROR:
raise raise
diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py
index 9a2fba79bc..77c8ed3592 100644 index fe7eba43b2..463790965c 100644
--- a/src/sage_setup/docbuild/sphinxbuild.py --- a/src/sage_setup/docbuild/sphinxbuild.py
+++ b/src/sage_setup/docbuild/sphinxbuild.py +++ b/src/sage_setup/docbuild/sphinxbuild.py
@@ -318,3 +318,8 @@ def runsphinx(): @@ -321,3 +321,8 @@ def runsphinx():
sys.stderr = saved_stderr sys.stderr = saved_stderr
sys.stdout.flush() sys.stdout.flush()
sys.stderr.flush() sys.stderr.flush()

View File

@ -1,64 +0,0 @@
diff --git a/build/pkgs/threejs/spkg-src b/build/pkgs/threejs/spkg-src
index 91780d813c..254b850a24 100755
--- a/build/pkgs/threejs/spkg-src
+++ b/build/pkgs/threejs/spkg-src
@@ -20,9 +20,17 @@ URL3="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/LICENSE"
echo "Downloading $URL3"
curl -OL "$URL3"
+# Set up directory structure
+
+mkdir build
+mv three.min.js build
+
+mkdir -p examples/js/controls
+mv OrbitControls.js examples/js/controls
+
# Package
-tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" 'three.min.js' 'OrbitControls.js' 'LICENSE'
-rm -rf 'three.min.js' 'OrbitControls.js' 'LICENSE'
+tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" build examples 'LICENSE'
+rm -rf 'build' 'examples' 'LICENSE'
# Update package info
echo "${GIT_VERSION}" > 'package-version.txt'
diff --git a/src/sage/repl/rich_output/backend_ipython.py b/src/sage/repl/rich_output/backend_ipython.py
index 7c27d48a21..8bf4861a35 100644
--- a/src/sage/repl/rich_output/backend_ipython.py
+++ b/src/sage/repl/rich_output/backend_ipython.py
@@ -411,10 +411,15 @@ class BackendIPythonCommandline(BackendIPython):
sage: backend.threejs_offline_scripts()
'...<script ...</script>...'
"""
- from sage.env import SAGE_SHARE
+ from sage.env import THREEJS_DIR
- scripts = [os.path.join(SAGE_SHARE, 'threejs', script)
- for script in ['three.min.js', 'OrbitControls.js']]
+ scripts = [
+ os.path.join(THREEJS_DIR, script)
+ for script in [
+ 'build/three.min.js',
+ 'examples/js/controls/OrbitControls.js',
+ ]
+ ]
if sys.platform == 'cygwin':
import cygwin
@@ -594,13 +599,13 @@ class BackendIPythonNotebook(BackendIPython):
sage: from sage.repl.rich_output.backend_ipython import BackendIPythonNotebook
sage: backend = BackendIPythonNotebook()
sage: backend.threejs_offline_scripts()
- '...<script src="/nbextensions/threejs/three.min...<\\/script>...'
+ '...<script src="/nbextensions/threejs/build/three.min...<\\/script>...'
"""
from sage.repl.rich_output import get_display_manager
CDN_scripts = get_display_manager().threejs_scripts(online=True)
return """
-<script src="/nbextensions/threejs/three.min.js"></script>
-<script src="/nbextensions/threejs/OrbitControls.js"></script>
+<script src="/nbextensions/threejs/build/three.min.js"></script>
+<script src="/nbextensions/threejs/examples/js/controls/OrbitControls.js"></script>
<script>
if ( !window.THREE ) document.write('{}');
</script>

View File

@ -10,14 +10,14 @@
# all get the same sources with the same patches applied. # all get the same sources with the same patches applied.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "8.8"; version = "8.9";
pname = "sage-src"; pname = "sage-src";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sagemath"; owner = "sagemath";
repo = "sage"; repo = "sage";
rev = version; rev = version;
sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x"; sha256 = "1bwga58x3s8z42w5h51c232f91ndsc1861dlb1glhax3pn0rhn3a";
}; };
# Patches needed because of particularities of nix or the way this is packaged. # Patches needed because of particularities of nix or the way this is packaged.
@ -49,10 +49,6 @@ stdenv.mkDerivation rec {
# https://trac.sagemath.org/ticket/27660#ticket # https://trac.sagemath.org/ticket/27660#ticket
./patches/do-not-test-find-library.patch ./patches/do-not-test-find-library.patch
# https://trac.sagemath.org/ticket/28007
./patches/threejs-offline.patch
# Parallelize docubuild using subprocesses, fixing an isolation issue. See # Parallelize docubuild using subprocesses, fixing an isolation issue. See
# https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
./patches/sphinx-docbuild-subprocesses.patch ./patches/sphinx-docbuild-subprocesses.patch
@ -97,14 +93,6 @@ stdenv.mkDerivation rec {
stripLen = 1; stripLen = 1;
}) })
# https://trac.sagemath.org/ticket/26932
(fetchSageDiff {
name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch";
base = "8.8.beta4";
rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504";
sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi";
})
# After updating smypow to (https://trac.sagemath.org/ticket/3360) we can # After updating smypow to (https://trac.sagemath.org/ticket/3360) we can
# now set the cache dir to be withing the .sage directory. This is not # now set the cache dir to be withing the .sage directory. This is not
# strictly necessary, but keeps us from littering in the user's HOME. # strictly necessary, but keeps us from littering in the user's HOME.

View File

@ -138,8 +138,8 @@ buildPythonPackage rec {
mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython" mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython"
mkdir -p "var/lib/sage/installed" mkdir -p "var/lib/sage/installed"
source build/bin/sage-dist-helpers
cd src cd src
source bin/sage-dist-helpers
${python.interpreter} -u setup.py --no-user-cfg build ${python.interpreter} -u setup.py --no-user-cfg build
''; '';

View File

@ -5,13 +5,13 @@
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
majorver = "1.4"; majorver = "1.4";
minorver = "7"; minorver = "10";
version = "${majorver}.${minorver}"; version = "${majorver}.${minorver}";
pname = "catfish"; pname = "catfish";
src = fetchurl { src = fetchurl {
url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2"; url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2";
sha256 = "1s97jb1r07ff40jnz8zianpn1f0c67hssn8ywdi2g7njfb4amjj8"; sha256 = "0g9l5sv5d7wmyb23cvpz5mpvjnxiqjh25v9gr5qzhcah202a0wr5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
file file
which which
intltool intltool
gobject-introspection gobject-introspection # for setup hook populating GI_TYPELIB_PATH
wrapGAppsHook wrapGAppsHook
]; ];
@ -29,9 +29,11 @@ pythonPackages.buildPythonApplication rec {
pythonPackages.pyxdg pythonPackages.pyxdg
pythonPackages.ptyprocess pythonPackages.ptyprocess
pythonPackages.pycairo pythonPackages.pycairo
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
pythonPackages.dbus-python
pythonPackages.pygobject3 pythonPackages.pygobject3
pythonPackages.pexpect pythonPackages.pexpect
xdg_utils xdg_utils
@ -52,7 +54,7 @@ pythonPackages.buildPythonApplication rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://docs.xfce.org/apps/catfish/start; homepage = https://docs.xfce.org/apps/catfish/start;
description = "A handy file search tool"; description = "Handy file search tool";
longDescription = '' longDescription = ''
Catfish is a handy file searching tool. The interface is Catfish is a handy file searching tool. The interface is
intentionally lightweight and simple, using only GTK 3. intentionally lightweight and simple, using only GTK 3.

View File

@ -1,17 +1,18 @@
{ stdenv, fetchurl, python2Packages, git }: { stdenv, fetchurl, pythonPackages, git }:
python2Packages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
version = "1.4.2";
pname = "git-up"; pname = "git-up";
version = "1.6.1";
src = fetchurl { src = pythonPackages.fetchPypi {
url = "mirror://pypi/g/git-up/${pname}-${version}.zip"; inherit pname version;
sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q"; sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za";
}; };
buildInputs = [ git ] ++ (with python2Packages; [ nose ]); # git should be on path for tool to work correctly
propagatedBuildInputs = with python2Packages; [ click colorama docopt GitPython six termcolor ]; propagatedBuildInputs = [ git ] ++ (with pythonPackages; [ click colorama docopt GitPython six termcolor ]);
checkInputs = [ git pythonPackages.nose ]; # git needs to be on path
# 1. git fails to run as it cannot detect the email address, so we set it # 1. git fails to run as it cannot detect the email address, so we set it
# 2. $HOME is by default not a valid dir, so we have to set that too # 2. $HOME is by default not a valid dir, so we have to set that too
# https://github.com/NixOS/nixpkgs/issues/12591 # https://github.com/NixOS/nixpkgs/issues/12591
@ -22,7 +23,7 @@ python2Packages.buildPythonApplication rec {
''; '';
postInstall = '' postInstall = ''
rm -r $out/${python2Packages.python.sitePackages}/PyGitUp/tests rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -31,6 +32,5 @@ python2Packages.buildPythonApplication rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all; platforms = platforms.all;
broken = true; # Incompatible with Git 2.15 object store.
}; };
} }

View File

@ -13,11 +13,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gitkraken"; pname = "gitkraken";
version = "6.2.0"; version = "6.2.1";
src = fetchurl { src = fetchurl {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
sha256 = "1kvp0fbixpynb0wh8px1qm6gnxwc5ml2q0vwsll0pa8zrjdz4q3k"; sha256 = "1l1w8gr4ss0g2k7bfslnc7df4ls1av59jjjc8mrx97wsndrm3vxg";
}; };
libPath = makeLibraryPath [ libPath = makeLibraryPath [

View File

@ -37,13 +37,13 @@ let
optional = stdenv.lib.optional; optional = stdenv.lib.optional;
in mkDerivation rec { in mkDerivation rec {
pname = "obs-studio"; pname = "obs-studio";
version = "23.2.1"; version = "24.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jp9000"; owner = "jp9000";
repo = "obs-studio"; repo = "obs-studio";
rev = version; rev = version;
sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz"; sha256 = "056s0hs1ds3c57sc0gy39dxaxvwlakl3w25jxgawh0fs99211ar5";
}; };
nativeBuildInputs = [ cmake nativeBuildInputs = [ cmake

View File

@ -1,14 +1,14 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
version = "1.1.1"; version = "1.2.0";
pname = "streamlink"; pname = "streamlink";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "streamlink"; owner = "streamlink";
repo = "streamlink"; repo = "streamlink";
rev = version; rev = version;
sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33"; sha256 = "0l8b9ipfmd6dic07ajqqml26jdydz0k046hvx32mqp64jl5jpznh";
}; };
checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];

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