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: 9e693a074d0c
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: 749c0a9c16e4
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on Mar 18, 2019

  1. vscode-extensions.WakaTime.vscode-wakatime: 1.2.7 -> 1.2.13

    @eadwu
    eadwu committed Mar 18, 2019
    Copy the full SHA
    7e335a3 View commit details

Commits on Mar 25, 2019

  1. buildRustCrate: Fix include filter 

    buildRustCrate has a handy `include` helper, that only imports those whitelisted
files and folders to the store.

However, the function's matching logic is broken and includes all files,
regardless of whether or not they're whitelisted, as long as the whitelist
contains at least one name (regardless of whether that name exists). This is
because it doesn't take into account that
`lib.strings.removePrefix "foo" "bar" == "bar"` (that is, paths that don't match
the prefix are passed straight through).
    @nightkr
    nightkr committed Mar 25, 2019
    Copy the full SHA
    5eec83e View commit details

  2. Merge pull request #58258 from teozkr/buildRustCrate-fix-include 

    buildRustCrate: Fix `include` filter
    @dywedir
    dywedir authored Mar 25, 2019
    Copy the full SHA
    7be93a4 View commit details

  3. Merge pull request #57325 from eadwu/vscode-extensions.WakaTime.vscod… 

    …e-wakatime/1.2.12

vscode-extensions.WakaTime.vscode-wakatime: 1.2.7 -> 1.2.13
    @veprbl
    veprbl authored Mar 25, 2019
    Copy the full SHA
    749c0a9 View commit details
Showing with 5 additions and 6 deletions.
  1. +1 −2 pkgs/build-support/rust/build-rust-crate/helpers.nix
  2. +4 −4 pkgs/misc/vscode-extensions/wakatime/default.nix
3 changes: 1 addition & 2 deletions pkgs/build-support/rust/build-rust-crate/helpers.nix
View file
Original file line number Diff line number Diff line change
@@ -14,9 +14,8 @@
include = includedFiles: src: builtins.filterSource (path: type:
lib.lists.any (f:
let p = toString (src + ("/" + f));
suff = lib.strings.removePrefix p path;
in
suff == "" || (lib.strings.hasPrefix "/" suff)
p == path || (lib.strings.hasPrefix (p + "/") path)
) includedFiles
) src;
exclude = excludedFiles: src: builtins.filterSource (path: type:
8 changes: 4 additions & 4 deletions pkgs/misc/vscode-extensions/wakatime/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@ in
mktplcRef = {
name = "vscode-wakatime";
publisher = "WakaTime";
version = "1.2.7";
sha256 = "1z1l9jbx7y7y643qxp76bxkpik4kbcqkw1492s11mrflqlfasyfn";
version = "1.2.13";
sha256 = "0zidlc1flgw8h9l5ph98xh6anxhggk4vpmq6k1k2sfzrrjypymgf";
};

postPatch = ''
mkdir -p dist/wakatime-master
cp -rt dist/wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime
mkdir -p wakatime-master
cp -rt wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime
'';

meta = with stdenv.lib; {