Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c0515dad8b53
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3aa3291b2088
Choose a head ref
12 contributors

Commits on Feb 23, 2020

  1. lib/modules.nix: Add file context to unmerged values in mergeDefinitions 

    This helps with troubleshooting exceptions in config values, which were hard
to track down for options with many definitions.
The trace will look like:

    error: while evaluating the attribute 'config.foo' at undefined position:
    [...]
    while evaluating the option `foo':
    [...]
    while evaluating definitions from `/home/user/mymod.nix':
    while evaluating 'dischargeProperties' at /home/user/nixpkgs/lib/modules.nix:464:25, called from /home/user/nixpkgs/lib/modules.nix:392:137:
    while evaluating the attribute 'value' at /home/user/nixpkgs/lib/modules.nix:277:44:
    Value error!

where the `/home/user/mymod.nix` module is

    { lib, ... }: {
      options.foo = lib.mkOption {
        type = lib.types.lines;
      };
      config.foo = builtins.throw "Value error!";
    }
    @roberth
    roberth committed Feb 23, 2020
    Copy the full SHA
    9c0ab2f View commit details

Commits on Mar 3, 2020

  1. python-mapnik: 3.0.16 -> unstable-2020-02-24 

    Update to fix build errors with mapnik 3.0.23, along with other pending
upstream commits.

Upstream has not tagged a python-mapnik release since 2017. This
unstable commit, however, is also the basis for the python-mapnik
package in Debian testing.
    @tollb
    tollb committed Mar 3, 2020
    Copy the full SHA
    79b582b View commit details

Commits on Mar 5, 2020

  1. brave: 1.4.95 -> 1.4.96

    @JeffLabonte
    JeffLabonte committed Mar 5, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    3f6d356 View commit details

  2. jgmenu: 4.0.2 -> 4.1.0

    @r-ryantm
    r-ryantm committed Mar 5, 2020
    Copy the full SHA
    0309045 View commit details

  3. users.groups.disnix instead of a list 

    related to #63103.
    @dguibert
    dguibert committed Mar 5, 2020
    Copy the full SHA
    bbc2cd8 View commit details

  4. Merge pull request #81788 from JeffLabonte/brave_1.4.95_to_1.4.96 

    brave: 1.4.95 -> 1.4.96
    @worldofpeace
    worldofpeace authored Mar 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    08e62cd View commit details

  5. Merge pull request #81791 from r-ryantm/auto-update/jgmenu 

    jgmenu: 4.0.2 -> 4.1.0
    @romildo
    romildo authored Mar 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6fd71f3 View commit details

  6. Merge pull request #81809 from dguibert/dg/disnix-group-list-to-attrset 

    users.groups.disnix instead of a list
    @rnhmjoj
    rnhmjoj authored Mar 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e64dcc2 View commit details

  7. khronos: 1.0.5 -> 1.0.6

    @r-ryantm
    r-ryantm committed Mar 5, 2020
    Copy the full SHA
    f730d6d View commit details

  8. Merge pull request #81845 from r-ryantm/auto-update/khronos 

    khronos: 1.0.5 -> 1.0.6
    @worldofpeace
    worldofpeace authored Mar 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    23aa5ff View commit details

  9. Merge pull request #81628 from tollb/python-mapnik-unstable-2020-02-24 

    python-mapnik: 3.0.16 -> unstable-2020-02-24
    @hrdinka
    hrdinka authored Mar 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0508c93 View commit details

  10. Merge pull request #80919 from hercules-ci/modules-add-file-context 

    lib/modules.nix: Add file context to unmerged values in mergeDefinitions
    @roberth
    roberth authored Mar 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    99a2910 View commit details

  11. riot-web: 1.5.10 -> 1.5.12

    @pacien
    pacien authored and Jon committed Mar 5, 2020
    Copy the full SHA
    1884821 View commit details

  12. riot-desktop: 1.5.10 -> 1.5.12

    @pacien
    pacien authored and Jon committed Mar 5, 2020
    Copy the full SHA
    abc58dc View commit details

  13. heimer: 1.15.0 -> 1.15.1

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    384ed01 View commit details

  14. gleam: 0.6.0 -> 0.7.1

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    9328cff View commit details

  15. go-license-detector: 3.0.2 -> 3.1.0

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    0c0f318 View commit details

  16. libqalculate: 3.7.0 -> 3.8.0

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    10e4457 View commit details

  17. abcmidi: 2019.12.09 -> 2020.02.12

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    ceeaf41 View commit details

  18. chafa: 1.2.1 -> 1.2.2

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    4b4dcda View commit details

  19. codeql: 2.0.2 -> 2.0.4

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    e17a1a0 View commit details

  20. zsh-syntax-highlighting: 0.6.0 -> 0.7.1

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    00c8e2b View commit details

  21. bitwarden_rs-vault: 2.12.0c -> 2.12.0e

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    7948c35 View commit details

  22. wpgtk: 6.0.12 -> 6.0.13

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    98968b1 View commit details

  23. azure-storage-azcopy: v10.3.2 -> v10.3.4

    @colemickens
    colemickens authored and Jon committed Mar 5, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    6c6091a View commit details

  24. bitcoin-abc: 0.20.12 -> 0.21.1

    @r-ryantm
    r-ryantm authored and Jon committed Mar 5, 2020
    Copy the full SHA
    3aa3291 View commit details
