Merge branch 'master' into staging-next

The nss rebuild isn't so small.
This commit is contained in:
Vladimír Čunát 2020-01-08 22:48:13 +01:00
commit 5c780036c5
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
142 changed files with 9444 additions and 5948 deletions

1
.github/CODEOWNERS vendored
View file

@ -82,6 +82,7 @@
# Rust
/pkgs/development/compilers/rust @Mic92 @LnL7
/pkgs/build-support/rust @andir
# Darwin-related
/pkgs/stdenv/darwin @NixOS/darwin-maintainers

View file

@ -821,6 +821,9 @@ should be used with `ignoreCollisions = true`.
The following are setup hooks specifically for Python packages. Most of these are
used in `buildPythonPackage`.
- `eggUnpackhook` to move an egg to the correct folder so it can be installed with the `eggInstallHook`
- `eggBuildHook` to skip building for eggs.
- `eggInstallHook` to install eggs.
- `flitBuildHook` to build a wheel using `flit`.
- `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`.
- `pipInstallHook` to install wheels.

View file

@ -123,7 +123,7 @@ rec {
if m ? config || m ? options then
let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta"]; in
if badAttrs != {} then
throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by assignments to the top-level attributes `config' or `options'."
throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by introducing a top-level `config' or `options' attribute. Add configuration attributes immediately on the top level instead, or move all of them (namely: ${toString (attrNames badAttrs)}) into the explicit `config' attribute."
else
{ _file = m._file or file;
key = toString m.key or key;

View file

@ -1764,6 +1764,12 @@
githubId = 11946442;
name = "Dipin Hora";
};
dirkx = {
email = "dirkx@webweaving.org";
github = "dirkx";
githubId = 392583;
name = "Dirk-Willem van Gulik";
};
disassembler = {
email = "disasm@gmail.com";
github = "disassembler";
@ -1983,6 +1989,12 @@
githubId = 50854;
name = "edef";
};
emantor = {
email = "rouven+nixos@czerwinskis.de";
github = "emantor";
githubId = 934284;
name = "Rouven Czerwinski";
};
embr = {
email = "hi@liclac.eu";
github = "liclac";

View file

@ -357,6 +357,40 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
<link linkend="opt-services.httpd.virtualHosts">services.httpd.virtualHosts.&lt;name&gt;.useACMEHost</link>.
</para>
</listitem>
<listitem>
<para>
For NixOS configuration options, the <literal>loaOf</literal> type has
been deprecated and will be removed in a future release. In nixpkgs,
options of this type will be changed to <literal>attrsOf</literal>
instead. If you were using one of these in your configuration, you will
see a warning suggesting what changes will be required.
</para>
<para>
For example, <link linkend="opt-users.users">users.users</link> is a
<literal>loaOf</literal> option that is commonly used as follows:
<programlisting>
users.users =
[ { name = "me";
description = "My personal user.";
isNormalUser = true;
}
];
</programlisting>
This should be rewritten by removing the list and using the
value of <literal>name</literal> as the name of the attribute set:
<programlisting>
users.users.me =
{ description = "My personal user.";
isNormalUser = true;
};
</programlisting>
</para>
<para>
For more information on this change have look at these links:
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/1800">issue #1800</link>,
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/63103">PR #63103</link>.
</para>
</listitem>
</itemizedlist>
</section>

View file

@ -4,6 +4,7 @@
{ isNormalUser = true;
description = "Alice Foobar";
password = "foobar";
uid = 1000;
};
users.users.bob =

View file

@ -1,41 +1,79 @@
import ./make-test.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "gnome3-xorg";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = pkgs.gnome3.maintainers;
};
machine =
{ ... }:
machine = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
in
{ imports = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = false;
services.xserver.displayManager.lightdm.enable = true;
services.xserver.displayManager.lightdm.autoLogin.enable = true;
services.xserver.displayManager.lightdm.autoLogin.user = "alice";
services.xserver.displayManager.gdm = {
enable = true;
autoLogin = {
enable = true;
user = user.name;
};
};
services.xserver.desktopManager.gnome3.enable = true;
services.xserver.displayManager.defaultSession = "gnome-xorg";
virtualisation.memorySize = 1024;
};
testScript =
''
$machine->waitForX;
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
uid = toString user.uid;
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
xauthority = "/run/user/${uid}/gdm/Xauthority";
display = "DISPLAY=:0.0";
env = "${bus} XAUTHORITY=${xauthority} ${display}";
gdbus = "${env} gdbus";
su = command: "su - ${user.name} -c '${env} ${command}'";
# wait for alice to be logged in
$machine->waitForUnit("default.target","alice");
# Call javascript in gnome shell, returns a tuple (success, output), where
# `success` is true if the dbus call was successful and output is what the
# javascript evaluates to.
eval = "call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval";
# Check that logging in has given the user ownership of devices.
$machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
# False when startup is done
startingUp = su "${gdbus} ${eval} Main.layoutManager._startingUp";
$machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
$machine->succeed("xauth merge ~alice/.Xauthority");
$machine->waitForWindow(qr/alice.*machine/);
$machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'");
$machine->sleep(10);
$machine->screenshot("screen");
# Start gnome-terminal
gnomeTerminalCommand = su "gnome-terminal";
# Hopefully gnome-terminal's wm class
wmClass = su "${gdbus} ${eval} global.display.focus_window.wm_class";
in ''
with subtest("Login to GNOME Xorg with GDM"):
machine.wait_for_x()
# Wait for alice to be logged in"
machine.wait_for_unit("default.target", "${user.name}")
machine.wait_for_file("${xauthority}")
machine.succeed("xauth merge ${xauthority}")
# Check that logging in has given the user ownership of devices
assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
with subtest("Wait for GNOME Shell"):
# correct output should be (true, 'false')
machine.wait_until_succeeds(
"${startingUp} | grep -q 'true,..false'"
)
with subtest("Open Gnome Terminal"):
machine.succeed(
"${gnomeTerminalCommand}"
)
# correct output should be (true, '"Gnome-terminal"')
machine.wait_until_succeeds(
"${wmClass} | grep -q 'true,...Gnome-terminal'"
)
machine.sleep(20)
machine.screenshot("screen")
'';
})

View file

@ -7,13 +7,13 @@
mkDerivation rec {
pname = "elisa";
version = "0.4.2";
version = "19.12.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "elisa";
rev = "v${version}";
sha256 = "0q098zaajwbpkrarrsdzpjhpsq2nxkqaxwzhr2gjlg08j9vqkpfm";
sha256 = "1939xwhy1s502pai63vz56hnnsl3qsb6arhrlg5bw6bwsv88blac";
};
buildInputs = [ vlc ];

View file

