diff --git a/.editorconfig b/.editorconfig
index a4a872ed5c85..a32d8056f16f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -43,6 +43,14 @@ indent_style = space
# Disable file types or individual files
# some of these files may be auto-generated and/or require significant changes
+[*.{c,h}]
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+
+[*.{key,ovpn}]
+insert_final_newline = unset
+end_of_line = unset
+
[*.lock]
indent_size = unset
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000000..5ace4600a1f2
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"
diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
new file mode 100644
index 000000000000..70959b42aa16
--- /dev/null
+++ b/.github/workflows/editorconfig.yml
@@ -0,0 +1,22 @@
+name: actions
+
+on:
+ pull_request:
+ branches:
+ - master
+
+jobs:
+ editorconfig:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: technote-space/get-diff-action@v2.0.2
+ - name: editorconfig check
+ env:
+ VERSION: "2.0.4"
+ OS: "linux"
+ ARCH: "amd64"
+ run: |
+ curl -sSf -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/$VERSION/ec-$OS-$ARCH.tar.gz && \
+ tar xzf ec-$OS-$ARCH.tar.gz && \
+ ./bin/ec-$OS-$ARCH -disable-indentation ${{ env.GIT_DIFF }}
diff --git a/doc/builders/packages/steam.xml b/doc/builders/packages/steam.xml
index 8dfede59ac1b..59673328bace 100644
--- a/doc/builders/packages/steam.xml
+++ b/doc/builders/packages/steam.xml
@@ -45,13 +45,7 @@
How to play
- For 64-bit systems it's important to have
-hardware.opengl.driSupport32Bit = true;
- in your /etc/nixos/configuration.nix. You'll also need
-hardware.pulseaudio.support32Bit = true;
- if you are using PulseAudio - this will enable 32bit ALSA apps integration. To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add
-hardware.steam-hardware.enable = true;
- to your configuration.
+ Use programs.steam.enable = true; if you want to add steam to systemPackages and also enable a few workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr.
diff --git a/doc/builders/packages/urxvt.xml b/doc/builders/packages/urxvt.xml
index f85680cecc40..135cc82a0b51 100644
--- a/doc/builders/packages/urxvt.xml
+++ b/doc/builders/packages/urxvt.xml
@@ -50,7 +50,7 @@ map (p: p.name) pkgs.rxvt-unicode.plugins
In addition to plugins the options
extraDeps and perlDeps can be used
to install extra packages.
- extraDeps can be used, for example, to provide
+ extraDeps can be used, for example, to provide
xsel (a clipboard manager) to the clipboard plugin,
without installing it globally:
rxvt-unicode.override { configure = { availablePlugins, ... }: {
diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
index 278535237c2c..1d307e1d6dcf 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/doc/languages-frameworks/beam.xml
@@ -68,7 +68,7 @@
How to Install BEAM Packages
- BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users.
+ BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users.
To install any of those builders into your profile, refer to them by their attribute path beamPackages.rebar3:
diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md
index 80e1094809ad..3663f962d5f2 100644
--- a/doc/languages-frameworks/emscripten.section.md
+++ b/doc/languages-frameworks/emscripten.section.md
@@ -21,11 +21,11 @@ Modes of use of `emscripten`:
* **Declarative usage**:
This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`.
- * build and install all packages:
- * `nix-env -iA emscriptenPackages`
-
- * dev-shell for zlib implementation hacking:
- * `nix-shell -A emscriptenPackages.zlib`
+ * build and install all packages:
+ * `nix-env -iA emscriptenPackages`
+
+ * dev-shell for zlib implementation hacking:
+ * `nix-shell -A emscriptenPackages.zlib`
## Imperative usage
@@ -90,7 +90,7 @@ See the `zlib` example:
libz.so.${old.version} -I . -o example.js
echo "Using node to execute the test"
- ${pkgs.nodejs}/bin/node ./example.js
+ ${pkgs.nodejs}/bin/node ./example.js
set +x
if [ $? -ne 0 ]; then
@@ -112,7 +112,7 @@ See the `zlib` example:
### Usage 2: pkgs.buildEmscriptenPackage
-This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used.
+This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used.
xmlmirror = pkgs.buildEmscriptenPackage rec {
name = "xmlmirror";
@@ -163,7 +163,7 @@ This `xmlmirror` example features a emscriptenPackage which is defined completel
checkPhase = ''
'';
- };
+ };
### Declarative debugging
@@ -182,4 +182,3 @@ Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from
Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from.
If in trouble, ask the maintainers.
-
diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index ff39276f640e..06901449fa29 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -64,6 +64,11 @@ pet = buildGoModule rec {
subPackages limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built.
+
+
+ runVend runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build.
+
+
@@ -72,7 +77,7 @@ pet = buildGoModule rec {
When `null` is used as a value, rather than fetching the dependencies
and vendoring them, we use the vendoring included within the source repo.
- If you'd like to not have to update this field on dependency changes,
+ If you'd like to not have to update this field on dependency changes,
run `go mod vendor` in your source repo and set 'vendorSha256 = null;'
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index ec418c563359..419d7da19f86 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -79,7 +79,7 @@ pkgs.rustPlatform.buildRustPackage {
When using `buildRustPackage`, the `checkPhase` is enabled by default and runs
`cargo test` on the package to build. To make sure that we don't compile the
-sources twice and to actually test the artifacts that will be used at runtime,
+sources twice and to actually test the artifacts that will be used at runtime,
the tests will be ran in the `release` mode by default.
However, in some cases the test-suite of a package doesn't work properly in the
diff --git a/doc/old/cross.txt b/doc/old/cross.txt
index 9dd5b4c9993b..064ca8d37b01 100644
--- a/doc/old/cross.txt
+++ b/doc/old/cross.txt
@@ -220,7 +220,7 @@ fi
preConfigure=preConfigure
preConfigure() {
-
+
# Determine the frontends to build.
langs="c"
if test -n "$langCC"; then
@@ -262,7 +262,7 @@ postInstall() {
#if test -z "$profiledCompiler"; then
#makeFlags="bootstrap"
-#else
+#else
#makeFlags="profiledbootstrap"
#fi
diff --git a/lib/tests/modules/define-option-dependently.nix b/lib/tests/modules/define-option-dependently.nix
index 6abce29366ae..ad85f99a919f 100644
--- a/lib/tests/modules/define-option-dependently.nix
+++ b/lib/tests/modules/define-option-dependently.nix
@@ -7,7 +7,7 @@
# Always defined, but the value depends on the presence of an option.
config = {
value = if options ? enable then 360 else 7;
- }
+ }
# Only define if possible.
// lib.optionalAttrs (options ? enable) {
enable = true;
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index afd66bf1823b..b2c8ff1f4954 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -833,6 +833,12 @@
githubId = 135230;
name = "Aycan iRiCAN";
};
+ artturin = {
+ email = "artturin@artturin.com";
+ github = "artturin";
+ githubId = 56650223;
+ name = "Artturi N";
+ };
b4dm4n = {
email = "fabianm88@gmail.com";
github = "B4dM4n";
@@ -1930,6 +1936,12 @@
githubId = 14032;
name = "Daniel Brockman";
};
+ ddelabru = {
+ email = "ddelabru@redhat.com";
+ github = "ddelabru";
+ githubId = 39909293;
+ name = "Dominic Delabruere";
+ };
dduan = {
email = "daniel@duan.ca";
github = "dduan";
@@ -4151,6 +4163,12 @@
github = "karantan";
githubId = 7062631;
};
+ KarlJoad = {
+ email = "karl@hallsby.com";
+ github = "KarlJoad";
+ githubId = 34152449;
+ name = "Karl Hallsby";
+ };
karolchmist = {
email = "info+nix@chmist.com";
name = "karolchmist";
@@ -7480,6 +7498,12 @@
githubId = 2770647;
name = "Simon Vandel Sillesen";
};
+ siraben = {
+ email = "bensiraphob@gmail.com";
+ github = "siraben";
+ githubId = 8219659;
+ name = "Siraphob Phipathananunth";
+ };
siriobalmelli = {
email = "sirio@b-ad.ch";
github = "siriobalmelli";
@@ -8022,6 +8046,12 @@
githubId = 26417242;
name = "Mikolaj Galkowski";
};
+ TethysSvensson = {
+ email = "freaken@freaken.dk";
+ github = "TethysSvensson";
+ githubId = 4294434;
+ name = "Tethys Svensson";
+ };
teto = {
email = "mcoudron@hotmail.com";
github = "teto";
diff --git a/maintainers/scripts/rebuild-amount.sh b/maintainers/scripts/rebuild-amount.sh
index 1a54cada8af6..ca89e08073e8 100755
--- a/maintainers/scripts/rebuild-amount.sh
+++ b/maintainers/scripts/rebuild-amount.sh
@@ -60,7 +60,7 @@ nixexpr() {
"darwin-tested" "unstable" "stdenvBootstrapTools"
"moduleSystem" "lib-tests" # these just confuse the output
];
-
+
in
tweak (builtins.removeAttrs hydraJobs blacklist)
EONIX
@@ -124,4 +124,3 @@ if [ -n "$optPrint" ]; then
echo
cat "$newlist"
fi
-
diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml
index d114261f53be..fa7c8c0c6d79 100644
--- a/nixos/doc/manual/man-nixos-build-vms.xml
+++ b/nixos/doc/manual/man-nixos-build-vms.xml
@@ -13,15 +13,15 @@
- nixos-build-vms
+ nixos-build-vms
-
+
-
+
diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml
index fe560d3efdd8..c32e1c7f8cab 100644
--- a/nixos/doc/manual/man-nixos-enter.xml
+++ b/nixos/doc/manual/man-nixos-enter.xml
@@ -13,21 +13,21 @@
- nixos-enter
+ nixos-enter
root
-
+
system
-
+
@@ -40,13 +40,13 @@
-
+
-
+
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 7da1f5023780..e03a5f5ce5c7 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -130,6 +130,11 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
This will make container tools like Podman work as non-root users out of the box.
+
+
+ The various documented workarounds to use steam have been converted to a module. programs.steam.enable enables steam, controller support and the workarounds.
+
+
@@ -556,6 +561,12 @@ services.bitcoind."example-mainnet" = {
+
+
+ Graylog introduced a change in the LDAP server certificate validation behaviour for version 3.3.3 which might break existing setups.
+ When updating Graylog from a version before 3.3.3 make sure to check the Graylog release info for information on how to avoid the issue.
+
+
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 4806fe9dbac7..8aa606a56af8 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -71,7 +71,7 @@ let format' = format; in let
vdi = "vdi";
vpc = "vhd";
raw = "img";
- }.${format};
+ }.${format} or format;
rootPartition = { # switch-case
legacy = "1";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 585cef9b42ec..08a5f32c4c94 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -156,6 +156,7 @@
./programs/ssmtp.nix
./programs/sysdig.nix
./programs/systemtap.nix
+ ./programs/steam.nix
./programs/sway.nix
./programs/system-config-printer.nix
./programs/thefuck.nix
diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
new file mode 100644
index 000000000000..3c919c47a0c6
--- /dev/null
+++ b/nixos/modules/programs/steam.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.steam;
+in {
+ options.programs.steam.enable = mkEnableOption "steam";
+
+ config = mkIf cfg.enable {
+ hardware.opengl = { # this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932
+ enable = true;
+ driSupport32Bit = true;
+ };
+
+ # optionally enable 32bit pulseaudio support if pulseaudio is enabled
+ hardware.pulseaudio.support32Bit = config.hardware.pulseaudio.enable;
+
+ hardware.steam-hardware.enable = true;
+
+ environment.systemPackages = [ pkgs.steam ];
+ };
+
+ meta.maintainers = with maintainers; [ mkg20001 ];
+}
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 3962d7b15989..4230f2edd279 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -8,12 +8,8 @@ let
mkTlpConfig = tlpConfig: generators.toKeyValue {
mkKeyValue = generators.mkKeyValueDefault {
mkValueString = val:
- if isInt val then toString val
- else if isString val then val
- else if true == val then "1"
- else if false == val then "0"
- else if isList val then "\"" + (concatStringsSep " " val) + "\""
- else err "invalid value provided to mkTlpConfig:" (toString val);
+ if isList val then "\"" + (toString val) + "\""
+ else toString val;
} "=";
} tlpConfig;
in
@@ -27,10 +23,24 @@ in
description = "Whether to enable the TLP power management daemon.";
};
+ settings = mkOption {type = with types; attrsOf (oneOf [bool int float str (listOf str)]);
+ default = {};
+ example = {
+ SATA_LINKPWR_ON_BAT = "med_power_with_dipm";
+ USB_BLACKLIST_PHONE = 1;
+ };
+ description = ''
+ Options passed to TLP. See https://linrunner.de/tlp for all supported options..
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
- description = "Additional configuration variables for TLP";
+ description = ''
+ Verbatim additional configuration variables for TLP.
+ DEPRECATED: use services.tlp.config instead.
+ '';
};
};
};
@@ -39,8 +49,20 @@ in
config = mkIf cfg.enable {
boot.kernelModules = [ "msr" ];
+ warnings = optional (cfg.extraConfig != "") ''
+ Using config.services.tlp.extraConfig is deprecated and will become unsupported in a future release. Use config.services.tlp.settings instead.
+ '';
+
+ assertions = [{
+ assertion = cfg.enable -> config.powerManagement.scsiLinkPolicy == null;
+ message = ''
+ `services.tlp.enable` and `config.powerManagement.scsiLinkPolicy` cannot be set both.
+ Set `services.tlp.settings.SATA_LINKPWR_ON_AC` and `services.tlp.settings.SATA_LINKPWR_ON_BAT` instead.
+ '';
+ }];
+
environment.etc = {
- "tlp.conf".text = cfg.extraConfig;
+ "tlp.conf".text = (mkTlpConfig cfg.settings) + cfg.extraConfig;
} // optionalAttrs enableRDW {
"NetworkManager/dispatcher.d/99tlp-rdw-nm".source =
"${tlp}/etc/NetworkManager/dispatcher.d/99tlp-rdw-nm";
@@ -48,18 +70,25 @@ in
environment.systemPackages = [ tlp ];
- # FIXME: When the config is parametrized we need to move these into a
- # conditional on the relevant options being enabled.
- powerManagement = {
- scsiLinkPolicy = null;
- cpuFreqGovernor = null;
- cpufreq.max = null;
- cpufreq.min = null;
+
+ services.tlp.settings = let
+ cfg = config.powerManagement;
+ maybeDefault = val: lib.mkIf (val != null) (lib.mkDefault val);
+ in {
+ CPU_SCALING_GOVERNOR_ON_AC = maybeDefault cfg.cpuFreqGovernor;
+ CPU_SCALING_GOVERNOR_ON_BAT = maybeDefault cfg.cpuFreqGovernor;
+ CPU_SCALING_MIN_FREQ_ON_AC = maybeDefault cfg.cpufreq.min;
+ CPU_SCALING_MAX_FREQ_ON_AC = maybeDefault cfg.cpufreq.max;
+ CPU_SCALING_MIN_FREQ_ON_BAT = maybeDefault cfg.cpufreq.min;
+ CPU_SCALING_MAX_FREQ_ON_BAT = maybeDefault cfg.cpufreq.max;
};
services.udev.packages = [ tlp ];
systemd = {
+ # use native tlp instead because it can also differentiate between AC/BAT
+ services.cpufreq.enable = false;
+
packages = [ tlp ];
# XXX: These must always be disabled/masked according to [1].
#
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 0fbc9cecb4df..924a007efc6d 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -500,6 +500,13 @@ in
config = {
+ assertions = [
+ {
+ assertion = config.nix.distributedBuilds || config.nix.buildMachines == [];
+ message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines";
+ }
+ ];
+
nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
nix.binaryCaches = [ "https://cache.nixos.org/" ];
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 607aec87f01e..54e3a691b2f8 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -144,6 +144,14 @@ for o in $(cat /proc/cmdline); do
set -- $(IFS==; echo $o)
stage2Init=$2
;;
+ boot.persistence=*)
+ set -- $(IFS==; echo $o)
+ persistence=$2
+ ;;
+ boot.persistence.opt=*)
+ set -- $(IFS==; echo $o)
+ persistence_opt=$2
+ ;;
boot.trace|debugtrace)
# Show each command.
set -x
@@ -534,6 +542,14 @@ while read -u 3 mountPoint; do
continue
fi
+ if [ "$mountPoint" = / ] && [ "$device" = tmpfs ] && [ ! -z "$persistence" ]; then
+ echo persistence...
+ waitDevice "$persistence"
+ echo enabling persistence...
+ mountFS "$persistence" "$mountPoint" "$persistence_opt" "auto"
+ continue
+ fi
+
mountFS "$device" "$mountPoint" "$options" "$fsType"
done
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 5ce67695de48..2543801ae8bd 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -79,6 +79,16 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker rmi ${examples.nix.imageName}",
)
+ with subtest(
+ "Ensure (layered) nix store has correct permissions "
+ "and that the container starts when its process does not have uid 0"
+ ):
+ docker.succeed(
+ "docker load --input='${examples.bashLayeredWithUser}'",
+ "docker run -u somebody --rm ${examples.bashLayeredWithUser.imageName} ${pkgs.bash}/bin/bash -c 'test 555 == $(stat --format=%a /nix) && test 555 == $(stat --format=%a /nix/store)'",
+ "docker rmi ${examples.bashLayeredWithUser.imageName}",
+ )
+
with subtest("The nix binary symlinks are intact"):
docker.succeed(
"docker load --input='${examples.nix}'",
diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix
new file mode 100644
index 000000000000..c74c0ca4eff0
--- /dev/null
+++ b/pkgs/applications/audio/bambootracker/default.nix
@@ -0,0 +1,72 @@
+{ mkDerivation
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, installShellFiles
+, qmake
+, qtbase
+, qtmultimedia
+, qttools
+, alsaSupport ? stdenv.hostPlatform.isLinux
+, alsaLib
+, pulseSupport ? stdenv.hostPlatform.isLinux
+, libpulseaudio
+, jackSupport ? stdenv.hostPlatform.isUnix
+, libjack2
+}:
+let
+
+ inherit (stdenv.lib) optional optionals;
+
+in
+mkDerivation rec {
+ pname = "bambootracker";
+ version = "0.4.3";
+
+ src = fetchFromGitHub {
+ owner = "rerrahkr";
+ repo = "BambooTracker";
+ rev = "v${version}";
+ sha256 = "0gq40qmsdavsyl2d6a71rwp4mjlwvp1c8bry32srn4hliwfnvqa6";
+ };
+
+ # Fix macOS build until new release
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/rerrahkr/BambooTracker/commit/45346ed99559d44c2e32a5c6138a0835b212e875.patch";
+ sha256 = "1xkiqira1kpcqkacycy0y7qm1brhf89amliv42byijl4palmykh2";
+ })
+ ];
+
+ preConfigure = "cd BambooTracker";
+
+ nativeBuildInputs = [ qmake qttools installShellFiles ];
+
+ buildInputs = [ qtbase qtmultimedia ]
+ ++ optional alsaSupport alsaLib
+ ++ optional pulseSupport libpulseaudio
+ ++ optional jackSupport libjack2;
+
+ qmakeFlags = [ "CONFIG+=release" "CONFIG-=debug" ]
+ ++ optional pulseSupport "CONFIG+=use_pulse"
+ ++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ];
+
+ postInstall = ''
+ install -Dm644 ../BambooTracker.desktop $out/share/applications/BambooTracker.desktop
+ installManPage ../BambooTracker*.1
+
+ cp -r ../{demos,licenses,skins,LICENSE} $out/share/BambooTracker/
+
+ for size in 16x16 256x256; do
+ install -Dm644 res/icon/icon_$size.png $out/share/icons/hicolor/$size/apps/BambooTracker.png
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers";
+ homepage = "https://github.com/rerrahkr/BambooTracker";
+ license = licenses.gpl2Only;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ OPNA2608 ];
+ };
+}
diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix
index 3984305f4bc8..b8763f07b45b 100644
--- a/pkgs/applications/audio/jamulus/default.nix
+++ b/pkgs/applications/audio/jamulus/default.nix
@@ -3,12 +3,12 @@
mkDerivation rec {
pname = "jamulus";
- version = "3.5.8";
+ version = "3.5.9";
src = fetchFromGitHub {
owner = "corrados";
repo = "jamulus";
rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
- sha256 = "0mkrlfaw85pxlacrxfhb45731i4jnn67v411lzx5kb42ncar1586";
+ sha256 = "0h2m1sahi8cg15k6wa9m2d38va2cs3nvi0q8rpr9vak8g8d3p460";
};
nativeBuildInputs = [ pkg-config qmake ];
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index c243e9beb233..b01c4055e406 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "lmms";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "LMMS";
repo = "lmms";
rev = "v${version}";
- sha256 = "08k2nfj0rw9mahr7pr90n79wviqmjmflrgcljc6y3x30v84wbp26";
+ sha256 = "006hwv1pbh3y5whsxkjk20hsbgwkzr4dawz43afq1gil69y7xpda";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index 87f86306b482..6ba29226b585 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "muse-sequencer";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "muse-sequencer";
repo = "muse";
rev = "muse_${builtins.replaceStrings ["."] ["_"] version}";
- sha256 = "08k25652w88xf2i79lw305x1phpk7idrww9jkqwcs8q6wzgmz8aq";
+ sha256 = "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p";
};
sourceRoot = "source/muse3";
diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix
new file mode 100644
index 000000000000..2c0d0a24c573
--- /dev/null
+++ b/pkgs/applications/audio/pd-plugins/gem/default.nix
@@ -0,0 +1,62 @@
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, autoreconfHook
+, pkg-config
+, puredata
+, libGL
+, libGLU
+, glew
+, freeglut
+, libv4l
+, libX11
+, file
+ }:
+
+stdenv.mkDerivation rec {
+ pname = "gem-unstable";
+ # The patch below applies to the latest release (v0.94), but then the build
+ # fails. I didn't track down what changed between that version and the
+ # current master that fixes the build on Nix
+ version = "2020-03-26";
+
+ src = fetchFromGitHub {
+ owner = "umlaeute";
+ repo = "Gem";
+ rev = "f38748d71bfca00e4d2b2f31d6c4e3759c03d599";
+ sha256 = "0bkky5fk0a836bapslrgzil272iq9y704y7hw254cfq5ffjd4qjy";
+ };
+
+ patches = [
+ # Update autoconf OpenGL/GLU/GLUT detection scripts
+ # https://github.com/umlaeute/Gem/pull/251
+ (fetchpatch {
+ url = "https://github.com/umlaeute/Gem/commit/343a486c2b5c3427696f77aeabdff440e6590fc7.diff";
+ sha256 = "0gkzxv80rgg8lgp9av5qp6xng3ldhnbjz9d6r7ym784fw8yx41yj";
+ })
+ ];
+
+ nativeBuildInputs = [
+ autoreconfHook
+ file
+ pkg-config
+ ];
+
+ buildInputs = [
+ puredata
+ libGL
+ libGLU
+ glew
+ freeglut
+ libv4l
+ libX11
+ ];
+
+ meta = {
+ description = "Graphics Environment for Multimedia";
+ homepage = "http://puredata.info/downloads/gem";
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [ stdenv.lib.maintainers.raboof ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix
new file mode 100644
index 000000000000..caa703f59ce4
--- /dev/null
+++ b/pkgs/applications/audio/plexamp/default.nix
@@ -0,0 +1,39 @@
+{ lib, fetchurl, appimageTools, pkgs }:
+
+let
+ pname = "plexamp";
+ version = "3.1.1";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
+ sha256 = "11hgcysa1x9yqvha6ri4vl1zk8gf8vhcpnh3j38wg9ncd7nz5k2v";
+ name="${pname}-${version}.AppImage";
+ };
+
+ appimageContents = appimageTools.extractType2 {
+ inherit name src;
+ };
+in appimageTools.wrapType2 {
+ inherit name src;
+
+ multiPkgs = null; # no 32bit needed
+ extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
+
+ extraInstallCommands = ''
+ ln -s $out/bin/${name} $out/bin/${pname}
+ install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop
+ install -m 444 -D ${appimageContents}/plexamp.png \
+ $out/share/icons/hicolor/512x512/apps/plexamp.png
+ substituteInPlace $out/share/applications/plexamp.desktop \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
+ '';
+
+ meta = with lib; {
+ description = "A beautiful Plex music player for audiophiles, curators, and hipsters.";
+ homepage = "https://plexamp.com/";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ killercup ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 421acfef6ba1..0edeccf4003c 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -11,21 +11,8 @@ buildGoModule rec {
sha256 = "0nkzwmrzk0m9662cr18h5i54v07mw8v3fh0csvqx8n50z5fcvb7b";
};
- usb = fetchFromGitHub {
- owner = "karalabe";
- repo = "usb";
- rev = "911d15fe12a9c411cf5d0dd5635231c759399bed";
- sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2";
- };
-
- vendorSha256 = "13wh6r9zi5qw72xkbzy3mcgn7lv9l981x4lniypjbnkwhq2dj5iz";
-
- overrideModAttrs = (_: {
- postBuild = ''
- cp -r --reflink=auto ${usb}/libusb vendor/github.com/karalabe/usb
- cp -r --reflink=auto ${usb}/hidapi vendor/github.com/karalabe/usb
- '';
- });
+ runVend = true;
+ vendorSha256 = "1744df059bjksvih4653nnvb4kb1xvzdhypd0nnz36m1wrihqssv";
subPackages = [
"cmd/abidump"
diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix
index f745860f6612..5a525dec9995 100644
--- a/pkgs/applications/blockchains/quorum.nix
+++ b/pkgs/applications/blockchains/quorum.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, buildGoPackage, git, which }:
-
+
buildGoPackage rec {
pname = "quorum";
version = "2.5.0";
diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
index fd1e61463f8b..c6f5a23235a0 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/pkgs/applications/editors/glow/default.nix
@@ -21,4 +21,4 @@ buildGoModule rec {
license = licenses.mit;
maintainers = with maintainers; [ ehmry filalex77 ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index e2f041d0fd56..13a0e797adc2 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
pname = "nano";
- version = "4.9.3";
+ version = "5.0";
src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
- sha256 = "1d2i3wvsq5lvpxxinq51dcvd58xx7j0d0c2csz9hgvd06gq3hd3f";
+ sha256 = "0dmagj4p1llb1a2w0iwdrqbd9cgp0bda4s18vwh6y1ndd6z983bw";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index c7d5f7649783..716ec8d06aee 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper
+{ stdenv, symlinkJoin, lib, makeWrapper
, vimUtils
, bundlerEnv, ruby
, nodejs
@@ -55,44 +55,95 @@ let
binPath = makeBinPath (optionals withRuby [rubyEnv] ++ optionals withNodeJs [nodejs]);
+ # Mapping a boolean argument to a key that tells us whether to add or not to
+ # add to nvim's 'embedded rc' this:
+ #
+ # let g:_host_prog=$out/bin/nvim-
+ #
+ # Or this:
+ #
+ # let g:loaded_${prog}_provider=1
+ #
+ # While the later tells nvim that this provider is not available
+ #
+ hostprog_check_table = {
+ node = withNodeJs;
+ python = withPython;
+ python3 = withPython3;
+ ruby = withRuby;
+ };
+ ## Here we calculate all of the arguments to the 1st call of `makeWrapper`
+ # We start with the executable itself NOTE we call this variable "initial"
+ # because if configure != {} we need to call makeWrapper twice, in order to
+ # avoid double wrapping, see comment near finalMakeWrapperArgs
+ initialMakeWrapperArgs =
+ let
+ flags = lib.concatLists (lib.mapAttrsToList (
+ prog:
+ withProg:
+ [
+ "--cmd"
+ (if withProg then
+ "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'"
+ else
+ "let g:loaded_${prog}_provider=1"
+ )
+ ]
+ ) hostprog_check_table);
+ in [
+ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim"
+ "--argv0" "$0"
+ "--add-flags" (lib.escapeShellArgs flags)
+ ] ++ lib.optionals withRuby [
+ "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}"
+ ] ++ lib.optionals (binPath != "") [
+ "--suffix" "PATH" ":" binPath
+ ];
+ # If configure != {}, we can't generate the rplugin.vim file with e.g
+ # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in
+ # the wrapper. That's why only when configure != {} (tested both here and
+ # when postBuild is evaluated), we call makeWrapper once to generate a
+ # wrapper with most arguments we need, excluding those that cause problems to
+ # generate rplugin.vim, but still required for the final wrapper.
+ finalMakeWrapperArgs = initialMakeWrapperArgs
+ # this relies on a patched neovim, see
+ # https://github.com/neovim/neovim/issues/9413
+ ++ lib.optionals (configure != {}) [
+ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim"
+ "--add-flags" "-u ${vimUtils.vimrcFile configure}"
+ ]
+ ;
in
- stdenv.mkDerivation {
+ symlinkJoin {
name = "neovim-${stdenv.lib.getVersion neovim}";
- buildCommand = let bin="${neovim}/bin/nvim"; in ''
- if [ ! -x "${bin}" ]
- then
- echo "cannot find executable file \`${bin}'"
- exit 1
- fi
-
- makeWrapper "$(readlink -v --canonicalize-existing "${bin}")" \
- "$out/bin/nvim" --add-flags " \
- --cmd \"${if withNodeJs then "let g:node_host_prog='${nodePackages.neovim}/bin/neovim-node-host'" else "let g:loaded_node_provider=1"}\" \
- --cmd \"${if withPython then "let g:python_host_prog='$out/bin/nvim-python'" else "let g:loaded_python_provider = 1"}\" \
- --cmd \"${if withPython3 then "let g:python3_host_prog='$out/bin/nvim-python3'" else "let g:loaded_python3_provider = 1"}\" \
- --cmd \"${if withRuby then "let g:ruby_host_prog='$out/bin/nvim-ruby'" else "let g:loaded_ruby_provider=1"}\" " \
- --suffix PATH : ${binPath} \
- ${optionalString withRuby '' --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' }
- ''
- + optionalString (!stdenv.isDarwin) ''
- # copy icon and patch the original neovim.desktop file
- mkdir -p $out/share/{applications,pixmaps}
- ln -s ${neovim}/share/pixmaps/nvim.png $out/share/pixmaps/nvim.png
+ postBuild = ''
+ # Remove the symlinks created by symlinkJoin which we need to perform
+ # extra actions upon
+ rm $out/share/applications/nvim.desktop $out/bin/nvim
+ makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs}
substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \
--replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \
--replace 'Name=Neovim' 'Name=WrappedNeovim'
''
+ optionalString withPython ''
makeWrapper ${pythonEnv}/bin/python $out/bin/nvim-python --unset PYTHONPATH
- '' + optionalString withPython3 ''
+ ''
+ + optionalString withPython3 ''
makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH
- '' + optionalString withRuby ''
+ ''
+ + optionalString withRuby ''
ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
- '' + optionalString vimAlias ''
+ ''
+ + optionalString withNodeJs ''
+ ln -s ${nodePackages.neovim}/bin/neovim-node $out/bin/nvim-node
+ ''
+ + optionalString vimAlias ''
ln -s $out/bin/nvim $out/bin/vim
- '' + optionalString viAlias ''
+ ''
+ + optionalString viAlias ''
ln -s $out/bin/nvim $out/bin/vi
- '' + optionalString (configure != {}) ''
+ ''
+ + optionalString (configure != {}) ''
echo "Generating remote plugin manifest"
export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim
# Some plugins assume that the home directory is accessible for
@@ -119,22 +170,18 @@ let
echo -e "\nGenerating rplugin.vim failed!"
exit 1
fi
- unset NVIM_RPLUGIN_MANIFEST
-
- # this relies on a patched neovim, see
- # https://github.com/neovim/neovim/issues/9413
- wrapProgram $out/bin/nvim \
- --set NVIM_SYSTEM_RPLUGIN_MANIFEST $out/rplugin.vim \
- --add-flags "-u ${vimUtils.vimrcFile configure}" ${extraMakeWrapperArgs}
+ makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${extraMakeWrapperArgs}
'';
+ paths = [ neovim ];
+
preferLocalBuild = true;
buildInputs = [makeWrapper];
passthru = { unwrapped = neovim; };
meta = neovim.meta // {
- description = neovim.meta.description;
+ # To prevent builds on hydra
hydraPlatforms = [];
# prefer wrapper over the package
priority = (neovim.meta.priority or 0) - 1;
diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix
index c03f5f8ed890..e6037c6fce39 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/pkgs/applications/graphics/pdfcpu/default.nix
@@ -22,4 +22,4 @@ buildGoModule rec {
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.all;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix
index 28bda827204f..5210e10f814b 100644
--- a/pkgs/applications/logging/humioctl/default.nix
+++ b/pkgs/applications/logging/humioctl/default.nix
@@ -1,9 +1,9 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, stdenv }:
let
- humioCtlVersion = "0.25.0";
- sha256 = "1x8354m410nf9g167v0i1c77s5w2by7smdlyjwl89ixgdjw04ay3";
- vendorSha256 = "14bysjgvahr56hvd8walym11hh721i1q2g503n8m68wdzrrym4qy";
+ humioCtlVersion = "0.26.0";
+ sha256 = "1j33hmvhkb546dbi2qd5hmpcv715yg9rnpxicc1mayr9f1i2aj2i";
+ vendorSha256 = "1l2wa4w43srfrkb4qrgiyzdb6bnaqvp9g3fnrln6bhrcw6jsgj4z";
in buildGoModule {
name = "humioctl-${humioCtlVersion}";
pname = "humioctl";
@@ -23,7 +23,6 @@ in buildGoModule {
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
- mv $out/bin/cli $out/bin/humioctl
$out/bin/humioctl completion bash > humioctl.bash
$out/bin/humioctl completion zsh > humioctl.zsh
installShellCompletion humioctl.{bash,zsh}
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index a1f45fc7ed17..72e00cb15a70 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -52,16 +52,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "alacritty";
- version = "0.4.3";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "alacritty";
repo = pname;
rev = "v${version}";
- sha256 = "1b6fspcd8yn1857cgn1m8a828bvjspvrfc2giwsa9ai0ighcqbgl";
+ sha256 = "1948j57xhqvc5y876s929x9rhd6j0xnw5c91g1zqw2rfncn602g2";
};
- cargoSha256 = "1zadnwjqk9kklj0p43azd78kgbva2zihh9wh81w4c5y0kypbchyd";
+ cargoSha256 = "17lyzcj07f0vyki3091vgjd0w8ki11sw5m8gb3bxdph1dl04rria";
nativeBuildInputs = [
cmake
diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix
index 0e345b1e273d..8602282dd6b7 100644
--- a/pkgs/applications/misc/archiver/default.nix
+++ b/pkgs/applications/misc/archiver/default.nix
@@ -23,4 +23,4 @@ buildGoModule rec {
maintainers = with maintainers; [ kalbasit ];
platforms = platforms.all;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix
index 624349829684..56c508eaca92 100644
--- a/pkgs/applications/misc/batsignal/default.nix
+++ b/pkgs/applications/misc/batsignal/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "batsignal";
- version = "1.0.0";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "electrickite";
repo = "batsignal";
rev = "${version}";
- sha256 = "wy7YhgKfz07u0bp7rWpze+KmSdooOkmU7giaBX3wWkY=";
+ sha256 = "0ss5dw7wpqsf96dig6r7x4fhf6brmjdy54jyyf5nk1h9kzw4d69r";
};
buildInputs = [ libnotify glib ];
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 232ab1b2df02..45df35475459 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -17,11 +17,11 @@ let python = python3Packages.python; in
stdenv.mkDerivation rec {
pname = "blender";
- version = "2.83.1";
+ version = "2.83.3";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
- sha256 = "1kd74nzqvpcpsb4lghnjj9z3ps93lzqbhkv3lp5p79rqs8y64i23";
+ sha256 = "18m27abp4j3xv48dr6ddr2mqcvx2vkjffr487z90059yv9k0yh2p";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 42b03774749c..3cc51c83616e 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -3,13 +3,13 @@
buildGoModule rec {
pname = "cheat";
- version = "4.0.0";
+ version = "4.0.2";
src = fetchFromGitHub {
owner = "cheat";
repo = "cheat";
rev = version;
- sha256 = "0j9w2rm8imb15njj7334xl6w0fgjvfqnrfvdq4zfsrwzl67ds86l";
+ sha256 = "06dqwjyk7pmfxvkscn06sc307pxvyjqc6myighfsh3f5x83pg1nc";
};
subPackages = [ "cmd/cheat" ];
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index d983458a7ce1..991123bf60bf 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -21,4 +21,4 @@ buildGoModule rec {
license = licenses.mit;
maintainers = [ maintainers.rbasso ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix
index 2b0fc88ccf9a..9f4220c59ee3 100644
--- a/pkgs/applications/misc/geoipupdate/default.nix
+++ b/pkgs/applications/misc/geoipupdate/default.nix
@@ -20,4 +20,4 @@ buildGoModule rec {
platforms = platforms.all;
maintainers = with maintainers; [ das_j ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/applications/misc/gomatrix/default.nix
index 0cf6c9660932..77d63a93ae4e 100644
--- a/pkgs/applications/misc/gomatrix/default.nix
+++ b/pkgs/applications/misc/gomatrix/default.nix
@@ -19,4 +19,4 @@ buildGoModule rec {
maintainers = with maintainers; [ skykanin ];
homepage = "https://github.com/GeertJohan/gomatrix";
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index fba36f5e8ac7..de93dc6f43e5 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -1,25 +1,33 @@
-{ stdenv, fetchFromGitHub, python }:
+{ stdenv, fetchFromGitHub, python, installShellFiles }:
stdenv.mkDerivation rec {
pname = "googler";
- version = "4.1";
+ version = "4.2";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
- sha256 = "04d7n2l159s7c9xzvyvbnbii1k3zdbajagpx09x1l692cwjbvpxw";
+ sha256 = "0c480wzc7q4pks1f6mnayr580c73jhzshliz4hgznzc7zwcdf41w";
};
- propagatedBuildInputs = [ python ];
+ buildInputs = [ python ];
+
+ nativeBuildInputs = [ installShellFiles ];
makeFlags = [ "PREFIX=$(out)" ];
+ postInstall = ''
+ installShellCompletion --bash --name googler.bash auto-completion/bash/googler-completion.bash
+ installShellCompletion --fish auto-completion/fish/googler.fish
+ installShellCompletion --zsh auto-completion/zsh/_googler
+ '';
+
meta = with stdenv.lib; {
homepage = "https://github.com/jarun/googler";
description = "Google Search, Google Site Search, Google News from the terminal";
license = licenses.gpl3;
maintainers = with maintainers; [ koral filalex77 ];
- platforms = platforms.unix;
+ platforms = python.meta.platforms;
};
}
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 3f0f8946c29a..b08d2fe79140 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -11,21 +11,8 @@ buildGoModule rec {
sha256 = "0rikr4yrjvmrv8smvr8jdbcjqwf61y369wn875iywrj63pyr74r9";
};
- golibsass = fetchFromGitHub {
- owner = "bep";
- repo = "golibsass";
- rev = "8a04397f0baba474190a9f58019ff499ec43057a";
- sha256 = "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3";
- };
-
- overrideModAttrs = (_: {
- postBuild = ''
- rm -rf vendor/github.com/bep/golibsass/
- cp -r --reflink=auto ${golibsass} vendor/github.com/bep/golibsass
- '';
- });
-
- vendorSha256 = "031k8bvca1pb1naw922vg5h95gnwp76dii1cjcs0b1qj93isdibk";
+ vendorSha256 = "17xn6bdy942g6nx5xky41ixmd5kaz68chj3rb02ibpyraamx04nm";
+ runVend = true;
buildFlags = [ "-tags" "extended" ];
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 85e9795a0361..181917501231 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -20,14 +20,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.18.1";
+ version = "0.18.2";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "1g4mfgygyl143k0k6d3cb8b2l05ahiamlcqs1iqi66pc73cax4z6";
+ sha256 = "0x6h8g017mbpjkpkb1y8asyfdc48bgjzmj5gachsp5cf5jcqwir2";
};
buildInputs = [
@@ -85,9 +85,15 @@ buildPythonApplication rec {
checkInputs = [ pillow ];
- checkPhase = ''
- ${python.interpreter} test.py
- '';
+ checkPhase =
+ let buildBinPath =
+ if stdenv.isDarwin
+ then "kitty.app/Contents/MacOS"
+ else "linux-package/bin";
+ in
+ ''
+ env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py
+ '';
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index 1294ca6dcf4a..f5c237da440a 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "pueue";
- version = "0.6.1";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "Nukesor";
repo = pname;
rev = "v${version}";
- sha256 = "0x8slqxpnk4pis834g11wzp8fqsxwhdf0xnssz1pkkww4dqzali0";
+ sha256 = "1ksks8c35q9aq5vnjxh480vqjyaa8c1fz1fb465vngnlyw762b22";
};
- cargoSha256 = "0r110zlzpzg0j5cq9zg0kk46qigp6bzd0kzmpx3ddvhblhxvq5m5";
+ cargoSha256 = "0v1h4jhrzfb55zmpnbq18188rdvx7a7lvnjqh0w7cy90kvxssian";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
index 4f63ed057b78..b508a73de1dc 100644
--- a/pkgs/applications/misc/rsclock/default.nix
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
rev = "v${version}";
sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
};
-
+
cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl";
meta = with stdenv.lib; {
@@ -21,4 +21,3 @@ rustPlatform.buildRustPackage rec {
platforms = platforms.all;
};
}
-
diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix
index a1f4c8f41bca..f2f6c5854f06 100644
--- a/pkgs/applications/misc/sampler/default.nix
+++ b/pkgs/applications/misc/sampler/default.nix
@@ -24,4 +24,4 @@ buildGoModule rec {
maintainers = with maintainers; [ uvnikita ];
platforms = platforms.unix;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 7cc5bc6eb7fc..52aa215987b9 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -16,10 +16,10 @@ let
pname = "simplenote";
- version = "1.19.0";
+ version = "1.20.0";
sha256 = {
- x86_64-linux = "1bvg8xlf2y9nz7dzs5jkr5b48hwmvhvb6m4ia1fyvnqqq46nz9wb";
+ x86_64-linux = "0fzv8nbac5bnxvm2p7p4jsjvfrzk3h9j57zjmwvsi2dq6l80d2n7";
}.${system} or throwSystem;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix
new file mode 100644
index 000000000000..a8a0bfb1e10a
--- /dev/null
+++ b/pkgs/applications/misc/sl1-to-photon/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, pillow
+, pyside2
+, numpy
+, pyphotonfile
+, shiboken2
+, which
+}:
+let
+ version = "0.1.3";
+in
+ buildPythonApplication rec {
+ pname = "sl1-to-photon";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "fookatchu";
+ repo = "SL1toPhoton";
+ rev = "v${version}";
+ sha256 = "1hmb74rcky3nax4lxn7pw6lcd5a66fdbwrm11c84zb31xb51bakw";
+ };
+
+ propagatedBuildInputs = [ pyphotonfile pillow numpy pyside2 shiboken2 ];
+
+ format = "other";
+
+ installPhase = ''
+ install -D -m 0755 SL1_to_Photon.py $out/bin/${pname}
+ sed -i '1i#!/usr/bin/env python' $out/bin/${pname}
+ '';
+
+ meta = with lib; {
+ maintainers = [ maintainers.cab404 ];
+ license = licenses.gpl3Plus;
+ description = "Tool for converting Slic3r PE's SL1 files to Photon files for the Anycubic Photon 3D-Printer";
+ homepage = "https://github.com/fookatchu/SL1toPhoton";
+ };
+
+}
diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix
index e8f1c711d276..2a083f45731f 100644
--- a/pkgs/applications/misc/taskell/default.nix
+++ b/pkgs/applications/misc/taskell/default.nix
@@ -1,8 +1,8 @@
{ lib, haskellPackages, fetchFromGitHub }:
let
- version = "1.9.3";
- sha256 = "1xh18884xkhcln4blglzi0faag4ydhxxsk9hj6llb81kcsxlsi89";
+ version = "1.9.4";
+ sha256 = "0k8s1f0c99fz6jmqi6jqscsfxrrijnnpyw4jcj8zxpdf0sc07gca";
in (haskellPackages.mkDerivation {
pname = "taskell";
diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix
index accaf62c60e2..a283f744929b 100644
--- a/pkgs/applications/misc/terminal-parrot/default.nix
+++ b/pkgs/applications/misc/terminal-parrot/default.nix
@@ -20,4 +20,4 @@ buildGoModule rec {
platforms = platforms.all;
maintainers = [ maintainers.heel ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix
index b3b3561227f1..e7ba56f6f25f 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/pkgs/applications/misc/todoist/default.nix
@@ -19,4 +19,4 @@ buildGoModule rec {
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index d466384e66cb..69ec8fffaa1a 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -2,27 +2,17 @@
stdenv.mkDerivation rec {
pname = "wofi";
- version = "1.1.2";
+ version = "1.2.1";
src = fetchhg {
url = "https://hg.sr.ht/~scoopta/wofi";
rev = "v${version}";
- sha256 = "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn";
+ sha256 = "0hx61br19dlmc3lay23ww3n9ry06m7b6xrkjx7sk4vrg1422iq99";
};
nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ];
buildInputs = [ wayland gtk3 ];
- # Fixes icon bug on NixOS.
- # Will need to be removed on next release
- # see https://todo.sr.ht/~scoopta/wofi/54
- patches = [
- (fetchpatch {
- url = "https://paste.sr.ht/blob/1cbddafac3806afb203940c029e78ce8390d8f49";
- sha256 = "1n4jpmh66p7asjhj0z2s94ny91lmaq4hhh2356nj406vlqr15vbb";
- })
- ];
-
postInstall = ''
installManPage man/wofi*
'';
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 5af14805bd85..0e3e7205e1f9 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -11,12 +11,12 @@ assert withMediaPlayback -> gst_all_1 != null;
let
pdfjs = let
- version = "2.3.200";
+ version = "2.4.456";
in
fetchzip rec {
name = "pdfjs-${version}";
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
- sha256 = "1fpxsw0hzahccyng08acvc7g0gk29j2x701p6w6fg1718mvcrm1q";
+ sha256 = "02hpy96pi06gdq2s7n56ycm34d6d3gf8ly22y366np5vpwmc29rx";
stripRoot = false;
};
@@ -30,12 +30,12 @@ let
in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
- version = "1.13.0";
+ version = "1.13.1";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "1xq0a0mcssc1ss4fvhhwr75dhlh3nr9w46i2gmqczzh5cynk1sfk";
+ sha256 = "1n72dvrv4dch4i07lsis76p7g16a039fwx8rk7w8q9f60wgqb5i8";
};
# Needs tox
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 4b8a1238c010..21a34539b86e 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -91,19 +91,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "9.5";
+ version = "9.5.3";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
- sha256 = "0l4fz2zkgwv2qniia4nv53a4pd79hfbgb66jn68r44diails1z08";
+ sha256 = "1kqvr0sag94xdkq85k426qq1hz2b52m315yz51w6hvc87d8332b4";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
- sha256 = "1h4awhyaiws68s727pq9r32xqg2878dl2df4kbc2nmllwrl2fxq3";
+ sha256 = "179g00xw964d6x11wvzs84r7d6rcczx7ganqrxrs499yklscc46b";
};
};
in
@@ -404,7 +404,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.torproject.org/";
changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
platforms = attrNames srcs;
- maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap ];
+ maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap KarlJoad ];
hydraPlatforms = [];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain
diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 409498905051..834503484a0e 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -25,16 +25,16 @@ buildGoModule rec {
-X github.com/argoproj/argo-cd/common.gitCommit=${commit}
-X github.com/argoproj/argo-cd/common.gitTreeState=clean
'';
-
+
# run packr to embed assets
preBuild = ''
packr
'';
-
+
meta = with lib; {
description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes";
homepage = "https://github.com/argoproj/argo";
license = licenses.asl20;
maintainers = with maintainers; [ shahrukh330 ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
index 19a62c1dc17a..3cab2a9cedff 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -22,4 +22,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ jpotier ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
index 83c03671bf7d..71996e43a9b9 100644
--- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
@@ -20,4 +20,4 @@ buildGoModule rec {
maintainers = with maintainers; [ atkinschang ];
platforms = platforms.darwin;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index 2e2115b4b717..4092a5b5d3b0 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -24,4 +24,4 @@ buildGoModule rec {
maintainers = with maintainers; [ tadfisher atkinschang ];
platforms = platforms.linux;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index 45480e8c30fc..97557fa98953 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -23,4 +23,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ Gonzih filalex77 ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 98edd849bac5..2c17f411474c 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -25,4 +25,4 @@ buildGoModule rec {
maintainers = with lib.maintainers; [ eliasp ];
platforms = lib.platforms.unix;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index 90ce1d82f490..e4197a50ef15 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, go-bindata }:
buildGoModule rec {
pname = "istioctl";
@@ -12,6 +12,24 @@ buildGoModule rec {
};
vendorSha256 = "15l9z2a8p46jvmkl0vvm6s196mlics0qgmpm3yq3bn6cqnybdsij";
+ nativeBuildInputs = [ go-bindata ];
+
+ # Bundle charts
+ preBuild = ''
+ patchShebangs operator/scripts
+ operator/scripts/create_assets_gen.sh
+ '';
+
+ # Bundle release metadata
+ buildFlagsArray = let
+ attrs = [
+ "istio.io/pkg/version.buildVersion=${version}"
+ "istio.io/pkg/version.buildStatus=Nix"
+ "istio.io/pkg/version.buildTag=${version}"
+ "istio.io/pkg/version.buildHub=docker.io/istio"
+ ];
+ in ["-ldflags=${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"];
+
subPackages = [ "istioctl/cmd/istioctl" ];
meta = with lib; {
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index a65ac2ec98b5..12d74121dc89 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -39,4 +39,4 @@ buildGoModule rec {
platforms = platforms.linux;
maintainers = with maintainers; [ kuznero jlesquembre ngerstle ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix
index c739be763243..7af4f787a86c 100644
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeseal";
- version = "0.12.4";
+ version = "0.12.5";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
- sha256 = "1abm63fb40zky5i97wm6h8ifmdf6i71ws9y7217hv2rnja37f4zd";
+ sha256 = "135ls3ngdz43qx6a49faczs2vdmccalsgak2hg0rairpy2jxym37";
};
vendorSha256 = null;
@@ -23,4 +23,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ groodt ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/applications/networking/cluster/kubespy/default.nix
index 6b08f43589c6..17f66881ad6e 100644
--- a/pkgs/applications/networking/cluster/kubespy/default.nix
+++ b/pkgs/applications/networking/cluster/kubespy/default.nix
@@ -10,9 +10,9 @@ buildGoModule rec {
repo = "kubespy";
sha256 = "1p0qmn6458pa9la6zkvyrkgs2rhzfwsk9m3rk5fkmcfbh7b031r8";
};
-
+
vendorSha256 = "0q85is01cbgxflnqdvxc9w5iqdizgvsc44h8z21j712bm2w7blqq";
-
+
# TODO: enable after https://github.com/pulumi/kubespy/issues/72 is addressed.
# postInstall = ''
# for shell in bash zsh; do
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index 114c5f5af152..7e6a66eea506 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kubetail";
- version = "1.6.10";
+ version = "1.6.12";
src = fetchFromGitHub {
owner = "johanhaleby";
repo = "kubetail";
rev = version;
- sha256 = "0bg872n9fs6pl03rmjny9sgby718yznx9jwi5rx3hi4km3ha9j0b";
+ sha256 = "0hayfd7yvdhd2klfmhvl04hfqk0nfsimjyg3kbq8c5dbgbpz05nd";
};
installPhase = ''
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 10d75435e421..f537b238ae8f 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -20,4 +20,4 @@ buildGoModule rec {
maintainers = with maintainers; [ johanot nicknovitski ];
platforms = platforms.all;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix
index 331cef0444cd..ac3143ae6688 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -21,4 +21,4 @@ buildGoModule {
license = licenses.asl20;
maintainers = with maintainers; [ Gonzih ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix
index 4ad685418d35..94924822b141 100644
--- a/pkgs/applications/networking/cluster/prow/default.nix
+++ b/pkgs/applications/networking/cluster/prow/default.nix
@@ -63,4 +63,4 @@ buildGoModule rec {
maintainers = with maintainers; [ kalbasit ];
platforms = platforms.linux ++ platforms.darwin;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
index 6afa63c4a525..4a3d0bc16b3a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
@@ -24,4 +24,4 @@ buildGoModule rec {
license = licenses.mpl20;
maintainers = with maintainers; [ basvandijk ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
index 69d93ac1c754..217dacc0ef7e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
@@ -22,4 +22,4 @@ buildGoModule rec {
license = licenses.mpl20;
maintainers = with maintainers; [ gila ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index d65e15373b32..56fda026192a 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -30,4 +30,4 @@ buildGoModule rec {
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix
index a9b9436a211a..1be44cbb2502 100644
--- a/pkgs/applications/networking/gmailctl/default.nix
+++ b/pkgs/applications/networking/gmailctl/default.nix
@@ -23,4 +23,4 @@ buildGoModule rec {
maintainers = [ maintainers.doronbehar ];
platforms = platforms.unix;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix
index 318867922c4e..cdccdddbf384 100644
--- a/pkgs/applications/networking/hydroxide/default.nix
+++ b/pkgs/applications/networking/hydroxide/default.nix
@@ -22,4 +22,4 @@ buildGoModule rec {
maintainers = with maintainers; [ filalex77 ];
platforms = platforms.unix;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index bc76949e80ab..a79065a0f8a8 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -17,20 +17,20 @@ in {
pname = "discord-ptb";
binaryName = "DiscordPTB";
desktopName = "Discord PTB";
- version = "0.0.19";
+ version = "0.0.20";
src = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
- sha256 = "0wixmm16qsmgbr0l9144vl5pc3s2p4jqhl7cnc6kmgy1y4ig56ib";
+ sha256 = "0wn2qdv0a4n59xl451y7fcq11klp2g63qwx40qkshllvnf5lzzsx";
};
};
canary = callPackage ./base.nix rec {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
- version = "0.0.104";
+ version = "0.0.105";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "17np1hqqygjlbmlln0d1ba2qlbjykwj156w5dw7g4lg77kfxicfk";
+ sha256 = "1jc2zr8q33ras5mkifg19kcxpb84vsqx01rj66w62hsjw1nsbidg";
};
};
}.${branch}
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index f46a293be974..bebafe431932 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, fetchurl
, dpkg
+, undmg
, makeWrapper
, nodePackages
, alsaLib
@@ -19,10 +20,12 @@
, gnome2
, gtk3
, libappindicator-gtk3
+, libdrm
, libnotify
, libpulseaudio
, libuuid
, libxcb
+, mesa
, nspr
, nss
, pango
@@ -32,21 +35,26 @@
}:
let
-
- pname = "slack";
-
inherit (stdenv.hostPlatform) system;
-
throwSystem = throw "Unsupported system: ${system}";
- sha256 = {
- x86_64-darwin = "09daxnqxyccshkrmr7ysgjvgvgmlgd590ym68fz0l8n6ayfpkgw0";
- x86_64-linux = "00ihhsgxm441nsmav7pq4n4y9s7p2r4x5dqld160658xyqi836cq";
+ pname = "slack";
+ version = {
+ x86_64-darwin = "4.8.0";
+ x86_64-linux = "4.7.0";
}.${system} or throwSystem;
- version = {
- x86_64-darwin = "4.6.0";
- x86_64-linux = "4.4.3";
+ src = let
+ base = "https://downloads.slack-edge.com";
+ in {
+ x86_64-darwin = fetchurl {
+ url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
+ sha256 = "0k22w3c3brbc7ivmc5npqy8h7zxfgnbs7bqwii03psymm6sw53j2";
+ };
+ x86_64-linux = fetchurl {
+ url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
+ sha256 = "1nwyl70caaz9k0hccfpkjli0jjc6m9zbjb3nf4bwmykpbxbzr9w3";
+ };
}.${system} or throwSystem;
meta = with stdenv.lib; {
@@ -58,11 +66,7 @@ let
};
linux = stdenv.mkDerivation rec {
- inherit pname meta version;
- src = fetchurl {
- url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
- inherit sha256;
- };
+ inherit pname version src meta;
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -81,10 +85,12 @@ let
gnome2.GConf
gtk3
libappindicator-gtk3
+ libdrm
libnotify
libpulseaudio
libuuid
libxcb
+ mesa
nspr
nss
pango
@@ -143,21 +149,16 @@ let
'';
};
- darwin = stdenv.mkDerivation rec {
- inherit pname meta version;
+ darwin = stdenv.mkDerivation {
+ inherit pname version src meta;
- phases = [ "installPhase" ];
+ nativeBuildInputs = [ undmg ];
- src = fetchurl {
- url = "https://downloads.slack-edge.com/mac_releases/Slack-${version}-macOS.dmg";
- inherit sha256;
- };
+ sourceRoot = "Slack.app";
installPhase = ''
- /usr/bin/hdiutil mount -nobrowse -mountpoint slack-mnt $src
- mkdir -p $out/Applications
- cp -r ./slack-mnt/Slack.app $out/Applications
- /usr/bin/hdiutil unmount slack-mnt
+ mkdir -p $out/Applications/Slack.app
+ cp -R . $out/Applications/Slack.app
/usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES
'';
};
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index ee9e368a6590..261e1e718a5a 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -21,4 +21,4 @@ buildGoModule rec {
platforms = platforms.unix;
maintainers = with maintainers; [ jglukasik ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index 34adb18c4ce9..12b6d8118dbe 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -13,21 +13,8 @@ buildGoModule rec {
sha256 = "05qy14k9wmyhsg1hiv4njfx1zn1m9lz4d1p50kc36v7pq0n4csfk";
};
- libvterm = fetchFromGitHub {
- owner = "ddevault";
- repo = "go-libvterm";
- rev = "b7d861da381071e5d3701e428528d1bfe276e78f";
- sha256 = "06vv4pgx0i6hjdjcar4ch18hp9g6q6687mbgkvs8ymmbacyhp7s6";
- };
-
- vendorSha256 = "1rqn36510m0yb7k4bvq2hgirr3z8a2h5xa7cq5mb84xsmhvf0g69";
-
- overrideModAttrs = (_: {
- postBuild = ''
- cp -r --reflink=auto ${libvterm}/libvterm vendor/github.com/ddevault/go-libvterm
- cp -r --reflink=auto ${libvterm}/encoding vendor/github.com/ddevault/go-libvterm
- '';
- });
+ runVend = true;
+ vendorSha256 = "0avdvbhv1jlisiicpi5vshz28a2p2fgnlrag9zngzglcrbhdd1rn";
nativeBuildInputs = [
scdoc
diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix
index b02788e67722..90c6c6b6e40e 100644
--- a/pkgs/applications/networking/mailreaders/hasmail/default.nix
+++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix
@@ -38,4 +38,4 @@ buildGoModule rec {
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.all;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix
new file mode 100644
index 000000000000..e643954fea0d
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix
@@ -0,0 +1,183 @@
+# This pakcage is keeped until Thunderbird 78 supports OpenPGP.
+# https://www.thunderbird.net/en-US/thunderbird/78.0.1/releasenotes/
+{ stdenv, fetchurl, config, makeWrapper
+, alsaLib
+, at-spi2-atk
+, atk
+, cairo
+, cups
+, curl
+, dbus-glib
+, dbus
+, fontconfig
+, freetype
+, gdk-pixbuf
+, glib
+, glibc
+, gtk2
+, gtk3
+, kerberos
+, libX11
+, libXScrnSaver
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXext
+, libXfixes
+, libXi
+, libXinerama
+, libXrender
+, libXt
+, libxcb
+, libcanberra
+, gnome3
+, libGLU, libGL
+, nspr
+, nss
+, pango
+, writeScript
+, xidel
+, coreutils
+, gnused
+, gnugrep
+, gnupg
+, runtimeShell
+}:
+
+# imports `version` and `sources`
+with (import ./68_sources.nix);
+
+let
+ arch = if stdenv.hostPlatform.system == "i686-linux"
+ then "linux-i686"
+ else "linux-x86_64";
+
+ isPrefixOf = prefix: string:
+ builtins.substring 0 (builtins.stringLength prefix) string == prefix;
+
+ sourceMatches = locale: source:
+ (isPrefixOf source.locale locale) && source.arch == arch;
+
+ systemLocale = config.i18n.defaultLocale or "en-US";
+
+ defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources;
+
+ source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;
+
+ name = "thunderbird-bin-${version}";
+in
+
+stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2";
+ inherit (source) sha512;
+ };
+
+ phases = "unpackPhase installPhase";
+
+ libPath = stdenv.lib.makeLibraryPath
+ [ stdenv.cc.cc
+ alsaLib
+ at-spi2-atk
+ atk
+ cairo
+ cups
+ curl
+ dbus-glib
+ dbus
+ fontconfig
+ freetype
+ gdk-pixbuf
+ glib
+ glibc
+ gtk2
+ gtk3
+ kerberos
+ libX11
+ libXScrnSaver
+ libXcomposite
+ libXcursor
+ libXdamage
+ libXext
+ libXfixes
+ libXi
+ libXinerama
+ libXrender
+ libXt
+ libxcb
+ libcanberra
+ libGLU libGL
+ nspr
+ nss
+ pango
+ ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
+ stdenv.cc.cc
+ ];
+
+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase =
+ ''
+ mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
+ cp -r * "$prefix/usr/lib/thunderbird-bin-${version}"
+
+ mkdir -p "$out/bin"
+ ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"
+
+ for executable in \
+ thunderbird crashreporter thunderbird-bin plugin-container updater
+ do
+ patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ "$out/usr/lib/thunderbird-bin-${version}/$executable"
+ done
+
+ find . -executable -type f -exec \
+ patchelf --set-rpath "$libPath" \
+ "$out/usr/lib/thunderbird-bin-${version}/{}" \;
+
+ # Create a desktop item.
+ mkdir -p $out/share/applications
+ cat > $out/share/applications/thunderbird.desktop < gtk3Support == true;
+
+stdenv.mkDerivation rec {
+ pname = "thunderbird";
+ version = "68.10.0";
+
+ src = fetchurl {
+ url =
+ "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
+ sha512 =
+ "24jq4wxhk58403ax8jf6p82fyzf0vszz8am5d8jb6j559da3lp6wv4m5xqavvcf9i57rdivzrmqw9agr8mypfxs8zb908aln5iy7d4d";
+ };
+
+ nativeBuildInputs = [
+ autoconf213
+ cargo
+ gnused
+ llvmPackages.llvm
+ m4
+ nasm
+ nodejs
+ perl
+ pkgconfig
+ python2
+ python3
+ rust-cbindgen
+ rustc
+ which
+ yasm
+ ] ++ lib.optional gtk3Support wrapGAppsHook;
+
+ buildInputs = [
+ bzip2
+ dbus
+ dbus-glib
+ file
+ fontconfig
+ freetype
+ glib
+ gtk2
+ icu
+ jemalloc
+ libGL
+ libGLU
+ libevent
+ libjpeg
+ libnotify
+ libpng
+ libstartup_notification
+ libvpx
+ libwebp
+ nspr
+ nss
+ pango
+ perl
+ sqlite
+ unzip
+ xorg.libX11
+ xorg.libXScrnSaver
+ xorg.libXcursor
+ xorg.libXext
+ xorg.libXft
+ xorg.libXi
+ xorg.libXrender
+ xorg.libXt
+ xorg.pixman
+ xorg.xorgproto
+ zip
+ zlib
+ ] ++ lib.optional alsaSupport alsaLib
+ ++ lib.optional gtk3Support gtk3
+ ++ lib.optional pulseaudioSupport libpulseaudio
+ ++ lib.optional waylandSupport libxkbcommon;
+
+ NIX_CFLAGS_COMPILE =[
+ "-I${glib.dev}/include/gio-unix-2.0"
+ "-I${nss.dev}/include/nss"
+ ];
+
+ patches = [
+ ./no-buildconfig-68.patch
+ ];
+
+ postPatch = ''
+ rm -rf obj-x86_64-pc-linux-gnu
+ '';
+
+ hardeningDisable = [ "format" ];
+
+ preConfigure = ''
+ # remove distributed configuration files
+ rm -f configure
+ rm -f js/src/configure
+ rm -f .mozconfig*
+
+ configureScript="$(realpath ./mach) configure"
+ # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
+ unset AS
+
+ export MOZCONFIG=$(pwd)/mozconfig
+
+ # Set C flags for Rust's bindgen program. Unlike ordinary C
+ # compilation, bindgen does not invoke $CC directly. Instead it
+ # uses LLVM's libclang. To make sure all necessary flags are
+ # included we need to look in a few places.
+ # TODO: generalize this process for other use-cases.
+
+ BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \
+ $(< ${stdenv.cc}/nix-support/cc-cflags) \
+ $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \
+ ${
+ lib.optionalString stdenv.cc.isClang
+ "-idirafter ${stdenv.cc.cc}/lib/clang/${
+ lib.getVersion stdenv.cc.cc
+ }/include"
+ } \
+ ${
+ lib.optionalString stdenv.cc.isGNU
+ "-isystem ${stdenv.cc.cc}/include/c++/${
+ lib.getVersion stdenv.cc.cc
+ } -isystem ${stdenv.cc.cc}/include/c++/${
+ lib.getVersion stdenv.cc.cc
+ }/${stdenv.hostPlatform.config}"
+ } \
+ $NIX_CFLAGS_COMPILE"
+
+ echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG
+ '';
+
+ configureFlags = let
+ toolkitSlug = if gtk3Support then
+ "3${lib.optionalString waylandSupport "-wayland"}"
+ else
+ "2";
+ toolkitValue = "cairo-gtk${toolkitSlug}";
+ in [
+ "--enable-application=comm/mail"
+
+ "--with-system-bz2"
+ "--with-system-icu"
+ "--with-system-jpeg"
+ "--with-system-libevent"
+ "--with-system-nspr"
+ "--with-system-nss"
+ "--with-system-png" # needs APNG support
+ "--with-system-icu"
+ "--with-system-zlib"
+ "--with-system-webp"
+ "--with-system-libvpx"
+
+ "--enable-rust-simd"
+ "--enable-crashreporter"
+ "--enable-default-toolkit=${toolkitValue}"
+ "--enable-js-shell"
+ "--enable-necko-wifi"
+ "--enable-startup-notification"
+ "--enable-system-ffi"
+ "--enable-system-pixman"
+ "--enable-system-sqlite"
+
+ "--disable-gconf"
+ "--disable-tests"
+ "--disable-updater"
+ "--enable-jemalloc"
+ ] ++ (if debugBuild then [
+ "--enable-debug"
+ "--enable-profiling"
+ ] else [
+ "--disable-debug"
+ "--enable-release"
+ "--disable-debug-symbols"
+ "--enable-optimize"
+ "--enable-strip"
+ ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [
+ # on i686-linux: --with-libclang-path is not available in this configuration
+ "--with-libclang-path=${llvmPackages.libclang}/lib"
+ "--with-clang-path=${llvmPackages.clang}/bin/clang"
+ ] ++ lib.optional alsaSupport "--enable-alsa"
+ ++ lib.optional calendarSupport "--enable-calendar"
+ ++ lib.optional enableOfficialBranding "--enable-official-branding"
+ ++ lib.optional pulseaudioSupport "--enable-pulseaudio";
+
+ enableParallelBuilding = true;
+
+ postConfigure = ''
+ cd obj-*
+ '';
+
+ makeFlags = lib.optionals enableOfficialBranding [
+ "MOZILLA_OFFICIAL=1"
+ "BUILD_OFFICIAL=1"
+ ];
+
+ doCheck = false;
+
+ postInstall = let
+ desktopItem = makeDesktopItem {
+ categories = lib.concatStringsSep ";" [ "Application" "Network" ];
+ desktopName = "Thunderbird";
+ genericName = "Mail Reader";
+ name = "thunderbird";
+ exec = "thunderbird %U";
+ icon = "$out/lib/thunderbird/chrome/icons/default/default256.png";
+ mimeType = lib.concatStringsSep ";" [
+ # Email
+ "x-scheme-handler/mailto"
+ "message/rfc822"
+ # Feeds
+ "x-scheme-handler/feed"
+ "application/rss+xml"
+ "application/x-extension-rss"
+ # Newsgroups
+ "x-scheme-handler/news"
+ "x-scheme-handler/snews"
+ "x-scheme-handler/nntp"
+ ];
+ };
+ in ''
+ # TODO: Move to a dev output?
+ rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
+
+ ${desktopItem.buildCommand}
+ '';
+
+ preFixup = ''
+ # Needed to find Mozilla runtime
+ gappsWrapperArgs+=(
+ --argv0 "$out/bin/thunderbird"
+ --set MOZ_APP_LAUNCHER thunderbird
+ # https://github.com/NixOS/nixpkgs/pull/61980
+ --set SNAP_NAME "thunderbird"
+ --set MOZ_LEGACY_PROFILES 1
+ --set MOZ_ALLOW_DOWNGRADE 1
+ )
+ '';
+
+ # FIXME: The XUL portion of this can probably be removed as soon as we
+ # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
+ postFixup = ''
+ local xul="$out/lib/thunderbird/libxul.so"
+ patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ "$out/bin/thunderbird" --version
+ '';
+
+ disallowedRequisites = [
+ stdenv.cc
+ ];
+
+ passthru.updateScript = import ./../../browsers/firefox/update.nix {
+ attrPath = "thunderbird";
+ baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
+ inherit writeScript lib common-updater-scripts xidel coreutils gnused
+ gnugrep curl runtimeShell;
+ };
+
+ meta = with stdenv.lib; {
+ description = "A full-featured e-mail client";
+ homepage = "https://www.thunderbird.net";
+ maintainers = with maintainers; [
+ eelco
+ lovesegfault
+ pierron
+ ];
+ platforms = platforms.linux;
+ license = licenses.mpl20;
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 3de59ba8f114..db5774038e47 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true;
stdenv.mkDerivation rec {
pname = "thunderbird";
- version = "68.10.0";
+ version = "78.1.0";
src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
- "24jq4wxhk58403ax8jf6p82fyzf0vszz8am5d8jb6j559da3lp6wv4m5xqavvcf9i57rdivzrmqw9agr8mypfxs8zb908aln5iy7d4d";
+ "2m1gqq11k5cql5f49mwrfjk06rm2r24lf9l0hrvj569gqxckyh8wdch3dn339x3yn5fhxqlw0l770p2ssr2kkllv3yy20qqzjqgfpgh";
};
nativeBuildInputs = [
@@ -207,14 +207,12 @@ stdenv.mkDerivation rec {
in [
"--enable-application=comm/mail"
- "--with-system-bz2"
"--with-system-icu"
"--with-system-jpeg"
"--with-system-libevent"
"--with-system-nspr"
"--with-system-nss"
"--with-system-png" # needs APNG support
- "--with-system-icu"
"--with-system-zlib"
"--with-system-webp"
"--with-system-libvpx"
@@ -224,12 +222,9 @@ stdenv.mkDerivation rec {
"--enable-default-toolkit=${toolkitValue}"
"--enable-js-shell"
"--enable-necko-wifi"
- "--enable-startup-notification"
"--enable-system-ffi"
"--enable-system-pixman"
- "--enable-system-sqlite"
- "--disable-gconf"
"--disable-tests"
"--disable-updater"
"--enable-jemalloc"
@@ -322,7 +317,7 @@ stdenv.mkDerivation rec {
];
passthru.updateScript = import ./../../browsers/firefox/update.nix {
- attrPath = "thunderbird";
+ attrPath = "thunderbird-78";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
inherit writeScript lib common-updater-scripts xidel coreutils gnused
gnugrep curl runtimeShell;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch
new file mode 100644
index 000000000000..fe3a93ebda7b
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch
@@ -0,0 +1,35 @@
+diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
+--- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200
++++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200
+@@ -32,8 +32,6 @@
+ {"about", "chrome://global/content/aboutAbout.xhtml", 0},
+ {"addons", "chrome://mozapps/content/extensions/extensions.xul",
+ nsIAboutModule::ALLOW_SCRIPT},
+- {"buildconfig", "chrome://global/content/buildconfig.html",
+- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
+ {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
+ nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+ nsIAboutModule::ALLOW_SCRIPT},
+diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+--- a/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200
++++ b/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200
+@@ -39,7 +39,6 @@
+ content/global/plugins.css
+ content/global/browser-child.js
+ content/global/browser-content.js
+-* content/global/buildconfig.html
+ content/global/buildconfig.css
+ content/global/contentAreaUtils.js
+ content/global/datepicker.xhtml
+--- a/comm/mail/base/jar.mn
++++ b/comm/mail/base/jar.mn
+@@ -117,9 +117,7 @@
+ % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
+ % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul
+
+-* content/messenger/buildconfig.html (content/buildconfig.html)
+ content/messenger/buildconfig.css (content/buildconfig.css)
+-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html
+ % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css
+
+ # L10n resources and overrides.
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
index fe3a93ebda7b..efbddd3fba81 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
+++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
@@ -1,31 +1,32 @@
diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
---- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200
-+++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200
-@@ -32,8 +32,6 @@
- {"about", "chrome://global/content/aboutAbout.xhtml", 0},
- {"addons", "chrome://mozapps/content/extensions/extensions.xul",
+--- a/docshell/base/nsAboutRedirector.cpp
++++ b/docshell/base/nsAboutRedirector.cpp
+@@ -63,8 +63,6 @@
+ {"about", "chrome://global/content/aboutAbout.html", 0},
+ {"addons", "chrome://mozapps/content/extensions/extensions.xhtml",
nsIAboutModule::ALLOW_SCRIPT},
- {"buildconfig", "chrome://global/content/buildconfig.html",
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
- {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
+ {"checkerboard", "chrome://global/content/aboutCheckerboard.html",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT},
diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn
---- a/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200
-+++ b/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200
-@@ -39,7 +39,6 @@
- content/global/plugins.css
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -35,7 +35,6 @@
+ content/global/plugins.js
content/global/browser-child.js
content/global/browser-content.js
-* content/global/buildconfig.html
content/global/buildconfig.css
content/global/contentAreaUtils.js
content/global/datepicker.xhtml
+diff -ru -x '*~' a/comm/mail/base/jar.mn b/comm/mail/base/jar.mn
--- a/comm/mail/base/jar.mn
+++ b/comm/mail/base/jar.mn
-@@ -117,9 +117,7 @@
+@@ -119,9 +119,7 @@
% override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
- % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul
+ % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml
-* content/messenger/buildconfig.html (content/buildconfig.html)
content/messenger/buildconfig.css (content/buildconfig.css)
diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix
index 1dcf42b7ece1..4dc5503e4ec8 100644
--- a/pkgs/applications/networking/p2p/magnetico/default.nix
+++ b/pkgs/applications/networking/p2p/magnetico/default.nix
@@ -30,4 +30,4 @@ buildGoModule rec {
badPlatforms = platforms.darwin;
maintainers = with maintainers; [ rnhmjoj ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index cdc2f5e14784..fe75268c0ecb 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -9,13 +9,13 @@ let
in stdenv.mkDerivation rec {
pname = "resilio-sync";
- version = "2.7.1";
+ version = "2.7.2";
src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = {
- x86_64-linux = "1gdjpwdg7cpig68wsl3b8w1y12391dh5ipg7g19kr30s6wr3avvm";
- i686-linux = "1b6pzckaixfzhjf38amrkg8pahh2p3jg6cgfacswdx7cjb4a0c4i";
+ x86_64-linux = "0gar5lzv1v4yqmypwqsjnfb64vffzn8mw9vnjr733fgf1pmr57hf";
+ i686-linux = "1bws7r86h1vysjkhyvp2zk8yvxazmlczvhjlcayldskwq48iyv6w";
}.${stdenv.hostPlatform.system};
};
diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix
index a890aefe8cd6..2019e1c2b818 100644
--- a/pkgs/applications/networking/termius/default.nix
+++ b/pkgs/applications/networking/termius/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "termius";
- version = "5.10.1";
+ version = "6.1.1";
src = fetchurl {
url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb";
- sha256 = "04zh0zzyp906lf6mz3xzxybn2a55rv3vvrj0m12gnrb8kjb3pk5s";
+ sha256 = "1z3ry9jjiyqn41h38hyrx27c2cz8j39qa6i6f0f79p6pqfv93p70";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix
index 17f42b5ece4f..37e13ffa40a6 100644
--- a/pkgs/applications/networking/websocketd/default.nix
+++ b/pkgs/applications/networking/websocketd/default.nix
@@ -19,4 +19,4 @@ buildGoModule rec {
maintainers = [ maintainers.bjornfor ];
license = licenses.bsd2;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index f19d7e35c3e3..a3844dc3700b 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "eprover";
- version = "2.4";
+ version = "2.5";
src = fetchurl {
url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz";
- sha256 = "1xn5yypy6w36amsb3kvj1srlbv6v5dl51k64cd264asz2n469dxw";
+ sha256 = "0jj0zkiqpcx9xp16spkskrv3jycprz7jg1g97i67j43c4yvxylwa";
};
buildInputs = [ which ];
diff --git a/pkgs/applications/science/logic/why3/configure.patch b/pkgs/applications/science/logic/why3/configure.patch
deleted file mode 100644
index 3eebf3cf165d..000000000000
--- a/pkgs/applications/science/logic/why3/configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -4029,7 +4029,6 @@ fi
-
- if test "$USEOCAMLFIND" = yes; then
- OCAMLFINDLIB=$(ocamlfind printconf stdlib)
-- OCAMLFIND=$(which ocamlfind)
- if test "$OCAMLFINDLIB" != "$OCAMLLIB"; then
- USEOCAMLFIND=no;
- echo "but your ocamlfind is not compatible with your ocamlc:"
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index cd44dadcedce..b9bd2172bb1c 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation {
pname = "why3";
- version = "1.2.1";
+ version = "1.3.1";
src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/file/38185/why3-1.2.1.tar.gz";
- sha256 = "014gkwisjp05x3342zxkryb729p02ngx1hcjjsrplpa53jzgz647";
+ url = "https://gforge.inria.fr/frs/download.php/file/38291/why3-1.3.1.tar.gz";
+ sha256 = "16zcrc60zz2j3gd3ww93z2z9x2jkxb3kr57y8i5rcgmacy7mw3bv";
};
buildInputs = with ocamlPackages; [
@@ -29,15 +29,6 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- # Remove unnecessary call to which
- patches = [ ./configure.patch
- # Compatibility with js_of_ocaml 3.5
- (fetchpatch {
- url = "https://gitlab.inria.fr/why3/why3/commit/269ab313382fe3e64ef224813937314748bf7cf0.diff";
- sha256 = "0i92wdnbh8pihvl93ac0ma1m5g95jgqqqj4kw6qqvbbjjqdgvzwa";
- })
- ];
-
postPatch = ''
substituteInPlace Makefile.in --replace js_of_ocaml.ppx js_of_ocaml-ppx
'';
diff --git a/pkgs/applications/science/misc/gplates/boostfix.patch b/pkgs/applications/science/misc/gplates/boostfix.patch
deleted file mode 100644
index e429600b7095..000000000000
--- a/pkgs/applications/science/misc/gplates/boostfix.patch
+++ /dev/null
@@ -1,612 +0,0 @@
---- a/src/app-logic/ApplicationState.h
-+++ b/src/app-logic/ApplicationState.h
-@@ -33,6 +33,7 @@
- #include
- #include
-
-+#ifndef Q_MOC_RUN
- #include "FeatureCollectionFileState.h"
- #include "Layer.h"
- #include "LayerTaskRegistry.h"
-@@ -48,6 +49,7 @@
- #include "model/ModelInterface.h"
- #include "model/types.h"
- #include "model/WeakReferenceCallback.h"
-+#endif
-
- ////////////////////////////////////////////////////////////////////////////////////////////////
- // NOTE: Please use forward declarations (and boost::scoped_ptr) instead of including headers
---- a/src/app-logic/CoRegistrationLayerTask.h
-+++ b/src/app-logic/CoRegistrationLayerTask.h
-@@ -32,11 +32,13 @@
- #include
- #include
-
-+#ifndef Q_MOC_RUN
- #include "CoRegistrationLayerParams.h"
- #include "CoRegistrationLayerProxy.h"
- #include "LayerTask.h"
-
- #include "model/FeatureCollectionHandle.h"
-+#endif
-
- namespace GPlatesAppLogic
- {
---- a/src/app-logic/RasterLayerTask.h
-+++ b/src/app-logic/RasterLayerTask.h
-@@ -32,11 +32,13 @@
- #include
- #include
-
-+#ifndef Q_MOC_RUN
- #include "LayerTask.h"
- #include "RasterLayerParams.h"
- #include "RasterLayerProxy.h"
-
- #include "model/FeatureCollectionHandle.h"
-+#endif
-
-
- namespace GPlatesAppLogic
---- a/src/app-logic/ReconstructGraph.h
-+++ b/src/app-logic/ReconstructGraph.h
-@@ -46,6 +46,7 @@
- #include
- #include
-
-+#ifndef Q_MOC_RUN
- #include "FeatureCollectionFileState.h"
- #include "Layer.h"
- #include "Reconstruction.h"
-@@ -53,6 +54,7 @@
-
- #include "model/FeatureCollectionHandle.h"
- #include "model/WeakReferenceCallback.h"
-+#endif
-
-
- namespace GPlatesAppLogic
---- a/src/app-logic/ReconstructLayerTask.h
-+++ b/src/app-logic/ReconstructLayerTask.h
-@@ -33,6 +33,7 @@
- #include
- #include
-
-+#ifndef Q_MOC_RUN
- #include "LayerTask.h"
- #include "ReconstructLayerProxy.h"
- #include "ReconstructLayerParams.h"
-@@ -42,6 +43,7 @@
- #include "maths/types.h"
-
- #include "model/FeatureCollectionHandle.h"
-+#endif
-
-
- namespace GPlatesAppLogic
---- a/src/app-logic/ReconstructScalarCoverageLayerParams.h
-+++ b/src/app-logic/ReconstructScalarCoverageLayerParams.h
-@@ -30,6 +30,7 @@
- #include
- #include
-
-+#ifndef Q_MOC_RUN
- #include "LayerParams.h"
- #include "ReconstructScalarCoverageLayerProxy.h"
- #include "ReconstructScalarCoverageParams.h"
-@@ -38,6 +39,7 @@
- #include "property-values/ValueObjectType.h"
-
- #include "utils/SubjectObserverToken.h"
-+#endif
-
-
- namespace GPlatesAppLogic
---- a/src/app-logic/ReconstructScalarCoverageLayerTask.h
-+++ b/src/app-logic/ReconstructScalarCoverageLayerTask.h
-@@ -30,12 +30,14 @@
- #include
- #include
-
-+#ifndef Q_MOC_RUN
- #include "LayerTask.h"
- #include "ReconstructScalarCoverageLayerParams.h"
- #include "ReconstructScalarCoverageLayerProxy.h"
- #include "ScalarCoverageFeatureProperties.h"
-
- #include "model/FeatureCollectionHandle.h"
-+#endif
-
-
- namespace GPlatesAppLogic
---- a/src/app-logic/TopologyNetworkResolverLayerTask.h
-+++ b/src/app-logic/TopologyNetworkResolverLayerTask.h
-@@ -33,6 +33,7 @@
- #include
- #include
-
-+#ifndef Q_MOC_RUN
- #include "LayerParams.h"
- #include "LayerTask.h"
- #include "ReconstructLayerProxy.h"
-@@ -41,6 +42,7 @@
- #include "TopologyNetworkResolverLayerProxy.h"
-
- #include "model/FeatureCollectionHandle.h"
-+#endif
-
-
- namespace GPlatesAppLogic
---- a/src/app-logic/VelocityFieldCalculatorLayerTask.h
-+++ b/src/app-logic/VelocityFieldCalculatorLayerTask.h
-@@ -32,9 +32,11 @@
- #include
- #include
-
-+#ifndef Q_MOC_RUN
- #include "LayerTask.h"
- #include "VelocityFieldCalculatorLayerParams.h"
- #include "VelocityFieldCalculatorLayerProxy.h"
-+#endif
-
- #include "model/FeatureCollectionHandle.h"
-
---- a/src/data-mining/CoRegConfigurationTable.h
-+++ b/src/data-mining/CoRegConfigurationTable.h
-@@ -28,6 +28,7 @@
-
- #include
- #include