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: 9eb814f798fd
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: c8e389d512bf
Choose a head ref
  • 6 commits
  • 4 files changed
  • 4 contributors

Commits on Sep 23, 2020

  1. nixos: now beta

    Jonathan Ringer committed Sep 23, 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
    cc9d3bf View commit details

  2. lldb_5, lldb_6: add patch for >=python-3.7 

    (cherry picked from commit 172f3a1)
    @maxxk
    maxxk committed Sep 23, 2020
    Copy the full SHA
    fc83817 View commit details

  3. Merge pull request #98342 from maxxk/lldb5_6-python37-20.09 

    [20.09] lldb_5, lldb_6: add patch for >=python-3.7
    @risicle
    risicle authored Sep 23, 2020
    Copy the full SHA
    189520c View commit details

  4. Merge pull request #98524 from jonringer/cut-beta 

    nixos: now beta
    @worldofpeace
    worldofpeace authored Sep 23, 2020
    Copy the full SHA
    bc260ba View commit details

  5. python3Packages.ihatemoney: disable sandbox unfriendly tests, fix pas… 

    …sthru

(cherry picked from commit 43d588b)
    @wkral
    Jonathan Ringer authored and wkral committed Sep 23, 2020
    Copy the full SHA
    81d4751 View commit details

  6. Merge pull request #98585 from wkral/backport-ihatemoney 

    [20.09] python3Packages.ihatemoney: disable sandbox unfriendly tests, fix passthru
    @worldofpeace
    worldofpeace authored Sep 23, 2020
    Copy the full SHA
    c8e389d View commit details
Showing with 31 additions and 3 deletions.
  1. +1 −1 nixos/release.nix
  2. +10 −0 pkgs/development/compilers/llvm/5/lldb.nix
  3. +10 −0 pkgs/development/compilers/llvm/6/lldb.nix
  4. +10 −2 pkgs/development/python-modules/ihatemoney/default.nix
2 changes: 1 addition & 1 deletion nixos/release.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ let

version = fileContents ../.version;
versionSuffix =
(if stableBranch then "." else "alpha") + "${toString (nixpkgs.revCount - 242760)}.${nixpkgs.shortRev}";
(if stableBranch then "." else "beta") + "${toString (nixpkgs.revCount - 242760)}.${nixpkgs.shortRev}";

# Run the tests for each platform. You can run a test by doing
# e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,
10 changes: 10 additions & 0 deletions pkgs/development/compilers/llvm/5/lldb.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetch
, fetchpatch
, cmake
, zlib
, ncurses
@@ -20,6 +21,15 @@ stdenv.mkDerivation {

src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq";

patches = [
# Fix PythonString::GetString for >=python-3.7
(fetchpatch {
url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch";
sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps";
stripLen = 1;
})
];

postPatch = ''
# Fix up various paths that assume llvm and clang are installed in the same place
sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
10 changes: 10 additions & 0 deletions pkgs/development/compilers/llvm/6/lldb.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetch
, fetchpatch
, cmake
, zlib
, ncurses
@@ -20,6 +21,15 @@ stdenv.mkDerivation {

src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb";

patches = [
# Fix PythonString::GetString for >=python-3.7
(fetchpatch {
url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch";
sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps";
stripLen = 1;
})
];

postPatch = ''
# Fix up various paths that assume llvm and clang are installed in the same place
sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
12 changes: 10 additions & 2 deletions pkgs/development/python-modules/ihatemoney/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@
, wtforms
, psycopg2 # optional, for postgresql support
, flask_testing
, pytestCheckHook
}:

# ihatemoney is not really a library. It will only ever be imported
@@ -113,12 +114,19 @@ buildPythonPackage rec {
];

checkInputs = [
flask_testing
flask_testing pytestCheckHook
];

pytestFlagsArray = [ "--pyargs ihatemoney.tests.tests" ];
disabledTests = [
"test_notifications" # requires running service.
"test_invite" # requires running service.
];

passthru.tests = {
inherit (nixosTests) ihatemoney;
inherit (nixosTests.ihatemoney) ihatemoney-postgresql ihatemoney-sqlite;
};

meta = with lib; {
homepage = "https://ihatemoney.org";
description = "A simple shared budget manager web application";