diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-04 18:14:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 18:14:51 +0000 |
| commit | cb36dd7449c2cd8ed0d9c9946a3ffe0460a742b1 (patch) | |
| tree | abe3563a0bfd150dd72db39d0b1def08b359c74e /pkgs/applications/misc | |
| parent | 5524c43f2c0cc246de33d6eff378dcad843b2617 (diff) | |
| parent | b66ea6fc39acc588ecc8ccb1409995f2444862df (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/ausweisapp2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/dasel/default.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 911a30ccf611..dc46edc070fd 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.20.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb"; + sha256 = "00isb8xcbm419nvxx2ri0n8x5d403733h2whjqjcd3hmpx3x4q1h"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index ca1a87dd2dd9..d76cf9b106e7 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -16,6 +16,10 @@ buildGoModule rec { vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; + buildFlagsArray = '' + -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version} + ''; + meta = with stdenv.lib; { description = "Query and update data structures from the command line"; longDescription = '' |