diff --git a/PaymentServer.cabal b/PaymentServer.cabal index c5a6aef4f0dd0588a9a88a9e0cb3d6e93a2c32e3..8e6fee735d06db23137fc050df2cf279a8dce0f8 100644 --- a/PaymentServer.cabal +++ b/PaymentServer.cabal @@ -44,7 +44,7 @@ library , sqlite-simple default-language: Haskell2010 ghc-options: -Wmissing-import-lists -Wunused-imports - pkgconfig-depends: libchallenge_bypass_ristretto + pkgconfig-depends: libchallenge_bypass_ristretto_ffi executable PaymentServer-exe hs-source-dirs: app diff --git a/nix/PaymentServer.nix b/nix/PaymentServer.nix index 98421eb30f09b35a5cccff8f4e8e1ccee3f7d050..54162808eb8bf33ddbd3c325fe9b80fe105082ab 100644 --- a/nix/PaymentServer.nix +++ b/nix/PaymentServer.nix @@ -78,7 +78,7 @@ in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: (hsPkgs."sqlite-simple" or (buildDepError "sqlite-simple")) ]; pkgconfig = [ - (pkgconfPkgs."libchallenge_bypass_ristretto" or (pkgConfDepError "libchallenge_bypass_ristretto")) + (pkgconfPkgs."libchallenge_bypass_ristretto_ffi" or (pkgConfDepError "libchallenge_bypass_ristretto_ffi")) ]; }; exes = { diff --git a/nix/challenge-bypass-ristretto-repo.nix b/nix/challenge-bypass-ristretto-repo.nix index c7e246f6c2bfb2b8b2fb73bc02ef38b818ac4ddf..007d257fc49c1155eb4775f970a5bc60eb320329 100644 --- a/nix/challenge-bypass-ristretto-repo.nix +++ b/nix/challenge-bypass-ristretto-repo.nix @@ -4,6 +4,6 @@ in pkgs.fetchFromGitHub { owner = "LeastAuthority"; repo = "python-challenge-bypass-ristretto"; - rev = "f1a7cfab1a7f1bf8b3345c228c2183064889ad83"; - sha256 = "12myak2jwaisljs7bmx1vydgd0fnxvkaisk4zsf0kshwxrlnyh3x"; - } \ No newline at end of file + rev = "v2020.04.03rc1"; + sha256 = "03iqww9h7ff0pdi3mgg912a9s9yd8xbm4cx7iznv94611vxrcdzs"; + } diff --git a/nix/overlay.nix b/nix/overlay.nix index 482cbb066d6bb562c8046d9e73285aff2c38d199..dc4b0ae7f794e5a74c0391037ee5dbd9ee73713f 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -1,3 +1,3 @@ self: super: { - challenge-bypass-ristretto = super.callPackage ./challenge-bypass-ristretto.nix { }; + libchallenge_bypass_ristretto_ffi = super.callPackage ./challenge-bypass-ristretto.nix { }; }