@ -46,13 +46,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
version = "4.6.9";
version = "4.7.0";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "0ag19hvf50ip7z1s8jziy4pm8c72w7qq9zzgb4967l6v17rar4yh";
sha256 = "1cpiill24c54sy97xm1r0sqqpxj6ar40pnnwb72qs8b9zzci920r";
};
nativeBuildInputs = [

View file

@ -1,14 +1,14 @@
{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
mkDerivation rec {
version = "0.6.0";
version = "0.6.1";
pname = "qjackctl";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz";
sha256 = "1kddvxxhwvw1ps1c1drr08hxqci7jw4jwr8h1d9isb8agydfxmcx";
sha256 = "09y0s43ypcghnvzsz89mi1qs5bsvn4hpb98lqxmwwsy0ikcv3hny";
};
buildInputs = [

View file

@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
version = "1.19.2";
version = "1.20.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
sha256 = "1qgk0gwn7ijz00zfwf9rfl755lhgsig9xa6c3icj6l6wyzybz0z6";
sha256 = "09mgd5nsd65w4irgzgmfz1k0r1k4fgkq490pkil8nqy6akjrsw1z";
};
appimageContents = appimageTools.extractType2 {

View file

@ -208,10 +208,10 @@
elpaBuild {
pname = "async";
ename = "async";
version = "1.9.2";
version = "1.9.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/async-1.9.2.tar";
sha256 = "17fnvrj7jww29sav6a6jpizclg4w2962m6h37akpii71gf0vrffw";
url = "https://elpa.gnu.org/packages/async-1.9.3.tar";
sha256 = "1pmfjrlapvhkjqcal8x95w190hm9wsgxb3byc22rc1gf5z0p52c8";
};
packageRequires = [ cl-lib nadvice ];
meta = {
@ -223,10 +223,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "12.1.2";
version = "12.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-12.1.2.tar";
sha256 = "1yibg2anpmyr2a27wm4xqjsvsi9km2jzb56bf7cwyj8dnjfsd11n";
url = "https://elpa.gnu.org/packages/auctex-12.2.0.tar";
sha256 = "0j919l3q5sq6h1k1kmk4kyv0vkzl4f98fxcd64v34x5q1ahjhg48";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -324,6 +324,21 @@
license = lib.licenses.free;
};
}) {};
bluetooth = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "bluetooth";
ename = "bluetooth";
version = "0.1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bluetooth-0.1.2.el";
sha256 = "1vp2vpyq0ybjni35ics1mg1kiwgvc7x12dlmvygy78sqp52sfkcv";
};
packageRequires = [ dash emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/bluetooth.html";
license = lib.licenses.free;
};
}) {};
bnf-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "bnf-mode";
@ -542,10 +557,10 @@
elpaBuild {
pname = "company";
ename = "company";
version = "0.9.10";
version = "0.9.11";
src = fetchurl {
url = "https://elpa.gnu.org/packages/company-0.9.10.tar";
sha256 = "1w6a11rzsx5iyxn76xarzbghm460j0ampqxlh4j12bswvbn7swnd";
url = "https://elpa.gnu.org/packages/company-0.9.11.tar";
sha256 = "05fmkvsn5byaakl8i26nvnmiiz0766r17pni6x7bfrqby39ls233";
};
packageRequires = [ emacs ];
meta = {
@ -640,10 +655,10 @@
elpaBuild {
pname = "csv-mode";
ename = "csv-mode";
version = "1.9";
version = "1.10";
src = fetchurl {
url = "https://elpa.gnu.org/packages/csv-mode-1.9.el";
sha256 = "0sdnyi9in904k49yy5imapypnmk75lv14k9c1yyjhjpalvvh6br1";
url = "https://elpa.gnu.org/packages/csv-mode-1.10.el";
sha256 = "0q7j2cmj7vs6hz8cnf7j7lmlcjmig3jn2p6az345z96agl8a5xsq";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -711,21 +726,16 @@
license = lib.licenses.free;
};
}) {};
debbugs = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
, fetchurl
, lib
, soap-client }:
debbugs = callPackage ({ elpaBuild, emacs, fetchurl, lib, soap-client }:
elpaBuild {
pname = "debbugs";
ename = "debbugs";
version = "0.20";
version = "0.21";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.20.tar";
sha256 = "03mmb1zvbqlsznl5agq8k3xrlcz310vnsa2zn0y8myanm4ra51zm";
url = "https://elpa.gnu.org/packages/debbugs-0.21.tar";
sha256 = "1xx1wjfpsnwx2fpydqhwy9k1b5kjk8dqbkzf8lqaj9c4rvjbn50a";
};
packageRequires = [ cl-lib emacs soap-client ];
packageRequires = [ emacs soap-client ];
meta = {
homepage = "https://elpa.gnu.org/packages/debbugs.html";
license = lib.licenses.free;
@ -810,10 +820,10 @@
elpaBuild {
pname = "dired-git-info";
ename = "dired-git-info";
version = "0.2";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dired-git-info-0.2.el";
sha256 = "1pxn6kmgnynil13gp3m0y8hhkvciy3dcd55psj70pkrj50555dqx";
url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.el";
sha256 = "1kd0rpw7l32wvwi7q8s0inx4bc66xrl7hkllnlicyczsnzw2z52z";
};
packageRequires = [ emacs ];
meta = {
@ -915,10 +925,10 @@
elpaBuild {
pname = "ebdb";
ename = "ebdb";
version = "0.6.11";
version = "0.6.12";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.6.11.tar";
sha256 = "1ljcp4vy8z5xbcrlf33xgi63a2px4fhx6928qhwr7sy7jwil2s6n";
url = "https://elpa.gnu.org/packages/ebdb-0.6.12.tar";
sha256 = "1nmg2xxhfv53h13kb19xd4x5a7q9ln2rwzxc5v8zkf0g3vaxmhxw";
};
packageRequires = [ cl-lib emacs seq ];
meta = {
@ -975,10 +985,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20190902";
version = "20191105";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20190902.tar";
sha256 = "09rk01ykvvmmzadkz8y064iil2sm6ql6qz0rj0jjlnyymi58lj69";
url = "https://elpa.gnu.org/packages/eev-20191105.tar";
sha256 = "0w53wq8nhl4c5czda5imcv7y97pgbpfmvcvpi6kdwl3jbn9cx396";
};
packageRequires = [ emacs ];
meta = {
@ -995,10 +1005,10 @@
elpaBuild {
pname = "eglot";
ename = "eglot";
version = "1.4";
version = "1.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eglot-1.4.tar";
sha256 = "1f2p08ly17jcjyh8bif5zhmzhx3z5y9z20v6z24z939bqk8c1pdq";
url = "https://elpa.gnu.org/packages/eglot-1.5.tar";
sha256 = "00ifgz9r9xvy19zsz1yfls6n1acvms14p86nbw0x6ldjgvpf279i";
};
packageRequires = [ emacs flymake jsonrpc ];
meta = {
@ -1056,6 +1066,21 @@
license = lib.licenses.free;
};
}) {};
elisp-benchmarks = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "elisp-benchmarks";
ename = "elisp-benchmarks";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.1.tar";
sha256 = "1blx3wsnz94va67437rmqa4i90gm9ig69bbmg9lp6jqyxrm9d7gc";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html";
license = lib.licenses.free;
};
}) {};
enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "enwc";
@ -1327,10 +1352,10 @@
elpaBuild {
pname = "gnorb";
ename = "gnorb";
version = "1.6.3";
version = "1.6.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnorb-1.6.3.tar";
sha256 = "14cdldlvq2fx0j9g1bbzb6dq7yp9rw6bv39sls67i2p35h3gc2gd";
url = "https://elpa.gnu.org/packages/gnorb-1.6.4.tar";
sha256 = "1zm4c48x9vjqyn1h60lphhnzzg005wcad5mzn0majk0h59qcr0ff";
};
packageRequires = [ cl-lib ];
meta = {
@ -1379,10 +1404,10 @@
elpaBuild {
pname = "gnus-mock";
ename = "gnus-mock";
version = "0.4.2";
version = "0.4.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnus-mock-0.4.2.tar";
sha256 = "04ddmdm2hykgr2y9g2yzmjp3fszhaywwnxhiy608cpvqdjwlwhn7";
url = "https://elpa.gnu.org/packages/gnus-mock-0.4.4.tar";
sha256 = "0v94z800f1y3ylbgbrw4nslqm7j2jr592g402nxgj9rlldazzxg0";
};
packageRequires = [];
meta = {
@ -1521,10 +1546,10 @@
elpaBuild {
pname = "hyperbole";
ename = "hyperbole";
version = "7.0.3";
version = "7.0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/hyperbole-7.0.3.tar";
sha256 = "1mvplaxfjji00gg8rkhidfsdl8knwi6c0ai149zm4djsfaww3ikh";
url = "https://elpa.gnu.org/packages/hyperbole-7.0.6.tar";
sha256 = "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab";
};
packageRequires = [ emacs ];
meta = {
@ -1566,10 +1591,10 @@
elpaBuild {
pname = "ivy";
ename = "ivy";
version = "0.12.0";
version = "0.13.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-0.12.0.tar";
sha256 = "14q9kh48iabrnhwcmhlvgk7sg4a0j5c3zjp0yzj1ijrz5zbdhxxz";
url = "https://elpa.gnu.org/packages/ivy-0.13.0.tar";
sha256 = "18r9vb9v7hvdkylchn436sgh7ji9avhry1whjip8zrn0c1bnqmk8";
};
packageRequires = [ emacs ];
meta = {
@ -1596,10 +1621,10 @@
elpaBuild {
pname = "javaimp";
ename = "javaimp";
version = "0.6.1";
version = "0.7.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/javaimp-0.6.1.tar";
sha256 = "1piaj3sgw6a05g9dhkbrn5n490w01z1rxa7axh3vg1xqbs6rv7lw";
url = "https://elpa.gnu.org/packages/javaimp-0.7.1.tar";
sha256 = "0i93akp9jhlpgbm454wkjhir8cbzhfjb97cxxlk8n4pgzbh481l3";
};
packageRequires = [];
meta = {
@ -1656,10 +1681,10 @@
elpaBuild {
pname = "jsonrpc";
ename = "jsonrpc";
version = "1.0.7";
version = "1.0.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/jsonrpc-1.0.7.el";
sha256 = "19z35gjphl4mlgpznfhlccgipnmbb3c1dvax48f4hw8qwksfcac1";
url = "https://elpa.gnu.org/packages/jsonrpc-1.0.9.el";
sha256 = "1ncsdv9pr2zsfa9mxm4n68fppnkpm410mh72r7h5f8yj17lz00ss";
};
packageRequires = [ emacs ];
meta = {
@ -1802,16 +1827,16 @@
license = lib.licenses.free;
};
}) {};
loccur = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
loccur = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "loccur";
ename = "loccur";
version = "1.2.3";
version = "1.2.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/loccur-1.2.3.el";
sha256 = "09pxp03g4pg95cpqiadyv9dz6qrwd9igrkwrhm4s38cscmqm7dzq";
url = "https://elpa.gnu.org/packages/loccur-1.2.4.el";
sha256 = "00f1ifa4z5ay90bd2002fmj83d7xqzrcr9018q8crlypmpxkyh7j";
};
packageRequires = [ cl-lib ];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/loccur.html";
license = lib.licenses.free;
@ -2070,10 +2095,10 @@
elpaBuild {
pname = "nhexl-mode";
ename = "nhexl-mode";
version = "1.3";
version = "1.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/nhexl-mode-1.3.el";
sha256 = "1fcy4ybr12dvswmzaqkv4798snb1x1y7ldxwrsgjv5sx7bb5j60z";
url = "https://elpa.gnu.org/packages/nhexl-mode-1.4.el";
sha256 = "1c2q4w6hkvc7z4026hiqdcsm2scd6q35x7b0dk80h8qicsbi14c8";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -2160,10 +2185,10 @@
elpaBuild {
pname = "objed";
ename = "objed";
version = "0.8.1";
version = "0.8.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/objed-0.8.1.tar";
sha256 = "06jfvz7avh28p1ghyd1aik5lz8k9fnv1fcxh9npm1iyvh810y5zj";
url = "https://elpa.gnu.org/packages/objed-0.8.3.tar";
sha256 = "1s38d6bvggdk5p45ww1jb4gxifzgjwgw1m6ar920nlg0j4fgbcvr";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -2220,10 +2245,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.2.6";
version = "9.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.2.6.tar";
sha256 = "0ikd78k4yw4sm5x7l3dsbvfcmvnv5qna2mxirr560gvcnzhr0zg4";
url = "https://elpa.gnu.org/packages/org-9.3.1.tar";
sha256 = "1n79h6ihhsaxxbnl9hw511aav0215m3pa51sa5fh3ddknjfplian";
};
packageRequires = [];
meta = {
@ -2250,10 +2275,10 @@
elpaBuild {
pname = "orgalist";
ename = "orgalist";
version = "1.9";
version = "1.11";
src = fetchurl {
url = "https://elpa.gnu.org/packages/orgalist-1.9.el";
sha256 = "1rmmcyiiqkq54hn74nhzxzl4nvd902hv6gq341jwhrm7yiagffi6";
url = "https://elpa.gnu.org/packages/orgalist-1.11.el";
sha256 = "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl";
};
packageRequires = [ emacs ];
meta = {
@ -2265,10 +2290,10 @@
elpaBuild {
pname = "osc";
ename = "osc";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/osc-0.1.el";
sha256 = "09nzbbzvxfrjm91wawbv6bg6fqlcx1qi0711qc73yfrbc8ndsnsb";
url = "https://elpa.gnu.org/packages/osc-0.2.el";
sha256 = "1b1ck9kb9mkyd7nlj4cqahsshar6h8mpvqss6n3dp4cl3r6dk1sw";
};
packageRequires = [];
meta = {
@ -2385,10 +2410,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.3.1";
version = "0.3.27";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.3.1.tar";
sha256 = "1h6s5k156mbbkaysb07vcb13k3izs91pwigzcfh6jvv3lak4azg5";
url = "https://elpa.gnu.org/packages/phps-mode-0.3.27.tar";
sha256 = "1p6s5dq0d1ysm993qax8mi2sv4956ggainfbhsn65gc2718kjd0h";
};
packageRequires = [ emacs ];
meta = {
@ -2505,10 +2530,10 @@
elpaBuild {
pname = "rainbow-mode";
ename = "rainbow-mode";
version = "1.0.1";
version = "1.0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.1.el";
sha256 = "0cpga4ax635rfpj7y2vmh7ank0yw00dcy20gjg1mj74r97by8csf";
url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.3.el";
sha256 = "0cpwqllhv3cb0gii22cj9i731rk3sbf2drm5m52w5yclm8sfr339";
};
packageRequires = [];
meta = {
@ -2725,10 +2750,10 @@
elpaBuild {
pname = "relint";
ename = "relint";
version = "1.10";
version = "1.11";
src = fetchurl {
url = "https://elpa.gnu.org/packages/relint-1.10.el";
sha256 = "1l0lh4pkksw7brmhhbaikwzs4zkgd2962ks1zy7m262dvkhxjfv8";
url = "https://elpa.gnu.org/packages/relint-1.11.tar";
sha256 = "0c7d35kp5k11fnyjrq9cg8i2r005gs57pmb3rvpf8ilwv0scn1m7";
};
packageRequires = [ xr ];
meta = {
@ -3046,10 +3071,10 @@
elpaBuild {
pname = "svg-clock";
ename = "svg-clock";
version = "1.0";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/svg-clock-1.0.el";
sha256 = "0j6zk7fsv72af12phqdw8axbn2y8y4rfgxiab1p3pxq3y7k47jid";
url = "https://elpa.gnu.org/packages/svg-clock-1.1.el";
sha256 = "12wf4dd3vgbq1v3363cil4wr2skx60xy546jc69ycyk0jq7plcq3";
};
packageRequires = [ emacs svg ];
meta = {
@ -3151,10 +3176,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.4.2.2";
version = "2.4.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.4.2.2.tar";
sha256 = "0bjfnxxyn8xgw10ybnjrza2gfwqifa3q7rh0bp6pidlhg45718p8";
url = "https://elpa.gnu.org/packages/tramp-2.4.3.tar";
sha256 = "0m1w4myvd2z293xcdyj7yc75b108f67f98i0jrizhdaj9nlw8j5f";
};
packageRequires = [ emacs ];
meta = {
@ -3211,10 +3236,10 @@
elpaBuild {
pname = "undo-tree";
ename = "undo-tree";
version = "0.6.5";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/undo-tree-0.6.5.el";
sha256 = "0bs97xyxwfkjvzax9llg0zsng0vyndnrxj5d2n5mmynaqcn89d37";
url = "https://elpa.gnu.org/packages/undo-tree-0.7.el";
sha256 = "0mc5spiqx20z8vh8b24dp9hqj27h5bm5wqk0ga7c6s6mp69r72h4";
};
packageRequires = [];
meta = {
@ -3241,10 +3266,10 @@
elpaBuild {
pname = "uniquify-files";
ename = "uniquify-files";
version = "1.0.1";
version = "1.0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/uniquify-files-1.0.1.tar";
sha256 = "0c4lf25503z71wz9f0v6ag5lmqfxz94lmq65xvzvhmqvkxvsgpm5";
url = "https://elpa.gnu.org/packages/uniquify-files-1.0.2.tar";
sha256 = "1vib79wsz5k94b9z0wiwhbzsdm70y9dla6szw2bb75245cx3kr0h";
};
packageRequires = [ emacs ];
meta = {
@ -3327,10 +3352,10 @@
elpaBuild {
pname = "verilog-mode";
ename = "verilog-mode";
version = "2019.9.23.4801067";
version = "2019.12.17.268053413";
src = fetchurl {
url = "https://elpa.gnu.org/packages/verilog-mode-2019.9.23.4801067.el";
sha256 = "0jaba2cqiiknjqc7qz6047hpjd87hznl6b154ai1900i52kjbs21";
url = "https://elpa.gnu.org/packages/verilog-mode-2019.12.17.268053413.el";
sha256 = "0g42sd5s5xrck077qx0p2sldnr2f9qm8dsr9d0fiaks294sk8li8";
};
packageRequires = [];
meta = {
@ -3480,10 +3505,10 @@
elpaBuild {
pname = "websocket";
ename = "websocket";
version = "1.11.1";
version = "1.12";
src = fetchurl {
url = "https://elpa.gnu.org/packages/websocket-1.11.1.tar";
sha256 = "09s8qyi012djmm3vrj1qg1zqqy0h0cbcfzfkhybvqi4amy4jgliw";
url = "https://elpa.gnu.org/packages/websocket-1.12.tar";
sha256 = "0ap4z80c6pzpb69wrx0hsvwzignxmd2b9xy974by9gf5xm2wpa8w";
};
packageRequires = [ cl-lib ];
meta = {
@ -3506,6 +3531,21 @@
license = lib.licenses.free;
};
}) {};
windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "windower";
ename = "windower";
version = "0.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/windower-0.0.1.el";
sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/windower.html";
license = lib.licenses.free;
};
}) {};
windresize = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "windresize";
@ -3635,10 +3675,10 @@
elpaBuild {
pname = "yasnippet";
ename = "yasnippet";
version = "0.13.0";
version = "0.14.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/yasnippet-0.13.0.tar";
sha256 = "1klnvyy8az3h7i7yrpbhad4ka9p9vlgf918ha1vf7i3wbcbm0s5z";
url = "https://elpa.gnu.org/packages/yasnippet-0.14.0.tar";
sha256 = "1lbil3dyz43nmr2lvx9vhpybqynpb7shg7m1xl1f7j4vm4dh0r08";
};
packageRequires = [ cl-lib ];
meta = {

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-php";
version = "5.4.5";
version = "5.4.6";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
sha256 = "12j0l2k6ii9ajp90lil3apk0xsz56cb549ighabik73a1w3c6ib6";
sha256 = "0p532r0ld6j6fpwqyf9m5m0d27y37chgbvcjp1x6g5jjvm7m77xk";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-python";
version = "5.4.5";
version = "5.4.6";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
sha256 = "1iq4lxbl8gq4qvydyz34ild4izw21cp22adlz9dc054v0wis331j";
sha256 = "1xzk0zgbc4nnz8gjbhw5h6kwznzxsqrg19ggyb8ijpmgg0ncxk8l";
};
cmakeFlags = [

View file

@ -10,11 +10,11 @@
mkDerivation rec {
pname = "kdevelop";
version = "5.4.5";
version = "5.4.6";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "08vhbg9ql0402bw3y3xw1kdxhig9sv3ss8g0h4477vy3z17m1h4j";
sha256 = "01jmrmwbc1hrvq7jdfcc7mxl03q2l6kz57yca2j26xwyvfcfv5sz";
};
nativeBuildInputs = [

View file

@ -4,14 +4,14 @@ with stdenv.lib;
pythonPackages.buildPythonApplication rec {
pname = "neovim-remote";
version = "2.2.3";
version = "2.4.0";
disabled = !pythonPackages.isPy3k;
src = fetchFromGitHub {
owner = "mhinz";
repo = "neovim-remote";
rev = "v${version}";
sha256 = "0g7gs5gigk3krydxdpmscgfr1fms0a6rc6am2y4c5szkgbd1d0ph";
sha256 = "0jlw0qksak4bdzddpsj74pm2f2bgpj3cwrlspdjjy0j9qzg0mpl9";
};
propagatedBuildInputs = with pythonPackages; [ pynvim psutil ];

View file

@ -101,7 +101,7 @@ let
# Only display the log on error since it will contain a few normally
# irrelevant messages.
if ! $out/bin/nvim \
-u ${vimUtils.vimrcFile (configure // { customRC = ""; beforePlugins = ''filetype indent plugin on | syn on''; })} \
-u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \
-i NONE -n \
-E -V1rplugins.log -s \
+UpdateRemotePlugins +quit! > outfile 2>&1; then

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "quilter";
version = "2.0.4";
version = "2.0.5";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "1vbckx4c2bklzxpqz332sjcyrx1xl1j0cp8778fvpl7x7mlnz460";
sha256 = "1gij5gqidzvwym7yq5fx0344n4fkydx5diwz8g8kwkcsz7z1w45a";
};
nativeBuildInputs = [

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "azpainter";
version = "2.1.4";
version = "2.1.5";
src = fetchFromGitHub {
owner = "Symbian9";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "1hrr9lhsbjyzar3nxvli6cazr7zhyzh0p8hwpg4g9ga6njs8vi8m";
sha256 = "0x5jmsprjissqcvwq75pqq9wgv4k9b7cy507hai8xk6xs3vxwgba";
};
nativeBuildInputs = [ autoreconfHook ];

View file

@ -10,11 +10,11 @@ with stdenv.lib;
perlPackages.buildPerlPackage rec {
pname = "gscan2pdf";
version = "2.6.2";
version = "2.6.3";
src = fetchurl {
url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
sha256 = "0z35lglf4anfczizynjp8sd1jpix5mkmm1nh39n1v94l7ahjxsww";
sha256 = "1chmk51xwylnjrgc6hw23x7g7cpwzgwmjc49fcah7pkd3dk1cvvr";
};
nativeBuildInputs = [ wrapGAppsHook ];

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
{ mkDerivation, stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects
, extra-cmake-modules, poppler, kimageformats, libarchive, libdevil
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "photoqt";
version = "1.7.1";

View file

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
version = "6.3.1";
version = "6.3.2";
desktopItem = makeDesktopItem {
name = "dbeaver";
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "0w7nsxm66gbwwql1zk7zh6zvvsjcn78qm0miv0w8nj1qk24zr494";
sha256 = "0yr79p4vdg6s6c8sry6qnf2ifjcjdapn0sff2crsnz331rsh27sm";
};
installPhase = ''

View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "gallery_dl";
version = "1.12.1";
version = "1.12.2";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0y1bzqcacik030zjchgmzrwpfb49mi68wdivli9ydb64w1zql9im";
sha256 = "013bavyqvnay38c844n1jvirsmj807f0wg2qlclkdghkj316p1pz";
};
doCheck = false;

View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "heimer";
version = "1.12.0";
version = "1.13.1";
src = fetchFromGitHub {
owner = "juzzlin";
repo = pname;
rev = version;
sha256 = "1gw4w6cvr3vb4zdb1kq8gwmadh2lb0jd0bd2hc7cw2d5kdbjaln7";
sha256 = "1s6s5rlzr917hq7370pmikbdvd6y468cyxw614ah65d4v105qfv7";
};
nativeBuildInputs = [ cmake ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "josm";
version = "15553";
version = "15628";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "07kkc19r9xkb5jim26nnmajp0jzvg3absgx55z5qnna6r189ba2j";
sha256 = "19yn311h9x1434832i0awpv2n9vhbhkk1j1mi9zggy9f256f80c6";
};
buildInputs = [ jdk11 makeWrapper ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools
{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools, darwin
, curl
, glibcLocales
@ -7,7 +7,6 @@
, libargon2
, libgcrypt
, libgpgerror
, libmicrohttpd
, libsodium
, libyubikey
, pkg-config
@ -93,7 +92,6 @@ stdenv.mkDerivation rec {
libargon2
libgcrypt
libgpgerror
libmicrohttpd
libsodium
libyubikey
pkg-config
@ -105,7 +103,8 @@ stdenv.mkDerivation rec {
zlib
]
++ stdenv.lib.optional withKeePassKeeShareSecure quazip
++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
++ stdenv.lib.optional stdenv.isDarwin qtmacextras
++ stdenv.lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;
preFixup = optionalString stdenv.isDarwin ''
# Make it work without Qt in PATH.
@ -118,6 +117,6 @@ stdenv.mkDerivation rec {
homepage = https://keepassxc.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ jonafato ];
platforms = with platforms; linux ++ darwin;
platforms = platforms.linux ++ platforms.darwin;
};
}

View file

@ -3,11 +3,11 @@
mkDerivation rec {
pname = "latte-dock";
version = "0.9.5";
version = "0.9.7";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
sha256 = "1g8a2lmg9agcs2kwbwh6sj9hkrbzad7bkxk39nx5536svnifbg1c";
sha256 = "1b8yz6r6x46xajx900m8s0sjfwiwbpp6nfb780ygfcz6inb1234q";
name = "${pname}-${version}.tar.xz";
};

View file

@ -110,12 +110,16 @@ let
url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch";
sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp";
})
] ++ lib.optional (lib.versionAtLeast ffversion "71") ./fix-ff71-lto.patch
]
++ lib.optional (lib.versionAtLeast ffversion "71") (fetchpatch {
url = "https://phabricator.services.mozilla.com/D56873?download=true";
sha256 = "183949phd2n27nhiq85a04j4fjn0jxmldic6wcjrczsd8g2rrr5k";
})
++ patches;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "${pname}-unwrapped-${version}";
version = browserVersion;
@ -363,4 +367,11 @@ stdenv.mkDerivation rec {
inherit browserName;
} // lib.optionalAttrs gtk3Support { inherit gtk3; };
}
} //
# the build system verifies checksums of the bundled rust sources
# ./third_party/rust is be patched by our libtool fixup code in stdenv
# unfortunately we can't just set this to `false` when we do not want it.
# See https://github.com/NixOS/nixpkgs/issues/77289 for more details
lib.optionalAttrs (lib.versionAtLeast ffversion "72") {
dontFixLibtool = true;
})

View file

@ -1,100 +0,0 @@
Original Patch: https://bugzilla.mozilla.org/show_bug.cgi?id=1601707#c6
Also fixes the issues with dom localstorage.
--- a/dom/indexedDB/ActorsParent.cpp
+++ b/dom/indexedDB/ActorsParent.cpp
@@ -24311,11 +24311,11 @@ nsresult ObjectStoreAddOrPutRequestOp::DoDatabaseWork(
// if we allow overwrite or not. By not allowing overwrite we raise
// detectable errors rather than corrupting data.
DatabaseConnection::CachedStatement stmt;
- const auto& optReplaceDirective = (!mOverwrite || keyUnset)
- ? NS_LITERAL_CSTRING("")
- : NS_LITERAL_CSTRING("OR REPLACE ");
rv = aConnection->GetCachedStatement(
- NS_LITERAL_CSTRING("INSERT ") + optReplaceDirective +
+ NS_LITERAL_CSTRING("INSERT ") +
+ ((!mOverwrite || keyUnset)
+ ? NS_LITERAL_CSTRING("")
+ : NS_LITERAL_CSTRING("OR REPLACE ")) +
NS_LITERAL_CSTRING("INTO object_data "
"(object_store_id, key, file_ids, data) "
"VALUES (:") +
@@ -26076,9 +26076,6 @@ nsresult Cursor::OpenOp::DoIndexDatabaseWork(DatabaseConnection* aConnection) {
const bool usingKeyRange = mOptionalKeyRange.isSome();
- const auto& indexTable = mCursor->mUniqueIndex
- ? NS_LITERAL_CSTRING("unique_index_data")
- : NS_LITERAL_CSTRING("index_data");
NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column");
@@ -26099,7 +26096,9 @@ nsresult Cursor::OpenOp::DoIndexDatabaseWork(DatabaseConnection* aConnection) {
"object_data.file_ids, "
"object_data.data "
"FROM ") +
- indexTable +
+ (mCursor->mUniqueIndex
+ ? NS_LITERAL_CSTRING("unique_index_data")
+ : NS_LITERAL_CSTRING("index_data")) +
NS_LITERAL_CSTRING(
" AS index_table "
"JOIN object_data "
@@ -26198,9 +26197,6 @@ nsresult Cursor::OpenOp::DoIndexKeyDatabaseWork(
const bool usingKeyRange = mOptionalKeyRange.isSome();
- const auto& table = mCursor->mUniqueIndex
- ? NS_LITERAL_CSTRING("unique_index_data")
- : NS_LITERAL_CSTRING("index_data");
NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column");
@@ -26218,7 +26214,10 @@ nsresult Cursor::OpenOp::DoIndexKeyDatabaseWork(
NS_LITERAL_CSTRING(
"object_data_key "
" FROM ") +
- table + NS_LITERAL_CSTRING(" WHERE index_id = :") +
+ (mCursor->mUniqueIndex
+ ? NS_LITERAL_CSTRING("unique_index_data")
+ : NS_LITERAL_CSTRING("index_data")) +
+ NS_LITERAL_CSTRING(" WHERE index_id = :") +
kStmtParamNameId;
const auto keyRangeClause =
diff --git a/dom/localstorage/ActorsParent.cpp b/dom/localstorage/ActorsParent.cpp
index 9c46c20670..642cef1701 100644
--- a/dom/localstorage/ActorsParent.cpp
+++ b/dom/localstorage/ActorsParent.cpp
@@ -6959,13 +6959,10 @@ nsresult PrepareDatastoreOp::Start() {
MOZ_ASSERT(!QuotaClient::IsShuttingDownOnBackgroundThread());
MOZ_ASSERT(MayProceed());
- const LSRequestCommonParams& commonParams =
- mForPreload
- ? mParams.get_LSRequestPreloadDatastoreParams().commonParams()
- : mParams.get_LSRequestPrepareDatastoreParams().commonParams();
-
const PrincipalInfo& storagePrincipalInfo =
- commonParams.storagePrincipalInfo();
+ mForPreload
+ ? mParams.get_LSRequestPreloadDatastoreParams().commonParams().storagePrincipalInfo()
+ : mParams.get_LSRequestPrepareDatastoreParams().commonParams().storagePrincipalInfo();
if (storagePrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo) {
QuotaManager::GetInfoForChrome(&mSuffix, &mGroup, &mOrigin);
@@ -6996,10 +6993,9 @@ nsresult PrepareDatastoreOp::CheckExistingOperations() {
return NS_ERROR_FAILURE;
}
- const LSRequestCommonParams& commonParams =
- mForPreload
- ? mParams.get_LSRequestPreloadDatastoreParams().commonParams()
- : mParams.get_LSRequestPrepareDatastoreParams().commonParams();
+ const LSRequestCommonParams& preloadCommonParams = mParams.get_LSRequestPreloadDatastoreParams().commonParams();
+ const LSRequestCommonParams& prepareCommonParams = mParams.get_LSRequestPrepareDatastoreParams().commonParams();
+ const LSRequestCommonParams& commonParams = mForPreload ? preloadCommonParams : prepareCommonParams;
const PrincipalInfo& storagePrincipalInfo =
commonParams.storagePrincipalInfo();

View file

@ -16,10 +16,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "71.0";
ffversion = "72.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0hfjlhwdhfdfzd27d6p3h8ff5m2jphlaipv4zym48bn6g95if1x98q2lb87617bxfm31di4rckjvqb70g9sm3smil6p6bnw2dsvnq1g";
sha512 = "3ri375myxn040avylz3xdvbgyb0ixn0q1sszrsc4b9jp620j1732qixylw0lyfym5a0vkhpmihbp5kdjrmc4r26myjar5c9zjzisnd0";
};
patches = [
@ -99,10 +99,10 @@ rec {
firefox-esr-68 = common rec {
pname = "firefox-esr";
ffversion = "68.3.0esr";
ffversion = "68.4.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "31zisy4l07hhm9yvxz7sx04kz1f5rl20z1w072jxaabi42sw07xr6lcflv88gwl21y902n7vwd1q1zfavpnipn65wap4i0vm8c4m6pr";
sha512 = "29h0fm929jrk9nbb40bajf6a6s4x9w8zc2qw1hrg5jki1pabx30wdgn372pb51ak371a0q59k8p1vab6j31q7par6xvpwh7aiydfq04";
};
patches = [

View file

@ -1,6 +1,8 @@
{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake
, qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools
, libqmatrixclient_0_5 }:
, libqmatrixclient_0_5
, gnome3
}:
let
generic = version: sha256: prefix: library: mkDerivation {
@ -14,7 +16,7 @@ let
inherit sha256;
};
buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library ];
buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library gnome3.libsecret ];
nativeBuildInputs = [ cmake qttools ];

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnunet";
version = "0.12.0";
version = "0.12.1";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
sha256 = "1bz0sbhbsivi1bcabk3vpxqnh4vgp86vrmiwkyb5fiqfjviar111";
sha256 = "0zhz3dd4mr6k7wlcxw2xclq8p8l4ia5nlg78dylyz6lbz96h2lsm";
};
enableParallelBuilding = true;

View file

@ -25,11 +25,11 @@ in
stdenv.mkDerivation rec {
pname = "gnucash";
version = "3.7";
version = "3.8b";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
sha256 = "1d2qi3ny0bxa16ifh3465z1jgn1l0fmqk9dkph4ialw076gv13kb";
sha256 = "0dvzm3bib7jcj685sklpzyy9mrak9mxyvih2k9fk4sl3v21wlphg";
};
nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];

View file

@ -0,0 +1,54 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3
, makeDesktopItem
}:
let
pname = "tusk";
version = "0.23.0";
icon = fetchurl {
url = "https://raw.githubusercontent.com/klaussinani/tusk/v${version}/static/Icon.png";
sha256 = "1jqclyrjgg6hir45spg75plfmd8k9nrsrzw3plbcg43s5m1qzihb";
};
desktopItem = makeDesktopItem {
name = pname;
exec = pname;
icon = icon;
desktopName = pname;
genericName = "Evernote desktop app";
categories = "Application";
};
in appimageTools.wrapType2 rec {
name = "${pname}-v${version}";
src = fetchurl {
url = "https://github.com/klaussinani/tusk/releases/download/v${version}/${pname}-${version}-x86_64.AppImage";
sha256 = "02q7wsnhlyq8z74avflrm7805ny8fzlmsmz4bmafp4b4pghjh5ky";
};
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = ''
mv $out/bin/{${name},${pname}}
mkdir "$out/share"
ln -s "${desktopItem}/share/applications" "$out/share/"
'';
meta = with lib; {
description = "Refined Evernote desktop app";
longDescription = ''
Tusk is an unofficial, featureful, open source, community-driven, free Evernote app used by people in more than 140 countries. Tusk is indicated by Evernote as an alternative client for Linux environments trusted by the open source community.
'';
homepage = "https://klaussinani.github.io/tusk/";
license = licenses.mit;
maintainers = with maintainers; [ tbenst ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -0,0 +1,108 @@
{ lib, stdenv, fetchurl, zlib, bzip2, perl, cpio, gawk, coreutils, ApplicationServices }:
stdenv.mkDerivation rec {
pname = "blast";
version = "2.10.0";
src = fetchurl {
url = "ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz";
sha256 = "09nry5knj5hhxpn0a5ww1gb1704grd4r1y7adbjl6kqwq37dkk9s";
};
sourceRoot = "ncbi-blast-${version}+-src/c++";
configureFlags = [
# With flat Makefile we can use all_projects in order not to build extra.
# These extra cause clang to hang on Darwin.
"--with-flat-makefile"
"--without-makefile-auto-update"
"--with-dll" # build dynamic libraries (static are default)
];
makeFlags = [ "all_projects=app/" ];
preConfigure = ''
export NCBICXX_RECONF_POLICY=warn
export PWD=$(pwd)
export HOME=$PWD
# The configure scripts wants to set AR="ar cr" unless it is already set in
# the environment. Because stdenv sets AR="ar", the result is a bad call to
# the assembler later in the process. Thus, we need to unset AR
unset AR
for awks in scripts/common/impl/is_log_interesting.awk \
scripts/common/impl/report_duplicates.awk; do
substituteInPlace $awks \
--replace /usr/bin/awk ${gawk}/bin/awk
done
for mk in src/build-system/Makefile.meta.in \
src/build-system/helpers/run_with_lock.c ; do
substituteInPlace $mk \
--replace /bin/rm ${coreutils}/bin/rm
done
for mk in src/build-system/Makefile.meta.gmake=no \
src/build-system/Makefile.meta_l \
src/build-system/Makefile.meta_r \
src/build-system/Makefile.requirements \
src/build-system/Makefile.rules_with_autodep.in; do
substituteInPlace $mk \
--replace /bin/echo ${coreutils}/bin/echo
done
for mk in src/build-system/Makefile.meta_p \
src/build-system/Makefile.rules_with_autodep.in \
src/build-system/Makefile.protobuf.in ; do
substituteInPlace $mk \
--replace /bin/mv ${coreutils}/bin/mv
done
substituteInPlace src/build-system/configure \
--replace /bin/pwd ${coreutils}/bin/pwd \
--replace /bin/ln ${coreutils}/bin/ln
substituteInPlace src/build-system/configure.ac \
--replace /bin/pwd ${coreutils}/bin/pwd \
--replace /bin/ln ${coreutils}/bin/ln
substituteInPlace src/build-system/Makefile.meta_l \
--replace /bin/date ${coreutils}/bin/date
'';
nativeBuildInputs = [ perl ];
# perl is necessary in buildInputs so that installed perl scripts get patched
# correctly
buildInputs = [ coreutils perl gawk zlib bzip2 cpio ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
hardeningDisable = [ "format" ];
postInstall = ''
substituteInPlace $out/bin/get_species_taxids.sh \
--replace /bin/rm ${coreutils}/bin/rm
'';
patches = [ ./no_slash_bin.patch ];
enableParallelBuilding = true;
# Many tests require either network access or locally available databases
doCheck = false;
meta = with stdenv.lib; {
description = ''Basic Local Alignment Search Tool (BLAST) finds regions of
similarity between biological sequences'';
homepage = https://blast.ncbi.nlm.nih.gov/Blast.cgi;
license = licenses.publicDomain;
# Version 2.10.0 fails on Darwin
# See https://github.com/NixOS/nixpkgs/pull/61430
platforms = platforms.linux;
maintainers = with maintainers; [ luispedro ];
};
}

View file

@ -0,0 +1,184 @@
diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/collect_outside_libs.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/collect_outside_libs.sh
--- ncbi-blast-2.9.0+-src/scripts/common/impl/collect_outside_libs.sh 2014-08-01 22:01:17.000000000 +0800
+++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/collect_outside_libs.sh 2019-05-15 12:40:44.145239480 +0800
@@ -1,8 +1,5 @@
#!/bin/sh
set -e
-PATH=/bin:/usr/bin
-export PATH
-unset CDPATH
base=$1
search=`echo ${2-$LD_LIBRARY_PATH} | tr : ' '`
diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/create_flat_tuneups.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/create_flat_tuneups.sh
--- ncbi-blast-2.9.0+-src/scripts/common/impl/create_flat_tuneups.sh 2011-08-17 02:55:10.000000000 +0800
+++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/create_flat_tuneups.sh 2019-05-15 12:40:48.449276574 +0800
@@ -1,9 +1,6 @@
#!/bin/sh
id='$Id: create_flat_tuneups.sh 331412 2011-08-16 18:55:10Z ucko $'
-PATH=/bin:/usr/bin
-export PATH
-
exec > auto_flat_tuneups.mk
cat <<EOF
diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/get_lock.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/get_lock.sh
--- ncbi-blast-2.9.0+-src/scripts/common/impl/get_lock.sh 2011-08-20 04:12:28.000000000 +0800
+++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/get_lock.sh 2019-05-15 12:40:52.901315000 +0800
@@ -1,7 +1,5 @@
#!/bin/sh
-PATH=/bin:/usr/bin
-export PATH
dir=$1.lock
diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/if_diff.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/if_diff.sh
--- ncbi-blast-2.9.0+-src/scripts/common/impl/if_diff.sh 2014-07-30 22:06:45.000000000 +0800
+++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/if_diff.sh 2019-05-15 12:42:57.298410841 +0800
@@ -4,9 +4,6 @@
# Author: Denis Vakatov (vakatov@ncbi.nlm.nih.gov)
#################################
-orig_PATH=$PATH
-PATH=/bin:/usr/bin
-
script_name=`basename $0`
script_args="$*"
@@ -16,7 +13,7 @@
base_action=`basename "$action"`
case "$base_action" in
cp | cp\ * | ln | ln\ * )
- action=/bin/$base_action
+ action=$base_action
rm="rm -f"
;;
* )
@@ -58,10 +55,8 @@
shift
cmd="$* $dest_file"
test "$quiet" = yes || echo "$cmd"
- PATH=$orig_PATH
"$@" "$dest"
status=$?
- PATH=/bin:/usr/bin
return $status
}
@@ -74,7 +69,7 @@
case "$base_action" in
ln | ln\ -f )
test "$quiet" = yes || echo "failed; trying \"cp -p ...\" instead"
- cmd="/bin/cp -p $src_file $dest_file"
+ cmd="cp -p $src_file $dest_file"
ExecHelper "$dest_file" /bin/cp -p "$src_file" ||
Usage "\"$cmd\" failed"
;;
diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/make_lock_map.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/make_lock_map.sh
--- ncbi-blast-2.9.0+-src/scripts/common/impl/make_lock_map.sh 2011-11-17 04:43:52.000000000 +0800
+++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/make_lock_map.sh 2019-05-15 12:40:56.769348434 +0800
@@ -1,8 +1,6 @@
#!/bin/sh
# $Id: make_lock_map.sh 344587 2011-11-16 20:43:52Z ucko $
-PATH=/bin:/usr/bin
-export PATH
act=false
cache_dir='.#SRC-cache'
diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/run_with_lock.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/run_with_lock.sh
--- ncbi-blast-2.9.0+-src/scripts/common/impl/run_with_lock.sh 2015-10-29 22:36:05.000000000 +0800
+++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/run_with_lock.sh 2019-05-15 12:41:53.401842849 +0800
@@ -1,10 +1,6 @@
#!/bin/sh
# $Id: run_with_lock.sh 483249 2015-10-29 14:36:05Z ucko $
-orig_PATH=$PATH
-PATH=/bin:/usr/bin
-export PATH
-
base=
logfile=
map=
@@ -23,7 +19,7 @@
: ${base:=`basename "$1"`}
clean_up () {
- /bin/rm -rf "$base.lock"
+ rm -rf "$base.lock"
}
case $0 in
@@ -45,7 +41,7 @@
trap "clean_up; exit $error_status" 1 2 15
if [ -n "$logfile" ]; then
status_file=$base.lock/status
- (PATH=$orig_PATH; export PATH; "$@"; echo $? > "$status_file") 2>&1 \
+ ("$@"; echo $? > "$status_file") 2>&1 \
| tee "$logfile.new"
# Emulate egrep -q to avoid having to move from under scripts.
if [ ! -f "$logfile" ] \
@@ -58,8 +54,6 @@
status=1
fi
else
- PATH=$orig_PATH
- export PATH
"$@"
status=$?
fi
diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/strip_for_install.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/strip_for_install.sh
--- ncbi-blast-2.9.0+-src/scripts/common/impl/strip_for_install.sh 2013-09-24 03:06:51.000000000 +0800
+++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/strip_for_install.sh 2019-05-15 12:40:13.272975092 +0800
@@ -1,8 +1,5 @@
#!/bin/sh
-PATH=/bin:/usr/bin:/usr/ccs/bin
-export PATH
-
case "$1" in
--dirs )
shift
--- ncbi-blast-2.9.0+-src/scripts/common/impl/update_configurable.sh 2017-07-13 22:53:24.000000000 +0800
+++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/update_configurable.sh 2019-05-15 15:03:35.861276083 +0800
@@ -1,6 +1,4 @@
#!/bin/sh
-PATH=/bin:/usr/bin
-export PATH
script_name=`basename $0`
script_dir=`dirname $0`
--- ncbi-blast-2.9.0+-src/src/build-system/Makefile.mk.in 2019-01-04 01:38:37.000000000 +0800
+++ ncbi-blast-2.9.0+-src.patched/src/build-system/Makefile.mk.in 2019-05-15 15:14:41.749416495 +0800
@@ -50,12 +50,12 @@
### Auxiliary commands, filters
-RM = /bin/rm -f
-RMDIR = /bin/rm -rf
-COPY = /bin/cp -p
+RM = rm -f
+RMDIR = rm -rf
+COPY = cp -p
BINCOPY = @BINCOPY@
TOUCH = @TOUCH@
-MKDIR = /bin/mkdir
+MKDIR = mkdir
BINTOUCH = $(TOUCH)
LN_S = @LN_S@
GREP = @GREP@
--- ncbi-blast-2.9.0+-src/src/build-system/configure 2019-03-05 00:49:08.000000000 +0800
+++ ncbi-blast-2.9.0+-src.patched/src/build-system/configure 2019-05-15 16:55:40.711795042 +0800
@@ -10417,10 +10417,6 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
-case "$LN_S" in
- /*) ;;
- * ) LN_S=/bin/$LN_S ;;
-esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "geogebra";
version = "5-0-569-0";
version = "5-0-570-0";
preferLocalBuild = true;
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
"http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
];
sha256 = "16bav6hf80l21gnhdjll82hpjqi7kr3w74jcq7mnf24acmcn70qm";
sha256 = "0q6brg5rkl2gyyg9vhiilvb8zy23zlp4a1xcwnv501xzcccv0p37";
};
srcIcon = fetchurl {

View file

@ -7,7 +7,7 @@ with stdenv; with lib;
mkDerivation rec {
name = "cvs-fast-export-${meta.version}";
meta = {
version = "1.49";
version = "1.50";
description = "Export an RCS or CVS history as a fast-import stream";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dfoxfranke ];
@ -16,8 +16,8 @@ mkDerivation rec {
};
src = fetchurl {
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.49.tar.gz";
sha256 = "1d75aq6inmd6yvc3rpxw1al95lvbl7wq64v3wygq69prrnzg8b6i";
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.50.tar.gz";
sha256 = "01m5l9xnl387hpyik5jvyhghkffj5v1wyxqpxpjxv69q9ly905yk";
};
buildInputs = [

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
project = "conmon";
name = "${project}-${version}";
version = "2.0.8";
version = "2.0.9";
src = fetchFromGitHub {
owner = "containers";
repo = project;
rev = "v${version}";
sha256 = "17pv80ba79wh4nwxy3wl0vl1m8054s346hgcp87iy3mpnrvq2cv2";
sha256 = "0wy3nihif9ih62rlskrjysshfaxdl878fj5ni1zfb9db4nsx6z0m";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "podman";
version = "1.6.3";
version = "1.7.0";
src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "0y87pylpff2xl796n5s2vrm90pspzqfw8h4a5gndn1mx18s09s69";
sha256 = "1f1dq9g08mlm9y9d7jbs780nrfc25ln97ca5qifcsyc9bmp4f6r1";
};
goPackagePath = "github.com/containers/libpod";

View file

@ -4,6 +4,7 @@
crateFeatures, crateRenames, libName, release, libPath,
crateType, metadata, crateBin, hasCrateBin,
extraRustcOpts, verbose, colors,
buildTests
}:
let
@ -30,6 +31,7 @@
baseRustcOpts
);
build_bin = if buildTests then "build_bin_test" else "build_bin";
in ''
runHook preBuild
${echo_build_heading colors}
@ -48,14 +50,18 @@
setup_link_paths
if [[ -e "$LIB_PATH" ]]; then
build_lib $LIB_PATH
build_lib "$LIB_PATH"
${lib.optionalString buildTests ''build_lib_test "$LIB_PATH"''}
elif [[ -e src/lib.rs ]]; then
build_lib src/lib.rs
${lib.optionalString buildTests "build_lib_test src/lib.rs"}
elif [[ -e "src/$LIB_NAME.rs" ]]; then
build_lib src/$LIB_NAME.rs
${lib.optionalString buildTests ''build_lib_test "src/$LIB_NAME.rs"''}
fi
${lib.optionalString (lib.length crateBin > 0) (lib.concatMapStringsSep "\n" (bin: ''
mkdir -p target/bin
BIN_NAME='${bin.name or crateName}'
@ -65,19 +71,39 @@
'' else ''
BIN_PATH='${bin.path}'
''}
build_bin "$BIN_NAME" "$BIN_PATH"
${build_bin} "$BIN_NAME" "$BIN_PATH"
'') crateBin)}
${lib.optionalString buildTests ''
# When tests are enabled build all the files in the `tests` directory as
# test binaries.
if [ -d tests ]; then
# find all the .rs files (or symlinks to those) in the tests directory, no subdirectories
find tests -maxdepth 1 \( -type f -o -type l \) -a -name '*.rs' -print0 | while IFS= read -r -d ''' file; do
mkdir -p target/bin
build_bin_test_file "$file"
done
# find all the subdirectories of tests/ that contain a main.rs file as
# that is also a test according to cargo
find tests/ -mindepth 1 -maxdepth 2 \( -type f -o -type l \) -a -name 'main.rs' -print0 | while IFS= read -r -d ''' file; do
mkdir -p target/bin
build_bin_test_file "$file"
done
fi
''}
# If crateBin is empty and hasCrateBin is not set then we must try to
# detect some kind of bin target based on some files that might exist.
${lib.optionalString (lib.length crateBin == 0 && !hasCrateBin) ''
if [[ -e src/main.rs ]]; then
mkdir -p target/bin
build_bin ${crateName} src/main.rs
${build_bin} ${crateName} src/main.rs
fi
for i in src/bin/*.rs; do #*/
mkdir -p target/bin
build_bin "$(basename $i .rs)" "$i"
${build_bin} "$(basename $i .rs)" "$i"
done
''}
# Remove object files to avoid "wrong ELF type"

View file

@ -39,12 +39,12 @@ let
inherit lib stdenv echo_build_heading noisily mkRustcDepArgs rust;
};
installCrate = import ./install-crate.nix;
installCrate = import ./install-crate.nix { inherit stdenv; };
in
crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides,
dependencies, buildDependencies, crateRenames,
extraRustcOpts,
extraRustcOpts, buildTests,
preUnpack, postUnpack, prePatch, patches, postPatch,
preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }:
@ -55,10 +55,12 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr
"src" "buildInputs" "crateBin" "crateLib" "libName" "libPath"
"buildDependencies" "dependencies" "features" "crateRenames"
"crateName" "version" "build" "authors" "colors" "edition"
"buildTests"
];
extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate;
extraDerivationAttrs = builtins.removeAttrs crate processedAttrs;
buildInputs_ = buildInputs;
extraRustcOpts_ = extraRustcOpts;
buildTests_ = buildTests;
# take a list of crates that we depend on and override them to fit our overrides, rustc, release, …
makeDependencies = map (dep: lib.getLib (dep.override { inherit release verbose crateOverrides; }));
@ -72,13 +74,23 @@ in
stdenv.mkDerivation (rec {
inherit (crate) crateName;
inherit preUnpack postUnpack prePatch patches postPatch preConfigure postConfigure preBuild postBuild preInstall postInstall;
inherit
preUnpack
postUnpack
prePatch
patches
postPatch
preConfigure
postConfigure
preBuild
postBuild
preInstall
postInstall
buildTests
;
src = if lib.hasAttr "src" crate then
crate.src
else
fetchCrate { inherit (crate) crateName version sha256; };
name = "rust_${crate.crateName}-${crate.version}";
src = crate.src or (fetchCrate { inherit (crate) crateName version sha256; });
name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}";
depsBuildBuild = [ rust stdenv.cc ];
buildInputs = (crate.buildInputs or []) ++ buildInputs_;
dependencies = makeDependencies dependencies_;
@ -122,6 +134,7 @@ stdenv.mkDerivation (rec {
++ extraRustcOpts_
++ (lib.optional (edition != null) "--edition ${edition}");
configurePhase = configureCrate {
inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription
crateFeatures crateRenames libName build workspace_member release libPath crateVersion
@ -132,12 +145,14 @@ stdenv.mkDerivation (rec {
inherit crateName dependencies
crateFeatures crateRenames libName release libPath crateType
metadata hasCrateBin crateBin verbose colors
extraRustcOpts;
extraRustcOpts buildTests;
};
installPhase = installCrate crateName metadata;
installPhase = installCrate crateName metadata buildTests;
outputs = [ "out" "lib" ];
outputDev = [ "lib" ];
# depending on the test setting we are either producing something with bins
# and libs or just test binaries
outputs = if buildTests then [ "out" ] else [ "out" "lib" ];
outputDev = if buildTests then [ "out" ] else [ "lib" ];
} // extraDerivationAttrs
)) {
@ -162,4 +177,5 @@ stdenv.mkDerivation (rec {
dependencies = crate_.dependencies or [];
buildDependencies = crate_.buildDependencies or [];
crateRenames = crate_.crateRenames or {};
buildTests = crate_.buildTests or false;
}

View file

@ -1,5 +1,6 @@
crateName: metadata:
''
{ stdenv }:
crateName: metadata: buildTests:
if !buildTests then ''
runHook preInstall
# always create $out even if we do not have binaries. We are detecting binary targets during compilation, if those are missing there is no way to only have $lib
mkdir $out
@ -28,5 +29,23 @@ crateName: metadata:
cp -P target/bin/* $out/bin # */
fi
fi
runHook postInstall
'' else
# for tests we just put them all in the output. No execution.
''
runHook preInstall
mkdir -p $out/tests
if [ -e target/bin ]; then
find target/bin/ -type f -executable -exec cp {} $out/tests \;
fi
if [ -e target/lib ]; then
find target/lib/ -type f \! -name '*.rlib' \
-a \! -name '*${stdenv.hostPlatform.extensions.sharedLibrary}' \
-a \! -name '*.d' \
-executable \
-print0 | xargs --no-run-if-empty --null install --target $out/tests;
fi
runHook postInstall
''

View file

@ -13,6 +13,7 @@ build_lib() {
$BUILD_OUT_DIR \
$EXTRA_BUILD \
$EXTRA_FEATURES \
$EXTRA_RUSTC_FLAGS \
--color $colors
EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-$metadata.rlib"
@ -22,9 +23,10 @@ build_lib() {
}
build_bin() {
crate_name=$1
crate_name_=$(echo $crate_name | tr '-' '_')
main_file=""
local crate_name=$1
local crate_name_=$(echo $crate_name | tr '-' '_')
local main_file=""
if [[ ! -z $2 ]]; then
main_file=$2
fi
@ -43,6 +45,7 @@ build_bin() {
$BUILD_OUT_DIR \
$EXTRA_BUILD \
$EXTRA_FEATURES \
$EXTRA_RUSTC_FLAGS \
--color ${colors} \
if [ "$crate_name_" != "$crate_name" ]; then
@ -50,6 +53,24 @@ build_bin() {
fi
}
build_lib_test() {
local file="$1"
EXTRA_RUSTC_FLAGS="--test $EXTRA_RUSTC_FLAGS" build_lib "$1" "$2"
}
build_bin_test() {
local crate="$1"
local file="$2"
EXTRA_RUSTC_FLAGS="--test $EXTRA_RUSTC_FLAGS" build_bin "$1" "$2"
}
build_bin_test_file() {
local file="$1"
local derived_crate_name="${file//\//_}"
derived_crate_name="${derived_crate_name%.rs}"
build_bin_test "$derived_crate_name" "$file"
}
setup_link_paths() {
EXTRA_LIB=""
if [[ -e target/link_ ]]; then

View file

@ -29,10 +29,30 @@ let
}
'';
mkTestFile = name: functionName: mkFile name ''
#[cfg(test)]
#[test]
fn ${functionName}() {
assert!(true);
}
'';
mkTestFileWithMain = name: functionName: mkFile name ''
#[cfg(test)]
#[test]
fn ${functionName}() {
assert!(true);
}
fn main() {}
'';
mkLib = name: mkFile name "pub fn test() -> i32 { return 23; }";
mkTest = crateArgs: let
crate = mkCrate crateArgs;
crate = mkCrate (builtins.removeAttrs crateArgs ["expectedTestOutput"]);
hasTests = crateArgs.buildTests or false;
expectedTestOutputs = crateArgs.expectedTestOutputs or null;
binaries = map (v: ''"${v.name}"'') (crateArgs.crateBin or []);
isLib = crateArgs ? libName || crateArgs ? libPath;
crateName = crateArgs.crateName or "nixtestcrate";
@ -44,16 +64,28 @@ let
src = mkBinExtern "src/main.rs" libName;
};
in runCommand "run-buildRustCrate-${crateName}-test" {
nativeBuildInputs = [ crate ];
} ''
${lib.concatStringsSep "\n" binaries}
${lib.optionalString isLib ''
test -e ${crate}/lib/*.rlib || exit 1
${libTestBinary}/bin/run-test-${crateName}
''}
touch $out
'';
in
assert expectedTestOutputs != null -> hasTests;
assert hasTests -> expectedTestOutputs != null;
runCommand "run-buildRustCrate-${crateName}-test" {
nativeBuildInputs = [ crate ];
} (if !hasTests then ''
${lib.concatStringsSep "\n" binaries}
${lib.optionalString isLib ''
test -e ${crate}/lib/*.rlib || exit 1
${libTestBinary}/bin/run-test-${crateName}
''}
touch $out
'' else ''
for file in ${crate}/tests/*; do
$file 2>&1 >> $out
done
set -e
${lib.concatMapStringsSep "\n" (o: "grep '${o}' $out || { echo 'output \"${o}\" not found in:'; cat $out; exit 23; }") expectedTestOutputs}
''
);
in rec {
tests = let
@ -85,6 +117,71 @@ let
dependencies = [ (mkCrate { crateName = "foo"; libName = "foolib"; src = mkLib "src/lib.rs"; }) ];
crateRenames = { "foo" = "foo_renamed"; };
};
rustLibTestsDefault = {
src = mkTestFile "src/lib.rs" "baz";
buildTests = true;
expectedTestOutputs = [ "test baz ... ok" ];
};
rustLibTestsCustomLibName = {
libName = "test_lib";
src = mkTestFile "src/test_lib.rs" "foo";
buildTests = true;
expectedTestOutputs = [ "test foo ... ok" ];
};
rustLibTestsCustomLibPath = {
libPath = "src/test_path.rs";
src = mkTestFile "src/test_path.rs" "bar";
buildTests = true;
expectedTestOutputs = [ "test bar ... ok" ];
};
rustLibTestsCustomLibPathWithTests = {
libPath = "src/test_path.rs";
src = symlinkJoin {
name = "rust-lib-tests-custom-lib-path-with-tests-dir";
paths = [
(mkTestFile "src/test_path.rs" "bar")
(mkTestFile "tests/something.rs" "something")
];
};
buildTests = true;
expectedTestOutputs = [
"test bar ... ok"
"test something ... ok"
];
};
rustBinTestsCombined = {
src = symlinkJoin {
name = "rust-bin-tests-combined";
paths = [
(mkTestFileWithMain "src/main.rs" "src_main")
(mkTestFile "tests/foo.rs" "tests_foo")
(mkTestFile "tests/bar.rs" "tests_bar")
];
};
buildTests = true;
expectedTestOutputs = [
"test src_main ... ok"
"test tests_foo ... ok"
"test tests_bar ... ok"
];
};
rustBinTestsSubdirCombined = {
src = symlinkJoin {
name = "rust-bin-tests-subdir-combined";
paths = [
(mkTestFileWithMain "src/main.rs" "src_main")
(mkTestFile "tests/foo/main.rs" "tests_foo")
(mkTestFile "tests/bar/main.rs" "tests_bar")
];
};
buildTests = true;
expectedTestOutputs = [
"test src_main ... ok"
"test tests_foo ... ok"
"test tests_bar ... ok"
];
};
};
brotliCrates = (callPackage ./brotli-crates.nix {});
in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // {

View file

@ -1,22 +1,21 @@
{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }:
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }:
stdenv.mkDerivation rec {
pname = "greybird";
version = "3.22.10";
version = "3.22.11";
src = fetchFromGitHub {
owner = "shimmerproject";
repo = pname;
rev = "v${version}";
sha256 = "1g1mnzxqwlbymq8npd2j294f8dzf9fw9nicd4pajmscg2vk71da9";
sha256 = "00x7dcjldph9k0nmvc8hyh3k4lhbmwk791rywd89ry6jivrx40pc";
};
nativeBuildInputs = [
autoreconfHook
which
meson
ninja
pkgconfig
sassc
glib
libxml2
];
buildInputs = [
@ -30,8 +29,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Grey and blue theme from the Shimmer Project for GTK-based environments";
homepage = https://github.com/shimmerproject/Greybird;
license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30
homepage = "https://github.com/shimmerproject/Greybird";
license = [ licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
};

View file

@ -93,6 +93,14 @@ mkDerivation rec {
--replace "/bin/systemctl" "${systemd}/bin/systemctl"
'';
dontWrapQtApps = true;
preFixup = ''
gappsWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
postFixup = ''
# debuging
searchForUnresolvedDLL $out

View file

@ -31,7 +31,7 @@ unwrapped = mkDerivation rec {
deepin-desktop-schemas
dtkcore
dtkwidget
glib.bin
glib
gsettings-qt
libdbusmenu
polkit
@ -64,6 +64,14 @@ unwrapped = mkDerivation rec {
cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ];
dontWrapQtApps = true;
preFixup = ''
gappsWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
postFixup = ''
searchHardCodedPaths $out
'';

View file

@ -45,8 +45,7 @@ mkDerivation rec {
dtkwidget
ffmpegthumbnailer
file
glib.bin
glib.dev
glib
gnugrep
gsettings-qt
gvfs
@ -233,6 +232,14 @@ mkDerivation rec {
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11}/lib";
'';
dontWrapQtApps = true;
preFixup = ''
gappsWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
postFixup = ''
# debuging
unset LD_LIBRARY_PATH

View file

@ -1,7 +1,7 @@
{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory,
dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers,
dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras,
which, xdg_utils, wrapGAppsHook }:
which, xdg_utils, wrapGAppsHook, glib }:
mkDerivation rec {
pname = "dde-launcher";
@ -29,6 +29,7 @@ mkDerivation rec {
deepin-wallpapers
dtkcore
dtkwidget
glib
gsettings-qt
qtsvg
qtx11extras
@ -58,6 +59,14 @@ mkDerivation rec {
# note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0
'';
dontWrapQtApps = true;
preFixup = ''
gappsWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
postFixup = ''
# debugging
searchHardCodedPaths $out

View file

@ -104,10 +104,18 @@ mkDerivation rec {
# - do not wrap dde-dman-portal related files: it appears it has been removed: https://github.com/linuxdeepin/dde-session-ui/commit/3bd028cf135ad22c784c0146e447ef34a69af768
'';
dontWrapQtApps = true;
preFixup = ''
gappsWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
postFixup = ''
# wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
# wrapGAppsHook or wrapQtAppsHook does not work with binaries outside of $out/bin or $out/libexec
for binary in $out/lib/deepin-daemon/*; do
wrapProgram $binary "''${qtWrapperArgs[@]}"
wrapProgram $binary "''${gappsWrapperArgs[@]}"
done
searchHardCodedPaths $out # debugging

View file

@ -50,6 +50,7 @@ let
qcef = callPackage ./qcef { };
qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
qt5integration = callPackage ./qt5integration { };
startdde = callPackage ./startdde { };
udisks2-qt5 = callPackage ./udisks2-qt5 { };
};

View file

@ -0,0 +1,136 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, alsaLib,
coreutils, dbus-factory, dde-api, dde-daemon, dde-dock,
dde-file-manager, dde-polkit-agent, dde-session-ui, deepin,
deepin-desktop-base, deepin-desktop-schemas, deepin-turbo,
dde-kwin, glib, gnome3, go, go-dbus-factory, go-gir-generator,
go-lib, gtk3, jq, kmod, libX11, libXi, libcgroup, pciutils, psmisc,
pulseaudio, systemd, xorg, wrapGAppsHook }:
buildGoPackage rec {
name = "${pname}-${version}";
pname = "startdde";
version = "5.0.1";
goPackagePath = "pkg.deepin.io/dde/startdde";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1xydmglydksy7hjlavf5pbfy0s0lndgavh8x3kg2mg7d36mbra43";
};
goDeps = ./deps.nix;
outputs = [ "out" ];
nativeBuildInputs = [
pkgconfig
dbus-factory
dde-api
go-dbus-factory
go-gir-generator
go-lib
jq
wrapGAppsHook
deepin.setupHook
];
buildInputs = [
alsaLib
dde-daemon
dde-dock
dde-file-manager
dde-kwin
dde-polkit-agent
dde-session-ui
deepin-desktop-schemas
deepin-turbo
glib
gnome3.dconf
gnome3.gnome-keyring
gnome3.libgnome-keyring
gtk3
kmod
libX11
libXi
libcgroup
pciutils
psmisc
pulseaudio
systemd
xorg.xdriinfo
];
postPatch = ''
searchHardCodedPaths # debugging
# Commented lines below indicates a doubt about how to fix the hard coded path
fixPath $out /etc/X11 Makefile
#fixPath ? /etc/xdg/autostop autostop/autostop.go
fixPath ${coreutils} /bin/ls copyfile_test.go
fixPath $out /usr/share/startdde/auto_launch.json launch_group.go
#fixPath ? /usr/bin/kwin_no_scale main.go # not found on deepin linux and archlinux
fixPath $out /usr/share/startdde/memchecker.json memchecker/config.go
fixPath $out /usr/bin/startdde misc/00deepin-dde-env
fixPath ${dde-file-manager} /usr/bin/dde-file-manager misc/auto_launch/chinese.json
fixPath ${deepin-turbo} /usr/lib/deepin-turbo/booster-dtkwidget misc/auto_launch/chinese.json
fixPath ${dde-daemon} /usr/lib/deepin-daemon/dde-session-daemon misc/auto_launch/chinese.json misc/auto_launch/default.json
fixPath ${dde-dock} /usr/bin/dde-dock misc/auto_launch/chinese.json misc/auto_launch/default.json
fixPath ${dde-file-manager} /usr/bin/dde-desktop misc/auto_launch/chinese.json misc/auto_launch/default.json
fixPath $out /usr/bin/startdde misc/deepin-session
#fixPath ? /usr/lib/lightdm/config-error-dialog.sh misc/deepin-session # provided by lightdm on deepin linux
#fixPath ? /usr/sbin/lightdm-session misc/deepin-session # provided by lightdm on deepin linux
fixPath ${dde-session-ui} /usr/bin/dde-lock session.go
fixPath ${dde-session-ui} /usr/bin/dde-shutdown session.go
fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-osd session.go
fixPath ${deepin-desktop-base} /etc/deepin-version session.go
fixPath ${gnome3.gnome-keyring} /usr/bin/gnome-keyring-daemon session.go
fixPath ${pulseaudio} /usr/bin/pulseaudio sound_effect.go
#fixPath ? /usr/lib/UIAppSched.hooks startmanager.go # not found anything about this
fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-welcome utils.go
fixPath ${dde-polkit-agent} /usr/lib/polkit-1-dde/dde-polkit-agent watchdog/dde_polkit_agent.go
#fixPath ? /var/log/Xorg.0.log wm/driver.go
#fixPath ? /etc/deepin-wm-switcher/config.json wm/switcher_config.go # not present on nixos, deepin linux and archlinux
substituteInPlace wm/driver.go --replace '/sbin/lsmod' "${kmod}/bin/lsmod"
substituteInPlace session.go --replace 'LookPath("cgexec"' 'LookPath("${libcgroup}/bin/cgexec"'
substituteInPlace vm.go --replace 'Command("dde-wm-chooser"' 'Command("${dde-session-ui}/bin/dde-wm-chooser"'
substituteInPlace vm.go --replace 'Command("systemd-detect-virt"' 'Command("${systemd}/bin/systemd-detect-virt"'
substituteInPlace wm/card_info.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"'
substituteInPlace wm/driver.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"'
substituteInPlace wm/driver.go --replace 'Command("xdriinfo"' 'Command("${xorg.xdriinfo}/bin/xdriinfo"'
substituteInPlace wm/platform.go --replace 'Command("gsettings"' 'Command("${glib}/bin/gsettings"'
substituteInPlace wm/platform.go --replace 'Command("uname"' 'Command("${coreutils}/bin/uname"'
substituteInPlace wm/switcher.go --replace 'Command("killall"' 'Command("${psmisc}/bin/killall"'
'';
buildPhase = ''
make -C go/src/${goPackagePath}
'';
installPhase = ''
make install PREFIX="$out" -C go/src/${goPackagePath}
rm -rf $out/share/lightdm # this is uselesss for NixOS
remove-references-to -t ${go} $out/bin/* $out/sbin/*
'';
postFixup = ''
searchHardCodedPaths $out # debugging
'';
passthru = {
updateScript = deepin.updateScript { inherit name; };
providedSessions = [ "deepin" ];
};
meta = with stdenv.lib; {
description = "Starter of deepin desktop environment";
homepage = https://github.com/linuxdeepin/startdde;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

30
pkgs/desktops/deepin/startdde/deps.nix generated Normal file
View file

@ -0,0 +1,30 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/cryptix/wav";
fetch = {
type = "git";
url = "https://github.com/cryptix/wav";
rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44";
sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6";
};
}
{
goPackagePath = "github.com/linuxdeepin/go-x11-client";
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-x11-client";
rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a";
sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "daa7c04131f568e31c51927b359a2d197a357058";
sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h";
};
}
]

View file

@ -9,6 +9,7 @@
, libobjc, libgcrypt
, icu
, pkgconfig, portaudio
, libiberty
}:
let
version = "1.26.0";
@ -30,8 +31,14 @@ gsmakeDerivation {
libobjc libgcrypt
icu
portaudio
libiberty
];
patches = [ ./fixup-paths.patch ];
# Bump to gcc9 has give missing xmemdup symbols. Need libiberty here
# to resolve it, unclear why. See #76927 for more info
NIX_LDFLAGS = "-liberty";
meta = {
description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa";
};

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "engrampa";
version = "1.22.2";
version = "1.22.3";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ph7ngk32nnzc3psqjs5zy52zbjilk30spr2r4sixqxvmz7d28gd";
sha256 = "17pn1qgr1a13jxv50qcnzqcw8gr96g7jz2z2y1wbwy7i44bknv6n";
};
nativeBuildInputs = [

View file

@ -24,13 +24,13 @@
, glib-networking
, elementary-icon-theme
, libcloudproviders
, fetchpatch
, libgit2-glib
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "4.2.0";
version = "4.3.0";
repoName = "files";
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "12f0hzb62nchksyqd2gwj3cv001rph24ggd9wywh9i1qwppx4b5k";
sha256 = "0brckm0vi9lh8l4g3cy37pbyrdh6g0mdsv3cpii069y2drrh8mz5";
};
passthru = {
@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
libcloudproviders
libdbusmenu-gtk3
libgee
libgit2-glib
libnotify
libunity
pango
@ -80,11 +81,6 @@ stdenv.mkDerivation rec {
patches = [
./hardcode-gsettings.patch
# Fixes https://github.com/elementary/files/issues/1081
(fetchpatch {
url = "https://github.com/elementary/files/commit/76b5cc95466733c2c100a99127ecd4fbd4d2a5ec.patch";
sha256 = "0dn8a9l7i2rdgia1rsc50332fsw0yrbfvpb5z8ba4iiki3lxy2nn";
})
];
postPatch = ''

View file

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "gala";
version = "unstable-2019-10-31"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
version = "3.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = "0f0724c97ad49f470f41c4a25c63103f51122997";
sha256 = "09cl3k2am878iiy76bijb0ykrcafh944kz027jgi1y5yk4bwfjc4";
rev = version;
sha256 = "1vf55ls3h20zpf0yxb206cijq8nkf89z2lmhccb4i1g2zajd31ix";
};
passthru = {

View file

@ -24,7 +24,7 @@ defmodule NixpkgsGitHubUpdate.GitHubLatestVersion do
String.to_charlist("#{System.get_env("OAUTH_TOKEN")}")
end
defp put_token(headers, token) when is_binary(token) do
defp put_token(headers, token) when is_list(token) do
Map.put_new(headers, 'Authorization', 'token #{token}')
end

View file

@ -3,10 +3,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "picoLisp";
version = "19.6";
version = "19.12";
src = fetchurl {
url = "https://www.software-lab.de/${pname}-${version}.tgz";
sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq";
sha256 = "10np0mhihr47r3201617zccrvzpkhdl1jwvz7zimk8kxpriydq2j";
};
buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;
patchPhase = ''

View file

@ -11,6 +11,27 @@ let
setuppy = ../run_setup.py;
in rec {
eggBuildHook = callPackage ({ }:
makeSetupHook {
name = "egg-build-hook.sh";
deps = [ ];
} ./egg-build-hook.sh) {};
eggInstallHook = callPackage ({ setuptools }:
makeSetupHook {
name = "egg-install-hook.sh";
deps = [ setuptools ];
substitutions = {
inherit pythonInterpreter pythonSitePackages;
};
} ./egg-install-hook.sh) {};
eggUnpackHook = callPackage ({ }:
makeSetupHook {
name = "egg-unpack-hook.sh";
deps = [ ];
} ./egg-unpack-hook.sh) {};
flitBuildHook = callPackage ({ flit }:
makeSetupHook {
name = "flit-build-hook";

View file

@ -0,0 +1,15 @@
# Setup hook to use for eggs
echo "Sourcing egg-build-hook"
eggBuildPhase() {
echo "Executing eggBuildPhase"
runHook preBuild
runHook postBuild
echo "Finished executing eggBuildPhase"
}
if [ -z "${dontUseEggBuild-}" ] && [ -z "${buildPhase-}" ]; then
echo "Using eggBuildPhase"
buildPhase=eggBuildPhase
fi

View file

@ -0,0 +1,21 @@
# Setup hook for eggs
echo "Sourcing egg-install-hook"
eggInstallPhase() {
echo "Executing eggInstallPhase"
runHook preInstall
mkdir -p "$out/@pythonSitePackages@"
export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH"
find
@pythonInterpreter@ -m easy_install --prefix="$out" *.egg
runHook postInstall
echo "Finished executing eggInstallPhase"
}
if [ -z "${dontUseEggInstall-}" ] && [ -z "${installPhase-}" ]; then
echo "Using eggInstallPhase"
installPhase=eggInstallPhase
fi

View file

@ -0,0 +1,17 @@
# Setup hook to use in case an egg is fetched
echo "Sourcing egg setup hook"
eggUnpackPhase(){
echo "Executing eggUnpackPhase"
runHook preUnpack
cp "$src" "$(stripHash "$src")"
# runHook postUnpack # Calls find...?
echo "Finished executing eggUnpackPhase"
}
if [ -z "${dontUseEggUnpack-}" ] && [ -z "${unpackPhase-}" ]; then
echo "Using eggUnpackPhase"
unpackPhase=eggUnpackPhase
fi

View file

@ -20,6 +20,9 @@
, setuptoolsBuildHook
, setuptoolsCheckHook
, wheelUnpackHook
, eggUnpackHook
, eggBuildHook
, eggInstallHook
}:
{ name ? "${attrs.pname}-${attrs.version}"
@ -119,6 +122,8 @@ let
pipBuildHook
] ++ lib.optionals (format == "wheel") [
wheelUnpackHook
] ++ lib.optionals (format == "egg") [
eggUnpackHook eggBuildHook eggInstallHook
] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [
pipInstallHook
] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [

File diff suppressed because it is too large Load diff

View file

@ -1,18 +1,18 @@
{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang, stdenv, darwin }:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "20191111";
version = "v0.8.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wasmtime";
rev = "0006a2af954eba74c79885cb1fe8cdeb68f531c1";
sha256 = "0lf3pdkjxcrjmjic7xxyjl5dka3arxi809sp9hm4hih5p2fhf2gw";
repo = "${pname}";
rev = "${version}";
sha256 = "0az893srw49szvs5461bd165ffla4cc98gh42p3dwskwfkhpqjm4";
fetchSubmodules = true;
};
cargoSha256 = "0mnwaipa2az3vpgbz4m9siz6bfyhmzwz174k678cv158m7mxx12f";
cargoSha256 = "08b3rbnl7qwyfbwaqcb7z84sh0h94v18v6557hrf0dlil414v54i";
cargoPatches = [ ./cargo-lock.patch ];
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
meta = with lib; {
description = "Standalone JIT-style runtime for WebAsssembly, using Cranelift";
description = "Standalone JIT-style runtime for WebAssembly, using Cranelift";
homepage = https://github.com/CraneStation/wasmtime;
license = licenses.asl20;
maintainers = [ maintainers.matthewbauer ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "catch2";
version = "2.11.0";
version = "2.11.1";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
rev = "v${version}";
sha256="1b07drrclvxj17s67ivypr9vr27rg0m36jqnrbci6f4wsp1b0gbl";
sha256="1jijj72cas6k5hckkxqppbv1inlwbca37p0ixzs3vzm2jhnd7z31";
};
nativeBuildInputs = [ cmake ];

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
let
name = "log4cplus-2.0.4";
name = "log4cplus-2.0.5";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
sha256 = "0lh2i22znx573jchcfy4n5lrr9yjg2hd3iphhlih61zzmd67p2hc";
sha256 = "05gb0crf440da3vcaxavglzvsldw8hsvxq3xvvj73mzniv3bz3dk";
};
meta = {

View file

@ -5,7 +5,7 @@ let
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
version = "3.47.1";
version = "3.48";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
sha256 = "1yx68a1ks63s8914zmiz9h1nh0261aqzcblgg1cb4ig33p5x3qqs";
sha256 = "1b7qs1q7jqhw9dvkdznanzhc5dyq4bwx0biywszy3qx4hqm8571z";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

View file

@ -0,0 +1,25 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
pname = "plplot";
version = "5.15.0";
src = fetchurl {
url = "https://downloads.sourceforge.net/project/${pname}/${pname}/${version}%20Source/${pname}-${version}.tar.gz";
sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_TEST=ON" ];
doCheck = true;
meta = with stdenv.lib; {
description = "Cross-platform scientific graphics plotting library";
homepage = "https://plplot.org";
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix;
license = licenses.lgpl2;
};
}

View file

@ -1,6 +1,7 @@
{ stdenv, lib, fetchurl
{ stdenv, lib, fetchurl, fetchpatch
, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps
, uthash, which }:
, uthash, which
}:
stdenv.mkDerivation rec {
pname = "tpm2-tss";
@ -11,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "19jg09sxy3aj4dc1yv32jjv0m62cnmhjlw02jbh4d4pk2439m4l2";
};
patches = [
# Fix test failure. see https://github.com/tpm2-software/tpm2-tss/pull/1585
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tss/pull/1585.patch";
sha256 = "0ak3l588ahzv3yx1gfa4sa6p74lsffxzkr23ppznm34wvlcci86n";
})
];
nativeBuildInputs = [
doxygen perl pkgconfig
# For unit tests and integration tests.

View file

@ -1,9 +1,21 @@
{ buildDunePackage, lwt, ppx_tools_versioned }:
{ fetchzip, buildDunePackage, lwt, ppx_tools_versioned }:
buildDunePackage {
pname = "lwt_ppx";
version = "1.2.4";
src = fetchzip {
# `lwt_ppx` has a different release cycle than Lwt, but it's included in
# one of its release bundles.
# Because there could exist an Lwt release _without_ a `lwt_ppx` release,
# this `src` field doesn't inherit from the Lwt derivation.
#
# This is particularly useful for overriding Lwt without breaking `lwt_ppx`,
# as new Lwt releases may contain broken `lwt_ppx` code.
url = "https://github.com/ocsigen/lwt/archive/4.4.0.tar.gz";
sha256 = "1l97zdcql7y13fhaq0m9n9xvxf712jg0w70r72fvv6j49xm4nlhi";
};
inherit (lwt) src version;
propagatedBuildInputs = [ lwt ppx_tools_versioned ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-rresult-${version}";
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ result ];
inherit (topkg) buildPhase installPhase;
meta = {

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "awkward";
version = "0.12.18";
version = "0.12.19";
src = fetchPypi {
inherit pname version;
sha256 = "9b3df4f2be92ac7d16709f15769c97591f25f0442061f1a4cc8715feb268e45c";
sha256 = "1s729a8205jzg7pfw8xgmi850x03p9nw8c6a602f5bnmhha96h45";
};
nativeBuildInputs = [ pytestrunner ];

View file

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3
, requests, click, configparser, fido2, isPy27 }:
, requests, requests-kerberos, click, configparser, fido2, isPy27 }:
buildPythonPackage rec {
pname = "aws-adfs";
@ -24,7 +24,7 @@ buildPythonPackage rec {
LC_ALL = "en_US.UTF-8";
checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ];
propagatedBuildInputs = [ lxml boto3 requests click configparser fido2 ];
propagatedBuildInputs = [ lxml boto3 requests requests-kerberos click configparser fido2 ];
meta = with lib; {
description = "Command line tool to ease aws cli authentication against ADFS";

View file

@ -0,0 +1,20 @@
{ lib, buildPythonPackage, fetchFromGitHub }:
buildPythonPackage rec {
version = "2.0";
pname = "crc32c";
src = fetchFromGitHub {
owner = "ICRAR";
repo = pname;
rev = "v${version}";
sha256 = "15x1sj23n50qdjmi8mjq5wgf5jfn1yv78vjc59wplvl0s50w2dnk";
};
meta = {
description = "Python software implementation and hardware API of CRC32C checksum algorithm";
homepage = "https://github.com/ICRAR/crc32c";
license = lib.licenses.lgpl21;
maintainers = with lib.maintainers; [ bcdarwin ];
};
}

View file

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "croniter";
version = "0.3.30";
version = "0.3.31";
src = fetchPypi {
inherit pname version;
sha256 = "538adeb3a7f7816c3cdec6db974c441620d764c25ff4ed0146ee7296b8a50590";
sha256 = "15riw8sl8jzzkvvjlz3i3p7jcx423zipxhff5ddvki6zgnrb9149";
};
propagatedBuildInputs = [

View file

@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "1.8.1";
version = "1.8.2";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "a57a295296820087e66a3c62569d288958f29d1a354701ace6639a7692cc3022";
sha256 = "1n3fd7i1br1s4f90yismgfcq9ix5kcqfacr7yy0hhhrabkf2sm37";
};
buildInputs = [

View file

@ -1,8 +1,6 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, docutils
, virtualenv
, webtest
, zope_component
, hupper
@ -10,7 +8,6 @@
, plaster
, plaster-pastedeploy
, repoze_lru
, repoze_sphinx_autointerface
, translationstring
, venusian
, webob
@ -28,9 +25,9 @@ buildPythonPackage rec {
sha256 = "d80ccb8cfa550139b50801591d4ca8a5575334adb493c402fce2312f55d07d66";
};
checkInputs = [ docutils virtualenv webtest zope_component ];
checkInputs = [ webtest zope_component ];
propagatedBuildInputs = [ hupper PasteDeploy plaster plaster-pastedeploy repoze_lru repoze_sphinx_autointerface translationstring venusian webob zope_deprecation zope_interface ];
propagatedBuildInputs = [ hupper PasteDeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ];
# Failing tests
# https://github.com/Pylons/pyramid/issues/1899

View file

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, python-toolbox
, pytest
, isPy27
}:
buildPythonPackage rec {
version = "0.3.0";
pname = "pysnooper";
src = fetchPypi {
inherit version;
pname = "PySnooper";
sha256 = "14vcxrzfmfhsmdck1cb56a6lbfga15qfhlkap9mh47fgspcq8xkx";
};
# test dependency python-toolbox fails with py27
doCheck = !isPy27;
checkInputs = [
python-toolbox
pytest
];
meta = with lib; {
description = "A poor man's debugger for Python";
homepage = https://github.com/cool-RR/PySnooper;
license = licenses.mit;
maintainers = with maintainers; [ seqizz ];
};
}

View file

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, docutils
, fetchFromGitHub
, isPy27
, nose
}:
buildPythonPackage rec {
version = "0.9.4";
pname = "python_toolbox";
disabled = isPy27;
src = fetchFromGitHub {
owner = "cool-RR";
repo = pname;
rev = version;
sha256 = "1qy2sfqfrkgxixmd22v5lkrdykdfiymsd2s3xa7ndlvg084cgj6r";
};
checkInputs = [
docutils
nose
];
meta = with lib; {
description = "Tools for testing PySnooper";
homepage = https://github.com/cool-RR/python_toolbox;
license = licenses.mit;
maintainers = with maintainers; [ seqizz ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, docutils, boto3 }:
{ stdenv, buildPythonPackage, fetchPypi, docutils, boto3, fsspec }:
buildPythonPackage rec {
pname = "s3fs";
@ -10,7 +10,7 @@ buildPythonPackage rec {
};
buildInputs = [ docutils ];
propagatedBuildInputs = [ boto3 ];
propagatedBuildInputs = [ boto3 fsspec ];
# Depends on `moto` which has a long dependency chain with exact
# version requirements that can't be made to work with current

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "uncompyle6";
version = "3.6.1";
version = "3.6.2";
src = fetchPypi {
inherit pname version;
sha256 = "f8c7ba2fd486d40d9a9fc1d6ab438588d7ce1be123aabf488736ff68a05f57f7";
sha256 = "aac071daef4b6cf95143ef08cd35d762a2bf2ea8249119a9371a91149c9996e7";
};
checkInputs = [ nose pytest hypothesis six ];

View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "xdis";
version = "4.2.1";
version = "4.2.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "rocky";
repo = "python-xdis";
rev = version;
sha256 = "19mnx746k9ls2f1321fl8nkps7x9by80f753f3c5wh1j91zivq6b";
sha256 = "0d286myx6z6cbih77h8z5p9vscxvww3gy59lmi1w6y2nq6c8sqzb";
};
checkInputs = [ pytest ];
@ -27,6 +27,5 @@ buildPythonPackage rec {
description = "Python cross-version byte-code disassembler and marshal routines";
homepage = https://github.com/rocky/python-xdis/;
license = licenses.gpl2;
broken = true; # doesn't support latest python3 interpreters
};
}

View file

@ -0,0 +1,26 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }:
buildPythonPackage rec {
pname = "xmodem";
version = "0.4.5";
src = fetchFromGitHub {
owner = "tehmaze";
repo = "xmodem";
rev = version;
sha256 = "0nz2gxwaq3ys1knpw6zlz3xrc3ziambcirg3fmp3nvzjdq8ma3h0";
};
checkInputs = [ pytest which lrzsz ];
checkPhase = ''
pytest
'';
meta = with stdenv.lib; {
description = "Pure python implementation of the XMODEM protocol";
maintainers = with maintainers; [ emantor ];
homepage = https://github.com/tehmaze/xmodem;
license = licenses.mit;
};
}

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, jre, makeWrapper, graphviz }:
stdenv.mkDerivation rec {
version = "6.0.0-rc2";
version = "6.1.0";
pname = "schemaspy";
src = fetchurl {
url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${pname}-${version}.jar";
sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn";
sha256 = "0lgz6b17hx9857fb2l03ggz8y3n8a37vrcsylif0gmkwj1v4qgl7";
};
dontUnpack = true;

View file

@ -19,8 +19,8 @@
makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \
--add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \
--add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \
--add-flags "-DjarDirs '$out/share/flyway/jars'" \
--add-flags "org.flywaydb.commandline.Main"
--add-flags "org.flywaydb.commandline.Main" \
--add-flags "-jarDirs='$out/share/flyway/jars'"
'';
meta = with stdenv.lib; {
description = "Evolve your Database Schema easily and reliably across all your instances";

View file

@ -15,7 +15,7 @@ buildRustPackage rec {
sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
};
cargoSha256 = "09y4fvv279cm5sgbpmskascb7rrwqgya5w5wkpz1bgx6pzw3mc7y";
cargoSha256 = "16qjbvppc01yxk8x9jk7gs8jaag5nkfl30j3lyv3dc27vv9mckjv";
cargoPatches = [
(fetchpatch {
@ -27,6 +27,11 @@ buildRustPackage rec {
url = "https://github.com/edef1c/git-series/commit/11fe70ffcc18200e5f2a159c36aab070e8ff4228.patch";
sha256 = "0clwllf9mrhq86dhzyyhkw1q2ggpgqpw7s05dvp3gj9zhfsyya4s";
})
# Cargo.lock: Update url, which fixes incompatibility with NLL
(fetchpatch {
url = "https://github.com/edef1c/git-series/commit/27ff2ecf2d615dae1113709eca0e43596de12ac4.patch";
sha256 = "1byjbdcx56nd0bbwz078bl340rk334mb34cvaa58h76byvhpkw10";
})
];
LIBGIT2_SYS_USE_PKG_CONFIG = true;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "heroku";
version = "7.33.1";
version = "7.35.1";
src = fetchurl {
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
sha256 = "0alkfc0vx2pghdv29w2p9i96q20xydrjfc3yjmvnsa5740y80ha7";
sha256 = "1b48jhl7a9nzvgankys32mfnv6i2kx11z874k7fz9px3kx8s7pbb";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -57,7 +57,7 @@ GEM
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jazzy (0.13.0)
jazzy (0.13.1)
cocoapods (~> 1.5)
mustache (~> 1.1)
open4
@ -66,7 +66,7 @@ GEM
sassc (~> 2.1)
sqlite3 (~> 1.3)
xcinvoke (~> 0.3.0)
json (2.2.0)
json (2.3.0)
liferaft (0.0.6)
minitest (5.13.0)
molinillo (0.6.6)
@ -76,17 +76,17 @@ GEM
netrc (0.11.0)
open4 (1.3.4)
redcarpet (3.5.0)
rouge (3.13.0)
rouge (3.14.0)
ruby-macho (1.4.0)
sassc (2.2.1)
ffi (~> 1.9)
sqlite3 (1.4.1)
sqlite3 (1.4.2)
thread_safe (0.3.6)
tzinfo (1.2.5)
tzinfo (1.2.6)
thread_safe (~> 0.1)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.13.0)
xcodeproj (1.14.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)

View file

@ -230,20 +230,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d903aii1y54xb348cyj7rps7xa3in41w2qjh6yvgkbxbabnc616";
sha256 = "0917v3dk9ks0apr0srk9sm6agk47iyh5bzfxqpkhd4dfgb4vpvjx";
type = "gem";
};
version = "0.13.0";
version = "0.13.1";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
type = "gem";
};
version = "2.2.0";
version = "2.3.0";
};
liferaft = {
source = {
@ -332,10 +332,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y90nx9ph9adnrpcsvs2adca2l3dyz8am2d2kzxkwd3a086ji7aw";
sha256 = "0k5jrp0qc9p61mfcwyn1a7dajmkw04z6y76wa8a0axh1v2wrw8ld";
type = "gem";
};
version = "3.13.0";
version = "3.14.0";
};
ruby-macho = {
groups = ["default"];
@ -363,10 +363,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v903nbcws3ifm6jnxrdfcpgl1qg2x3lbif16mhlbyfn0npzb494";
sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
type = "gem";
};
version = "1.4.1";
version = "1.4.2";
};
thread_safe = {
source = {
@ -382,10 +382,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
type = "gem";
};
version = "1.2.5";
version = "1.2.6";
};
xcinvoke = {
dependencies = ["liferaft"];
@ -402,9 +402,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c69yrhqd92q6nnpyhvnqyw9l7axnc91gnbd2gai8f5njdisd8wx";
sha256 = "1h9iba53mrb663qdqzpfbdwkwzqv7hndd0df71yr2kj2hzwjmkvb";
type = "gem";
};
version = "1.13.0";
version = "1.14.0";
};
}

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "lazygit";
version = "0.11.3";
version = "0.12.3";
goPackagePath = "github.com/jesseduffield/lazygit";
@ -12,13 +12,13 @@ buildGoPackage rec {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
sha256 = "0v765f93hkq94bmzfwkkb9ndbfka415sxyi01679fg860746rl6l";
sha256 = "1r20543dydp5m9ciw01y8wlw8kxwmjn6zabfalnb13y1pa0zm76q";
};
meta = with stdenv.lib; {
description = "Simple terminal UI for git commands";
homepage = "https://github.com/jesseduffield/lazygit";
license = licenses.mit;
maintainers = with maintainers; [ fpletz equirosa ];
maintainers = with maintainers; [ fpletz equirosa filalex77 ];
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
version = "20191223T204324";
version = "20200106T233511";
src = fetchurl {
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
sha256 = "1dcqn72szp4q3b591plby6vzv0xl3ik0hr5wiha3hfb8lm7y6inn";
sha256 = "0z550c15sywbaxbfi1nxx19whfysq4whl4na4fjihnin8ab5sh2x";
};
dontUnpack = true;

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "global";
version = "6.6.3";
version = "6.6.4";
src = fetchurl {
url = "mirror://gnu/global/${pname}-${version}.tar.gz";
sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb";
sha256 = "1515642wsjz7x3rsgaqk4sc7n0z2znl7idsk8jz8wgy5aswqqzlq";
};
nativeBuildInputs = [ libtool makeWrapper ];

View file

@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
pname = "dune";
version = "2.1.0";
version = "2.1.1";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "1hf8c0djx2v1jpjba0z096gw6qdr0igsljrf0qh0ggphg9valsmj";
sha256 = "0z5anyyfiydpk4l45p64k2ravypawnlllixq0h5ir450dw0ifi5i";
};
buildInputs = [ ocaml findlib ];

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