2 changes: 1 addition & 1 deletion lib/modules.nix
View file
Original file line number Diff line number Diff line change
@@ -389,7 +389,7 @@ rec {
let
# Process mkMerge and mkIf properties.
defs' = concatMap (m:
map (value: { inherit (m) file; inherit value; }) (dischargeProperties m.value)
map (value: { inherit (m) file; inherit value; }) (builtins.addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value))
) defs;

# Process mkOverride properties.
5 changes: 1 addition & 4 deletions nixos/modules/services/misc/disnix.nix
View file
Original file line number Diff line number Diff line change
@@ -61,10 +61,7 @@ in
++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService;

users.groups = singleton
{ name = "disnix";
gid = config.ids.gids.disnix;
};
users.groups.disnix.gid = config.ids.gids.disnix;

systemd.services = {
disnix = mkIf cfg.enableMultiUser {
6 changes: 3 additions & 3 deletions pkgs/applications/blockchains/bitcoin-abc.nix
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ with stdenv.lib;
mkDerivation rec {

name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
version = "0.20.12";
version = "0.21.1";

src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
sha256 = "0ar3syrz7psf83bh24hn2y0mxjgn7cjqk2h8q4cgdp7mq55v8ynj";
sha256 = "1aswgmzqk3vhxhp5k0m0awk22lf5ayaqg2cmlqy12jvfmpka9lrj";
};

patches = [ ./fix-bitcoin-qt-build.patch ];
@@ -37,7 +37,7 @@ mkDerivation rec {
Bitcoin ABC is a fork of the Bitcoin Core software project.
'';
homepage = https://bitcoinabc.org/;
homepage = "https://bitcoinabc.org/";
maintainers = with maintainers; [ lassulus ];
license = licenses.mit;
broken = stdenv.isDarwin;
4 changes: 2 additions & 2 deletions pkgs/applications/misc/heimer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

mkDerivation rec {
pname = "heimer";
version = "1.15.0";
version = "1.15.1";

src = fetchFromGitHub {
owner = "juzzlin";
repo = pname;
rev = version;
sha256 = "1qh8nr6yvxiy8pxl5pkhzlfr7hanxxc8hd8h00gsdxa0vgmqz11q";
sha256 = "13a9yfq7m8jhirb31i0mmigqb135r585zwqddknl090d88164fic";
};

nativeBuildInputs = [ cmake ];
6 changes: 3 additions & 3 deletions pkgs/applications/misc/jgmenu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "jgmenu";
version = "4.0.2";
version = "4.1.0";

src = fetchFromGitHub {
owner = "johanmalm";
repo = pname;
rev = "v${version}";
sha256 = "086p91l1igx5mv2i6fwbgx5p72war9aavc7v3m7sd0c0xvb334br";
sha256 = "1wsh37rapb1bszlq36hvwxqvfds39hbvbl152m8as4zlh93wfvvk";
};

nativeBuildInputs = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
homepage = https://github.com/johanmalm/jgmenu;
homepage = "https://github.com/johanmalm/jgmenu";
description = "Small X11 menu intended to be used with openbox and tint2";
license = licenses.gpl2;
platforms = platforms.linux;
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/brave/default.nix
View file
Original file line number Diff line number Diff line change
@@ -82,11 +82,11 @@ in

stdenv.mkDerivation rec {
pname = "brave";
version = "1.4.95";
version = "1.4.96";

src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "1a7rk4r7phlf1y3ap3942z5sfvb6i4qglvq06qqhz49wq1wbgvq1";
sha256 = "12fdef417180d295170dd61ff0586e568a0c6475fabc0b3d003921ec924a84fc";
};

dontConfigure = true;
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.5.10",
"version": "1.5.12",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
11 changes: 6 additions & 5 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, mkYarnPackage }:
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }:

# Notes for maintainers:
# * versions of `riot-web` and `riot-desktop` should be kept in sync.
# * the Yarn dependency expression must be updated with `./update-riot-desktop.sh <git release tag>`

let
executableName = "riot-desktop";
version = "1.5.10";
version = "1.5.12";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
sha256 = "0yr5f3i24qh9b8hjfalpqxwr0qhs7hax450g83vf06skap1l5i5j";
sha256 = "1qz3n2dlklhbi6rbhv2v769xbr4rcp9s6pm2cc9r33ak6axn4aym";
};
electron = electron_7;

in mkYarnPackage rec {
name = "riot-desktop-${version}";
@@ -45,7 +46,7 @@ in mkYarnPackage rec {
ln -s "${desktopItem}/share/applications" "$out/share/applications"
# executable wrapper
makeWrapper '${electron_5}/bin/electron' "$out/bin/${executableName}" \
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/riot/electron"
'';

@@ -78,6 +79,6 @@ in mkYarnPackage rec {
homepage = https://about.riot.im/;
license = licenses.asl20;
maintainers = with maintainers; [ pacien worldofpeace ];
inherit (electron_5.meta) platforms;
inherit (electron.meta) platforms;
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View file
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ let

in stdenv.mkDerivation rec {
pname = "riot-web";
version = "1.5.10";
version = "1.5.12";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1c11x8903p38c0f9k3ff4pnpb3n7hzs4pj6g65a4cvp6jgg1zfnn";
sha256 = "064zghrsl348ydzngwxhwjn0d0gkkf3nkzq03v5gad2f11qwnwb6";
};

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/applications/office/khronos/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,13 +16,13 @@

stdenv.mkDerivation rec {
pname = "khronos";
version = "1.0.5";
version = "1.0.6";

src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "0dk1b2d82gli3z35dn5p002lfkgq326janql0vn1z5hs8jvjakqh";
sha256 = "0s6yx05k0x90bmdmr61hw07nf9a1kyvvk6gwlg8m97zq1n3qc0f3";
};

nativeBuildInputs = [
6 changes: 3 additions & 3 deletions pkgs/development/compilers/gleam/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@

rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.6.0";
version = "0.7.1";

src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "1fvy2j6pw1rwm0rg7555q3qg2069cx2b9lk0nsyc3jxsqp9hbn6i";
sha256 = "1bcxq7bgn0kf1vdw6id8s3izz6mwf3ivr8iph4miig302qm9lmmr";
};

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];

cargoSha256 = "1vhra9v4jsy9hyhjrmxjy6rnraxz13h1b7l51xvbai5wxsxm7z8m";
cargoSha256 = "17bvms65frxhw0d196qswh3jjqlriidq3xi3mfjjgfh6n17rh608";

meta = with stdenv.lib; {
description = "A statically typed language for the Erlang VM";
6 changes: 3 additions & 3 deletions pkgs/development/libraries/libqalculate/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "libqalculate";
version = "3.7.0";
version = "3.8.0";

src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
sha256 = "0g3047lwd0rh0dds196iija3kq06mhkh6y8x5whcbv3s0db66h18";
sha256 = "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df";
};

outputs = [ "out" "dev" "doc" ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "An advanced calculator library";
homepage = http://qalculate.github.io;
homepage = "http://qalculate.github.io";
maintainers = with maintainers; [ gebner ];
license = licenses.gpl2Plus;
platforms = platforms.all;
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/python-mapnik/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,13 +18,13 @@ let

in buildPythonPackage rec {
pname = "python-mapnik";
version = "3.0.16";
version = "unstable-2020-02-24";

src = pkgs.fetchFromGitHub {
owner = "mapnik";
repo = "python-mapnik";
rev = "v${version}";
sha256 = "1gqs4kvmjawdgl80j0ab5r8y0va9kw0rvwix3093xsv4hwd00lcc";
rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b";
sha256 = "0snn7q7w1ab90311q8wgd1z64kw1svm5w831q0xd6glqhah86qc8";
};

disabled = isPyPy;
4 changes: 2 additions & 2 deletions pkgs/development/tools/analysis/codeql/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,15 @@

stdenv.mkDerivation rec {
pname = "codeql";
version = "2.0.2";
version = "2.0.4";

dontConfigure = true;
dontBuild = true;
dontStrip = true;

src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "11siv8qmj4arl6qxks7bqnhx5669r3kxqcxq37ai7sf9f7v78k1i";
sha256 = "02sqs7shxqrq6c6h12ldskk30k7sisa75wjxz99xyg49m4b2lw4m";
};

nativeBuildInputs = [
6 changes: 3 additions & 3 deletions pkgs/development/tools/azcopy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoModule rec {
pname = "azure-storage-azcopy";
version = "10.3.2";
version = "10.3.4";

src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "v${version}";
sha256 = "0n4yns81kwwx725smsgqg8hc693ygqlzrgkqdrhrfszkpm205479";
rev = version;
sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g";
};

subPackages = [ "." ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/misc/go-license-detector/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoModule rec {
pname = "go-license-detector";
version = "3.0.2";
version = "3.1.0";

src = fetchFromGitHub {
owner = "src-d";
repo = pname;
rev = "v${version}";
sha256 = "0gp7na2hqn5crr5x4khllsq7ka9h7rx8b4y10yzxmi0wpmxr53sw";
sha256 = "0ln1z3y9q5igf9djkxw05ql2hb1ijcvvz0mrbwz11cdv9xrsa4z4";
};

modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb";
6 changes: 3 additions & 3 deletions pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@
# To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option

stdenv.mkDerivation rec {
version = "0.6.0";
version = "0.7.1";
pname = "zsh-syntax-highlighting";

src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-syntax-highlighting";
rev = version;
sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
sha256 = "03r6hpb5fy4yaakqm3lbf4xcvd408r44jgpv4lnzl9asp4sb9qc0";
};

buildInputs = [ zsh ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "Fish shell like syntax highlighting for Zsh";
homepage = https://github.com/zsh-users/zsh-syntax-highlighting;
homepage = "https://github.com/zsh-users/zsh-syntax-highlighting";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = [ maintainers.loskutov ];
6 changes: 3 additions & 3 deletions pkgs/tools/X11/wpgtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

python3Packages.buildPythonApplication rec {
pname = "wpgtk";
version = "6.0.12";
version = "6.0.13";

src = fetchFromGitHub {
owner = "deviantfero";
repo = "wpgtk";
rev = version;
sha256 = "1wqdjq3pjgwb1da549izw3bzi1bk6q7d1hjw3i2zg5nhig1vvxw6";
sha256 = "1fphv6k2hqfi3fzazjqmvip7sz9fhy5ccsgpqv68vfylrf8g1f92";
};

buildInputs = [
@@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf.
'';
homepage = https://github.com/deviantfero/wpgtk;
homepage = "https://github.com/deviantfero/wpgtk";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.melkor333 ];
6 changes: 3 additions & 3 deletions pkgs/tools/audio/abcmidi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@

stdenv.mkDerivation rec {
pname = "abcMIDI";
version = "2019.12.09";
version = "2020.02.12";

src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
sha256 = "1pc7wm4np43ax13k4sfwr12dzyinw9p2ghacdw0rwdljg0k000a2";
sha256 = "1h0ixdbhxdfvii9in9pdidkdv12qfwbhjy3diknywl0yvaa40xw0";
};

# There is also a file called "makefile" which seems to be preferred by the standard build phase
makefile = "Makefile";

meta = with stdenv.lib; {
homepage = http://abc.sourceforge.net/abcMIDI/;
homepage = "http://abc.sourceforge.net/abcMIDI/";
downloadPage = https://ifdo.ca/~seymour/runabc/top.html;
license = licenses.gpl2Plus;
description = "Utilities for converting between abc and MIDI";
6 changes: 3 additions & 3 deletions pkgs/tools/misc/chafa/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@


stdenv.mkDerivation rec{
version = "1.2.1";
version = "1.2.2";
pname = "chafa";

src = fetchFromGitHub {
owner = "hpjansson";
repo = "chafa";
rev = version;
sha256 = "19dck47v4hd07q9742mgb928h7y1y9638qlh2rzsvqsfqvqmxh85";
sha256 = "10in960wzvmb25biifi480dz87c034vwb8mcshclssl7gmzgpzdn";
};

nativeBuildInputs = [ autoconf
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec{

meta = with stdenv.lib; {
description = "Terminal graphics for the 21st century.";
homepage = https://hpjansson.org/chafa/;
homepage = "https://hpjansson.org/chafa/";
license = licenses.lgpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.mog ];
4 changes: 2 additions & 2 deletions pkgs/tools/security/bitwarden_rs/vault.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "bitwarden_rs-vault";
version = "2.12.0c";
version = "2.12.0e";

src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
sha256 = "040bqbx6hpwq4qvv4s7d77gwp5n2ay9rr7kdb135582d80wjq5sp";
sha256 = "1jy3c5ywlplrjsy37i90x5s8k0i5n1mn8y0fyl074s807glqaxbf";
};

buildCommand = ''